Merge pull request eunji-0623#63 from eunji-0623/조혜진

Refactor: 스타일 리팩토링
ssumai-kr · Jul 25, 2024 · 6e04c6d · 6e04c6d
2 parents ada506c + d75ddf6
commit 6e04c6d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/components/ActivityDetails/ActivityDetails.tsx b/components/ActivityDetails/ActivityDetails.tsx
@@ -22,12 +22,11 @@ import {
 import Spinner from '../Spinner/Spinner';
 import { userState } from '@/states/userState';
 import { useRecoilValue } from 'recoil';
-import Head from 'next/head';
-import { ShareButton } from '../ ShareButton/ShareButton';
 import { ActivityDetailsPageMeta } from '../MetaData/MetaData';
 import useDeleteActivity from '@/hooks/myActivity/useDeleteActivity';
 import { usePopup } from '@/hooks/usePopup';
 import { darkModeState } from '@/states/themeState';
+import { ShareButton } from '../ShareButton/ShareButton';
 
 export default function ActivityDetails({ id }: ActivityDetailsProps) {
   const router = useRouter();
@@ -113,7 +112,7 @@ export default function ActivityDetails({ id }: ActivityDetailsProps) {
 
   const paginatedReviews = reviewData?.reviews || [];
   const isAuthor = activityData?.userId === userData?.id;
-  const currentUrl = location.href;
+  const currentUrl = typeof window !== 'undefined' ? window.location.href : '';
 
   return (
     <>
@@ -205,18 +204,17 @@ export default function ActivityDetails({ id }: ActivityDetailsProps) {
           />
         )}
         <div className="flex gap-4 m:block m:relative">
-          <div className="max-w-[800px] mb-20 ipad-pro:w-[725px] t:w-full m:w-fit m:px-[24px]">
+          <div className="mb-20 ipad-pro:w-[725px] t:w-full m:w-full m:px-[24px]">
             <div className="border-t-2 border-var-gray3 dark:border-var-dark4 border-solid pt-10 m:pt-6" />
             <div className="flex flex-col gap-4">
               <p className="text-nomad-black dark:text-var-gray2 font-bold text-xl">
                 체험 설명
               </p>
               <textarea
-                className="h-[200px] resize-none custom-scrollbar dark:bg-var-dark1 dark:text-var-gray2 "
+                className="h-[200px] resize-none custom-scrollbar dark:bg-var-dark1 dark:text-var-gray2"
                 disabled
-              >
-                {activityData?.description}
-              </textarea>
+                value={activityData?.description || ''}
+              />
             </div>
             <div className="border-t-2 border-var-gray3 dark:border-var-dark4 border-solid my-10 m:my-6" />
             {activityData && <Map address={activityData.address} />}

diff --git a/components/Lander/BestActivities.tsx b/components/Lander/BestActivities.tsx
@@ -11,7 +11,7 @@ import {
 import { useQuery } from '@tanstack/react-query';
 import { getActivityList } from '@/pages/api/activities/apiactivities';
 import { useRouter } from 'next/router';
-import { ShareButton } from '../ ShareButton/ShareButton';
+import { ShareButton } from '../ShareButton/ShareButton';
 import { BestsSlide, BestsSlideTsize } from './BestActivitiesSlide';
 
 function BestActivity({

diff --git a/components/Lander/BestActivitiesSlide.tsx b/components/Lander/BestActivitiesSlide.tsx
@@ -1,7 +1,7 @@
 import { ActivityDetail, BestActivityProps } from './BestActivities.type';
 import Image from 'next/image';
 import StarImg from '@/public/icon/Star.svg';
-import { ShareButton } from '../ ShareButton/ShareButton';
+import { ShareButton } from '../ShareButton/ShareButton';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
 import {

diff --git a/components/MyPageInput/MyPageInput.tsx b/components/MyPageInput/MyPageInput.tsx
@@ -99,7 +99,7 @@ export default function MyPageInput() {
   }
 
   return (
-    <div className="flex flex-col w-[792px] h-[564px] t:w-[429px] t:h-[556px] m:w-full m:h-full m:pb-[150px] m:px-[16px] ">
+    <div className="flex flex-col w-[792px] t:w-[429px] m:w-full m:pb-[150px] m:px-[16px] pb-14">
       <form
         className="flex flex-col gap-[24px] t:gap-[16px]"
         onSubmit={handleSubmit(onSubmit)}

diff --git a/components/ ShareButton/ShareButton.tsx → components/ShareButton/ShareButton.tsx b/components/ ShareButton/ShareButton.tsx → components/ShareButton/ShareButton.tsx