-
Notifications
You must be signed in to change notification settings - Fork 0
[Feat] 스케줄러 카드 추가 및 탭 컴포넌트 수정 #82
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
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
697540e
fix: TabNavigation을 query param 방식으로 변경하고 basePath 옵션 추가
claudia99503 e89b454
feat: Button 컴포넌트에 새로운 variant(leave, chat)와 size(xs) 추가
claudia99503 fffaf69
fix: 페이지 구조를 쿼리 파라미터 기반으로 변경
claudia99503 c66b3cc
Merge branch 'main' into minseo-feat/schedule-card
HopeFullee 4a784f4
Merge branch 'main' into minseo-feat/schedule-card
claudia99503 d6ce633
Merge branch 'main' into minseo-feat/schedule-card
claudia99503 2bb5893
fix: 탭 네비게이션에 sticky 속성 추가
claudia99503 b65cb29
Merge branch 'main' into minseo-feat/schedule-card
claudia99503 1cda394
Merge branch 'main' into minseo-feat/schedule-card
claudia99503 1afb256
fix: 카드 컴포넌트 onClick 테스트 수정
claudia99503 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 contains hidden or 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,46 @@ | ||
| 'use client'; | ||
|
|
||
| import { useRouter } from 'next/navigation'; | ||
|
|
||
| import Card from '@/components/shared/card'; | ||
|
|
||
| const MOCK_MEETINGS = [ | ||
| { | ||
| id: 1, | ||
| title: '네즈코와 무한성에서 정모 하실 분', | ||
| images: [], | ||
| location: '네즈코 호수공원', | ||
| dateTime: '25. 11. 28 - 10:00', | ||
| nickName: 'Hope Lee', | ||
| participantCount: 8, | ||
| maxParticipants: 10, | ||
| tags: ['#태그', '#태그', '#태그'], | ||
| }, | ||
| ]; | ||
|
|
||
| export default function Current() { | ||
| const router = useRouter(); | ||
|
|
||
| return ( | ||
| <section className='flex w-full flex-col gap-4 px-4 py-4'> | ||
| {MOCK_MEETINGS.map((meeting) => ( | ||
| <Card | ||
| key={meeting.id} | ||
| dateTime={meeting.dateTime} | ||
| images={meeting.images} | ||
| leaveAndChatActions={{ | ||
| onLeave: () => console.log('모임 탈퇴', meeting.id), | ||
| onChat: () => router.push(`/chat/${meeting.id}`), | ||
| }} | ||
| location={meeting.location} | ||
| maxParticipants={meeting.maxParticipants} | ||
| nickName={meeting.nickName} | ||
| participantCount={meeting.participantCount} | ||
| tags={meeting.tags} | ||
| title={meeting.title} | ||
| onClick={() => router.push(`/meetup/${meeting.id}`)} | ||
| /> | ||
| ))} | ||
| </section> | ||
| ); | ||
| } |
This file contains hidden or 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,46 @@ | ||
| 'use client'; | ||
|
|
||
| import { useRouter } from 'next/navigation'; | ||
|
|
||
| import Card from '@/components/shared/card'; | ||
|
|
||
| const MOCK_MEETINGS = [ | ||
| { | ||
| id: 3, | ||
| title: '동네 책모임 신규 멤버 구함', | ||
| images: [], | ||
| location: '망원동 카페 거리', | ||
| dateTime: '25. 12. 10 - 19:30', | ||
| nickName: 'Book Lover', | ||
| participantCount: 3, | ||
| maxParticipants: 8, | ||
| tags: ['#책모임', '#수다환영'], | ||
| }, | ||
| ]; | ||
|
|
||
| export default function History() { | ||
| const router = useRouter(); | ||
|
|
||
| return ( | ||
| <section className='flex w-full flex-col gap-4 px-4 py-4'> | ||
| {MOCK_MEETINGS.map((meeting) => ( | ||
| <Card | ||
| key={meeting.id} | ||
| dateTime={meeting.dateTime} | ||
| images={meeting.images} | ||
| leaveAndChatActions={{ | ||
| onLeave: () => console.log('모임 탈퇴', meeting.id), | ||
| onChat: () => router.push(`/chat/${meeting.id}`), | ||
| }} | ||
| location={meeting.location} | ||
| maxParticipants={meeting.maxParticipants} | ||
| nickName={meeting.nickName} | ||
| participantCount={meeting.participantCount} | ||
| tags={meeting.tags} | ||
| title={meeting.title} | ||
| onClick={() => router.push(`/meetup/${meeting.id}`)} | ||
| /> | ||
| ))} | ||
| </section> | ||
| ); | ||
| } |
This file contains hidden or 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,46 @@ | ||
| 'use client'; | ||
|
|
||
| import { useRouter } from 'next/navigation'; | ||
|
|
||
| import Card from '@/components/shared/card'; | ||
|
|
||
| const MOCK_MEETINGS = [ | ||
| { | ||
| id: 2, | ||
| title: '주말 러닝 크루 모집', | ||
| images: [], | ||
| location: '한강공원 잠실지구', | ||
| dateTime: '25. 12. 05 - 07:30', | ||
| nickName: 'Minseo Kim', | ||
| participantCount: 5, | ||
| maxParticipants: 12, | ||
| tags: ['#러닝', '#아침운동'], | ||
| }, | ||
| ]; | ||
|
|
||
| export default function My() { | ||
| const router = useRouter(); | ||
|
|
||
| return ( | ||
| <section className='flex w-full flex-col gap-4 px-4 py-4'> | ||
| {MOCK_MEETINGS.map((meeting) => ( | ||
| <Card | ||
| key={meeting.id} | ||
| dateTime={meeting.dateTime} | ||
| images={meeting.images} | ||
| leaveAndChatActions={{ | ||
| onLeave: () => console.log('모임 탈퇴', meeting.id), | ||
| onChat: () => router.push(`/chat/${meeting.id}`), | ||
| }} | ||
| location={meeting.location} | ||
| maxParticipants={meeting.maxParticipants} | ||
| nickName={meeting.nickName} | ||
| participantCount={meeting.participantCount} | ||
| tags={meeting.tags} | ||
| title={meeting.title} | ||
| onClick={() => router.push(`/meetup/${meeting.id}`)} | ||
| /> | ||
| ))} | ||
| </section> | ||
| ); | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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,30 @@ | ||
| import { redirect } from 'next/navigation'; | ||
| 'use client'; | ||
|
|
||
| import { useSearchParams } from 'next/navigation'; | ||
|
|
||
| import { TabNavigation } from '@/components/shared'; | ||
|
|
||
| import Current from './(components)/current'; | ||
| import History from './(components)/history'; | ||
| import My from './(components)/my'; | ||
|
|
||
| const SCHEDULE_TABS = [ | ||
| { label: '현재 모임', value: 'current' }, | ||
| { label: '나의 모임', value: 'my' }, | ||
| { label: '모임 이력', value: 'history' }, | ||
| ]; | ||
|
|
||
| export default function SchedulePage() { | ||
| redirect('/schedule/current'); | ||
| const searchParams = useSearchParams(); | ||
| const tab = searchParams.get('tab') || 'current'; | ||
|
|
||
| return ( | ||
| <div className='min-h-screen bg-[#F1F5F9]'> | ||
| <TabNavigation basePath='/schedule' tabs={SCHEDULE_TABS} /> | ||
|
|
||
| {tab === 'current' && <Current />} | ||
| {tab === 'my' && <My />} | ||
| {tab === 'history' && <History />} | ||
| </div> | ||
| ); | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
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.
위 훈수
아래 훈수