Merge pull request #74 from Moaguide-develop/feat/productpage

fix: conflict 해결
Moaguide-develop · Oct 15, 2024 · 7be57e0 · 7be57e0
2 parents 08109ef + 4be5404
commit 7be57e0
Showing 1 changed file with 62 additions and 63 deletions.
diff --git a/src/components/product/Bookmark.tsx b/src/components/product/Bookmark.tsx
@@ -54,74 +54,73 @@ const Bookmark = ({ content, totalPages, pageNumber }: IProductBuildingProps) =>
   if (isLoading) return <div></div>;
   if (error) return <div></div>;
   return (
-    <div className='min-h-[calc(100dvh-134.5px)] flex flex-col sm:min-h-[calc(100vh-60px)] sm:mb-0'>
+    <div className="min-h-[calc(100dvh-134.5px)] flex flex-col sm:min-h-[calc(100vh-60px)] sm:mb-0">
       <Container>
+        <div>
+          <Link href={'/mypage'}>
+            <Image
+              src="/images/product/LeftVector.svg"
+              alt=""
+              width={10}
+              height={10}
+              className="mt-[15px]"
+            />
+          </Link>
 
-        <Link href={'/mypage'}>
-          <Image
-            src="/images/product/LeftVector.svg"
-            alt=""
-            width={10}
-            height={10}
-            className="mt-[15px]"
-          />
-        </Link>
-
-
-        <div className="  text-2xl font-bold mt-[20px]">
-          관심종목{' '}
-          <span className="ml-[10px] font-normal text-purple-500">{bookmarks}</span>
-        </div>
-        <div className=" desk:overflow-scroll scrollbar-hide desk2:overflow-visible mb-3 mt-5 sm:mt-8 flex justify-between sm:justify-start items-center gap-5 border-b border-gray100 text-mobileTitle sm:text-title2 px-5 sm:px-0">
-          <div
-            onClick={() => {
-              setCategory('all');
-            }}
-            className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'all' || category == null ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
-            전체
-          </div>
-          <div
-            onClick={() => {
-              setCategory('building');
-            }}
-            className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'building' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
-            부동산
+          <div className="  text-2xl font-bold mt-[20px]">
+            관심종목{' '}
+            <span className="ml-[10px] font-normal text-purple-500">{bookmarks}</span>
           </div>
-          <div
-            onClick={() => {
-              setCategory('music');
-            }}
-            className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'music' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
-            음악저작권
+          <div className=" desk:overflow-scroll scrollbar-hide desk2:overflow-visible mb-3 mt-5 sm:mt-8 flex justify-between sm:justify-start items-center gap-5 border-b border-gray100 text-mobileTitle sm:text-title2 px-5 sm:px-0">
+            <div
+              onClick={() => {
+                setCategory('all');
+              }}
+              className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'all' || category == null ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
+              전체
+            </div>
+            <div
+              onClick={() => {
+                setCategory('building');
+              }}
+              className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'building' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
+              부동산
+            </div>
+            <div
+              onClick={() => {
+                setCategory('music');
+              }}
+              className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'music' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
+              음악저작권
+            </div>
+            <div
+              onClick={() => {
+                setCategory('cow');
+              }}
+              className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'cow' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
+              한우
+            </div>
+            <div
+              onClick={() => {
+                setCategory('art');
+              }}
+              className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'art' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
+              미술품
+            </div>
+            <div
+              onClick={() => {
+                setCategory('content');
+              }}
+              className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'content' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
+              콘텐츠
+            </div>
           </div>
-          <div
-            onClick={() => {
-              setCategory('cow');
-            }}
-            className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'cow' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
-            한우
-          </div>
-          <div
-            onClick={() => {
-              setCategory('art');
-            }}
-            className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'art' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
-            미술품
-          </div>
-          <div
-            onClick={() => {
-              setCategory('content');
-            }}
-            className={`pb-3 whitespace-nowrap sm:pb-5 cursor-pointer ${category === 'content' ? ' text-gray700 border-b-2 border-normal ' : 'text-gray300'}`}>
-            콘텐츠
-          </div>
-        </div>
 
-        <ProductBookmarkContentList
-          content={contentData as IProductDealDetailData['product']}
-          totalPages={totalPages}
-          pageNumber={pageNumber}
-        />
+          <ProductBookmarkContentList
+            content={contentData as IProductDealDetailData['product']}
+            totalPages={totalPages}
+            pageNumber={pageNumber}
+          />
         </div>
       </Container>
     </div>