-
Notifications
You must be signed in to change notification settings - Fork 4
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
[ Feat ] router 연결 #14
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
feaf484
feat: 페이지별 폴더 추가
j-nary 8f5d3ab
fix: tsx 기본 템플릿 수정
j-nary d41cf89
feat: router 연결
j-nary a395189
refactor: onboarding 상위폴더 생성
j-nary f27ab8c
fix: 쉼표 추가
j-nary 775e8ff
fix: 오타 수정
j-nary 9865eac
fix: 최상위 컴포넌트 네이밍 변경
j-nary 123c8ca
chore: 사용하지 않는 코드/파일 삭제
lydiacho 712d580
Merge branch 'develop' into feat/#13/router
lydiacho 9b5fdbc
fix: App Wrapper에 width 100vw 추가
lydiacho File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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
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,5 +1,42 @@ | ||
import { RouterProvider, createBrowserRouter } from 'react-router-dom'; | ||
import App from './App'; | ||
import HomePage from './pages/home/Home'; | ||
import JuniorPromisePage from './pages/juniorPromise/JuniorPromise'; | ||
import JuniorOnboardingPath from './pages/onboarding/juniorOnboarding/JuniorOnboarding'; | ||
import SeniorOnboardingPage from './pages/onboarding/seniorOnboarding/SeniorOnboarding'; | ||
import SeniorProfilePage from './pages/seniorProfile/SeniorProfile'; | ||
|
||
const router = createBrowserRouter([ | ||
{ | ||
path: '/', | ||
element: <App />, | ||
children: [ | ||
{ | ||
index: true, | ||
element: <HomePage />, | ||
}, | ||
{ | ||
path: 'seniorOnboarding', | ||
element: <SeniorOnboardingPage />, | ||
}, | ||
{ | ||
path: 'juniorOnboarding', | ||
element: <JuniorOnboardingPath />, | ||
}, | ||
{ | ||
path: 'seniorProfile', | ||
element: <SeniorProfilePage />, | ||
}, | ||
{ | ||
path: 'juniorPromise', | ||
element: <JuniorPromisePage />, | ||
}, | ||
], | ||
}, | ||
]); | ||
|
||
const Router = () => { | ||
return <div>Router</div>; | ||
return <RouterProvider router={router} />; | ||
}; | ||
|
||
export default Router; |
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,4 +1,9 @@ | ||
import React from 'react'; | ||
import ReactDOM from 'react-dom/client'; | ||
import App from './App.tsx'; | ||
import Router from './Router.tsx'; | ||
|
||
ReactDOM.createRoot(document.getElementById('root')!).render(<App />); | ||
ReactDOM.createRoot(document.getElementById('root')!).render( | ||
<React.StrictMode> | ||
<Router /> | ||
</React.StrictMode>, | ||
); |
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,5 @@ | ||
const HomePage = () => { | ||
return <div>Home</div>; | ||
}; | ||
|
||
export default HomePage; |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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,5 @@ | ||
const JuniorPromisePage = () => { | ||
return <div>JuniorPromise</div>; | ||
}; | ||
|
||
export default JuniorPromisePage; |
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
This file was deleted.
Oops, something went wrong.
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,5 @@ | ||
const JuniorOnboardingPath = () => { | ||
return <div>JuniorOnboarding</div>; | ||
}; | ||
|
||
export default JuniorOnboardingPath; |
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
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,5 @@ | ||
const SeniorOnboardingPage = () => { | ||
return <div>SeniorOnboarding</div>; | ||
}; | ||
|
||
export default SeniorOnboardingPage; |
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
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,5 @@ | ||
const SeniorProfilePage = () => { | ||
return <div>SeniorProfile</div>; | ||
}; | ||
|
||
export default SeniorProfilePage; |
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
p2) 2차 스프린트로 넘어간 부분이니까 없어도 괜찮을 거 같아요!!