Skip to content

Commit 1fa5fa4

Browse files
committed
feat: MUI 테마 및 글로벌 스타일 적용으로 App 구성 변경
1 parent 3cd6ff2 commit 1fa5fa4

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

src/App.tsx

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
import { 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";
62
import MainLayout from "./components/layout";
73
import Test from "./components/Test";
84

95
function 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

src/main.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { StrictMode } from "react";
22
import { createRoot } from "react-dom/client";
33
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
44
import { ThemeProvider, CssBaseline } from "@mui/material";
5-
import { theme } from "./theme";
5+
import { Global } from "@emotion/react";
6+
import { muiTheme, globalStyles } from "./styles/globalStyles";
67
import "./index.css";
78
import App from "./App.tsx";
89

@@ -19,8 +20,9 @@ const queryClient = new QueryClient({
1920
createRoot(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>

0 commit comments

Comments
 (0)