Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

빌드 에러 수정 (issue #744) #745

Merged
merged 16 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cd69616
refactor: 커스텀 뮤테이션 인자 변경
brgndyy Oct 8, 2024
6d6a468
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 10, 2024
7ada97b
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 11, 2024
2edb8ea
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 11, 2024
084c17a
remove: 파일 삭제
brgndyy Oct 11, 2024
72d9638
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 11, 2024
b98620e
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 15, 2024
195e287
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 17, 2024
9b7665e
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 18, 2024
414c7ee
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 22, 2024
23e6f2e
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 23, 2024
19c8b3d
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 23, 2024
259d238
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 24, 2024
a56070f
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 24, 2024
e34c503
Merge branch 'dev' of https://github.com/woowacourse-teams/2024-devel…
brgndyy Oct 24, 2024
24d7bf5
refactor: 수정사항 반영
brgndyy Oct 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions frontend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -296,28 +296,28 @@ export const router = createBrowserRouter(routes, {
// return worker.start();
// }

enableMocking().then(() => {
root.render(
<React.StrictMode>
<QueryClientProvider client={queryClient}>
<ThemeProvider theme={theme}>
<ReactQueryDevtools initialIsOpen={false} />
<GlobalStyle />
<RouterProvider router={router} />
</ThemeProvider>
</QueryClientProvider>
</React.StrictMode>,
);
});
// enableMocking().then(() => {
// root.render(
// <React.StrictMode>
// <QueryClientProvider client={queryClient}>
// <ThemeProvider theme={theme}>
// <ReactQueryDevtools initialIsOpen={false} />
// <GlobalStyle />
// <RouterProvider router={router} />
// </ThemeProvider>
// </QueryClientProvider>
// </React.StrictMode>,
// );
// });

// root.render(
// <React.StrictMode>
// <QueryClientProvider client={queryClient}>
// <ReactQueryDevtools />
// <ThemeProvider theme={theme}>
// <GlobalStyle />
// <RouterProvider router={router} />
// </ThemeProvider>
// </QueryClientProvider>
// </React.StrictMode>,
// );
root.render(
<React.StrictMode>
<QueryClientProvider client={queryClient}>
<ReactQueryDevtools />
<ThemeProvider theme={theme}>
<GlobalStyle />
<RouterProvider router={router} />
</ThemeProvider>
</QueryClientProvider>
</React.StrictMode>,
);
14 changes: 7 additions & 7 deletions frontend/src/pages/DashboardPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ export default function DashboardPage() {

return (
<DashboardLayoutContextProvider>
{/* <PrivateRoute redirectTo={ROUTES.login}> */}
<DashboardPageLayout>
<SpinnerSuspense>
<Outlet />
</SpinnerSuspense>
</DashboardPageLayout>
{/* </PrivateRoute> */}
<PrivateRoute redirectTo={ROUTES.login}>
<DashboardPageLayout>
<SpinnerSuspense>
<Outlet />
</SpinnerSuspense>
</DashboardPageLayout>
</PrivateRoute>
</DashboardLayoutContextProvider>
);
}
Loading