From cf8e29caf0546d4ff28b7fac9aaca8390b0756c0 Mon Sep 17 00:00:00 2001 From: Maksym Sadovnychyy Date: Sat, 16 Apr 2022 00:23:29 +0200 Subject: [PATCH] (refactor): update all packages to latest, layouts and components structure improvement --- clientapp/package.json | 39 +- clientapp/public/index.html | 2 +- clientapp/public/manifest.json | 4 +- clientapp/src/App.tsx | 6 +- clientapp/src/DynamicLayout.tsx | 29 - clientapp/src/DynamicPage.tsx | 28 - clientapp/src/index.tsx | 12 +- clientapp/src/layouts/admin/index.tsx | 18 + clientapp/src/layouts/index.tsx | 34 +- .../{basic => public}/NavMenu/index.tsx | 2 +- .../src/layouts/{basic => public}/index.tsx | 6 +- .../layouts/{basic => public}/scss/style.scss | 0 clientapp/src/pages/index.tsx | 29 +- clientapp/yarn.lock | 4233 ++++++++--------- 14 files changed, 2159 insertions(+), 2283 deletions(-) delete mode 100644 clientapp/src/DynamicLayout.tsx delete mode 100644 clientapp/src/DynamicPage.tsx create mode 100644 clientapp/src/layouts/admin/index.tsx rename clientapp/src/layouts/{basic => public}/NavMenu/index.tsx (94%) rename clientapp/src/layouts/{basic => public}/index.tsx (69%) rename clientapp/src/layouts/{basic => public}/scss/style.scss (100%) diff --git a/clientapp/package.json b/clientapp/package.json index 43ffeeb..e547ec3 100644 --- a/clientapp/package.json +++ b/clientapp/package.json @@ -1,40 +1,39 @@ { - "name": "react_redux_demo", + "name": "react-redux-template", "version": "0.1.0", "private": true, "dependencies": { "bootstrap": "5.1.3", - "history": "5.2.0", - "jquery": "^3.6.0", + "history": "5.3.0", "merge": "^2.1.1", - "popper.js": "^1.16.0", - "react": "17.0.2", - "react-dom": "17.0.2", - "react-redux": "7.2.6", - "react-router": "6.2.1", - "react-router-dom": "6.2.1", - "reactstrap": "9.0.1", + "react": "18.0.0", + "react-dom": "18.0.0", + "react-redux": "7.2.8", + "react-router": "6.3.0", + "react-router-dom": "6.3.0", + "reactstrap": "9.0.2", "redux": "4.1.2", - "redux-first-history": "^5.0.8", + "redux-first-history": "^5.0.9", "redux-thunk": "2.4.1", "svgo": "2.8.0" }, "devDependencies": { "@types/history": "4.7.11", - "@types/jest": "27.4.0", - "@types/node": "17.0.18", - "@types/react": "17.0.39", - "@types/react-dom": "17.0.11", - "@types/react-redux": "7.1.22", + "@types/jest": "27.4.1", + "@types/node": "17.0.24", + "@types/react": "18.0.5", + "@types/react-dom": "18.0.1", + "@types/react-redux": "7.1.24", "@types/react-router": "5.1.18", "@types/react-router-dom": "5.3.3", - "@types/reactstrap": "8.7.1", + "@typescript-eslint/parser": "^5.19.0", "cross-env": "7.0.3", + "eslint": "^8.13.0", "eslint-plugin-jsx-a11y": "^6.5.1", "nan": "^2.15.0", - "react-scripts": "^5.0.0", - "sass": "^1.49.7", - "typescript": "4.5.5" + "react-scripts": "^5.0.1", + "sass": "^1.50.0", + "typescript": "4.6.3" }, "scripts": { "start": "react-scripts start", diff --git a/clientapp/public/index.html b/clientapp/public/index.html index 9d2e7bb..fa368cc 100644 --- a/clientapp/public/index.html +++ b/clientapp/public/index.html @@ -20,7 +20,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - react_redux_demo + react-redux-template