Skip to content

Commit be37e25

Browse files
0xbuidler0xbuidler
committed
clean repo with proper redux
1 parent a28cc9d commit be37e25

File tree

9 files changed

+53
-60
lines changed

9 files changed

+53
-60
lines changed

‎packages/app/package.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"@mui/material": "^5.0.6",
1010
"@mui/styled-engine-sc": "^5.0.4",
1111
"@react-three/fiber": "^7.0.24",
12+
"@reduxjs/toolkit": "^1.8.1",
1213
"@testing-library/jest-dom": "^5.11.4",
1314
"@testing-library/react": "^11.1.0",
1415
"@testing-library/user-event": "^12.1.10",
@@ -57,6 +58,7 @@
5758
"@mui/icons-material": "^5.0.5",
5859
"@react-three/drei": "^8.4.0",
5960
"@types/react-outside-click-handler": "^1.3.1",
61+
"@types/react-redux": "^7.1.24",
6062
"@types/react-scroll": "^1.8.3",
6163
"@types/react-slick": "^0.23.7",
6264
"@types/react-transition-group": "^4.4.4",
@@ -72,13 +74,9 @@
7274
"react-awesome-reveal": "^3.8.1",
7375
"react-fast-marquee": "^1.3.1",
7476
"react-outside-click-handler": "^1.3.0",
75-
"react-redux": "^7.2.6",
7677
"react-router-hash-link": "^2.4.3",
7778
"react-scroll": "^1.8.4",
7879
"react-slick": "^0.28.1",
79-
"react-spring": "^9.3.2",
80-
"redux": "^4.1.2",
81-
"redux-devtools": "^3.7.0",
82-
"redux-thunk": "^2.4.0"
80+
"react-spring": "^9.3.2"
8381
}
8482
}

‎packages/app/src/_utils/components/stateless/card/index.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { FC } from "react";
22
import ReactDOM from "react-dom";
3-
import { Provider } from "react-redux";
43

54
// styles
65
import Style from "./style";

‎packages/app/src/_utils/components/stateless/iconWithText/index.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { FC } from "react";
22
import ReactDOM from "react-dom";
3-
import { Provider } from "react-redux";
43

54
import { Grid } from "@mui/material";
65

‎packages/app/src/dapp/navbar/index.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ import { Toolbar, Grid } from "@mui/material";
44

55
import Style from "./style";
66
import Clickable from "../../_utils/components/stateless/clickable";
7-
import ArrowLeftAltIcon from "@mui/icons-material/West";
87
import Logo from "../../_utils/assets/images/logo.svg";
98
import AccountBalanceWalletIcon from "@mui/icons-material/AccountBalanceWallet";
10-
import Button from "@mui/material/Button";
119
import Popover from "@mui/material/Popover";
1210
import ClickAwayListener from "@mui/material/ClickAwayListener";
1311
import VerifiedIcon from "@mui/icons-material/Verified";

‎packages/app/src/dapp/store/hooks.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {
2+
TypedUseSelectorHook,
3+
useDispatch as useAppDispatch,
4+
useSelector as useAppSelector,
5+
} from "react-redux";
6+
import type { RootState, AppDispatch } from ".";
7+
8+
// Use throughout your app instead of plain `useDispatch` and `useSelector`
9+
export const useDispatch = () => useAppDispatch<AppDispatch>();
10+
export const useSelector: TypedUseSelectorHook<RootState> = useAppSelector;

‎packages/app/src/dapp/store/index.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
import { createStore, applyMiddleware } from "redux";
1+
import { configureStore } from "@reduxjs/toolkit";
22
import thunk from "redux-thunk";
33
import { reducers } from "./reducers/index";
44

5-
export const store = createStore(reducers, applyMiddleware(thunk));
5+
export const store = configureStore({
6+
reducer: reducers,
7+
middleware: [thunk],
8+
});
9+
10+
export type RootState = ReturnType<typeof store.getState>;
11+
export type AppDispatch = typeof store.dispatch;

‎packages/app/src/dapp/store/reducers/app.reducer.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { AppActionTypes } from "../actions/app.actions";
2-
32
import { SIGN_IN } from "../actions/app.actions";
43

54
export type appState = {

‎packages/app/src/dapp/store/reducers/index.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { combineReducers, Reducer } from "redux";
2-
32
import { appStateReducer, appState } from "./app.reducer";
43

54
export interface IAppState {

‎packages/app/yarn.lock‎

Lines changed: 32 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2783,6 +2783,16 @@
27832783
utility-types "^3.10.0"
27842784
zustand "^3.5.1"
27852785

2786+
"@reduxjs/toolkit@^1.8.1":
2787+
version "1.8.1"
2788+
resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.8.1.tgz#94ee1981b8cf9227cda40163a04704a9544c9a9f"
2789+
integrity sha512-Q6mzbTpO9nOYRnkwpDlFOAbQnd3g7zj7CtHAZWz5SzE5lcV97Tf8f3SzOO8BoPOMYBFgfZaqTUZqgGu+a0+Fng==
2790+
dependencies:
2791+
immer "^9.0.7"
2792+
redux "^4.1.2"
2793+
redux-thunk "^2.4.1"
2794+
reselect "^4.1.5"
2795+
27862796
"@rollup/plugin-node-resolve@^7.1.1":
27872797
version "7.1.3"
27882798
resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz#80de384edfbd7bfc9101164910f86078151a3eca"
@@ -3159,7 +3169,7 @@
31593169
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz#374e31645d58cb18a07b3ecd8e9dede4deb2cccd"
31603170
integrity sha512-DxZZbyMAM9GWEzXL+BMZROWz9oo6A9EilwwOMET2UVu2uZTqMWS5S69KVtuVKaRjCUpcrOXRalet86/OpG4kqw==
31613171

3162-
"@types/prop-types@*", "@types/prop-types@^15.7.3", "@types/prop-types@^15.7.4":
3172+
"@types/prop-types@*", "@types/prop-types@^15.7.4":
31633173
version "15.7.4"
31643174
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
31653175
integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
@@ -3190,10 +3200,10 @@
31903200
dependencies:
31913201
"@types/react" "*"
31923202

3193-
"@types/react-redux@^7.1.20":
3194-
version "7.1.20"
3195-
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.20.tgz#42f0e61ababb621e12c66c96dda94c58423bd7df"
3196-
integrity sha512-q42es4c8iIeTgcnB+yJgRTTzftv3eYYvCZOh1Ckn2eX/3o5TdsQYKUWpLoLuGlcY/p+VAhV9IOEZJcWk/vfkXw==
3203+
"@types/react-redux@^7.1.24":
3204+
version "7.1.24"
3205+
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
3206+
integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==
31973207
dependencies:
31983208
"@types/hoist-non-react-statics" "^3.3.0"
31993209
"@types/react" "*"
@@ -7772,6 +7782,11 @@ [email protected]:
77727782
resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.1.tgz#9c73db683e2b3975c424fb0572af5889877ae656"
77737783
integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
77747784

7785+
immer@^9.0.7:
7786+
version "9.0.12"
7787+
resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.12.tgz#2d33ddf3ee1d247deab9d707ca472c8c942a0f20"
7788+
integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==
7789+
77757790
import-cwd@^2.0.0:
77767791
version "2.1.0"
77777792
resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -11690,18 +11705,6 @@ react-reconciler@^0.26.2:
1169011705
object-assign "^4.1.1"
1169111706
scheduler "^0.20.2"
1169211707

11693-
react-redux@^7.2.6:
11694-
version "7.2.6"
11695-
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa"
11696-
integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==
11697-
dependencies:
11698-
"@babel/runtime" "^7.15.4"
11699-
"@types/react-redux" "^7.1.20"
11700-
hoist-non-react-statics "^3.3.2"
11701-
loose-envify "^1.4.0"
11702-
prop-types "^15.7.2"
11703-
react-is "^17.0.2"
11704-
1170511708
react-refresh@^0.8.3:
1170611709
version "0.8.3"
1170711710
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
@@ -11964,33 +11967,15 @@ redent@^3.0.0:
1196411967
indent-string "^4.0.0"
1196511968
strip-indent "^3.0.0"
1196611969

11967-
redux-devtools-instrument@^1.10.0:
11968-
version "1.10.0"
11969-
resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.10.0.tgz#036caf79fa1e5f25ec4bae38a9af4f08c69e323a"
11970-
integrity sha512-X8JRBCzX2ADSMp+iiV7YQ8uoTNyEm0VPFPd4T854coz6lvRiBrFSqAr9YAS2n8Kzxx8CJQotR0QF9wsMM+3DvA==
11971-
dependencies:
11972-
lodash "^4.17.19"
11973-
symbol-observable "^1.2.0"
11974-
11975-
redux-devtools@^3.7.0:
11976-
version "3.7.0"
11977-
resolved "https://registry.yarnpkg.com/redux-devtools/-/redux-devtools-3.7.0.tgz#5bc2d50227d94ce95c79dbfdf2ffc7a23c553553"
11978-
integrity sha512-Lnx3UX7mnJij2Xs+RicPK1GyKkbuodrCKtfYmJsN603wC0mc99W//xCAskGVNmRhIXg4e57m2k1CyX0kVzCsBg==
11979-
dependencies:
11980-
"@types/prop-types" "^15.7.3"
11981-
lodash "^4.17.19"
11982-
prop-types "^15.7.2"
11983-
redux-devtools-instrument "^1.10.0"
11984-
11985-
redux-thunk@^2.4.0:
11986-
version "2.4.0"
11987-
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.0.tgz#ac89e1d6b9bdb9ee49ce69a69071be41bbd82d67"
11988-
integrity sha512-/y6ZKQNU/0u8Bm7ROLq9Pt/7lU93cT0IucYMrubo89ENjxPa7i8pqLKu6V4X7/TvYovQ6x01unTeyeZ9lgXiTA==
11970+
redux-thunk@^2.4.1:
11971+
version "2.4.1"
11972+
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714"
11973+
integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==
1198911974

1199011975
redux@^4.0.0, redux@^4.1.2:
11991-
version "4.1.2"
11992-
resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
11993-
integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==
11976+
version "4.2.0"
11977+
resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
11978+
integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
1199411979
dependencies:
1199511980
"@babel/runtime" "^7.9.2"
1199611981

@@ -12176,6 +12161,11 @@ requires-port@^1.0.0:
1217612161
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
1217712162
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
1217812163

12164+
reselect@^4.1.5:
12165+
version "4.1.5"
12166+
resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6"
12167+
integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==
12168+
1217912169
resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
1218012170
version "1.5.1"
1218112171
resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
@@ -13308,11 +13298,6 @@ svgo@^1.0.0, svgo@^1.2.2:
1330813298
unquote "~1.1.1"
1330913299
util.promisify "~1.0.0"
1331013300

13311-
symbol-observable@^1.2.0:
13312-
version "1.2.0"
13313-
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
13314-
integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
13315-
1331613301
symbol-tree@^3.2.4:
1331713302
version "3.2.4"
1331813303
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"

0 commit comments

Comments
 (0)