[Main to Dev] 2주년 기념 픽픽픽 prod 배포

components/common/bottomContents/BottomContainer.tsx

@@ -18,7 +18,7 @@ export default function BottomContainer({
   return (
     <div className='fixed z-[70] inset-0'>
       <div className='absolute inset-0 bg-black bg-opacity-50 ' onClick={() => onClose()}>
-        <div className='fixed bg-gray700 left-0 right-0 w-full bottom-0  rounded-t-[2.4rem] px-[2rem] py-[4rem] flex flex-col gap-[1.2rem]'>
+        <div className='fixed bg-gray700 left-0 right-0 w-full bottom-0 rounded-t-[2.4rem] py-[2.8rem] flex flex-col gap-[1.2rem]'>
           {children}
         </div>
       </div>

components/common/dropdowns/mobileDropdown.tsx

@@ -97,7 +97,7 @@ export default function MobileDropdown({
 
       {showBottom ? (
         <BottomContainer onClose={() => setShowBottom(false)}>
-          <b className='st2 font-bold px-[2.2rem] pt-[2.8rem] pb-[1.6rem]'>정렬</b>
+          <b className='st2 font-bold px-[2.2rem] pb-[1.6rem]'>정렬</b>
           <ul className='flex flex-col gap-[0.4rem]'>
             {dropdownOptions.map((option, index) => (
               <li

components/common/skeleton/pickSkeleton.tsx

@@ -1,6 +1,9 @@
-import { MobilePickInfo, PickInfo } from '@pages/pickpickpick/components/PickInfo';
+import { MobilePickInfoV1, PickInfoV1 } from '@pages/pickpickpick/components/PickInfo';
 
-export const PickSkeleton = () => {
+import AngleRightIcon from '@components/svgs/AngleRightIcon';
+
+// ------------------------------픽픽픽 메인 스켈레톤  v1------------------------------
+export const PickSkeletonV1 = () => {
   return (
     <div className='px-[2.4rem] py-[3.2rem] flex flex-col gap-[3.2rem] rounded-[1.6rem] border-gray600 border-solid border'>
       <div className='h-[3.7rem] w-[100%] rounded-[1.6rem] bg-gray600 relative overflow-hidden skeleton-item' />
@@ -13,56 +16,130 @@ export const PickSkeleton = () => {
   );
 };
 
-interface PickSkeletonListProps {
+interface PickSkeletonListV1Props {
   rows: number;
   itemsInRows: number;
   hasInfo?: boolean;
 }
 
-export const PickSkeletonList = ({ rows, itemsInRows, hasInfo }: PickSkeletonListProps) => {
+export const PickSkeletonListV1 = ({ rows, itemsInRows, hasInfo }: PickSkeletonListV1Props) => {
   return (
     <div className='grid grid-cols-3 gap-8'>
       {hasInfo ? (
         <>
-          <PickInfo />
+          <PickInfoV1 />
           {Array.from({ length: rows * itemsInRows - 1 }, (_, index) => (
-            <PickSkeleton key={index} />
+            <PickSkeletonV1 key={index} />
           ))}
         </>
       ) : (
         <>
           {Array.from({ length: rows * itemsInRows }, (_, index) => (
-            <PickSkeleton key={index} />
+            <PickSkeletonV1 key={index} />
           ))}
         </>
       )}
     </div>
   );
 };
 
-export const MobilePickSkeletonList = ({ rows, hasInfo }: { rows: number; hasInfo?: boolean }) => {
+export const MobilePickSkeletonListV1 = ({
+  rows,
+  hasInfo,
+}: {
+  rows: number;
+  hasInfo?: boolean;
+}) => {
   const arr = Array.from({ length: rows });
 
   return (
     <div className='grid grid-cols-1 gap-8'>
-      {hasInfo && <MobilePickInfo />}
+      {hasInfo && <MobilePickInfoV1 />}
+
+      {arr.map((_, index) => (
+        <PickSkeletonV1 key={index} />
+      ))}
+    </div>
+  );
+};
+
+export const MyPickSkeletonListV1 = ({ rows, itemsInRows }: PickSkeletonListV1Props) => {
+  return (
+    <div className='grid grid-cols-2 gap-8'>
+      {Array.from({ length: rows * itemsInRows }, (_, index) => (
+        <PickSkeletonV1 key={index} />
+      ))}
+    </div>
+  );
+};
+// -------------------------------------------------------------------------------
+
+// ------------------------------픽픽픽 메인 스켈레톤  v2------------------------------
+
+export const PickSkeletonV2 = () => {
+  return (
+    <div className='pt-[3.2rem] pb-[2.4rem] px-[3.2rem] flex flex-col gap-[3.2rem] rounded-[1.6rem] bg-gray600'>
+      <div className='flex flex-col gap-[2.4rem]'>
+        <div className='flex flex-row items-start justify-between gap-[1.6rem]'>
+          <div className='bg-black h-[4.3rem] w-[100%] rounded-[1.6rem] relative overflow-hidden skeleton-item' />
+          <AngleRightIcon color='var(--gray300)' />
+        </div>
+        <div className='bg-black h-[1rem] w-[40%] rounded-[1.6rem] relative overflow-hidden skeleton-item' />
+      </div>
 
+      <div className='flex flex-row gap-[1.6rem]'>
+        <div className='bg-black flex flex-col gap-[1rem] p-[2.4rem] w-[50%] rounded-[1.6rem] relative overflow-hidden border border-gray500'>
+          <div className='bg-gray500 h-[1rem] w-[50%] rounded-[1.6rem] relative overflow-hidden skeleton-item' />
+          <div className='bg-gray500 h-[5rem] w-[100%] rounded-[1.6rem] relative overflow-hidden skeleton-item' />
+          <div className='bg-gray500 h-[12rem] w-[100%] rounded-[1.6rem] relative overflow-hidden skeleton-item' />
+        </div>
+        <div className='bg-black flex flex-col gap-[1rem] p-[2.4rem] w-[50%] rounded-[1.6rem] relative overflow-hidden border border-gray500'>
+          <div className='bg-gray500 h-[1rem] w-[50%] rounded-[1.6rem] relative overflow-hidden skeleton-item' />
+          <div className='bg-gray500 h-[5rem] w-[100%] rounded-[1.6rem] relative overflow-hidden skeleton-item' />
+          <div className='bg-gray500 h-[12rem] w-[100%] rounded-[1.6rem] relative overflow-hidden skeleton-item' />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+interface PickSkeletonListV2Props {
+  rows: number;
+  itemsInRows: number;
+}
+
+export const PickSkeletonListV2 = ({ rows, itemsInRows }: PickSkeletonListV2Props) => {
+  return (
+    <div className='grid grid-cols-2 gap-8'>
+      {Array.from({ length: rows * itemsInRows }, (_, index) => (
+        <PickSkeletonV2 key={index} />
+      ))}
+    </div>
+  );
+};
+
+export const MobilePickSkeletonListV2 = ({ rows }: { rows: number }) => {
+  const arr = Array.from({ length: rows });
+
+  return (
+    <div className='grid grid-cols-1 gap-8'>
       {arr.map((_, index) => (
-        <PickSkeleton key={index} />
+        <PickSkeletonV2 key={index} />
       ))}
     </div>
   );
 };
 
-export const MyPickSkeletonList = ({ rows, itemsInRows }: PickSkeletonListProps) => {
+export const MyPickSkeletonListV2 = ({ rows, itemsInRows }: PickSkeletonListV2Props) => {
   return (
     <div className='grid grid-cols-2 gap-8'>
       {Array.from({ length: rows * itemsInRows }, (_, index) => (
-        <PickSkeleton key={index} />
+        <PickSkeletonV2 key={index} />
       ))}
     </div>
   );
 };
+// -------------------------------------------------------------------------------
 
 /** 메인페이지 픽픽픽 스켈레톤 */
 export const MainPickSkeleton = () => {
@@ -86,7 +163,7 @@ export const MainPickSkeletonList = ({ itemsInRows }: MainPickSkeletonListProps)
   return (
     <>
       {Array.from({ length: itemsInRows }, (_, index) => (
-        <MainPickSkeleton key={index} />
+        <PickSkeletonV2 key={index} />
       ))}
     </>
   );

components/common/title/ArrowWithTitle.tsx

@@ -17,6 +17,7 @@ export const ArrowWithTitleVariants = cva(ARROW_TITLE_CLASSES, {
       mainTitle: ['st2', 'text-gray200'],
       similarPick: ['st2', 'text-white'],
       defaultPick: ['p1', 'text-gray100'],
+      defaultPickV2: ['st2', 'text-white'],
     },
   },
 });
@@ -26,8 +27,8 @@ interface ArrowWithTitleProps extends VariantProps<typeof ArrowWithTitleVariants
   iconText?: string;
   routeURL?: string;
   className?: string;
-  iconSize?: string;
   ArrowClassName?: string;
+  iconSize?: { width: number; height: number };
 }
 
 const ArrowWithTitle: FC<ArrowWithTitleProps> = ({
@@ -37,9 +38,10 @@ const ArrowWithTitle: FC<ArrowWithTitleProps> = ({
   routeURL,
   className,
   ArrowClassName,
+  iconSize = { width: 7, height: 14 },
 }) => {
   return (
-    <div className='grid grid-flow-col items-baseline gap-6 justify-between'>
+    <div className='grid grid-flow-col items-baseline gap-6 justify-between pb-[2.45rem]'>
       <p className={cn(className, ArrowWithTitleVariants({ variant }))}>{title}</p>
 
       <div className='flex items-center'>
@@ -51,8 +53,8 @@ const ArrowWithTitle: FC<ArrowWithTitleProps> = ({
         <Image
           src={AngleRight}
           alt={'오른쪽 화살표'}
-          width={7}
-          height={14}
+          width={iconSize.width}
+          height={iconSize.height}
           className={ArrowClassName}
         />
       </div>

components/features/main/dynamicPickComponent.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import Link from 'next/link';
 
 import { useInfinitePickData } from '@pages/pickpickpick/api/useInfinitePickData';
-import PickContainer from '@pages/pickpickpick/components/PickContainer';
+import PickContainerV2 from '@pages/pickpickpick/components/PickContainerV2';
 import {
   PICK_VIEW_SIZE,
   MOBILE_MAIN_PICK_VIEW_SIZE,
@@ -26,7 +26,7 @@ export default function DynamicPickComponent() {
   const getStatusComponent = () => {
     switch (status) {
       case 'pending':
-        return <MainPickSkeletonList itemsInRows={2} />;
+        return <MainPickSkeletonList itemsInRows={1} />;
 
       default:
         return (
@@ -38,7 +38,7 @@ export default function DynamicPickComponent() {
                 <div key={index}>
                   {group?.data.content.map((data: PickDataProps) => (
                     <Link href={`${ROUTES.PICKPICKPICK.MAIN}/${data.id}`} key={data.id}>
-                      <PickContainer pickData={data} type='main' />
+                      <PickContainerV2 pickData={data} />
                     </Link>
                   ))}
                 </div>

components/features/main/dynamicTechBlogComponent.tsx

@@ -38,7 +38,7 @@ export default function DynamicTechBlogComponent({
 
   const { techBlogData, isFetchingNextPage, hasNextPage, status, onIntersect } = data;
 
-  const SCROLL_CLASS = isMobile ? '' : 'relative overflow-y-scroll scrollbar-hide max-h-[50rem]';
+  const SCROLL_CLASS = isMobile ? '' : 'relative overflow-y-scroll scrollbar-hide max-h-[47rem]';
 
   useObserver({
     target: bottomDiv,

components/features/techblog/BookmarkComponent.tsx

@@ -28,7 +28,7 @@ export default function BookmarkComponent() {
           <MobileDropdown type='bookmark' />
         </div>
       ) : (
-        <Dropdown type='bookmark' disable={!hasData} />
+        <Dropdown type='bookmark' disable={!hasData} line />
       )}
     </div>
   );

hooks/useVerticalStepLoop.ts

@@ -0,0 +1,55 @@
+import { useAnimationControls } from 'framer-motion';
+
+import { useEffect, useRef, useState } from 'react';
+
+type Options = {
+  itemCount: number;
+  dwellMs: number;
+  slideMs: number;
+  reduceMotion: boolean | null;
+};
+
+export function useVerticalStepLoop({ itemCount, dwellMs, slideMs, reduceMotion }: Options) {
+  const controls = useAnimationControls();
+  const firstItemRef = useRef<HTMLParagraphElement | null>(null);
+  const [rowHeight, setRowHeight] = useState(0);
+
+  useEffect(() => {
+    if (firstItemRef.current) setRowHeight(firstItemRef.current.offsetHeight);
+  }, []);
+
+  useEffect(() => {
+    if (reduceMotion === true || rowHeight === 0) return;
+
+    let i = 0;
+    let mounted = true;
+    // 한 칸씩 위로 이동 후, 마지막(복제된 첫 항목)까지 도달하면 즉시 y=0으로 스냅하여
+    // 시각적 깜빡임 없이 처음 상태로 되돌립니다. (복제된 첫 항목과 실제 첫 항목은 동일 내용)
+    const tick = async () => {
+      try {
+        i += 1;
+        await controls.start({
+          y: -(i * rowHeight),
+          transition: { duration: slideMs / 1000, ease: 'easeInOut' },
+        });
+        if (!mounted) return;
+        if (i === itemCount) {
+          // set()은 마운트 이후에만 안전합니다. 언마운트/미바인딩 크래시 방지를 위해
+          // start() + duration: 0으로 즉시 스냅 처리합니다.
+          await controls.start({ y: 0, transition: { duration: 0 } });
+          i = 0;
+        }
+      } catch (e) {
+        // 언마운트 타이밍 등으로 발생 가능한 경합 에러 무시
+      }
+    };
+
+    const id = setInterval(tick, dwellMs + slideMs);
+    return () => {
+      mounted = false;
+      clearInterval(id);
+    };
+  }, [controls, reduceMotion, rowHeight, itemCount, dwellMs, slideMs]);
+
+  return { controls, firstItemRef } as const;
+}

pages/main/index.page.tsx

@@ -55,7 +55,6 @@ export default function Index() {
               variant='mainTitle'
               iconText='바로가기'
               routeURL={PICK_PATH}
-              className='pb-[2.45rem]'
             />
             <QueryErrorBoundary
               fallbackRender={({ handleRetryClick }) => (
@@ -98,4 +97,4 @@ export function getStaticProps() {
       meta: META.MAIN,
     },
   };
-}
+}

pages/myinfo/mywriting/mypick/components/MyPickStatusComponent.tsx

@@ -9,8 +9,8 @@ import { PickDataProps } from '@pages/pickpickpick/types/pick';
 import { useObserver } from '@hooks/useObserver';
 
 import {
-  MobilePickSkeletonList,
-  MyPickSkeletonList,
+  MobilePickSkeletonListV1,
+  MyPickSkeletonListV1,
 } from '@components/common/skeleton/pickSkeleton';
 
 import { ROUTES } from '@/constants/routes';
@@ -38,9 +38,9 @@ export default function MyPickStatusComponent() {
         return (
           <>
             {isMobile ? (
-              <MobilePickSkeletonList rows={3} />
+              <MobilePickSkeletonListV1 rows={3} />
             ) : (
-              <MyPickSkeletonList rows={3} itemsInRows={2} />
+              <MyPickSkeletonListV1 rows={3} itemsInRows={2} />
             )}
           </>
         );
@@ -77,9 +77,9 @@ export default function MyPickStatusComponent() {
             {isFetchingNextPage && hasNextPage && (
               <div className='mt-[2rem]'>
                 {isMobile ? (
-                  <MobilePickSkeletonList rows={3} />
+                  <MobilePickSkeletonListV1 rows={3} />
                 ) : (
-                  <MyPickSkeletonList rows={3} itemsInRows={2} />
+                  <MyPickSkeletonListV1 rows={3} itemsInRows={2} />
                 )}
               </div>
             )}

pages/pickpickpick/[id]/apiHooks/comment/usePostPickComment.tsx

@@ -24,7 +24,7 @@ const postPickComment = async ({ pickId, contents, isPickVotePublic }: PostPickC
   return res.data;
 };
 
-export const usePostPickComment = () => {
+export const usePostPickComment = ({ pickId }: { pickId: string }) => {
   const queryClient = useQueryClient();
   const { setToastVisible } = useToastVisibleStore();
 
@@ -33,6 +33,7 @@ export const usePostPickComment = () => {
     onSuccess: async () => {
       await queryClient.invalidateQueries({ queryKey: ['pickCommentData'] });
       await queryClient.invalidateQueries({ queryKey: ['getBestComments'] });
+      await queryClient.invalidateQueries({ queryKey: ['getDetailPickData', pickId] });
       setToastVisible({ message: '댓글을 성공적으로 작성했어요!', type: 'success' });
     },
     onError: (error: ErrorRespone) => {

pages/pickpickpick/[id]/apiHooks/usePickDetailData.ts

@@ -5,7 +5,7 @@ import { UseQueryResult, useQuery } from '@tanstack/react-query';
 import { PickDetailData } from '../types/pickDetailData';
 
 export const getPickDetailData = async (pickId: string) => {
-  const res = await axios.get(`/devdevdev/api/v1/picks/${pickId}`);
+  const res = await axios.get(`/devdevdev/api/v2/picks/${pickId}`);
   return res;
 };