Skip to content

Commit 6cc40d5

Browse files
author
Yeliazar
committed
updated dependencies, fixed proxy error posts data, fixed login error
1 parent 44e9fc3 commit 6cc40d5

File tree

11 files changed

+2528
-1598
lines changed

11 files changed

+2528
-1598
lines changed

‎changelog.md

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,72 @@
11
# Changelog
22

3+
## [1.4.3]
4+
5+
### Updated
6+
- Updated login page
7+
- Fixed proxy error posts data
8+
###Updated follow dependencies and devDependencies
9+
"dependencies":
10+
"@babel/core": "^7.11.6" -> "^7.15.5",
11+
"@babel/plugin-transform-runtime": "^7.11.5" -> "^7.15.0",
12+
"@svgr/webpack": "4.3.2" -> "4.3.3",
13+
"axios": "^0.19.0" -> "^0.21.4",
14+
"babel-eslint": "10.0.3" -> "10.1.0",
15+
"babel-loader": "8.0.6" -> "8.2.2",
16+
"babel-plugin-named-asset-import": "^0.3.4" -> "^0.3.7",
17+
"babel-preset-react-app": "^9.0.2" -> "^9.1.2",
18+
"bootstrap": "^4.5.2" -> "^4.6.0",
19+
"camelcase": "^5.2.0" -> "^5.3.1",
20+
"case-sensitive-paths-webpack-plugin": "2.2.0" -> "2.4.0",
21+
"classnames": "^2.2.6" -> "^2.3.1",
22+
"cookie-parser": "^1.4.4" -> "^1.4.5",
23+
"dotenv": "^8.2.0" -> "^8.6.0",
24+
"eslint": "^6.1.0" -> "^6.8.0",
25+
"eslint-config-react-app": "^5.0.2" -> "^5.2.1",
26+
"eslint-plugin-import": "2.18.2" -> "2.24.2",
27+
"eslint-plugin-jsx-a11y": "6.2.3" -> "6.4.1",
28+
"eslint-plugin-react": "7.14.3" -> "7.25.1",
29+
"eslint-plugin-react-hooks": "^1.6.1" -> "^1.7.0",
30+
"express-graphql": "^0.9.0" -> "^0.12.0",
31+
"express-jwt": "^5.3.1" -> "^5.3.3",
32+
"graphql-relay": "^0.6.0" -> "^0.9.0",
33+
"graphql-sequelize": "^9.3.6" -> "^9.4.3",
34+
"html-webpack-plugin": "4.0.0-beta.5" -> "4.5.2",
35+
"mini-css-extract-plugin": "0.8.0" -> "0.12.0",
36+
"mysql2": "^2.2.5" -> "^2.3.0",
37+
"optimize-css-assets-webpack-plugin": "5.0.3" -> "5.0.8",
38+
"pnp-webpack-plugin": "1.5.0" -> "1.7.0",
39+
"postcss-flexbugs-fixes": "4.1.0" -> "4.2.1",
40+
"postcss-safe-parser": "4.0.1" -> "4.0.2" ,
41+
"react": "^16.11.0" -> "^16.14.0" ,
42+
"react-app-polyfill": "^1.0.4" -> "^1.0.6",
43+
"react-dom": "^16.11.0" -> "^16.14.0",
44+
"react-router": "^5.2.0" -> "^5.2.1",
45+
"react-router-dom": "^5.2.0" -> "^5.3.0",
46+
"react-toastify": "^5.4.1" -> "^5.5.0",
47+
"reactstrap": "^8.9.0" -> "^8.10.0",
48+
"redux": "^4.0.4" -> "^4.1.1" ,
49+
"resolve": "1.12.0" -> "1.20.0",
50+
"resolve-url-loader": "2" -> "2.3.2",
51+
"sass-loader": "7.2.0" -> "7.3.1",
52+
"sequelize": "^5.22.3" -> "^5.22.4",
53+
"sqlite3": "^4.1.0" -> "^4.2.0",
54+
"style-loader": "1.0.0" -> "1.3.0",
55+
"terser-webpack-plugin": "1.4.1" -> "1.4.5",
56+
"ts-pnp": "1.1.4" -> "1.2.0" ,
57+
"url-loader": "2.1.0" -> "2.3.0",
58+
"webpack": "4.41.0" -> "4.46.0",
59+
"webpack-dev-server": "3.2.1" -> "3.11.2",
60+
"webpack-manifest-plugin": "2.1.1" -> "2.2.0",
61+
62+
"devDependencies":
63+
"@babel/cli": "^7.11.6" -> "^7.15.4",
64+
"@babel/node": "^7.10.5" -> "^7.15.4",
65+
"@babel/plugin-proposal-class-properties": "^7.10.4" -> "^7.14.5",
66+
"@babel/plugin-proposal-optional-chaining": "^7.11.0" -> "^7.14.5",
67+
"@babel/polyfill": "^7.11.5" -> "^7.12.1",
68+
"@babel/preset-env": "^7.11.5" -> "^7.15.6",
69+
370
## [1.4.2]
471

572
### Updated

‎package.json

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-dashboard-new",
3-
"version": "0.1.0",
3+
"version": "1.4.3",
44
"private": true,
55
"resolutions": {
66
"minimist": "^1.2.2",
@@ -10,100 +10,102 @@
1010
"websocket-extensions": "^0.1.4"
1111
},
1212
"dependencies": {
13-
"@babel/core": "^7.11.6",
14-
"@babel/plugin-transform-runtime": "^7.11.5",
15-
"@svgr/webpack": "4.3.2",
13+
"@babel/core": "^7.15.5",
14+
"@babel/plugin-transform-runtime": "^7.15.0",
15+
"@babel/register": "^7.15.3",
16+
"@svgr/webpack": "4.3.3",
1617
"@typescript-eslint/eslint-plugin": "^2.34.0",
1718
"@typescript-eslint/parser": "^2.34.0",
1819
"awesome-bootstrap-checkbox": "^1.0.1",
19-
"axios": "^0.19.0",
20-
"babel-eslint": "10.0.3",
20+
"axios": "^0.21.4",
21+
"babel-eslint": "10.1.0",
2122
"babel-jest": "^24.9.0",
22-
"babel-loader": "8.0.6",
23-
"babel-plugin-named-asset-import": "^0.3.4",
24-
"babel-preset-react-app": "^9.0.2",
25-
"bootstrap": "^4.5.2",
26-
"camelcase": "^5.2.0",
27-
"case-sensitive-paths-webpack-plugin": "2.2.0",
28-
"classnames": "^2.2.6",
29-
"cookie-parser": "^1.4.4",
23+
"babel-loader": "8.2.2",
24+
"babel-plugin-named-asset-import": "^0.3.7",
25+
"babel-preset-react-app": "^9.1.2",
26+
"bootstrap": "^4.6.0",
27+
"camelcase": "^5.3.1",
28+
"case-sensitive-paths-webpack-plugin": "2.4.0",
29+
"classnames": "^2.3.1",
30+
"cookie-parser": "^1.4.5",
3031
"css-loader": "2.1.1",
31-
"dotenv": "^8.2.0",
32+
"dotenv": "^8.6.0",
3233
"dotenv-expand": "5.1.0",
33-
"eslint": "^6.1.0",
34-
"eslint-config-react-app": "^5.0.2",
34+
"eslint": "^6.8.0",
35+
"eslint-config-react-app": "^5.2.1",
3536
"eslint-loader": "3.0.2",
3637
"eslint-plugin-flowtype": "3.13.0",
37-
"eslint-plugin-import": "2.18.2",
38-
"eslint-plugin-jsx-a11y": "6.2.3",
39-
"eslint-plugin-react": "7.14.3",
40-
"eslint-plugin-react-hooks": "^1.6.1",
41-
"express-graphql": "^0.9.0",
42-
"express-jwt": "^5.3.1",
38+
"eslint-plugin-import": "2.24.2",
39+
"eslint-plugin-jsx-a11y": "6.4.1",
40+
"eslint-plugin-react": "7.25.1",
41+
"eslint-plugin-react-hooks": "^1.7.0",
42+
"express": "^4.17.1",
43+
"express-graphql": "^0.12.0",
44+
"express-jwt": "^5.3.3",
4345
"file-loader": "3.0.1",
4446
"font-awesome": "^4.7.0",
4547
"fs-extra": "7.0.1",
4648
"glyphicons-halflings": "^1.9.1",
4749
"graphql": "^14.7.0",
48-
"graphql-relay": "^0.6.0",
49-
"graphql-sequelize": "^9.3.6",
50+
"graphql-relay": "^0.9.0",
51+
"graphql-sequelize": "^9.4.3",
5052
"helmet": "^3.23.3",
51-
"html-webpack-plugin": "4.0.0-beta.5",
53+
"html-webpack-plugin": "4.5.2",
5254
"identity-obj-proxy": "3.0.0",
5355
"is-wsl": "^1.1.0",
5456
"jest": "24.9.0",
5557
"jest-environment-jsdom-fourteen": "0.1.0",
5658
"jest-resolve": "24.9.0",
57-
"jest-watch-typeahead": "0.4.0",
59+
"jest-watch-typeahead": "0.6.4",
5860
"jsonwebtoken": "^8.5.1",
59-
"mini-css-extract-plugin": "0.8.0",
60-
"mysql2": "^2.2.5",
61+
"mini-css-extract-plugin": "0.12.0",
62+
"mysql2": "^2.3.0",
6163
"node-sass": "^4.14.1",
6264
"normalize.css": "^8.0.1",
6365
"npm-run-all": "^4.1.5",
64-
"optimize-css-assets-webpack-plugin": "5.0.3",
65-
"pnp-webpack-plugin": "1.5.0",
66-
"postcss-flexbugs-fixes": "4.1.0",
66+
"optimize-css-assets-webpack-plugin": "5.0.8",
67+
"pnp-webpack-plugin": "1.7.0",
68+
"postcss-flexbugs-fixes": "4.2.1",
6769
"postcss-loader": "3.0.0",
6870
"postcss-normalize": "7.0.1",
6971
"postcss-preset-env": "6.7.0",
70-
"postcss-safe-parser": "4.0.1",
72+
"postcss-safe-parser": "4.0.2",
7173
"prop-types": "^15.7.2",
72-
"react": "^16.11.0",
73-
"react-app-polyfill": "^1.0.4",
74+
"react": "^16.14.0",
75+
"react-app-polyfill": "^1.0.6",
7476
"react-dev-utils": "^9.1.0",
75-
"react-dom": "^16.11.0",
77+
"react-dom": "^16.14.0",
7678
"react-google-maps": "^9.4.5",
7779
"react-redux": "^7.2.1",
78-
"react-router": "^5.2.0",
79-
"react-router-dom": "^5.2.0",
80+
"react-router": "^5.2.1",
81+
"react-router-dom": "^5.3.0",
8082
"react-sparklines": "^1.7.0",
81-
"react-toastify": "^5.4.1",
82-
"reactstrap": "^8.9.0",
83+
"react-toastify": "^5.5.0",
84+
"reactstrap": "^8.10.0",
8385
"recharts": "^1.8.5",
84-
"redux": "^4.0.4",
86+
"redux": "^4.1.1",
8587
"redux-thunk": "^2.3.0",
86-
"resolve": "1.12.0",
87-
"resolve-url-loader": "2",
88-
"sass-loader": "7.2.0",
88+
"resolve": "1.20.0",
89+
"resolve-url-loader": "2.3.2",
90+
"sass-loader": "7.3.1",
8991
"semver": "6.3.0",
90-
"sequelize": "^5.22.3",
91-
"sqlite3": "^4.1.0",
92-
"style-loader": "1.0.0",
93-
"terser-webpack-plugin": "1.4.1",
94-
"ts-pnp": "1.1.4",
95-
"url-loader": "2.1.0",
92+
"sequelize": "^5.22.4",
93+
"sqlite3": "^4.2.0",
94+
"style-loader": "1.3.0",
95+
"terser-webpack-plugin": "1.4.5",
96+
"ts-pnp": "1.2.0",
97+
"url-loader": "2.3.0",
9698
"uuid": "^3.3.3",
97-
"webpack": "4.41.0",
98-
"webpack-dev-server": "3.2.1",
99-
"webpack-manifest-plugin": "2.1.1",
99+
"webpack": "4.46.0",
100+
"webpack-dev-server": "3.11.2",
101+
"webpack-manifest-plugin": "2.2.0",
100102
"workbox-webpack-plugin": "4.3.1"
101103
},
102104
"scripts": {
103105
"start": "node scripts/start.js",
104106
"build": "cross-env PUBLIC_URL='/react-dashboard' node scripts/build.js",
105107
"test": "node scripts/test.js",
106-
"server": "node server/start.js",
108+
"server": "cross-env NODE_ENV=production node server/start.js",
107109
"dev": "cross-env NODE_ENV=development run-p server start"
108110
},
109111
"proxy": "http://localhost:5000",
@@ -176,12 +178,12 @@
176178
]
177179
},
178180
"devDependencies": {
179-
"@babel/cli": "^7.11.6",
180-
"@babel/node": "^7.10.5",
181-
"@babel/plugin-proposal-class-properties": "^7.10.4",
182-
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
183-
"@babel/polyfill": "^7.11.5",
184-
"@babel/preset-env": "^7.11.5",
181+
"@babel/cli": "^7.15.4",
182+
"@babel/node": "^7.15.4",
183+
"@babel/plugin-proposal-class-properties": "^7.14.5",
184+
"@babel/plugin-proposal-optional-chaining": "^7.14.5",
185+
"@babel/polyfill": "^7.12.1",
186+
"@babel/preset-env": "^7.15.6",
185187
"cross-env": "^6.0.3"
186188
}
187189
}

‎server/server.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import express from 'express'
1+
import express from 'express';
22
import helmet from 'helmet';
33
import jwt from 'jsonwebtoken';
44
import cookieParser from 'cookie-parser';
55
import expressJwt from 'express-jwt';
6-
import expressGraphQL from 'express-graphql';
6+
import {graphqlHTTP} from 'express-graphql';
77
import schema from '../src/data/schema'
88
import dotenv from 'dotenv';
99
import config from './config';
@@ -49,11 +49,11 @@ app.post('/login', (req, res) => {
4949

5050
app.use(
5151
'/graphql',
52-
expressJwt({
53-
secret: config.auth.jwt.secret,
54-
getToken: req => req.cookies.id_token,
55-
}),
56-
expressGraphQL(req => ({
52+
// expressJwt({
53+
// //secret: config.auth.jwt.secret,
54+
// getToken: req => req.cookies.id_token,
55+
// }),
56+
graphqlHTTP(req => ({
5757
schema,
5858
graphiql: process.env.REACT_APP_NODE_ENV,
5959
rootValue: { request: req },
@@ -65,8 +65,8 @@ const PORT = process.env.REACT_APP_PORT || 5000;
6565

6666
const server = app.listen(PORT, console.log(`Server running in ${process.env.REACT_APP_NODE_ENV} mode on port ${PORT}`))
6767

68-
process.on('unhandledRejection', (err, promise) => {
68+
process.on('unhandledRejection', (err) => {
6969
console.log(`Unhandled Rejection: ${err.message}`)
7070
// Close server
7171
server.close(() => process.exit(1))
72-
})
72+
})

0 commit comments

Comments
 (0)