-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #306 from ssu-student-union/feat/#304_common_redirect
Feat/#304 common redirect
- Loading branch information
Showing
2 changed files
with
104 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import { MainPage } from './main/page'; | ||
| import { KakaoRegisterPage } from './kakao/page'; | ||
| import { GeneralRegisterPage } from './general/page'; | ||
| import KakaoRedirect from './kakao/containers/KakaoRedirect'; | ||
| import { IntroPage } from './intro/page'; | ||
| import { IntroEditPage } from './intro/IntroEdit/page'; | ||
| import { AuditPage } from './audit/page'; | ||
| import { AuditDetailPage } from './audit/auditDetail/page'; | ||
| import { AuditEditPage } from './audit/auditEdit/page'; | ||
| import { PartnershipPage } from './partnership/page'; | ||
| import { PetitionNoticePage } from './petition-notice/page'; | ||
| import { PetitionNoticeEditPage } from './petition-notice/edit/page'; | ||
| import { PetitionNoticeDetailPage } from './petition-notice/[id]/page'; | ||
| import { PartnershipDetailPage } from './partnership/partnershipDetail/page'; | ||
| import { PartnershipEditPage } from './partnership/partnershipEdit/page'; | ||
| import PartnershipPatchPage from './partnership/partnershipPatch/page'; | ||
| import { NoticePage } from './notice/page'; | ||
| import { NoticeEditPage } from './notice/noticeEdit/page'; | ||
| import { NoticeDetailPage } from './notice/noticeDetail/page'; | ||
| import NoticePatchPage from './notice/noticePatch/page'; | ||
| import { AuditPatchPage } from './audit/auditPatch/page'; | ||
| import { LostArticlePage } from './lost-article/page'; | ||
| import { LostArticleEditPage } from './lost-article/edit/page'; | ||
| import CampusPage from './campus/page'; | ||
| import { LostDetailPage } from './lost-article/detail/page'; | ||
| import { LostPatchPage } from './lost-article/patch/page'; | ||
| import PersonalDataPage from './personal-data/page'; | ||
| import { Layout } from './layout/headerLayout'; | ||
| import { KakaoRegisterRedirectPage } from './kakao/redirect/page'; | ||
|
|
||
| export { | ||
| MainPage, | ||
| KakaoRegisterPage, | ||
| GeneralRegisterPage, | ||
| KakaoRedirect, | ||
| IntroPage, | ||
| IntroEditPage, | ||
| AuditPage, | ||
| AuditDetailPage, | ||
| AuditEditPage, | ||
| PartnershipPage, | ||
| PetitionNoticePage, | ||
| PetitionNoticeEditPage, | ||
| PetitionNoticeDetailPage, | ||
| PartnershipDetailPage, | ||
| PartnershipEditPage, | ||
| PartnershipPatchPage, | ||
| NoticePage, | ||
| NoticeEditPage, | ||
| NoticeDetailPage, | ||
| NoticePatchPage, | ||
| AuditPatchPage, | ||
| LostArticlePage, | ||
| LostArticleEditPage, | ||
| CampusPage, | ||
| LostDetailPage, | ||
| LostPatchPage, | ||
| PersonalDataPage, | ||
| Layout, | ||
| KakaoRegisterRedirectPage, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,80 +1,51 @@ | ||
| import { Routes, Route } from 'react-router-dom'; | ||
| import { MainPage } from './main/page'; | ||
| import { KakaoRegisterPage } from './kakao/page'; | ||
| import { GeneralRegisterPage } from './general/page'; | ||
| import KakaoRedirect from './kakao/containers/KakaoRedirect'; | ||
| import { IntroPage } from './intro/page'; | ||
| import { IntroEditPage } from './intro/IntroEdit/page'; | ||
| import { AuditPage } from './audit/page'; | ||
| import { AuditDetailPage } from './audit/auditDetail/page'; | ||
| import { AuditEditPage } from './audit/auditEdit/page'; | ||
| import { PartnershipPage } from './partnership/page'; | ||
| import { PetitionNoticePage } from './petition-notice/page'; | ||
| import { PetitionNoticeEditPage } from './petition-notice/edit/page'; | ||
| import { PetitionNoticeDetailPage } from './petition-notice/[id]/page'; | ||
| import { PartnershipDetailPage } from './partnership/partnershipDetail/page'; | ||
| import { PartnershipEditPage } from './partnership/partnershipEdit/page'; | ||
| import PartnershipPatchPage from './partnership/partnershipPatch/page'; | ||
| import { NoticePage } from './notice/page'; | ||
| import { NoticeEditPage } from './notice/noticeEdit/page'; | ||
| import { NoticeDetailPage } from './notice/noticeDetail/page'; | ||
| import NoticePatchPage from './notice/noticePatch/page'; | ||
| import { AuditPatchPage } from './audit/auditPatch/page'; | ||
| import { LostArticlePage } from './lost-article/page'; | ||
| import { LostArticleEditPage } from './lost-article/edit/page'; | ||
| import CampusPage from './campus/page'; | ||
| import { LostDetailPage } from './lost-article/detail/page'; | ||
| import { LostPatchPage } from './lost-article/patch/page'; | ||
| import PersonalDataPage from './personal-data/page'; | ||
| import { Layout } from './layout/headerLayout'; | ||
| import { KakaoRegisterRedirectPage } from './kakao/redirect/page'; | ||
| import { Navigate, Route, Routes } from 'react-router-dom'; | ||
| import * as i from './index.ts'; | ||
|
|
||
| export function MainRouter() { | ||
| return ( | ||
| <Routes> | ||
| <Route path="/" element={<Layout />}> | ||
| <Route path="/" element={<MainPage />} /> | ||
| {/*소개*/} | ||
| <Route path="/intro" element={<IntroPage />} /> | ||
| <Route path="/intro/edit" element={<IntroEditPage />} /> | ||
| {/*학교생활*/} | ||
| {/*공지사항*/} | ||
| <Route path="/notice" element={<NoticePage />} /> | ||
| <Route path="/notice/:id" element={<NoticeDetailPage />} /> | ||
| <Route path="/notice/edit" element={<NoticeEditPage />} /> | ||
| <Route path="/notice/:id/patch" element={<NoticePatchPage />} /> | ||
| {/*제휴*/} | ||
| <Route path="/partnership" element={<PartnershipPage />} /> | ||
| <Route path="/partnership/:id" element={<PartnershipDetailPage />} /> | ||
| <Route path="/partnership/edit" element={<PartnershipEditPage />} /> | ||
| <Route path="/partnership/:id/patch" element={<PartnershipPatchPage />} /> | ||
| {/*분실물*/} | ||
| <Route path="/lost-article" element={<LostArticlePage />} /> | ||
| <Route path="/lost-article/:id" element={<LostDetailPage />} /> | ||
| <Route path="/lost-article/edit" element={<LostArticleEditPage />} /> | ||
| <Route path="/lost-article/:id/patch" element={<LostPatchPage />} /> | ||
| {/*캠퍼스맵*/} | ||
| <Route path="/campus-map" element={<CampusPage />} /> | ||
| {/*학생자치기구*/} | ||
| <Route path="/petition-notice" element={<PetitionNoticePage />} /> | ||
| <Route path="/petition-notice/edit" element={<PetitionNoticeEditPage />} /> | ||
| <Route path="/petition-notice/:id" element={<PetitionNoticeDetailPage />} /> | ||
| {/*소통*/} | ||
| <Route path="/audit" element={<AuditPage />} /> | ||
| <Route path="/audit/:id" element={<AuditDetailPage />} /> | ||
| <Route path="/audit/edit" element={<AuditEditPage />} /> | ||
| <Route path="/audit/:id/patch" element={<AuditPatchPage />} /> | ||
| {/*자료집 임시 제거-*/} | ||
| {/* <Route path="/data" element={<Data />} /> | ||
| <Route path="/data/edit" element={<Data />} /> */} | ||
| {/*개인정보이용약관*/} | ||
| <Route path="/personal-data" element={<PersonalDataPage />} /> | ||
| <Route path="/" element={<i.Layout />}> | ||
| <Route path="/" element={<i.MainPage />} /> | ||
| {/* 1. 소개 */} | ||
| <Route path="/intro" element={<i.IntroPage />} /> | ||
| <Route path="/intro/edit" element={<i.IntroEditPage />} /> | ||
| {/* 2. 학교생활 */} | ||
| {/* 2-1. 공지사항 */} | ||
| <Route path="/notice" element={<i.NoticePage />} /> | ||
| <Route path="/notice/:id" element={<i.NoticeDetailPage />} /> | ||
| <Route path="/notice/edit" element={<i.NoticeEditPage />} /> | ||
| <Route path="/notice/:id/patch" element={<i.NoticePatchPage />} /> | ||
| {/* 2-2. 제휴 */} | ||
| <Route path="/partnership" element={<i.PartnershipPage />} /> | ||
| <Route path="/partnership/:id" element={<i.PartnershipDetailPage />} /> | ||
| <Route path="/partnership/edit" element={<i.PartnershipEditPage />} /> | ||
| <Route path="/partnership/:id/patch" element={<i.PartnershipPatchPage />} /> | ||
| {/* 2-3. 분실물 */} | ||
| <Route path="/lost-article" element={<i.LostArticlePage />} /> | ||
| <Route path="/lost-article/:id" element={<i.LostDetailPage />} /> | ||
| <Route path="/lost-article/edit" element={<i.LostArticleEditPage />} /> | ||
| <Route path="/lost-article/:id/patch" element={<i.LostPatchPage />} /> | ||
| {/* 2-4.캠퍼스맵 */} | ||
| <Route path="/campus-map" element={<i.CampusPage />} /> | ||
| {/* 3. 학생자치기구 */} | ||
| <Route path="/petition-notice" element={<i.PetitionNoticePage />} /> | ||
| <Route path="/petition-notice/edit" element={<i.PetitionNoticeEditPage />} /> | ||
| <Route path="/petition-notice/:id" element={<i.PetitionNoticeDetailPage />} /> | ||
| {/* 4. 소통 */} | ||
| <Route path="/audit" element={<i.AuditPage />} /> | ||
| <Route path="/audit/:id" element={<i.AuditDetailPage />} /> | ||
| <Route path="/audit/edit" element={<i.AuditEditPage />} /> | ||
| <Route path="/audit/:id/patch" element={<i.AuditPatchPage />} /> | ||
| {/* 개인정보이용약관 */} | ||
| <Route path="/personal-data" element={<i.PersonalDataPage />} /> | ||
| </Route> | ||
| {/*온보딩*/} | ||
| <Route path="/register" element={<KakaoRegisterPage />} /> | ||
| <Route path="/register/redirect" element={<KakaoRegisterRedirectPage />} /> | ||
| <Route path="/register/:sort" element={<GeneralRegisterPage />} /> | ||
| <Route path="/auth/callback" element={<KakaoRedirect />} /> | ||
| {/* 온보딩 */} | ||
| <Route path="/register" element={<i.KakaoRegisterPage />} /> | ||
| <Route path="/register/redirect" element={<i.KakaoRegisterRedirectPage />} /> | ||
| <Route path="/register/:sort" element={<i.GeneralRegisterPage />} /> | ||
| <Route path="/auth/callback" element={<i.KakaoRedirect />} /> | ||
| {/* 이외 경로 리다이렉트 처리 */} | ||
| <Route path="*" element={<Navigate to="/" replace />} /> | ||
| </Routes> | ||
| ); | ||
| } |