evo/EvoCalculator
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Chika 2021-12-16 13:01:21 +03:00
commit ba72ed9399
7 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env Normal file
View File

@ -0,0 +1,3 @@
REACT_APP_COLOR_PRIMARY=#BF3676
REACT_APP_COLOR_SECONDARY=#FD4047
REACT_APP_COLOR_TERTIARTY=#FF9112

2
.gitignore vendored
View File

@ -13,8 +13,6 @@
# misc
.DS_Store
.env
.env.development
npm-debug.log*
yarn-debug.log*

12
Dockerfile
View File

@ -1,18 +1,22 @@
FROM node:14-alpine as builder
FROM node:16-alpine as builder
ENV REACT_APP_PRODUCTION=true
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/
RUN npm install --only=prod
RUN yarn install
COPY . /app
RUN npm run build
RUN yarn build
FROM nginx:alpine

3
package.json
View File

@ -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",

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
public/favicon.prod.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

33
src/client/UIKit/colors.js
View File

@ -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);