File tree Expand file tree Collapse file tree 2 files changed +11
-17
lines changed
Expand file tree Collapse file tree 2 files changed +11
-17
lines changed Original file line number Diff line number Diff line change 11import { BrowserRouter , Routes , Route } from "react-router-dom" ;
2- import { ThemeProvider } from "@mui/material/styles" ;
3- import { CssBaseline } from "@mui/material" ;
4- import { Global } from "@emotion/react" ;
5- import { muiTheme , globalStyles } from "./styles/globalStyles" ;
62import MainLayout from "./components/layout" ;
73import Test from "./components/Test" ;
84
95function App ( ) {
106 return (
11- < ThemeProvider theme = { muiTheme } >
12- < CssBaseline />
13- < Global styles = { globalStyles } />
14- < BrowserRouter >
15- < Routes >
16- < Route element = { < MainLayout /> } >
17- < Route path = "/" element = { < Test /> } />
18- </ Route >
19- </ Routes >
20- </ BrowserRouter >
21- </ ThemeProvider >
7+ < BrowserRouter >
8+ < Routes >
9+ < Route element = { < MainLayout /> } >
10+ < Route path = "/" element = { < Test /> } />
11+ </ Route >
12+ </ Routes >
13+ </ BrowserRouter >
2214 ) ;
2315}
2416
Original file line number Diff line number Diff line change @@ -2,7 +2,8 @@ import { StrictMode } from "react";
22import { createRoot } from "react-dom/client" ;
33import { QueryClient , QueryClientProvider } from "@tanstack/react-query" ;
44import { ThemeProvider , CssBaseline } from "@mui/material" ;
5- import { theme } from "./theme" ;
5+ import { Global } from "@emotion/react" ;
6+ import { muiTheme , globalStyles } from "./styles/globalStyles" ;
67import "./index.css" ;
78import App from "./App.tsx" ;
89
@@ -19,8 +20,9 @@ const queryClient = new QueryClient({
1920createRoot ( document . getElementById ( "root" ) ! ) . render (
2021 < StrictMode >
2122 < QueryClientProvider client = { queryClient } >
22- < ThemeProvider theme = { theme } >
23+ < ThemeProvider theme = { muiTheme } >
2324 < CssBaseline />
25+ < Global styles = { globalStyles } />
2426 < App />
2527 </ ThemeProvider >
2628 </ QueryClientProvider >
You can’t perform that action at this time.
0 commit comments