Skip to content

Commit f732a61

Browse files
chhsiao1981chhsiao1981
authored
Merge pull request #1399 from chhsiao1981/refactor-user
replace userSlice to reducers.user
2 parents 396135f + 5cdd0d0 commit f732a61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1354
-1167
lines changed

‎config.build/index.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
export default {
22
API_ROOT: "b87f4fda-012a-4564-8c36-096e496cbedf",
33
PFDCM_ROOT: "700e747e-619f-4007-ad8d-47677c0d0b46",
4+
AUTH_ROOT: "b87f4fda-012a-4564-8c36-096e496cbedf",
5+
USER_ROOT: "b87f4fda-012a-4564-8c36-096e496cbedf",
6+
47
PUBLIC_USER: "fnndsc",
58

69
STORE_ROOT: "79e63221-ccf9-43c3-bf0d-45d05db72c48",

‎config.tmpl/index.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
export default {
22
API_ROOT: "http://localhost:8000/api/v1",
33
PFDCM_ROOT: "http://localhost:4005/api/v1",
4+
AUTH_ROOT: "http://localhost:8000/api/v1",
5+
USER_ROOT: "http://localhost:8000/api/v1",
6+
47
PUBLIC_USER: "chris",
58

69
STORE_ROOT: "",

‎index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<body>
3131
<div id="root"></div>
3232
<!-- `X` is on npm, but the npm package is currently broken -->
33-
<script src="https://get.goxtk.com/xtk_edge.js"></script>
34-
<script src="https://get.goxtk.com/xtk_xdat.gui.js"></script>
33+
<!-- <script src="https://get.goxtk.com/xtk_edge.js"></script> -->
34+
<!-- <script src="https://get.goxtk.com/xtk_xdat.gui.js"></script> -->
3535
<script type="module" src="/src/main.tsx"></script>
3636
</body>
3737
</html>

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@
8888
"react-dropzone": "^14.2.3",
8989
"react-error-boundary": "^4.0.13",
9090
"react-force-graph-2d": "^1.25.5",
91-
"@chhsiao1981/use-thunk": "^9.0.2",
91+
"@chhsiao1981/use-thunk": "^9.0.3",
9292
"react-redux": "^9.1.2",
9393
"react-resizable-panels": "^2.1.4",
9494
"react-responsive": "^10.0.0",
95-
"react-router": "^6.26.2",
96-
"react-router-dom": "^6.26.2",
95+
"react-router": "^6.30.1",
96+
"react-router-dom": "^6.30.1",
9797
"react-use-websocket": "^4.13.0",
9898
"redux-saga": "^1.3.0",
9999
"rusha": "^0.8.14",

‎pnpm-lock.yaml‎

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/App.tsx‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -54,38 +54,41 @@ export default (props: Props) => {
5454
// to render
5555
const themeAlg = isDarkTheme ? theme.darkAlgorithm : theme.defaultAlgorithm;
5656

57+
const futureRouter = {
58+
v7_startTransition: true,
59+
v7_relativeSplatPath: true,
60+
};
61+
5762
return (
58-
<>
59-
<Provider store={store}>
60-
<CookiesProvider>
61-
<BrowserRouter>
62-
<QueryClientProvider client={queryClient}>
63-
<ConfigProvider
64-
theme={{
65-
algorithm: themeAlg,
66-
token: {
67-
// var(--pf-v5-global--primary-color--200)
68-
colorSuccess: "#004080",
69-
},
70-
components: {
71-
Progress: {
72-
// var(--pf-v5-global--primary-color--100)
73-
defaultColor: "#0066CC",
74-
},
63+
<Provider store={store}>
64+
<CookiesProvider>
65+
<BrowserRouter future={futureRouter}>
66+
<QueryClientProvider client={queryClient}>
67+
<ConfigProvider
68+
theme={{
69+
algorithm: themeAlg,
70+
token: {
71+
// var(--pf-v5-global--primary-color--200)
72+
colorSuccess: "#004080",
73+
},
74+
components: {
75+
Progress: {
76+
// var(--pf-v5-global--primary-color--100)
77+
defaultColor: "#0066CC",
7578
},
76-
}}
77-
>
78-
<AntdApp>
79-
<div className="patternfly-font">
80-
<Cart />
81-
<Routes />
82-
</div>
83-
</AntdApp>
84-
</ConfigProvider>
85-
</QueryClientProvider>
86-
</BrowserRouter>
87-
</CookiesProvider>
88-
</Provider>
89-
</>
79+
},
80+
}}
81+
>
82+
<AntdApp>
83+
<div className="patternfly-font">
84+
<Cart />
85+
<Routes />
86+
</div>
87+
</AntdApp>
88+
</ConfigProvider>
89+
</QueryClientProvider>
90+
</BrowserRouter>
91+
</CookiesProvider>
92+
</Provider>
9093
);
9194
};

0 commit comments

Comments
 (0)