From 7198b74a2939c84b2e3bf89b5ea844d70d7feebe Mon Sep 17 00:00:00 2001 From: jellie Date: Fri, 20 Jun 2025 20:59:20 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8?= =?UTF-8?q?=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/trainee/Lounge.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/trainee/Lounge.tsx b/src/pages/trainee/Lounge.tsx index 24c07d7..476f0be 100644 --- a/src/pages/trainee/Lounge.tsx +++ b/src/pages/trainee/Lounge.tsx @@ -21,7 +21,7 @@ import LoungeForm from '@/components/lounge/form/LoungeForm'; const initialFilter: LoungeProjectFilter = { page: 1, - size: 20, + size: 21, keyword: '', }; From 39f690d2bf42be938be241e1ab778d49c6d976fe Mon Sep 17 00:00:00 2001 From: jellie Date: Fri, 27 Jun 2025 21:15:51 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8?= =?UTF-8?q?=20postId=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Login.tsx | 9 ++++-- src/pages/trainee/Notice.tsx | 2 +- src/pages/trainee/NoticeDetail.tsx | 24 ++++++++++++++-- src/route/mainRoutes.tsx | 45 ++++++++++++++++-------------- src/services/post/noticeQueries.ts | 2 +- src/services/post/postQueries.ts | 11 +++++--- src/types/lounge/loungeDto.d.ts | 1 + 7 files changed, 61 insertions(+), 33 deletions(-) diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index 6ec83d9..0b0b07c 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -17,9 +17,12 @@ export default function Login() { const handleTestAdminLogin = async () => { try { - const response = await axiosInstance.get('/test/getAdminCookie', { - withCredentials: true, - }); + const response = await axiosInstance.get( + '/test/getUserCookie?email=talentforest0501@gmail.com', + { + withCredentials: true, + }, + ); const { access_token: accessToken } = response.data; diff --git a/src/pages/trainee/Notice.tsx b/src/pages/trainee/Notice.tsx index afd48c1..3252ee9 100644 --- a/src/pages/trainee/Notice.tsx +++ b/src/pages/trainee/Notice.tsx @@ -74,7 +74,7 @@ export default function Notice() { {noticeCategoryList.map(({ key, name }) => (
  • + )} + + {showFavoriteButton && ( + + )} + + +
      +
    • + + + + {storeData.campusName} + - {isOpenStoreProposalEditModal && ( - - )} - - {showFavoriteButton && ( - - )} - - -
      - -
      - - {storeData ? `${storeData.campusName}` : '-'} + + 도보{' '} + {storeData.walkTime || 0}분 + + + + +
      + + 빠른 길찾기 -
      - 도보 - - {storeData.walkTime || 0} - 분 - - -
      - 빠른 길찾기 -
      -
      -
      +
      • + +
    • + -
      - {isOpenForBusiness() ? '영업 중' : '영업 종료'} - | -
      - -
      + | + +
      + {/* 영업시간 정보 */} + + + {storeData.workingDay} + + +
      {/* 삼각형 */} -
      +
        {storeData.workingDay.split(/, |\(|\)/).map(workingDay => (
      • {workingDay}
        • ))} + {/* 브레이크타임 정보 */} + {storeData.breakTime !== ' ' && ( +
      • {storeData.breakTime} 브레이크타임
        • + )}
      - - {storeData.breakTime && openHoursModal && ( -
      - {storeData ? `${storeData.breakTime} 브레이크타임` : '-'} -
      - )}
      -
      +
      • {storeData.contact && ( -
      - +
    • + {storeData.contact} -
      • + )} +
    -
    - {storeData.isZeropay && ( - - )} - {storeData.isLessThan10000Menu && ( - - )} - {storeData.isOverPerson && ( - - )} - {storeData.walkTime <= 5 && ( - - )} -
    - +
    + {storeData.isZeropay && ( + + )} + {storeData.isLessThan10000Menu && ( + + )} + {storeData.isOverPerson && ( + + )} + {storeData.walkTime <= 5 && ( + + )} +
    ); } diff --git a/src/components/store/StoreFilterForm.tsx b/src/components/store/StoreFilterForm.tsx index e8975c8..49ff6e4 100644 --- a/src/components/store/StoreFilterForm.tsx +++ b/src/components/store/StoreFilterForm.tsx @@ -169,8 +169,8 @@ export default function StoreFilterForm({ onReset }: StoreFilterFormProps) { ); }} errorMsg={error?.message} - selectBoxClassName="w-full h-[46px] p-5 bg-lightGray rounded-lg border border-mainGray-active justify-between items-center inline-flex" - optionClassName="text-sm hover:rounded-sm hover:bg-lightGray-hover pl-1 data-[selected=true]:text-black data-[selected=true]:font-bold" + selectBoxClassName="w-full h-[46px] p-5 bg-lightGray-hover rounded-lg border border-mainGray-active justify-between items-center inline-flex" + optionClassName="hover:rounded-sm text-[17px] hover:bg-lightGray-hover pl-1 data-[selected=true]:text-black data-[selected=true]:font-bold" /> ); }} diff --git a/src/layouts/MainView.tsx b/src/layouts/MainView.tsx index dd2f319..101f0e8 100644 --- a/src/layouts/MainView.tsx +++ b/src/layouts/MainView.tsx @@ -8,7 +8,7 @@ interface Props { export default function MainView({ children, className }: Props) { return (
    {children}
    diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index 0b0b07c..6ec83d9 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -17,12 +17,9 @@ export default function Login() { const handleTestAdminLogin = async () => { try { - const response = await axiosInstance.get( - '/test/getUserCookie?email=talentforest0501@gmail.com', - { - withCredentials: true, - }, - ); + const response = await axiosInstance.get('/test/getAdminCookie', { + withCredentials: true, + }); const { access_token: accessToken } = response.data; diff --git a/src/pages/SignUp.tsx b/src/pages/SignUp.tsx index fe926e6..d72c65c 100644 --- a/src/pages/SignUp.tsx +++ b/src/pages/SignUp.tsx @@ -220,7 +220,7 @@ export default function SignUp() { onChange([data[0]?.id]); }} errorMsg={errors.campusIdList?.message} - selectBoxClassName="!h-[50px] !text-base !border-darkGray" + selectBoxClassName="!h-[50px] !text-base" /> ) : ( +
    diff --git a/src/pages/admin/ContentsManagement.tsx b/src/pages/admin/ContentsManagement.tsx index e134bcc..4b0c269 100644 --- a/src/pages/admin/ContentsManagement.tsx +++ b/src/pages/admin/ContentsManagement.tsx @@ -5,7 +5,7 @@ import PreparingPage from '@/components/common/PreparingPage'; export default function ContentsManagement() { return ( - +
    diff --git a/src/pages/admin/CourseManagement.tsx b/src/pages/admin/CourseManagement.tsx index efe3692..076d674 100644 --- a/src/pages/admin/CourseManagement.tsx +++ b/src/pages/admin/CourseManagement.tsx @@ -20,7 +20,7 @@ export default function CourseManagement() { const { data: userProfile } = useGetUserProfile(); return ( - +
    {userProfile && ( diff --git a/src/pages/admin/UserManagement.tsx b/src/pages/admin/UserManagement.tsx index 6c5c4ec..d417a05 100644 --- a/src/pages/admin/UserManagement.tsx +++ b/src/pages/admin/UserManagement.tsx @@ -109,7 +109,7 @@ export default function UserManagement() { const { data, labelList, gridStyle } = dataTypeObj[currTab]; return ( - +
    @@ -194,7 +194,7 @@ export default function UserManagement() { ) : ( )} diff --git a/src/pages/trainee/Home.tsx b/src/pages/trainee/Home.tsx index 19d3120..8ca863a 100644 --- a/src/pages/trainee/Home.tsx +++ b/src/pages/trainee/Home.tsx @@ -17,6 +17,7 @@ import { useAtom } from 'jotai'; import LoadingPage from '@/pages/LoadingPage'; import Calendar from '@/components/calendar/Calendar'; +import EmptyContent from '@/components/common/EmptyContent'; import Title from '@/components/common/Title'; import RoleSwitchButton from '@/components/common/button/RoleSwitchButton'; import SwiperContainer from '@/components/common/container/SwiperContainer'; @@ -129,12 +130,20 @@ export default function Home() { - - {item => } - + {loungeList?.projects.length !== 0 ? ( + + {item => } + + ) : ( + + )} ); diff --git a/src/pages/trainee/Lounge.tsx b/src/pages/trainee/Lounge.tsx index 476f0be..002307b 100644 --- a/src/pages/trainee/Lounge.tsx +++ b/src/pages/trainee/Lounge.tsx @@ -150,7 +150,7 @@ export default function Lounge() { -
      +
        {projects.map(project => (
      • @@ -159,7 +159,10 @@ export default function Lounge() {
      {projects.length === 0 && !isLoading && ( - + )} {isLoading && ( diff --git a/src/pages/trainee/MyPage.tsx b/src/pages/trainee/MyPage.tsx index 76581ce..42eeea7 100644 --- a/src/pages/trainee/MyPage.tsx +++ b/src/pages/trainee/MyPage.tsx @@ -46,7 +46,7 @@ export default function MyPage() { -
      +
      <MyCollection /> </section> diff --git a/src/pages/trainee/Notice.tsx b/src/pages/trainee/Notice.tsx index 3252ee9..68c2b1c 100644 --- a/src/pages/trainee/Notice.tsx +++ b/src/pages/trainee/Notice.tsx @@ -103,7 +103,7 @@ export default function Notice() { {noticeList.length === 0 && !isLoading && ( <EmptyContent message={`${tab === 'BOOKMARK' ? '북마크한' : '등록된'} 공지사항이 없습니다.`} - className="mt-32" + className="mt-16" /> )} </> diff --git a/src/pages/trainee/Schedule.tsx b/src/pages/trainee/Schedule.tsx index e3e3584..6658809 100644 --- a/src/pages/trainee/Schedule.tsx +++ b/src/pages/trainee/Schedule.tsx @@ -24,7 +24,7 @@ export default function Schedule() { if (isCalendarDataLoading || isLoading) return <LoadingPage />; return ( - <MainView className="mb-40 h-screen !min-h-[900px]"> + <MainView className="mb-20 h-screen !min-h-[900px]"> <Header title={`${userProfile?.name} 스프님 새싹 일정`} highlight="새싹"