Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates dashboard #46

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updates dashboard #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e9fc3
updated styling layout, buttons, tables, notifications, alerts, badges
Jul 22, 2021
6cc40d5
updated dependencies, fixed proxy error posts data, fixed login error
Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,81 @@
# Changelog

## [1.4.3]

### Updated
- Updated login page
- Fixed proxy error posts data
###Updated follow dependencies and devDependencies
"dependencies":
"@babel/core": "^7.11.6" -> "^7.15.5",
"@babel/plugin-transform-runtime": "^7.11.5" -> "^7.15.0",
"@svgr/webpack": "4.3.2" -> "4.3.3",
"axios": "^0.19.0" -> "^0.21.4",
"babel-eslint": "10.0.3" -> "10.1.0",
"babel-loader": "8.0.6" -> "8.2.2",
"babel-plugin-named-asset-import": "^0.3.4" -> "^0.3.7",
"babel-preset-react-app": "^9.0.2" -> "^9.1.2",
"bootstrap": "^4.5.2" -> "^4.6.0",
"camelcase": "^5.2.0" -> "^5.3.1",
"case-sensitive-paths-webpack-plugin": "2.2.0" -> "2.4.0",
"classnames": "^2.2.6" -> "^2.3.1",
"cookie-parser": "^1.4.4" -> "^1.4.5",
"dotenv": "^8.2.0" -> "^8.6.0",
"eslint": "^6.1.0" -> "^6.8.0",
"eslint-config-react-app": "^5.0.2" -> "^5.2.1",
"eslint-plugin-import": "2.18.2" -> "2.24.2",
"eslint-plugin-jsx-a11y": "6.2.3" -> "6.4.1",
"eslint-plugin-react": "7.14.3" -> "7.25.1",
"eslint-plugin-react-hooks": "^1.6.1" -> "^1.7.0",
"express-graphql": "^0.9.0" -> "^0.12.0",
"express-jwt": "^5.3.1" -> "^5.3.3",
"graphql-relay": "^0.6.0" -> "^0.9.0",
"graphql-sequelize": "^9.3.6" -> "^9.4.3",
"html-webpack-plugin": "4.0.0-beta.5" -> "4.5.2",
"mini-css-extract-plugin": "0.8.0" -> "0.12.0",
"mysql2": "^2.2.5" -> "^2.3.0",
"optimize-css-assets-webpack-plugin": "5.0.3" -> "5.0.8",
"pnp-webpack-plugin": "1.5.0" -> "1.7.0",
"postcss-flexbugs-fixes": "4.1.0" -> "4.2.1",
"postcss-safe-parser": "4.0.1" -> "4.0.2" ,
"react": "^16.11.0" -> "^16.14.0" ,
"react-app-polyfill": "^1.0.4" -> "^1.0.6",
"react-dom": "^16.11.0" -> "^16.14.0",
"react-router": "^5.2.0" -> "^5.2.1",
"react-router-dom": "^5.2.0" -> "^5.3.0",
"react-toastify": "^5.4.1" -> "^5.5.0",
"reactstrap": "^8.9.0" -> "^8.10.0",
"redux": "^4.0.4" -> "^4.1.1" ,
"resolve": "1.12.0" -> "1.20.0",
"resolve-url-loader": "2" -> "2.3.2",
"sass-loader": "7.2.0" -> "7.3.1",
"sequelize": "^5.22.3" -> "^5.22.4",
"sqlite3": "^4.1.0" -> "^4.2.0",
"style-loader": "1.0.0" -> "1.3.0",
"terser-webpack-plugin": "1.4.1" -> "1.4.5",
"ts-pnp": "1.1.4" -> "1.2.0" ,
"url-loader": "2.1.0" -> "2.3.0",
"webpack": "4.41.0" -> "4.46.0",
"webpack-dev-server": "3.2.1" -> "3.11.2",
"webpack-manifest-plugin": "2.1.1" -> "2.2.0",

"devDependencies":
"@babel/cli": "^7.11.6" -> "^7.15.4",
"@babel/node": "^7.10.5" -> "^7.15.4",
"@babel/plugin-proposal-class-properties": "^7.10.4" -> "^7.14.5",
"@babel/plugin-proposal-optional-chaining": "^7.11.0" -> "^7.14.5",
"@babel/polyfill": "^7.11.5" -> "^7.12.1",
"@babel/preset-env": "^7.11.5" -> "^7.15.6",

## [1.4.2]

### Updated
- Added widget to icons on page icons,
- Updated styling badge component
- Updated styling alerts on page Dashboard
- Add styling to component sidebar, layout, buttons


## [1.4.1]

### Updated
Expand Down
122 changes: 62 additions & 60 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-dashboard-new",
"version": "0.1.0",
"version": "1.4.3",
"private": true,
"resolutions": {
"minimist": "^1.2.2",
Expand All @@ -10,100 +10,102 @@
"websocket-extensions": "^0.1.4"
},
"dependencies": {
"@babel/core": "^7.11.6",
"@babel/plugin-transform-runtime": "^7.11.5",
"@svgr/webpack": "4.3.2",
"@babel/core": "^7.15.5",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/register": "^7.15.3",
"@svgr/webpack": "4.3.3",
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"awesome-bootstrap-checkbox": "^1.0.1",
"axios": "^0.19.0",
"babel-eslint": "10.0.3",
"axios": "^0.21.4",
"babel-eslint": "10.1.0",
"babel-jest": "^24.9.0",
"babel-loader": "8.0.6",
"babel-plugin-named-asset-import": "^0.3.4",
"babel-preset-react-app": "^9.0.2",
"bootstrap": "^4.5.2",
"camelcase": "^5.2.0",
"case-sensitive-paths-webpack-plugin": "2.2.0",
"classnames": "^2.2.6",
"cookie-parser": "^1.4.4",
"babel-loader": "8.2.2",
"babel-plugin-named-asset-import": "^0.3.7",
"babel-preset-react-app": "^9.1.2",
"bootstrap": "^4.6.0",
"camelcase": "^5.3.1",
"case-sensitive-paths-webpack-plugin": "2.4.0",
"classnames": "^2.3.1",
"cookie-parser": "^1.4.5",
"css-loader": "2.1.1",
"dotenv": "^8.2.0",
"dotenv": "^8.6.0",
"dotenv-expand": "5.1.0",
"eslint": "^6.1.0",
"eslint-config-react-app": "^5.0.2",
"eslint": "^6.8.0",
"eslint-config-react-app": "^5.2.1",
"eslint-loader": "3.0.2",
"eslint-plugin-flowtype": "3.13.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.14.3",
"eslint-plugin-react-hooks": "^1.6.1",
"express-graphql": "^0.9.0",
"express-jwt": "^5.3.1",
"eslint-plugin-import": "2.24.2",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-react": "7.25.1",
"eslint-plugin-react-hooks": "^1.7.0",
"express": "^4.17.1",
"express-graphql": "^0.12.0",
"express-jwt": "^5.3.3",
"file-loader": "3.0.1",
"font-awesome": "^4.7.0",
"fs-extra": "7.0.1",
"glyphicons-halflings": "^1.9.1",
"graphql": "^14.7.0",
"graphql-relay": "^0.6.0",
"graphql-sequelize": "^9.3.6",
"graphql-relay": "^0.9.0",
"graphql-sequelize": "^9.4.3",
"helmet": "^3.23.3",
"html-webpack-plugin": "4.0.0-beta.5",
"html-webpack-plugin": "4.5.2",
"identity-obj-proxy": "3.0.0",
"is-wsl": "^1.1.0",
"jest": "24.9.0",
"jest-environment-jsdom-fourteen": "0.1.0",
"jest-resolve": "24.9.0",
"jest-watch-typeahead": "0.4.0",
"jest-watch-typeahead": "0.6.4",
"jsonwebtoken": "^8.5.1",
"mini-css-extract-plugin": "0.8.0",
"mysql2": "^2.2.5",
"mini-css-extract-plugin": "0.12.0",
"mysql2": "^2.3.0",
"node-sass": "^4.14.1",
"normalize.css": "^8.0.1",
"npm-run-all": "^4.1.5",
"optimize-css-assets-webpack-plugin": "5.0.3",
"pnp-webpack-plugin": "1.5.0",
"postcss-flexbugs-fixes": "4.1.0",
"optimize-css-assets-webpack-plugin": "5.0.8",
"pnp-webpack-plugin": "1.7.0",
"postcss-flexbugs-fixes": "4.2.1",
"postcss-loader": "3.0.0",
"postcss-normalize": "7.0.1",
"postcss-preset-env": "6.7.0",
"postcss-safe-parser": "4.0.1",
"postcss-safe-parser": "4.0.2",
"prop-types": "^15.7.2",
"react": "^16.11.0",
"react-app-polyfill": "^1.0.4",
"react": "^16.14.0",
"react-app-polyfill": "^1.0.6",
"react-dev-utils": "^9.1.0",
"react-dom": "^16.11.0",
"react-dom": "^16.14.0",
"react-google-maps": "^9.4.5",
"react-redux": "^7.2.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-router": "^5.2.1",
"react-router-dom": "^5.3.0",
"react-sparklines": "^1.7.0",
"react-toastify": "^5.4.1",
"reactstrap": "^8.6.0",
"react-toastify": "^5.5.0",
"reactstrap": "^8.10.0",
"recharts": "^1.8.5",
"redux": "^4.0.4",
"redux": "^4.1.1",
"redux-thunk": "^2.3.0",
"resolve": "1.12.0",
"resolve-url-loader": "2",
"sass-loader": "7.2.0",
"resolve": "1.20.0",
"resolve-url-loader": "2.3.2",
"sass-loader": "7.3.1",
"semver": "6.3.0",
"sequelize": "^5.22.3",
"sqlite3": "^4.1.0",
"style-loader": "1.0.0",
"terser-webpack-plugin": "1.4.1",
"ts-pnp": "1.1.4",
"url-loader": "2.1.0",
"sequelize": "^5.22.4",
"sqlite3": "^4.2.0",
"style-loader": "1.3.0",
"terser-webpack-plugin": "1.4.5",
"ts-pnp": "1.2.0",
"url-loader": "2.3.0",
"uuid": "^3.3.3",
"webpack": "4.41.0",
"webpack-dev-server": "3.2.1",
"webpack-manifest-plugin": "2.1.1",
"webpack": "4.46.0",
"webpack-dev-server": "3.11.2",
"webpack-manifest-plugin": "2.2.0",
"workbox-webpack-plugin": "4.3.1"
},
"scripts": {
"start": "node scripts/start.js",
"build": "cross-env PUBLIC_URL='/react-dashboard' node scripts/build.js",
"test": "node scripts/test.js",
"server": "node server/start.js",
"server": "cross-env NODE_ENV=production node server/start.js",
"dev": "cross-env NODE_ENV=development run-p server start"
},
"proxy": "http://localhost:5000",
Expand Down Expand Up @@ -176,12 +178,12 @@
]
},
"devDependencies": {
"@babel/cli": "^7.11.6",
"@babel/node": "^7.10.5",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@babel/polyfill": "^7.11.5",
"@babel/preset-env": "^7.11.5",
"@babel/cli": "^7.15.4",
"@babel/node": "^7.15.4",
"@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-optional-chaining": "^7.14.5",
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.15.6",
"cross-env": "^6.0.3"
}
}
18 changes: 9 additions & 9 deletions server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import express from 'express'
import express from 'express';
import helmet from 'helmet';
import jwt from 'jsonwebtoken';
import cookieParser from 'cookie-parser';
import expressJwt from 'express-jwt';
import expressGraphQL from 'express-graphql';
import {graphqlHTTP} from 'express-graphql';
import schema from '../src/data/schema'
import dotenv from 'dotenv';
import config from './config';
Expand Down Expand Up @@ -49,11 +49,11 @@ app.post('/login', (req, res) => {

app.use(
'/graphql',
expressJwt({
secret: config.auth.jwt.secret,
getToken: req => req.cookies.id_token,
}),
expressGraphQL(req => ({
// expressJwt({
// //secret: config.auth.jwt.secret,
// getToken: req => req.cookies.id_token,
// }),
graphqlHTTP(req => ({
schema,
graphiql: process.env.REACT_APP_NODE_ENV,
rootValue: { request: req },
Expand All @@ -65,8 +65,8 @@ const PORT = process.env.REACT_APP_PORT || 5000;

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

process.on('unhandledRejection', (err, promise) => {
process.on('unhandledRejection', (err) => {
console.log(`Unhandled Rejection: ${err.message}`)
// Close server
server.close(() => process.exit(1))
})
})
Loading