mirror of
https://github.com/dec0dOS/zero-ui.git
synced 2024-09-20 06:56:05 +08:00
fix: apply theme before showing the loading screen
This commit is contained in:
parent
b8a5a37fc7
commit
5be92007b7
|
@ -1,5 +1,6 @@
|
|||
import "@fontsource/roboto";
|
||||
|
||||
import { Suspense } from "react";
|
||||
import { BrowserRouter, Route, Redirect, Switch } from "react-router-dom";
|
||||
|
||||
import Theme from "./components/Theme";
|
||||
|
@ -10,9 +11,14 @@ import NotFound from "./routes/NotFound";
|
|||
import Network from "./routes/Network/Network";
|
||||
import Settings from "./routes/Settings";
|
||||
|
||||
import Loading from "./components/Loading";
|
||||
|
||||
import "./i18n";
|
||||
|
||||
function App() {
|
||||
return (
|
||||
<Theme>
|
||||
<Suspense fallback={<Loading />}>
|
||||
<BrowserRouter basename="/app">
|
||||
<Bar />
|
||||
<Switch>
|
||||
|
@ -23,6 +29,7 @@ function App() {
|
|||
<Redirect to="/404" />
|
||||
</Switch>
|
||||
</BrowserRouter>
|
||||
</Suspense>
|
||||
</Theme>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ function Loading() {
|
|||
|
||||
return (
|
||||
<div className={classes.root}>
|
||||
<CircularProgress color="secondary" />
|
||||
<CircularProgress color="primary" />
|
||||
<Typography variant="h6" component="div" className={classes.loadingText}>
|
||||
Loading
|
||||
<span className="loadingDots"></span>
|
||||
|
|
|
@ -1,18 +1,13 @@
|
|||
import "./index.css";
|
||||
|
||||
import React, { Suspense } from "react";
|
||||
import React from "react";
|
||||
import ReactDOM from "react-dom";
|
||||
|
||||
import App from "./App";
|
||||
|
||||
import "./i18n";
|
||||
import Loading from "components/Loading";
|
||||
|
||||
ReactDOM.render(
|
||||
<React.StrictMode>
|
||||
<Suspense fallback={<Loading />}>
|
||||
<App />
|
||||
</Suspense>
|
||||
</React.StrictMode>,
|
||||
document.getElementById("root")
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue