Skip to content

[fix] 레이아웃이 깨지는 버그 수정 #1208

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.

Sign up for GitHub

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

Merged
seongwon030 merged 2 commits into from
Feb 16, 2026
Merged

[fix] 레이아웃이 깨지는 버그 수정 #1208

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96e7752
fix: globalstyle 위치 변경
lepitaaar Feb 16, 2026
36ceb19
style: ci 스타일링 일치
lepitaaar Feb 16, 2026
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
98 changes: 53 additions & 45 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,51 +35,59 @@ const AdminRoutes = lazy(() => import('@/pages/AdminPage/AdminRoutes'));

const App = () => {
return (
<GlobalBoundary>
<QueryClientProvider client={queryClient}>
<ThemeProvider theme={theme}>
<BrowserRouter>
<GlobalStyles />
<ScrollToTop />
<ScrollToTopButton />
<Routes>
<Route path='/' element={<MainPage />} />
{/*기존 웹 & 안드로이드 url (android: v1.1.0)*/}
<Route path='/club/:clubId' element={<LegacyClubDetailPage />} />
{/*웹 유저에게 신규 상세페이지 보유주기 위한 임시 url*/}
<Route path='/clubDetail/:clubId' element={<ClubDetailPage />} />
{/*새로 빌드해서 배포할 앱 주소 url*/}
<Route
path='/webview/club/:clubId'
element={<ClubDetailPage />}
/>
<Route path='/introduce' element={<IntroducePage />} />
<Route path='/admin/login' element={<LoginTab />} />
<Route
path='/admin/*'
element={
<AdminClubProvider>
<PrivateRoute>
<AdminRoutes />
</PrivateRoute>
</AdminClubProvider>
}
/>
<Route
path='/application/:clubId/:applicationFormId'
element={<ApplicationFormPage />}
/>
<Route path='/club-union' element={<ClubUnionPage />} />
{/* 개발 환경에서만 사용 가능한 에러 테스트 페이지 */}
{import.meta.env.DEV && (
<Route path='/error-test' element={<ErrorTestPage />} />
)}
<Route path='*' element={<Navigate to='/' replace />} />
</Routes>
</BrowserRouter>
</ThemeProvider>
</QueryClientProvider>
</GlobalBoundary>
<>
<GlobalStyles />
<GlobalBoundary>
<QueryClientProvider client={queryClient}>
<ThemeProvider theme={theme}>
<BrowserRouter>
<ScrollToTop />
<ScrollToTopButton />
<Routes>
<Route path='/' element={<MainPage />} />
{/*기존 웹 & 안드로이드 url (android: v1.1.0)*/}
<Route
path='/club/:clubId'
element={<LegacyClubDetailPage />}
/>
{/*웹 유저에게 신규 상세페이지 보유주기 위한 임시 url*/}
<Route
path='/clubDetail/:clubId'
element={<ClubDetailPage />}
/>
{/*새로 빌드해서 배포할 앱 주소 url*/}
<Route
path='/webview/club/:clubId'
element={<ClubDetailPage />}
/>
<Route path='/introduce' element={<IntroducePage />} />
<Route path='/admin/login' element={<LoginTab />} />
<Route
path='/admin/*'
element={
<AdminClubProvider>
<PrivateRoute>
<AdminRoutes />
</PrivateRoute>
</AdminClubProvider>
}
/>
<Route
path='/application/:clubId/:applicationFormId'
element={<ApplicationFormPage />}
/>
<Route path='/club-union' element={<ClubUnionPage />} />
{/* 개발 환경에서만 사용 가능한 에러 테스트 페이지 */}
{import.meta.env.DEV && (
<Route path='/error-test' element={<ErrorTestPage />} />
)}
<Route path='*' element={<Navigate to='/' replace />} />
</Routes>
</BrowserRouter>
</ThemeProvider>
</QueryClientProvider>
</GlobalBoundary>
</>
);
};

Expand Down
Loading