Skip to content

Commit 5be9200

Browse files
committed
fix: apply theme before showing the loading screen
1 parent b8a5a37 commit 5be9200

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

frontend/src/App.jsx

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import "@fontsource/roboto";
22

3+
import { Suspense } from "react";
34
import { BrowserRouter, Route, Redirect, Switch } from "react-router-dom";
45

56
import Theme from "./components/Theme";
@@ -10,19 +11,25 @@ import NotFound from "./routes/NotFound";
1011
import Network from "./routes/Network/Network";
1112
import Settings from "./routes/Settings";
1213

14+
import Loading from "./components/Loading";
15+
16+
import "./i18n";
17+
1318
function App() {
1419
return (
1520
<Theme>
16-
<BrowserRouter basename="/app">
17-
<Bar />
18-
<Switch>
19-
<Route exact path="/" component={Home} />
20-
<Route path="/network/:nwid" component={Network} />
21-
<Route path="/settings" component={Settings} />
22-
<Route path="/404" component={NotFound} />
23-
<Redirect to="/404" />
24-
</Switch>
25-
</BrowserRouter>
21+
<Suspense fallback={<Loading />}>
22+
<BrowserRouter basename="/app">
23+
<Bar />
24+
<Switch>
25+
<Route exact path="/" component={Home} />
26+
<Route path="/network/:nwid" component={Network} />
27+
<Route path="/settings" component={Settings} />
28+
<Route path="/404" component={NotFound} />
29+
<Redirect to="/404" />
30+
</Switch>
31+
</BrowserRouter>
32+
</Suspense>
2633
</Theme>
2734
);
2835
}

frontend/src/components/Loading/Loading.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function Loading() {
77

88
return (
99
<div className={classes.root}>
10-
<CircularProgress color="secondary" />
10+
<CircularProgress color="primary" />
1111
<Typography variant="h6" component="div" className={classes.loadingText}>
1212
Loading
1313
<span className="loadingDots"></span>

frontend/src/index.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
import "./index.css";
22

3-
import React, { Suspense } from "react";
3+
import React from "react";
44
import ReactDOM from "react-dom";
55

66
import App from "./App";
77

8-
import "./i18n";
9-
import Loading from "components/Loading";
10-
118
ReactDOM.render(
129
<React.StrictMode>
13-
<Suspense fallback={<Loading />}>
14-
<App />
15-
</Suspense>
10+
<App />
1611
</React.StrictMode>,
1712
document.getElementById("root")
1813
);

0 commit comments

Comments
 (0)