-
Notifications
You must be signed in to change notification settings - Fork 2
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: 내 일정 페이지 추가 구현 #41
Merged
Merged
Changes from all commits
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
498c72b
Merge branch 'develop' of https://github.com/Project-Catcher/catcher-…
pepperdad fbb4e95
fix: 현재 탭 path 수정
pepperdad 1c6899e
feat: string을 Date 타입으로 바꿔주는 함수 추가
pepperdad a7dae54
feat: 테스트 데이터 추가
pepperdad 974e16f
design: asset 추가
pepperdad a65e69e
feat: 모집 일정 페이지 추가
pepperdad f1ae4fb
feat: 일정 작은 카드, EmptyContent 컴포넌트 추가
pepperdad c5a4813
feat: 내 일정 메인 페이지 UI 수정 및 일정 카드 캐러셀 기능 추가
pepperdad bf46192
feat: TitleCardContainer 컴포넌트로 분리
pepperdad a4c24f8
feat: 일정 작은 카드 컴포넌트 타입별 UI 수정
pepperdad e3f89c6
feat: 캘린더 클릭 이벤트 범위 수정
pepperdad 89bc707
fix: calendar 닫히지 않는 오류 수정
pepperdad 9b27c8c
feat: default 데이터 수정
pepperdad a6f259c
feat: ScheduleCard Type별 UI 구분
pepperdad 45e9432
feat: ScheduleSmallCard Type별 UI 구분
pepperdad a9d78c7
feat: ContentFilter 컴포넌트 추가
pepperdad 404edde
feat: 일정 목록 type 별 구분 로직 추가 및 한 컴포넌트에서 관리
pepperdad 8f1a062
feat: 일정 작은 카드 토글 UI 추가
pepperdad 5348cb1
feat: 일정 카드 컴포넌트 tab별 Type,UI 구분 로직 추가
pepperdad bd5156f
feat: 모집 일정 페이지 필터링, 카드 목록 추가
pepperdad 1551104
design: asset 추가 및 자잘한 타입 수정
pepperdad 0cd7eea
fix: 임시저장 카드 UI 분리
pepperdad f63ce41
feat: 일정카드 상태 뱃지 UI 추가
pepperdad e885985
feat: 신청자 관리 모달 추가
pepperdad 2149cc9
feat: ScheduleHeader 상위 컴포넌트로 분리
pepperdad 3059877
fix: 기존 header 제거
pepperdad d0fb656
feat: 참여 신청 페이지 추가
pepperdad bded74d
style: 불필요한 import 삭제
pepperdad f19554e
feat: ScheduleHeader에 임시저장 추가
pepperdad fee3616
feat: context로 탭 관리 추가
pepperdad e2ba371
feat: 참여신청 필터링 및 CardStatus 컴포넌트 상태 정보 추가
pepperdad 63e5133
fix: 모달 위에 confirm, alert 보이게 수정
pepperdad c349e13
feat: 승인 클릭 함수 추가 및 테이블 데이터 스크롤
pepperdad ec9630c
feat: 임시저장 페이지 구현
pepperdad 5f51645
feat: 나만의 아이템 페이지 추가
pepperdad c2498b7
Merge branch 'develop' of https://github.com/Project-Catcher/catcher-…
pepperdad fac9116
fix: error resolve
pepperdad e74d862
refactor: 동일 구조 map으로 변경
pepperdad bb19ada
fix: Content 필터 컴포넌트에서 검색창 넓이 %로 수정
pepperdad b4faf2b
feat: msw 설정 및 데이터 받아오기 수정
pepperdad bb35c7c
feat: 내 일정, 모든 일정, 모집 일정, 참여 신청 데이터 msw
pepperdad e7af5a4
feat: 기존의 상수로 사용되던 부분 수정
pepperdad df521c3
feat: 신청자 관리 모달 데이터 msw에서 불러오기
pepperdad 078b4ee
feat: 나만의 아이템 msw로 불러오기 및 호버시 수정, 삭제 UI 추가
pepperdad 1bbd83d
feat: 스크랩 페이지 추가
pepperdad f88ece8
feat: 탭 클릭 시, 데이터 다시 불러오는 로직 추가
pepperdad f95b5bb
Merge branch 'develop' of https://github.com/Project-Catcher/catcher-…
pepperdad f5c85c9
fix: 임시 저장 카드 높이 수정
pepperdad 58f363f
feat: 내 일정 페이지 작성 중인 일정 UI 수정
pepperdad 6f6b9d4
feat: 내 일정 전체 페이지 카드뷰를 위해 빈 카드 추가
pepperdad 63aafb5
fix: review 반영하여 코드 refactor
pepperdad a2bd607
fix: TabContext 제거
pepperdad 7949606
fix: 오타 수정
pepperdad 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 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 |
---|---|---|
@@ -0,0 +1,164 @@ | ||
import axios from "axios"; | ||
|
||
export const getAllSchedule = async ( | ||
tab?: string, | ||
title?: string, | ||
startDate?: Date, | ||
endDate?: Date, | ||
) => { | ||
let tabParam; | ||
|
||
if (tab === "진행 예정") { | ||
tabParam = "proceed"; | ||
} else if (tab === "진행중/완료 일정") { | ||
tabParam = "ongoing"; | ||
} | ||
|
||
return await axios.get(`${process.env.NEXT_PUBLIC_BASE_URL}/getAllSchedule`, { | ||
params: { | ||
tab: tabParam, | ||
title, | ||
startDate, | ||
endDate, | ||
}, | ||
}); | ||
}; | ||
|
||
export const getRecruitSchedule = async ( | ||
tab?: string, | ||
title?: string, | ||
startDate?: Date, | ||
endDate?: Date, | ||
) => { | ||
let tabParam; | ||
|
||
if (tab === "모집 중/예정") { | ||
tabParam = "proceed"; | ||
} else if (tab === "모집 완료") { | ||
tabParam = "ongoing"; | ||
} | ||
|
||
return await axios.get( | ||
`${process.env.NEXT_PUBLIC_BASE_URL}/getRecruitSchedule`, | ||
{ | ||
params: { | ||
tab: tabParam, | ||
title, | ||
startDate, | ||
endDate, | ||
}, | ||
}, | ||
); | ||
}; | ||
|
||
export const getParticipateSchedule = async ( | ||
tab?: string, | ||
title?: string, | ||
startDate?: Date, | ||
endDate?: Date, | ||
) => { | ||
let tabParam = 0; | ||
|
||
if (tab === "승인 대기 중") { | ||
tabParam = 1; | ||
} else if (tab === "승인 완료") { | ||
tabParam = 2; | ||
} else if (tab === "승인 거절") { | ||
tabParam = 3; | ||
} | ||
|
||
return await axios.get( | ||
`${process.env.NEXT_PUBLIC_BASE_URL}/getParticipateSchedule`, | ||
{ | ||
params: { | ||
tab: tabParam, | ||
title, | ||
startDate, | ||
endDate, | ||
}, | ||
}, | ||
); | ||
}; | ||
|
||
export const getScrapSchedule = async ( | ||
title?: string, | ||
startDate?: Date, | ||
endDate?: Date, | ||
) => { | ||
return await axios.get( | ||
`${process.env.NEXT_PUBLIC_BASE_URL}/getScrapSchedule`, | ||
{ | ||
params: { | ||
title, | ||
startDate, | ||
endDate, | ||
}, | ||
}, | ||
); | ||
}; | ||
|
||
export const getTemporarySchedule = async ( | ||
title?: string, | ||
startDate?: Date, | ||
endDate?: Date, | ||
) => { | ||
return await axios.get( | ||
`${process.env.NEXT_PUBLIC_BASE_URL}/getTemporarySchedule`, | ||
{ | ||
params: { | ||
title, | ||
startDate, | ||
endDate, | ||
}, | ||
}, | ||
); | ||
}; | ||
|
||
export const getMainSchedule = async () => { | ||
try { | ||
const response = await axios.all([ | ||
getAllSchedule(), | ||
getRecruitSchedule(), | ||
getParticipateSchedule(), | ||
getTemporarySchedule(), | ||
]); | ||
|
||
// axios.spread를 사용하여 각 요청의 결과를 개별적으로 처리 | ||
const [ | ||
allSchedule, | ||
recruitSchedule, | ||
participateSchedule, | ||
temporarySchedule, | ||
] = response; | ||
|
||
// 각 요청의 데이터를 반환합니다. | ||
return { | ||
allSchedule: allSchedule.data, | ||
recruitSchedule: recruitSchedule.data, | ||
participateSchedule: participateSchedule.data, | ||
temporarySchedule: temporarySchedule.data, | ||
}; | ||
} catch (error) { | ||
console.error("API 호출 중 오류 발생:", error); | ||
throw error; // 오류를 호출자에게 전달 | ||
} | ||
}; | ||
|
||
export const getApplicantsList = async (id: number) => { | ||
return await axios.get( | ||
`${process.env.NEXT_PUBLIC_BASE_URL}/getApplicantsList`, | ||
{ | ||
params: { | ||
id, | ||
}, | ||
}, | ||
); | ||
}; | ||
|
||
export const getItemList = async (title?: string) => { | ||
return await axios.get(`${process.env.NEXT_PUBLIC_BASE_URL}/getItemList`, { | ||
params: { | ||
title, | ||
}, | ||
}); | ||
}; |
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,8 +1,13 @@ | ||
//모든 일정 페이지 | ||
import All from "@schedule/components/All"; | ||
import ScheduleWrapper from "@schedule/components/ScheduleWrapper"; | ||
|
||
const create = () => { | ||
return <All />; | ||
return ( | ||
<ScheduleWrapper> | ||
<All />; | ||
</ScheduleWrapper> | ||
); | ||
}; | ||
|
||
export default create; |
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,9 +1,14 @@ | ||
// 내 일정 페이지 | ||
import Main from "@schedule/components/Main"; | ||
import ScheduleWrapper from "@schedule/components/ScheduleWrapper"; | ||
import React from "react"; | ||
|
||
const index = () => { | ||
return <Main />; | ||
return ( | ||
<ScheduleWrapper> | ||
<Main />; | ||
</ScheduleWrapper> | ||
); | ||
}; | ||
|
||
export default index; |
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,13 @@ | ||
import Items from "@schedule/components/Items"; | ||
import ScheduleWrapper from "@schedule/components/ScheduleWrapper"; | ||
import React from "react"; | ||
|
||
const items = () => { | ||
return ( | ||
<ScheduleWrapper> | ||
<Items />; | ||
</ScheduleWrapper> | ||
); | ||
}; | ||
|
||
export default items; |
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,13 @@ | ||
import Participate from "@schedule/components/Participate"; | ||
import ScheduleWrapper from "@schedule/components/ScheduleWrapper"; | ||
import React from "react"; | ||
|
||
const participate = () => { | ||
return ( | ||
<ScheduleWrapper> | ||
<Participate />; | ||
</ScheduleWrapper> | ||
); | ||
}; | ||
|
||
export default participate; |
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,13 @@ | ||
import Recruit from "@schedule/components/Recruit"; | ||
import ScheduleWrapper from "@schedule/components/ScheduleWrapper"; | ||
import React from "react"; | ||
|
||
const recruit = () => { | ||
return ( | ||
<ScheduleWrapper> | ||
<Recruit />; | ||
</ScheduleWrapper> | ||
); | ||
}; | ||
|
||
export default recruit; |
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,13 @@ | ||
import ScheduleWrapper from "@schedule/components/ScheduleWrapper"; | ||
import Scrap from "@schedule/components/Scrap"; | ||
import React from "react"; | ||
|
||
const participate = () => { | ||
return ( | ||
<ScheduleWrapper> | ||
<Scrap />; | ||
</ScheduleWrapper> | ||
); | ||
}; | ||
|
||
export default participate; |
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,13 @@ | ||
import ScheduleWrapper from "@schedule/components/ScheduleWrapper"; | ||
import Temporary from "@schedule/components/Temporary"; | ||
import React from "react"; | ||
|
||
const temporary = () => { | ||
return ( | ||
<ScheduleWrapper> | ||
<Temporary />; | ||
</ScheduleWrapper> | ||
); | ||
}; | ||
|
||
export default temporary; |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
제안 사항:
코드 변경 내용:
버그 리스크: 현재 코드 패치에서는 명확한 버그 리스크가 보이지 않습니다. 그러나 다른 파일 또는 이 코드와 관련된 다른 코드를 고려해야 할 수 있습니다.
개선 제안: 이 코드 패치에서 개선할 만한 부분은 없어 보입니다. 그러나 전체 소스 코드나 프로젝트의 문맥을 파악하고 있다면 더 자세한 리뷰를 제공할 수 있습니다.