0.2.0 버전 업

.github/workflows/BuildTest.yml

@@ -13,11 +13,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Get Env
+        run: |
+          touch ./.env.production
+          echo "${{secrets.PRODUCTION_ENV}}" > ./.env.production
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20.x"
-          cache: "yarn"
+          node-version: '20.x'
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn install

.github/workflows/CICD.yml

@@ -13,7 +13,12 @@ jobs:
         node-version: [18.x, 20.x]
     steps:
       - name: git clone
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Get Env
+        run: |
+          touch ./.env.production
+          echo "${{secrets.PRODUCTION_ENV}}" > ./.env.production
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
@@ -42,7 +47,12 @@ jobs:
     steps:
       - name: 코드 체크아웃
         id: checkout-code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Get Env
+        run: |
+          touch ./.env.production
+          echo "${{secrets.PRODUCTION_ENV}}" > ./.env.production
 
       - name: Use Node.js 20.x
         uses: actions/setup-node@v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wdyta",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "private": true,
   "scripts": {
@@ -31,6 +31,7 @@
     "@typescript-eslint/parser": "^7.0.0",
     "add": "^2.0.6",
     "autoprefixer": "^10.4.19",
+    "cookies-next": "^4.2.1",
     "eslint": "^8",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^18.0.0",

src/app/@modal/(.)modal/compare/check/page.tsx

@@ -0,0 +1,12 @@
+import { CheckModal } from '@/components/@common/modal/CheckModal';
+import { Modal } from '@/shared/ui/Modal';
+
+const CompareCheckModal = () => {
+  return (
+    <Modal size="small" closeIcon>
+      <CheckModal />
+    </Modal>
+  );
+};
+
+export default CompareCheckModal;

src/app/@modal/(.)modal/compare/duplicate/page.tsx

@@ -0,0 +1,15 @@
+import { AlertModal } from '@/components/@common/modal';
+import { Modal } from '@/shared/ui/Modal';
+
+const CompareDuplicateModal = () => {
+  return (
+    <Modal size="small" closeIcon>
+      <AlertModal
+        errorMessage="이미 비교 대상에 포함되어 있습니다."
+        buttonText="닫기"
+      />
+    </Modal>
+  );
+};
+
+export default CompareDuplicateModal;

src/app/@modal/(.)modal/compare/page.tsx

@@ -0,0 +1,19 @@
+import { CompareModal } from '@/components/@common/modal/CompareModal';
+import { Modal } from '@/shared/ui/Modal';
+import { cookies } from 'next/headers';
+
+const CompareChangeModal = ({
+  searchParams,
+}: {
+  searchParams: { productId: number };
+}) => {
+  const { productId } = searchParams;
+  const accessToken = cookies().get('accessToken')?.value ?? '';
+  return (
+    <Modal size="small" closeIcon>
+      <CompareModal productId={productId} accessToken={accessToken} />
+    </Modal>
+  );
+};
+
+export default CompareChangeModal;

src/app/@modal/(.)modal/detail/edit/page.tsx

@@ -0,0 +1,14 @@
+import { EditModal } from '@/components/Detail/modal';
+import { Modal } from '@/shared/ui/Modal';
+import { cookies } from 'next/headers';
+
+const ProductEditModal = () => {
+  const accessToken = cookies().get('accessToken')?.value ?? '';
+  return (
+    <Modal size="large" closeIcon>
+      <EditModal accessToken={accessToken} />
+    </Modal>
+  );
+};
+
+export default ProductEditModal;

src/app/@modal/(.)modal/home/productAdd/page.tsx

@@ -0,0 +1,14 @@
+import { ProductModal } from '@/components/@common/modal/ProductModal';
+import { Modal } from '@/shared/ui/Modal';
+import { cookies } from 'next/headers';
+
+const ProductAddModal = () => {
+  const accessToken = cookies().get('accessToken')?.value ?? '';
+  return (
+    <Modal size="medium" closeIcon>
+      <ProductModal accessToken={accessToken} title="상품 추가" />
+    </Modal>
+  );
+};
+
+export default ProductAddModal;

src/app/@modal/(.)modal/login/page.tsx

@@ -7,7 +7,6 @@ const LoginAlertModal = () => {
       <AlertModal
         errorMessage="로그인 정보를 다시 확인해주세요"
         buttonText="로그인 다시하기"
-        path="/login"
       />
     </Modal>
   );

src/app/@modal/(.)modal/profile/page.tsx

@@ -0,0 +1,12 @@
+import { AlertModal } from '@/components/@common/modal';
+import { Modal } from '@/shared/ui/Modal';
+
+const LoginAlert = () => {
+  return (
+    <Modal size="small" closeIcon={false}>
+      <AlertModal errorMessage="로그인 후 이용해 주세요." buttonText="닫기" />
+    </Modal>
+  );
+};
+
+export default LoginAlert;

src/app/@modal/(.)modal/profileEdit/page.tsx

@@ -0,0 +1,14 @@
+import EditModal from '@/components/Profile/modal/EditModal';
+import { getUserCookies } from '@/shared/@common/utils/getUserCookies';
+import { Modal } from '@/shared/ui/Modal';
+
+const ProfileEdit = () => {
+  const { accessToken, loginedId } = getUserCookies();
+  return (
+    <Modal size="large" closeIcon>
+      <EditModal accessToken={accessToken} loginedId={loginedId} />
+    </Modal>
+  );
+};
+
+export default ProfileEdit;

src/app/@modal/(.)modal/register/page.tsx

@@ -7,7 +7,6 @@ const RegisterAlertModal = () => {
       <AlertModal
         errorMessage="회원가입을 다시 시도해주세요"
         buttonText="회원가입 다시하기"
-        path="/register"
       />
     </Modal>
   );

src/app/@modal/(.)modal/userFollowList/page.tsx

@@ -0,0 +1,19 @@
+import UserListModal from '@/components/Profile/modal/UserListModal';
+import { SkeletonUserListModal } from '@/components/Profile/skeleton';
+import { getUserCookies } from '@/shared/@common/utils/getUserCookies';
+import { Modal } from '@/shared/ui/Modal';
+import { Suspense } from 'react';
+
+const UserFollowList = () => {
+  const { accessToken, loginedId } = getUserCookies();
+
+  return (
+    <Modal size="small" closeIcon>
+      <Suspense fallback={<SkeletonUserListModal />}>
+        <UserListModal accessToken={accessToken} loginedId={loginedId} />
+      </Suspense>
+    </Modal>
+  );
+};
+
+export default UserFollowList;

src/app/compare/page.tsx

@@ -1,10 +1,9 @@
 import { cookies } from 'next/headers';
 import { Suspense } from 'react';
-import { SkeletonProductDetail } from '@/components/Detail/skeletons';
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
 import { Floating } from '@/shared/ui/Button/Floating';
-import ComparingButton from '@/components/Compare/ComparingButton';
-// import ComparingButton2 from '@/components/Compare/ComparingButton2';
+import { ComparingButton } from '@/components/Compare';
+import { SkeletonCompare } from '@/components/Compare/skeletons/SkeletonCompare';
 import { compareFirstOptions, compareSecondOptions } from './queryOptions';
 import { getQueryClient } from '../getQueryClient';
 
@@ -15,9 +14,7 @@ const Compare = ({
 }) => {
   const productId1 = searchParams.product1;
   const productId2 = searchParams.product2;
-  console.log('1:', productId1, '2', productId2);
   const accessToken = cookies().get('accessToken')?.value ?? '';
-  // const userId = Number(cookies().get('userId')?.value);
 
   const queryClient = getQueryClient();
 
@@ -27,7 +24,7 @@ const Compare = ({
 
   return (
     <>
-      <Suspense fallback={<SkeletonProductDetail />}>
+      <Suspense fallback={<SkeletonCompare />}>
         <HydrationBoundary state={dehydrate(queryClient)}>
           <ComparingButton
             productId1={productId1}

src/app/modal/compare/check/page.tsx

@@ -0,0 +1,12 @@
+import { CheckModal } from '@/components/@common/modal/CheckModal';
+import { Modal } from '@/shared/ui/Modal';
+
+const CompareCheckModal = () => {
+  return (
+    <Modal size="small" closeIcon={false}>
+      <CheckModal />
+    </Modal>
+  );
+};
+
+export default CompareCheckModal;

src/app/modal/compare/duplicate/page.tsx

@@ -0,0 +1,15 @@
+import { AlertModal } from '@/components/@common/modal';
+import { Modal } from '@/shared/ui/Modal';
+
+const CompareDuplicateModal = () => {
+  return (
+    <Modal size="small" closeIcon>
+      <AlertModal
+        errorMessage="이미 비교 대상에 포함되어 있습니다."
+        buttonText="닫기"
+      />
+    </Modal>
+  );
+};
+
+export default CompareDuplicateModal;

src/app/modal/compare/page.tsx

@@ -0,0 +1,19 @@
+import { CompareModal } from '@/components/@common/modal/CompareModal';
+import { Modal } from '@/shared/ui/Modal';
+import { cookies } from 'next/headers';
+
+const CompareChangeModal = ({
+  searchParams,
+}: {
+  searchParams: { productId: number };
+}) => {
+  const { productId } = searchParams;
+  const accessToken = cookies().get('accessToken')?.value ?? '';
+  return (
+    <Modal size="small" closeIcon>
+      <CompareModal productId={productId} accessToken={accessToken} />
+    </Modal>
+  );
+};
+
+export default CompareChangeModal;

src/app/modal/detail/edit/page.tsx

@@ -0,0 +1,14 @@
+import { EditModal } from '@/components/Detail/modal';
+import { Modal } from '@/shared/ui/Modal';
+import { cookies } from 'next/headers';
+
+const ProductEditModal = () => {
+  const accessToken = cookies().get('accessToken')?.value ?? '';
+  return (
+    <Modal size="large" closeIcon>
+      <EditModal accessToken={accessToken} />
+    </Modal>
+  );
+};
+
+export default ProductEditModal;

src/app/modal/home/productAdd/page.tsx

@@ -0,0 +1,14 @@
+import { ProductModal } from '@/components/@common/modal/ProductModal';
+import { Modal } from '@/shared/ui/Modal';
+import { cookies } from 'next/headers';
+
+const ProductAddModal = () => {
+  const accessToken = cookies().get('accessToken')?.value ?? '';
+  return (
+    <Modal size="medium" closeIcon>
+      <ProductModal accessToken={accessToken} title="상품 추가" />
+    </Modal>
+  );
+};
+
+export default ProductAddModal;

src/app/modal/login/page.tsx

@@ -7,7 +7,6 @@ const LoginAlertModal = () => {
       <AlertModal
         errorMessage="로그인 정보를 다시 확인해주세요"
         buttonText="로그인 다시하기"
-        path="/login"
       />
     </Modal>
   );

src/app/modal/profile/page.tsx

@@ -0,0 +1,12 @@
+import { AlertModal } from '@/components/@common/modal';
+import { Modal } from '@/shared/ui/Modal';
+
+const LoginAlert = () => {
+  return (
+    <Modal size="small" closeIcon={false}>
+      <AlertModal errorMessage="로그인 후 이용해 주세요." buttonText="닫기" />
+    </Modal>
+  );
+};
+
+export default LoginAlert;

src/app/modal/profileEdit/page.tsx

@@ -0,0 +1,14 @@
+import EditModal from '@/components/Profile/modal/EditModal';
+import { getUserCookies } from '@/shared/@common/utils/getUserCookies';
+import { Modal } from '@/shared/ui/Modal';
+
+const ProfileEdit = () => {
+  const { accessToken, loginedId } = getUserCookies();
+  return (
+    <Modal size="large" closeIcon>
+      <EditModal accessToken={accessToken} loginedId={loginedId} />
+    </Modal>
+  );
+};
+
+export default ProfileEdit;