diff --git a/package.json b/package.json index 061e194..c86254d 100644 --- a/package.json +++ b/package.json @@ -60,4 +60,4 @@ }, "homepage": "https://github.com/prgrms-web-devcourse-final-project/WEB5_6_HaeDokCoding_FE#readme", "description": "" -} +} \ No newline at end of file diff --git a/src/app/design-system/page.tsx b/src/app/design-system/page.tsx index 657ba91..0db21f4 100644 --- a/src/app/design-system/page.tsx +++ b/src/app/design-system/page.tsx @@ -5,7 +5,6 @@ import TextButton from '@/shared/components/button/TextButton'; import Input from '@/shared/components/Input-box/Input'; import { useState } from 'react'; import ModalLayout from '@/shared/components/modal-pop/ModalLayout'; - import Spinner from '@/shared/components/spinner/Spinner'; import LikeBtn from '@/domains/community/components/like/LikeBtn'; import Share from '@/domains/shared/components/share/Share'; diff --git a/src/app/mypage/my-active/my-comment/page.tsx b/src/app/mypage/my-active/my-comment/page.tsx index 5a666f1..c69e1e6 100644 --- a/src/app/mypage/my-active/my-comment/page.tsx +++ b/src/app/mypage/my-active/my-comment/page.tsx @@ -1,4 +1,4 @@ -import CommentList from '@/domains/shared/components/comment/CommentList'; +// import CommentList from '@/domains/shared/components/comment/CommentList'; import { Metadata } from 'next'; export const metadata: Metadata = { diff --git a/src/app/mypage/my-active/my-like/page.tsx b/src/app/mypage/my-active/my-like/page.tsx index be70584..0a8e73e 100644 --- a/src/app/mypage/my-active/my-like/page.tsx +++ b/src/app/mypage/my-active/my-like/page.tsx @@ -1,4 +1,4 @@ -import PostCard from '@/domains/community/main/PostCard'; +// import PostCard from '@/domains/community/main/PostCard'; import { Metadata } from 'next'; export const metadata: Metadata = { diff --git a/src/app/mypage/my-active/my-post/page.tsx b/src/app/mypage/my-active/my-post/page.tsx index a09b309..70c47d8 100644 --- a/src/app/mypage/my-active/my-post/page.tsx +++ b/src/app/mypage/my-active/my-post/page.tsx @@ -1,4 +1,4 @@ -import PostCard from '@/domains/community/main/PostCard'; +// import PostCard from '@/domains/community/main/PostCard'; import { Metadata } from 'next'; export const metadata: Metadata = { diff --git a/src/app/mypage/mybar/loading.tsx b/src/app/mypage/my-bar/loading.tsx similarity index 100% rename from src/app/mypage/mybar/loading.tsx rename to src/app/mypage/my-bar/loading.tsx diff --git a/src/app/mypage/mybar/page.tsx b/src/app/mypage/my-bar/page.tsx similarity index 88% rename from src/app/mypage/mybar/page.tsx rename to src/app/mypage/my-bar/page.tsx index 16095f4..63d3e8e 100644 --- a/src/app/mypage/mybar/page.tsx +++ b/src/app/mypage/my-bar/page.tsx @@ -1,4 +1,5 @@ -import CocktailCard from '@/domains/recipe/CocktailCard'; + +import CocktailCard from '@/domains/shared/components/cocktail-card/CocktailCard'; import { Metadata } from 'next'; export const metadata: Metadata = { diff --git a/src/app/mypage/page.tsx b/src/app/mypage/page.tsx index 9c828f3..da76bf5 100644 --- a/src/app/mypage/page.tsx +++ b/src/app/mypage/page.tsx @@ -1,6 +1,6 @@ import { redirect } from 'next/navigation'; function Page() { - return redirect('/mypage/mybar'); + return redirect('/mypage/my-bar'); } export default Page; diff --git a/src/app/recipe/page.tsx b/src/app/recipe/page.tsx index e4386e4..06cb569 100644 --- a/src/app/recipe/page.tsx +++ b/src/app/recipe/page.tsx @@ -1,13 +1,11 @@ import { Metadata } from 'next'; - import Input from '@/shared/components/Input-box/Input'; import Accordion from '../../domains/recipe/components/main/Accordion'; -import CocktailList from '@/domains/recipe/CocktailList'; import PageHeader from '@/domains/shared/components/page-header/PageHeader'; import { Suspense } from 'react'; import SkeletonRecipe from '@/domains/recipe/skeleton/SkeletonRecipe'; -import SelectBox from '@/shared/components/select-box/SelectBox'; +import Cocktails from '@/domains/recipe/main/Cocktails'; export const metadata: Metadata = { title: 'SSOUL | 칵테일레시피', @@ -31,15 +29,7 @@ function Page() { className="w-full md:max-w-80" /> -
-
-

n개

- -
-
- -
-
+ diff --git a/src/domains/community/write/cocktail-tag/TagModal.tsx b/src/domains/community/write/cocktail-tag/TagModal.tsx index 57caa79..734f8fc 100644 --- a/src/domains/community/write/cocktail-tag/TagModal.tsx +++ b/src/domains/community/write/cocktail-tag/TagModal.tsx @@ -2,12 +2,11 @@ import AddIcon from '@/shared/assets/icons/add_24.svg'; import Input from '@/shared/components/Input-box/Input'; -import CocktailCard from '@/domains/recipe/CocktailCard'; import ModalLayout from '@/shared/components/modal-pop/ModalLayout'; import Button from '@/shared/components/button/Button'; import TagList from '../../components/tag/TagList'; import { useState } from 'react'; - +import CocktailCard from '@/domains/shared/components/cocktail-card/CocktailCard'; type Props = { isOpen: boolean; setIsOpen: (value: boolean) => void; diff --git a/src/domains/recipe/CocktailList.tsx b/src/domains/recipe/CocktailList.tsx deleted file mode 100644 index fa2274f..0000000 --- a/src/domains/recipe/CocktailList.tsx +++ /dev/null @@ -1,35 +0,0 @@ -'use client'; -import { useEffect, useState } from 'react'; -import CocktailCard from './CocktailCard'; -import { getApi } from '@/app/api/config/appConfig'; - -function CocktailList() { - const [data, setData] = useState([]); - useEffect(() => { - fetch(`${getApi}/cocktails`) - .then((res) => res.json()) - .then((data) => { - console.log(data.data); - setData(data.data); - }); - }, []); - - return ( - - ); -} -export default CocktailList; diff --git a/src/domains/recipe/components/details/BackBtn.tsx b/src/domains/recipe/components/details/BackBtn.tsx index de2d467..c50c116 100644 --- a/src/domains/recipe/components/details/BackBtn.tsx +++ b/src/domains/recipe/components/details/BackBtn.tsx @@ -4,7 +4,6 @@ import { useRouter } from 'next/navigation'; function BackBtn() { const router = useRouter(); - console.log(router); return (