Merge pull request #211 from hyeonjuuu/ts/mypage

FRONTENDSCHOOL6 · Jan 12, 2024 · cc2a921 · cc2a921
2 parents 2ee9ad2 + ca0dda8
commit cc2a921
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 20 deletions.
diff --git a/src/components/TripCalendar/TripCalendar.tsx b/src/components/TripCalendar/TripCalendar.tsx
@@ -4,9 +4,11 @@ import '@/styles/calendar.css';
 import { DateStore } from '@/store/dateStore';
 import { getTripDateKo } from '@/utils';
 
-export default function TripCalendar() {
+function TripCalendar() {
   const { tripDate, setDate } = DateStore();
 
+  console.log(tripDate);
+
   return (
     <>
       <Calendar
@@ -57,3 +59,4 @@ export default function TripCalendar() {
     </>
   );
 }
+export default TripCalendar;
diff --git a/src/components/TripEdit/SelectHotelMap.tsx b/src/components/TripEdit/SelectHotelMap.tsx
@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
 
 const { kakao } = window;
 
-export default function SelectHotelMap({
+function SelectHotelMap({
   hotelList,
   placeList,
   width = 'w-full',
@@ -67,3 +67,4 @@ export default function SelectHotelMap({
 
   return <div id="map" style={{ width: '100%', height: '400px' }}></div>;
 }
+export default SelectHotelMap;
diff --git a/src/pages/MyPage/BookmarkPage.tsx b/src/pages/MyPage/BookmarkPage.tsx
@@ -2,7 +2,11 @@ import MyPageTab from '@/components/MyPage/MyPageTab';
 import BookmarkList from '@/components/MyPage/BookmarkList';
 import Profile from '@/components/MyPage/Profile';
 import MyPageHeader from '@/components/PageHeader';
-import { ItemType, getPocketHostImageURL } from '@/utils';
+import {
+  ItemType,
+  getPocketHostImageURL,
+  getPocketHostProfileURL,
+} from '@/utils';
 import pocketbase from '@/api/pocketbase';
 import MyPageTabInfo from '@/components/MyPage/MyPageTabInfo';
 import { Helmet } from 'react-helmet-async';
@@ -25,7 +29,7 @@ function BookmarkPage() {
             </span>
             {user.profile ? (
               <img
-                src={getPocketHostImageURL(user)}
+                src={getPocketHostProfileURL(user)}
                 alt={`${user.username}의 프로필`}
                 className="h-[4.375rem] w-[4.375rem] rounded-full border-[0.0938rem] border-contentsSecondary"
               />

diff --git a/src/pages/TripCalendarPage.tsx b/src/pages/TripCalendarPage.tsx
@@ -51,14 +51,14 @@ export default function TripCalendarPage() {
             question={'언제 떠나시나요?'}
             guide={'여행 일자를 선택하세요.'}
           />
-          {/* <TripCalendar /> */}
+          <TripCalendar />
           {Array.isArray(tripDate) ? (
             <Link to={`/tripedit/${data.id}`}>
-              {/* <ButtonLarge
+              <ButtonLarge
                 onClick={() => updateMyScheduleTitle(data.id, tripDate)}
               >
                 선택 완료
-              </ButtonLarge> */}
+              </ButtonLarge>
             </Link>
           ) : (
             <ButtonLarge>선택 완료</ButtonLarge>

diff --git a/src/pages/TripEditPage.tsx b/src/pages/TripEditPage.tsx
@@ -27,9 +27,9 @@ const fetchMySchedule = async (userId: string) => {
   });
   return response[0];
 };
-/* const getRecommends = async (userId: string) => {
+const getRecommends = async (userId: string) => {
   return await pocketbase.collection('recommends').getFullList();
-}; */
+};
 
 /* -------------------------------------------------------------------------- */
 
@@ -64,6 +64,8 @@ function TripEditPage() {
   } = ScheduleStore();
   const hotelList: any = Object.values(hotelPositions); //$ ListData 추후 지정
   const placeList: any = Object.values(placePositions); //$ ListData 추후 지정
+  console.log(placeList);
+
   // const removeSchedule = TripScheduleStore((state) => state.reset);
   const id = useId();
 
@@ -146,7 +148,8 @@ function TripEditPage() {
                 </div>
               ))}
 
-          <div className={toggleSchedule ? 'pt-0' : 'py-10'}>
+          {/* <div className={toggleSchedule ? 'pt-0' : 'py-10'}> */}
+          <div>
             <ButtonMedium menu="저장" fill={true} text="저장" />
             <ButtonMedium
               menu="저장"

diff --git a/src/store/scheduleStore.ts b/src/store/scheduleStore.ts
@@ -9,8 +9,9 @@ type Position = {
 };
 
 type ScheduleState = {
-  placePositions: Position[][];
-  hotelPositions: Position[][];
+  // placePositions: Position[][];
+  placePositions: any;
+  hotelPositions: any;
   resetHotelPositions: () => void;
   resetPlacePositions: () => void;
   addPlacePositions: (placePosition: Position, index: number) => void;

diff --git a/src/utils/getTripDate.ts b/src/utils/getTripDate.ts
@@ -13,17 +13,29 @@ export function getTripDate(date: string) {
 }
 
 export function getTripDateKo(dates: Date) {
-  const month = dates.getMonth() + 1;
-  const date = dates.getDate();
-  const day = dayText[dates.getDay()];
+  const month = dates?.getMonth() + 1;
+  const date = dates?.getDate();
+  const day = dayText[dates?.getDay()];
   return `${month}월 ${date}일 ${day}`;
 }
 
-export function getTripDateUTC(dates: Date) {
-  let dateUTC = new Date(
-    `${String(dates).slice(0, 15)} 12:00:00`
-  ).toISOString();
-  return `${dateUTC.slice(0, 10)} 12:00:00.123Z`;
+// export function getTripDateUTC(dates: Date) {
+//   let dateUTC = new Date(
+//     `${String(dates).slice(0, 15)} 12:00:00`
+//   ).toISOString();
+//   return `${dateUTC.slice(0, 10)} 12:00:00.123Z`;
+// }
+
+export function getTripDateUTC(dates: Date | undefined) {
+  // 1. 날짜가 유효한지 확인
+  if (!dates || isNaN(dates.getTime())) {
+    // 유효하지 않은 경우 에러 처리 또는 기본 값 반환
+    return '1970-01-01T00:00:00.123Z';
+  }
+
+  // 2. 표준 포맷 사용
+  const dateUTC = new Date(dates).toISOString();
+  return dateUTC;
 }
 
 export function getTripDateDot(dates: Date) {