From 5a7fe0b84dd4c98044712c3e8446661a829fb848 Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 16 Dec 2021 10:56:19 +0300 Subject: [PATCH 1/5] UIKit: move main colors to .env --- .env | 3 +++ .gitignore | 2 -- package.json | 3 ++- src/client/UIKit/colors.js | 33 +++------------------------------ 4 files changed, 8 insertions(+), 33 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..49a893b --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +REACT_APP_COLOR_PRIMARY=#BF3676 +REACT_APP_COLOR_SECONDARY=#FD4047 +REACT_APP_COLOR_TERTIARTY=#FF9112 \ No newline at end of file diff --git a/.gitignore b/.gitignore index af3f2e0..0f6157b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,6 @@ # misc .DS_Store -.env -.env.development npm-debug.log* yarn-debug.log* diff --git a/package.json b/package.json index de1b9de..de3ac79 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "@types/uuid": "^8.3.0", "commitizen": "^4.2.3", "cz-conventional-changelog": "^3.3.0", + "dotenv-cli": "^4.1.1", "source-map-explorer": "^2.5.2" }, "resolutions": { @@ -61,7 +62,7 @@ "scripts": { "test": "react-scripts test", "eject": "react-scripts eject", - "start": "craco start", + "start": "dotenv -e .env craco start", "build": "craco build", "eslint": "eslint ./src", "eslint:fix": "eslint ./src --fix", diff --git a/src/client/UIKit/colors.js b/src/client/UIKit/colors.js index 429d011..34c95d2 100644 --- a/src/client/UIKit/colors.js +++ b/src/client/UIKit/colors.js @@ -1,6 +1,3 @@ -/* eslint-disable @typescript-eslint/no-var-requires */ -/* eslint-disable no-undef */ - const colors = { BLACK: { 0: '#000000', @@ -21,36 +18,12 @@ const colors = { 400: '#B6B6B6', 500: '#A4A4A4', }, - - BLUE: { - 0: '#1C01A9', - 100: '#1B019B', - 200: '#190190', - 300: '#160184', - 400: '#140178', - 500: '#12016C', - }, - - PURPLE: { - 0: '#300191', - 100: '#3A0185', - 200: '#440179', - 300: '#4E016D', - 400: '#580161', - 500: '#620256', - }, }; const colorTheme = { - primary: process.env.REACT_APP_PRODUCTION - ? colors.BLUE[0] - : colors.PURPLE[300], - secondary: process.env.REACT_APP_PRODUCTION - ? colors.PURPLE[100] - : colors.PURPLE[400], - tertiary: process.env.REACT_APP_PRODUCTION - ? colors.PURPLE[400] - : colors.PURPLE[0], + primary: process.env.REACT_APP_COLOR_PRIMARY, + secondary: process.env.REACT_APP_COLOR_SECONDARY, + tertiary: process.env.REACT_APP_COLOR_TERTIARTY, }; module.exports = Object.assign(colors, colorTheme); From fbe073f088f85c3ee109b4463897be1da1d7863f Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 16 Dec 2021 10:56:40 +0300 Subject: [PATCH 2/5] add favicon.dev --- public/favicon.ico | Bin 9662 -> 3481 bytes public/favicon.prod.ico | Bin 0 -> 9662 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/favicon.prod.ico diff --git a/public/favicon.ico b/public/favicon.ico index 83f02521ff2404f2ab054b3e6327842b3ffe1f50..8bd844a41bd4f5c3a117fd66c28c760230cfa364 100644 GIT binary patch literal 3481 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 Vo(>pTh5bn3_IUiZQ@A5E>wn&Q;(q`D literal 9662 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 diff --git a/public/favicon.prod.ico b/public/favicon.prod.ico new file mode 100644 index 0000000000000000000000000000000000000000..83f02521ff2404f2ab054b3e6327842b3ffe1f50 GIT binary patch literal 9662 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 literal 0 HcmV?d00001 From cb7f73ccd37180ad38c04bcb13d4c1f641d21746 Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 16 Dec 2021 10:58:10 +0300 Subject: [PATCH 3/5] upgrade node version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index df7e447..556fe63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14-alpine as builder +FROM node:16-alpine as builder ENV REACT_APP_PRODUCTION=true ENV GENERATE_SOURCEMAP=false From 126ca7c919e74ad1bdcabf1fbfe010a65cd63f40 Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 16 Dec 2021 12:38:36 +0300 Subject: [PATCH 4/5] Dockerfile: use yarn --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 556fe63..260911c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:16-alpine as builder -ENV REACT_APP_PRODUCTION=true +ENV NODE_ENV=production ENV GENERATE_SOURCEMAP=false ENV DISABLE_ESLINT_PLUGIN=true @@ -8,11 +8,11 @@ WORKDIR /app COPY package.json /app/ -RUN npm install --only=prod +RUN yarn install COPY . /app -RUN npm run build +RUN yarn build FROM nginx:alpine From 301fa66e1abcd7b52f4feeae6e4e223e99c883bf Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 16 Dec 2021 12:57:26 +0300 Subject: [PATCH 5/5] Dockerfile: get args from docker-compose --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 260911c..30fdb5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,10 @@ ENV NODE_ENV=production ENV GENERATE_SOURCEMAP=false ENV DISABLE_ESLINT_PLUGIN=true +ARG REACT_APP_COLOR_PRIMARY +ARG REACT_APP_COLOR_SECONDARY +ARG REACT_APP_COLOR_TERTIARTY + WORKDIR /app COPY package.json /app/