diff --git a/.gitignore b/.gitignore index 4d29575..7093f0e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ npm-debug.log* yarn-debug.log* yarn-error.log* +yarn.lock +*.log +package-lock.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0adb7af --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "files.exclude": { + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/CVS": true, + "**/.DS_Store": true, + "**/node_modules": true + }, + "explorerExclude.backup": null +} \ No newline at end of file diff --git a/package.json b/package.json index e7d8d9b..6fc46db 100644 --- a/package.json +++ b/package.json @@ -1,25 +1,69 @@ { "name": "evo_calculator", - "version": "0.1.0", + "version": "0.0.1", "private": true, "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", - "@types/jest": "^24.0.0", - "@types/node": "^12.0.0", - "@types/react": "^16.9.0", - "@types/react-dom": "^16.9.0", + "axios": "^0.19.2", + "body-parser": "^1.19.0", + "class-validator": "^0.12.2", + "compression": "^1.7.4", + "cookie-parser": "^1.4.5", + "cors": "^2.8.5", + "express": "^4.17.1", + "express-node-sspi": "^1.0.1", + "helmet": "^4.1.0", + "http-errors": "^1.8.0", + "lodash": "^4.17.20", + "morgan": "^1.10.0", + "mssql": "^6.2.1", + "node-sspi": "^0.2.8", + "nodemon": "^2.0.4", + "normalize.css": "^8.0.1", "react": "^16.13.1", "react-dom": "^16.13.1", + "react-redux": "^7.2.1", + "react-router": "^5.2.0", + "react-router-dom": "^5.2.0", "react-scripts": "3.4.3", - "typescript": "~3.7.2" + "reflect-metadata": "^0.1.13", + "rxjs": "^6.6.2", + "styled-components": "^5.1.1", + "styled-system": "^5.1.5", + "ts-loader": "^8.0.2", + "typeorm": "^0.2.25", + "typescript": "~3.7.2", + "webpack-cli": "^3.3.12" + }, + "devDependencies": { + "@types/body-parser": "^1.19.0", + "@types/compression": "^1.7.0", + "@types/cookie-parser": "^1.4.2", + "@types/cors": "^2.8.7", + "@types/express": "^4.17.7", + "@types/morgan": "^1.9.1", + "@types/node": "^14.6.0", + "@types/react-router-dom": "^5.1.5", + "@types/styled-components": "^5.1.2", + "agentkeepalive": "^4.1.3", + "http-proxy-middleware": "^1.0.5", + "webpack-node-externals": "^2.5.1" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", "test": "react-scripts test", - "eject": "react-scripts eject" + "eject": "react-scripts eject", + "dev": "cross-env NODE_ENV=development concurrently -p name -c \"yellow,magenta,blue\" -n \"webpack-server,nodemon-server,CRA\" \"yarn dev:server:webpack\" \"yarn dev:server:nodemon\" \"yarn dev:client\"", + "dev:client": "wait-on -l tcp:3001 && react-scripts start", + "dev:server": "concurrently -p name -c \"yellow,magenta\" -n \"webpack-server,nodemon-server\" \"yarn dev:server:webpack\" \"yarn dev:server:nodemon\"", + "dev:server:webpack": "webpack --config webpack.config.server.js --watch", + "dev:server:nodemon": "rimraf build/server.js && wait-on -l build/server.js && nodemon build/server.js", + "build": "yarn build:client && yarn build:server", + "build:client": "react-scripts build", + "build:server": "cross-env NODE_ENV=production webpack --config webpack.config.server.js" }, "eslintConfig": { "extends": "react-app" diff --git a/public/index.html b/public/index.html index aa069f2..70ec97a 100644 --- a/public/index.html +++ b/public/index.html @@ -2,19 +2,31 @@
- + - + - +