Skip to content

[bugfix] 에러 처리 추가 #116

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
yeonjin719 merged 1 commit into from
Aug 16, 2025
Merged

[bugfix] 에러 처리 추가 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions src/components/modal/dateCourseSearchFilterModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// DateCourseSearchFilterModal.tsx
import { useMemo } from 'react';
import { useLocation } from 'react-router-dom';
import { Navigate, useLocation } from 'react-router-dom';
import ClipLoader from 'react-spinners/ClipLoader';

import { DateCourseQuestion } from '@/constants/dateCourseQuestion';

Expand Down Expand Up @@ -80,12 +80,12 @@ export default function DateCourseSearchFilterModal({ onClose }: TProps) {
transportation,
userPreferredKeywords,
size: 5,
page: 1,
page: 0,
isBookmarked,
};

const { data: courseData } = useGetCourse(commonParams);
const { data: bookmarkedData } = useGetBookmarkedCourse(commonParams);
const { data: courseData, isLoading: courseDataLoading, error: courseDataError } = useGetCourse(commonParams);
const { data: bookmarkedData, isLoading: bookmarkDataLoading, error: bookmarkDataError } = useGetBookmarkedCourse(commonParams);

const data = isBookmarked ? bookmarkedData : courseData;

Expand Down Expand Up @@ -162,6 +162,10 @@ export default function DateCourseSearchFilterModal({ onClose }: TProps) {
}
};

if (bookmarkDataError || courseDataError) {
return <Navigate to="/error" replace={true} />;
}

return (
<Modal onClose={onClose} title="검색 필터">
<div className="flex flex-col w-full max-w-[80vw] px-[8%] gap-10 py-10">
Expand All @@ -180,9 +184,13 @@ export default function DateCourseSearchFilterModal({ onClose }: TProps) {
))}

<div className="flex w-full justify-end">
<Button size="big-16" variant="mint" className="w-fit text-center px-[30px] font-body1" onClick={onClose}>
데이트 코스 {data?.result.totalCount ?? 0}개 보기
</Button>
{bookmarkDataLoading || courseDataLoading ? (
<ClipLoader />
) : (
<Button size="big-16" variant="mint" className="w-fit text-center px-[30px] font-body1" onClick={onClose}>
데이트 코스 {data?.result.totalCount ?? 0}개 보기
</Button>
)}
</div>
</div>
</Modal>
Expand Down
35 changes: 25 additions & 10 deletions src/pages/dateCourse/CoursePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Navigate, useNavigate } from 'react-router-dom';
import ClipLoader from 'react-spinners/ClipLoader';

import useGetBookmarkedCourse from '@/hooks/course/useGetBookmarkedCourse';
import { useUserGrade } from '@/hooks/home/useUserGrade';
Expand All @@ -15,11 +16,11 @@ import useModalStore from '@/store/useModalStore';
export default function Course() {
const navigate = useNavigate();
const { openModal } = useModalStore();
const [current, setCurrent] = useState(1);
const [current, setCurrent] = useState(0);

const { budget, datePlaces, dateDurationTime, startTime, mealTypes, transportation, userPreferredKeywords } = useFilterStore();
// 수정 예정
const { data } = useGetBookmarkedCourse({

const { data, isLoading, error } = useGetBookmarkedCourse({
page: current,
size: 5,
budget,
Expand All @@ -31,7 +32,13 @@ export default function Course() {
startTime,
isBookmarked: true,
});

const { data: gradeData } = useUserGrade();

if (error) {
return <Navigate to="/error" replace={true} />;
}

return (
<div className="flex flex-col justify-center items-center w-full">
<div className="flex w-[1000px] max-w-[80vw] flex-col py-[24px] gap-[64px]">
Expand Down Expand Up @@ -64,12 +71,20 @@ export default function Course() {
</div>
</div>
</div>
<div className="flex flex-col gap-[24px] ">
{data?.result.dateCourseList.map((course, idx) => {
return <DateCourse key={course.dateCourseId ?? idx} {...course} />;
})}
</div>
<Navigator current={current} end={data?.result.totalPages!} onClick={setCurrent} />
{isLoading ? (
<div className="w-full justify-center flex">
<ClipLoader />
</div>
) : (
<>
<div className="flex flex-col gap-[24px] ">
{data?.result.dateCourseList.map((course, idx) => {
return <DateCourse key={course.dateCourseId ?? idx} {...course} />;
})}
</div>
<Navigator current={current + 1} end={data?.result.totalPages!} onClick={setCurrent} />
</>
)}
</div>
</div>
</div>
Expand Down
31 changes: 22 additions & 9 deletions src/pages/dateCourse/FindDateCourse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Navigate, useNavigate } from 'react-router-dom';
import ClipLoader from 'react-spinners/ClipLoader';

import useGetCourse from '@/hooks/course/useGetCourse';

Expand All @@ -14,14 +15,14 @@ import useModalStore from '@/store/useModalStore';

function FindDateCourse() {
const { openModal } = useModalStore();
const [current, setCurrent] = useState(1);
const [current, setCurrent] = useState(0);
const navigate = useNavigate();
const { budget, datePlaces, dateDurationTime, startTime, mealTypes, transportation, userPreferredKeywords } = useFilterStore();
useEffect(() => {
setCurrent(1);
}, [budget, datePlaces, dateDurationTime, startTime, mealTypes, transportation, userPreferredKeywords]);

const { data: courseData } = useGetCourse({
const { data, isLoading, error } = useGetCourse({
page: current,
size: 5,
budget,
Expand All @@ -34,6 +35,10 @@ function FindDateCourse() {
isBookmarked: false,
});

if (error) {
return <Navigate to="/error" replace={true} />;
}

return (
<div className="w-full flex justify-center items-center flex-col h-fit">
<div className="flex w-[1000px] max-w-[80vw] flex-col py-[24px] gap-[20px]">
Expand All @@ -51,12 +56,20 @@ function FindDateCourse() {
검색 필터
</div>
</div>
<div className="flex flex-col gap-[24px] ">
{courseData?.result.dateCourseList.map((course) => {
return <DateCourse key={course.dateCourseId} {...course} />;
})}
</div>
<Navigator current={current} end={courseData?.result.totalPages!} onClick={setCurrent} />
{isLoading ? (
<div className="w-full justify-center flex">
<ClipLoader />
</div>
) : (
<>
<div className="flex flex-col gap-[24px] ">
{data?.result?.dateCourseList.map((course, idx) => {
return <DateCourse key={course.dateCourseId ?? idx} {...course} />;
})}
</div>
<Navigator current={current + 1} end={data?.result?.totalPages!} onClick={setCurrent} />
</>
)}
</div>
</div>
</div>
Expand Down