-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into github-packages
- Loading branch information
Showing
9 changed files
with
23,112 additions
and
70,697 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,92 @@ | ||
| { | ||
| "name": "iguideme", | ||
| "version": "0.1.1-b", | ||
| "private": true, | ||
| "dependencies": { | ||
| "@mdi/js": "^5.9.55", | ||
| "@types/d3-time-format": "^3.0.0", | ||
| "@types/draft-js": "^0.10.44", | ||
| "@types/history": "^4.7.7", | ||
| "@types/react": "^16.9.49", | ||
| "@types/react-dom": "^16.9.8", | ||
| "@types/react-fade-in": "^0.1.0", | ||
| "@types/react-redux": "^7.1.9", | ||
| "@types/react-router-dom": "^5.1.5", | ||
| "@types/react-router-redux": "^5.0.18", | ||
| "@types/react-select": "^3.1.2", | ||
| "@types/redux-logger": "^3.0.8", | ||
| "@types/redux-promise": "^0.5.29", | ||
| "@visx/chord": "^1.7.0", | ||
| "@visx/visx": "^1.7.3", | ||
| "@vx/gradient": "^0.0.199", | ||
| "@vx/mock-data": "^0.0.199", | ||
| "@vx/pattern": "^0.0.199", | ||
| "@vx/stats": "^0.0.199", | ||
| "@vx/tooltip": "^0.0.199", | ||
| "antd": "^4.6.2", | ||
| "apexcharts": "^3.25.0", | ||
| "axios": "^0.20.0", | ||
| "chart.js": "^4.2.1", | ||
| "compute.io": "^0.106.0", | ||
| "d3-array": "^2.12.1", | ||
| "d3-time-format": "^3.0.0", | ||
| "draft-js": "^0.11.7", | ||
| "draft-js-export-html": "^1.4.1", | ||
| "draft-js-import-html": "^1.4.1", | ||
| "draft-js-linkify-plugin": "^2.0.2", | ||
| "draft-js-plugins-editor": "^3.0.0", | ||
| "draft-js-static-toolbar-plugin": "^3.0.1", | ||
| "i18n": "^0.13.2", | ||
| "i18next": "^19.7.0", | ||
| "i18next-browser-languagedetector": "^6.0.1", | ||
| "i18next-http-backend": "^1.0.20", | ||
| "js-regression": "^1.0.10", | ||
| "ml-regression-multivariate-linear": "^2.0.3", | ||
| "moment": "^2.29.1", | ||
| "node-emoji": "^1.10.0", | ||
| "path": "^0.12.7", | ||
| "react": "^16.13.1", | ||
| "react-apexcharts": "^1.3.7", | ||
| "react-chartjs-2": "^5.2.0", | ||
| "react-csv-reader": "^3.1.1", | ||
| "react-dom": "^16.13.1", | ||
| "react-draggable": "^4.4.3", | ||
| "react-fade-in": "^1.1.0", | ||
| "react-i18next": "^11.7.2", | ||
| "react-json-view": "^1.19.1", | ||
| "react-loading-dot": "^1.0.6", | ||
| "react-multi-date-picker": "^4.0.0", | ||
| "react-redux": "^7.2.1", | ||
| "react-router-dom": "^5.2.0", | ||
| "react-router-redux": "^4.0.8", | ||
| "react-scripts": "^5.0.1", | ||
| "react-select": "^4.0.2", | ||
| "react-sizeme": "^3.0.1", | ||
| "react-smooth-dnd": "^0.11.1", | ||
| "redux": "^4.0.5", | ||
| "redux-logger": "^3.0.6", | ||
| "redux-persist": "^6.0.0", | ||
| "redux-promise": "^0.6.0", | ||
| "redux-thunk": "^2.3.0", | ||
| "sass": "^1.38.0", | ||
| "sweetalert2": "^11.1.3", | ||
| "tsne-js": "^1.0.3", | ||
| "typescript": "^4.0.2", | ||
| "ui-neumorphism": "^1.1.3", | ||
| "yarn": "^1.22.17", | ||
| "ztypescript": "github:everydayanchovies/ztypescript" | ||
| }, | ||
| "scripts": { | ||
| "start": "export REACT_APP_DEBUG=1 && react-scripts --openssl-legacy-provider start", | ||
| "build": "react-scripts --openssl-legacy-provider build", | ||
| "test": "react-scripts test", | ||
| "eject": "react-scripts eject" | ||
| }, | ||
| "eslintConfig": { | ||
| "extends": "react-app" | ||
| }, | ||
| "browserslist": [ | ||
| ">0.2%", | ||
| "not dead", | ||
| "not op_mini all" | ||
| ], | ||
| "devDependencies": { | ||
| "@types/node-emoji": "^1.8.1" | ||
| } | ||
| "name": "iguideme", | ||
| "version": "0.1.1-b", | ||
| "private": true, | ||
| "dependencies": { | ||
| "@mdi/js": "^5.9.55", | ||
| "@types/d3-time-format": "^3.0.0", | ||
| "@types/draft-js": "^0.10.44", | ||
| "@types/history": "^4.7.7", | ||
| "@types/react": "^16.9.49", | ||
| "@types/react-dom": "^16.9.8", | ||
| "@types/react-fade-in": "^0.1.0", | ||
| "@types/react-redux": "^7.1.9", | ||
| "@types/react-router-dom": "^5.1.5", | ||
| "@types/react-router-redux": "^5.0.18", | ||
| "@types/react-select": "^3.1.2", | ||
| "@types/redux-logger": "^3.0.8", | ||
| "@types/redux-promise": "^0.5.29", | ||
| "@visx/chord": "^1.7.0", | ||
| "@visx/visx": "^1.7.3", | ||
| "@vx/gradient": "^0.0.199", | ||
| "@vx/mock-data": "^0.0.199", | ||
| "@vx/pattern": "^0.0.199", | ||
| "@vx/stats": "^0.0.199", | ||
| "@vx/tooltip": "^0.0.199", | ||
| "antd": "^4.6.2", | ||
| "apexcharts": "^3.25.0", | ||
| "axios": "^0.20.0", | ||
| "chart.js": "^4.2.1", | ||
| "compute.io": "^0.106.0", | ||
| "d3-array": "^2.12.1", | ||
| "d3-time-format": "^3.0.0", | ||
| "draft-js": "^0.11.7", | ||
| "draft-js-export-html": "^1.4.1", | ||
| "draft-js-import-html": "^1.4.1", | ||
| "draft-js-linkify-plugin": "^2.0.2", | ||
| "draft-js-plugins-editor": "^3.0.0", | ||
| "draft-js-static-toolbar-plugin": "^3.0.1", | ||
| "i18n": "^0.13.2", | ||
| "i18next": "^19.7.0", | ||
| "i18next-browser-languagedetector": "^6.0.1", | ||
| "i18next-http-backend": "^1.0.20", | ||
| "js-regression": "^1.0.10", | ||
| "ml-regression-multivariate-linear": "^2.0.3", | ||
| "moment": "^2.29.1", | ||
| "node-emoji": "^1.10.0", | ||
| "path": "^0.12.7", | ||
| "react": "^16.13.1", | ||
| "react-apexcharts": "^1.3.7", | ||
| "react-chartjs-2": "^5.2.0", | ||
| "react-csv-reader": "^3.1.1", | ||
| "react-dom": "^16.13.1", | ||
| "react-draggable": "^4.4.3", | ||
| "react-fade-in": "^1.1.0", | ||
| "react-i18next": "^11.7.2", | ||
| "react-json-view": "^1.19.1", | ||
| "react-loading-dot": "^1.0.6", | ||
| "react-multi-date-picker": "^4.0.0", | ||
| "react-redux": "^7.2.1", | ||
| "react-router-dom": "^5.2.0", | ||
| "react-router-redux": "^4.0.8", | ||
| "react-scripts": "^5.0.1", | ||
| "react-select": "^4.0.2", | ||
| "react-sizeme": "^3.0.1", | ||
| "react-smooth-dnd": "^0.11.1", | ||
| "redux": "^4.0.5", | ||
| "redux-logger": "^3.0.6", | ||
| "redux-persist": "^6.0.0", | ||
| "redux-promise": "^0.6.0", | ||
| "redux-thunk": "^2.3.0", | ||
| "sass": "^1.38.0", | ||
| "sweetalert2": "^11.1.3", | ||
| "tsne-js": "^1.0.3", | ||
| "typescript": "^4.0.2", | ||
| "ui-neumorphism": "^1.1.3", | ||
| "yarn": "^1.22.18", | ||
| "ztypescript": "github:everydayanchovies/ztypescript" | ||
| }, | ||
| "scripts": { | ||
| "start": "export REACT_APP_DEBUG=1 && react-scripts --openssl-legacy-provider start", | ||
| "build": "react-scripts --openssl-legacy-provider build", | ||
| "test": "react-scripts test", | ||
| "eject": "react-scripts eject" | ||
| }, | ||
| "eslintConfig": { | ||
| "extends": "react-app" | ||
| }, | ||
| "browserslist": [">0.2%", "not dead", "not op_mini all"], | ||
| "devDependencies": { | ||
| "@types/node-emoji": "^1.8.1" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,23 @@ | ||
| import thunk from 'redux-thunk'; | ||
| import promise from 'redux-promise'; | ||
| import { createLogger } from 'redux-logger'; | ||
| import { applyMiddleware, createStore } from "redux"; | ||
| import { persistStore, persistReducer } from 'redux-persist' | ||
| import storage from 'redux-persist/lib/storage' | ||
| import thunk from "redux-thunk"; | ||
| import promise from "redux-promise"; | ||
| import { createLogger } from "redux-logger"; | ||
| import { compose, applyMiddleware, createStore } from "redux"; | ||
| import { persistStore, persistReducer } from "redux-persist"; | ||
| import storage from "redux-persist/lib/storage"; | ||
| import rootReducer from "../store"; | ||
|
|
||
| const persistConfig = { | ||
| key: 'root', | ||
| key: "root", | ||
| storage, | ||
| whitelist: ['COURSE', 'USER', 'TILES'] | ||
| } | ||
| whitelist: ["COURSE", "USER", "TILES"], | ||
| }; | ||
|
|
||
| const persistedReducer = persistReducer(persistConfig, rootReducer) | ||
| const persistedReducer = persistReducer(persistConfig, rootReducer); | ||
|
|
||
| // const logger = createLogger() commented out because it was not matching the overload in applymiddleware | ||
| export const store = createStore( | ||
| persistedReducer, | ||
| applyMiddleware(thunk, promise, createLogger()) | ||
| applyMiddleware(thunk, promise), | ||
| ); | ||
|
|
||
| export const persistor = persistStore(store); | ||
| export const persistor = persistStore(store); |
Oops, something went wrong.