diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 16084e3..cef553c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -18,10 +18,7 @@ export default function RootLayout({
diff --git a/src/app/login/first-user/page.tsx b/src/app/login/first-user/page.tsx
deleted file mode 100644
index 7f902a4..0000000
--- a/src/app/login/first-user/page.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import LoginRedirectHandler from '@/shared/components/auth/LoginRedirectHandler';
-
-function Page() {
- return
;
-}
-
-export default Page;
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index d1e4fb8..d2548bb 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -1,7 +1,7 @@
import Image from 'next/image';
import type { Metadata } from 'next';
import loginBg from '@/shared/assets/images/login_bg.webp';
-import SocialLogin from './SocialLogin';
+import SocialLogin from '@/domains/login/main/SocialLogin';
export const metadata: Metadata = {
title: 'SSOUL | 로그인',
diff --git a/src/app/login/success/page.tsx b/src/app/login/success/page.tsx
index 15766eb..48cef7d 100644
--- a/src/app/login/success/page.tsx
+++ b/src/app/login/success/page.tsx
@@ -1,4 +1,4 @@
-import LoginRedirectHandler from '@/shared/components/auth/LoginRedirectHandler';
+import LoginRedirectHandler from '@/domains/login/components/LoginRedirectHandler';
function Page() {
return
;
diff --git a/src/app/login/user/first-user/page.tsx b/src/app/login/user/first-user/page.tsx
new file mode 100644
index 0000000..131a5e1
--- /dev/null
+++ b/src/app/login/user/first-user/page.tsx
@@ -0,0 +1,7 @@
+import LoginRedirectHandler from '@/domains/login/components/LoginRedirectHandler';
+
+function Page() {
+ return
;
+}
+
+export default Page;
diff --git a/src/app/login/user/success/page.tsx b/src/app/login/user/success/page.tsx
new file mode 100644
index 0000000..48cef7d
--- /dev/null
+++ b/src/app/login/user/success/page.tsx
@@ -0,0 +1,6 @@
+import LoginRedirectHandler from '@/domains/login/components/LoginRedirectHandler';
+
+function Page() {
+ return
;
+}
+export default Page;
diff --git a/src/app/recipe/[id]/page.tsx b/src/app/recipe/[id]/page.tsx
index 9d89ac4..8eec717 100644
--- a/src/app/recipe/[id]/page.tsx
+++ b/src/app/recipe/[id]/page.tsx
@@ -1,9 +1,11 @@
-import StarBg from '@/shared/components/starBg/StarBg';
+import DetailMain from '@/domains/recipe/details/DetailMain';
+import StarBg from '@/domains/shared/starBg/StarBg';
function page() {
return (
-
-
+
+
+
);
}
diff --git a/src/app/recipe/page.tsx b/src/app/recipe/page.tsx
index 9f5e417..e2383b7 100644
--- a/src/app/recipe/page.tsx
+++ b/src/app/recipe/page.tsx
@@ -1,10 +1,10 @@
-import PageHeader from '@/shared/components/pageHeader/PageHeader';
import { Metadata } from 'next';
-import Glass from '@/shared/assets/images/recipe_page_header.webp';
-import SelectBox from '@/shared/components/InputBox/SelectBox';
+import SelectBox from '@/domains/shared/select-box/SelectBox';
import Input from '@/shared/components/InputBox/Input';
-import CocktailList from '@/shared/components/recipePage/cocktailList/CocktailList';
-import Accordion from './components/Accordion';
+
+import Accordion from '../../domains/recipe/components/main/Accordion';
+import CocktailList from '@/domains/recipe/CocktailList';
+import PageHeader from '@/domains/shared/pageHeader/PageHeader';
export const metadata: Metadata = {
title: 'SSOUL | 칵테일레시피',
@@ -15,11 +15,7 @@ function Page() {
return (
diff --git a/src/app/recommend/page.tsx b/src/app/recommend/page.tsx
index e8575e9..ee68e29 100644
--- a/src/app/recommend/page.tsx
+++ b/src/app/recommend/page.tsx
@@ -1,7 +1,7 @@
+import ChatForm from '@/domains/recommend/components/ChatForm';
+import MyChat from '@/domains/recommend/components/MyChat';
+import SsuryChat from '@/domains/recommend/components/SsuryChat';
import Bg from '@/shared/assets/images/recommend_bg.webp';
-import ChatForm from './components/ChatForm';
-import SsuryChat from './components/SsuryChat';
-import MyChat from './components/MyChat';
function Page() {
return (
diff --git a/src/shared/components/community/CommunityFilter.tsx b/src/domains/community/CommunityFilter.tsx
similarity index 87%
rename from src/shared/components/community/CommunityFilter.tsx
rename to src/domains/community/CommunityFilter.tsx
index c8deedd..fa7b129 100644
--- a/src/shared/components/community/CommunityFilter.tsx
+++ b/src/domains/community/CommunityFilter.tsx
@@ -1,6 +1,7 @@
'use client';
-import SelectBox from '../InputBox/SelectBox';
+import SelectBox from '../shared/select-box/SelectBox';
+
function CommunityFilter() {
return (
+ );
+}
+
+export default CommunityHeader;
diff --git a/src/shared/components/community/CommunityTab.tsx b/src/domains/community/CommunityTab.tsx
similarity index 100%
rename from src/shared/components/community/CommunityTab.tsx
rename to src/domains/community/CommunityTab.tsx
diff --git a/src/shared/components/community/PostCard.tsx b/src/domains/community/PostCard.tsx
similarity index 67%
rename from src/shared/components/community/PostCard.tsx
rename to src/domains/community/PostCard.tsx
index cc672e8..2514a24 100644
--- a/src/shared/components/community/PostCard.tsx
+++ b/src/domains/community/PostCard.tsx
@@ -1,11 +1,13 @@
import Image from 'next/image';
import prePost from '@/shared/assets/images/prepost_img.webp';
-import PostLabel from './PostLabel';
+
+import PostInfo from './PostInfo';
+import Label from '../shared/label/Label';
function PostCard({ label }: { label: string }) {
return (
-
+
@@ -14,18 +16,7 @@ function PostCard({ label }: { label: string }) {
칵테일 처음 만들어 보는데 랄랄
가나다라마바사아자차카파타하
- - 실버븬
- - |
- - 3분 전
- - |
- - 조회 3
- - |
- - 댓글 3
-
+
+ {hasUserName && (
+ <>
+ 실버븬
+ |
+
+ )}
+ 3분 전
+ |
+ 조회 3
+ |
+ 댓글 3
+
+ );
+}
+
+export default PostInfo;
diff --git a/src/domains/community/WriteBtn.tsx b/src/domains/community/WriteBtn.tsx
new file mode 100644
index 0000000..f6a8752
--- /dev/null
+++ b/src/domains/community/WriteBtn.tsx
@@ -0,0 +1,27 @@
+'use client';
+
+import Write from '@/shared/assets/icons/edit_28.svg';
+import { useRouter } from 'next/navigation';
+
+type RouterType = ReturnType;
+
+function WriteBtn() {
+ const router = useRouter();
+
+ const handleClick = (router: RouterType) => {
+ router.push('/community/write');
+ };
+
+ return (
+
+ );
+}
+
+export default WriteBtn;
diff --git a/src/domains/community/components/comment/CommentBtn.tsx b/src/domains/community/components/comment/CommentBtn.tsx
new file mode 100644
index 0000000..b3f497f
--- /dev/null
+++ b/src/domains/community/components/comment/CommentBtn.tsx
@@ -0,0 +1,25 @@
+import CommentIcon from '@/shared/assets/icons/comment_28.svg';
+import { useState } from 'react';
+
+function CommentBtn({ size }: { size: 'sm' | 'md' }) {
+ const [isClick, setIsClick] = useState(false);
+
+ const handleClick = () => {
+ setIsClick(!isClick);
+ };
+ return (
+
+ );
+}
+export default CommentBtn;
diff --git a/src/shared/components/like/LikeBtn.tsx b/src/domains/community/components/like/LikeBtn.tsx
similarity index 76%
rename from src/shared/components/like/LikeBtn.tsx
rename to src/domains/community/components/like/LikeBtn.tsx
index 48cbf5c..0ba3be4 100644
--- a/src/shared/components/like/LikeBtn.tsx
+++ b/src/domains/community/components/like/LikeBtn.tsx
@@ -1,7 +1,7 @@
import LikeIcon from '@/shared/assets/icons/like_28.svg';
import { useState } from 'react';
-function LikeBtn() {
+function LikeBtn({ size }: { size: 'sm' | 'md' }) {
const [isClick, setIsClick] = useState(false);
const handleClick = () => {
@@ -10,7 +10,7 @@ function LikeBtn() {
return (
+ );
+}
+
+export default CocktailTag;
diff --git a/src/domains/community/detail/DetailContent.tsx b/src/domains/community/detail/DetailContent.tsx
new file mode 100644
index 0000000..bcf5f65
--- /dev/null
+++ b/src/domains/community/detail/DetailContent.tsx
@@ -0,0 +1,46 @@
+import Image from 'next/image';
+import prePost from '@/shared/assets/images/prepost_img.webp';
+
+import PostInfo from '../main/PostInfo';
+
+import CocktailTag from './CocktailTag';
+import DetailTabMobile from './tab/DetailTabMobile';
+
+function DetailContent() {
+ return (
+
+
+
+
+
+ 내용은 이거입니다 하하하
+ 그런가요 안녕하세요
+
+ 글입니다다다다다다다다다다다다
+ 내용은 이거입니다 하하하
+ 그런가요 안녕하세요
+
+ 글입니다다다다다다다다다다다다
+ 내용은 이거입니다 하하하
+ 그런가요 안녕하세요
+
+ 글입니다다다다다다다다다다다다
+ 내용은 이거입니다 하하하
+ 그런가요 안녕하세요
+
+ 글입니다다다다다다다다다다다다
+ 내용은 이거입니다 하하하
+ 그런가요 안녕하세요
+
+ 글입니다다다다다다다다다다다다
+
+
+
+
+
+
+
+ );
+}
+
+export default DetailContent;
diff --git a/src/domains/community/detail/DetailHeader.tsx b/src/domains/community/detail/DetailHeader.tsx
new file mode 100644
index 0000000..9eb4300
--- /dev/null
+++ b/src/domains/community/detail/DetailHeader.tsx
@@ -0,0 +1,13 @@
+import Label from '@/domains/shared/label/Label';
+import EditDelete from './EditDelete';
+
+function DetailHeader() {
+ return (
+
+ );
+}
+
+export default DetailHeader;
diff --git a/src/domains/community/detail/DetailTitle.tsx b/src/domains/community/detail/DetailTitle.tsx
new file mode 100644
index 0000000..1850aff
--- /dev/null
+++ b/src/domains/community/detail/DetailTitle.tsx
@@ -0,0 +1,12 @@
+import Profile from './Profile';
+
+function DetailTitle() {
+ return (
+
+ );
+}
+
+export default DetailTitle;
diff --git a/src/domains/community/detail/EditDelete.tsx b/src/domains/community/detail/EditDelete.tsx
new file mode 100644
index 0000000..a07aec5
--- /dev/null
+++ b/src/domains/community/detail/EditDelete.tsx
@@ -0,0 +1,25 @@
+function EditDelete({ use }: { use: 'post' | 'comment' }) {
+ return (
+
+
+ |
+
+
+ );
+}
+
+export default EditDelete;
diff --git a/src/domains/community/detail/Profile.tsx b/src/domains/community/detail/Profile.tsx
new file mode 100644
index 0000000..6a07849
--- /dev/null
+++ b/src/domains/community/detail/Profile.tsx
@@ -0,0 +1,12 @@
+function Profile() {
+ return (
+
+ );
+}
+
+export default Profile;
diff --git a/src/domains/community/detail/comment/CommentHeader.tsx b/src/domains/community/detail/comment/CommentHeader.tsx
new file mode 100644
index 0000000..822736a
--- /dev/null
+++ b/src/domains/community/detail/comment/CommentHeader.tsx
@@ -0,0 +1,17 @@
+import EditDelete from '../EditDelete';
+import Profile from '../Profile';
+
+function CommentHeader() {
+ return (
+
+ );
+}
+
+export default CommentHeader;
diff --git a/src/domains/community/detail/comment/CommentList.tsx b/src/domains/community/detail/comment/CommentList.tsx
new file mode 100644
index 0000000..137e2ec
--- /dev/null
+++ b/src/domains/community/detail/comment/CommentList.tsx
@@ -0,0 +1,26 @@
+import CommentHeader from './CommentHeader';
+
+function CommentList() {
+ return (
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+ );
+}
+
+export default CommentList;
diff --git a/src/domains/community/detail/comment/DetailComment.tsx b/src/domains/community/detail/comment/DetailComment.tsx
new file mode 100644
index 0000000..1f747df
--- /dev/null
+++ b/src/domains/community/detail/comment/DetailComment.tsx
@@ -0,0 +1,21 @@
+import Button from '@/shared/components/button/Button';
+import Input from '@/shared/components/InputBox/Input';
+
+function DetailComment() {
+ return (
+
+ );
+}
+
+export default DetailComment;
diff --git a/src/domains/community/detail/tab/DetailTabDesktop.tsx b/src/domains/community/detail/tab/DetailTabDesktop.tsx
new file mode 100644
index 0000000..d0ccdfa
--- /dev/null
+++ b/src/domains/community/detail/tab/DetailTabDesktop.tsx
@@ -0,0 +1,32 @@
+'use client';
+
+import Share from '@/domains/shared/share/Share';
+import CommentBtn from '../../components/comment/CommentBtn';
+import LikeBtn from '../../components/like/LikeBtn';
+
+function DetailTabDesktop() {
+ return (
+
+
+
+
+
+ 2
+
+
+
+ 2
+
+
+
+
+
+
+ );
+}
+
+export default DetailTabDesktop;
diff --git a/src/domains/community/detail/tab/DetailTabMobile.tsx b/src/domains/community/detail/tab/DetailTabMobile.tsx
new file mode 100644
index 0000000..042413d
--- /dev/null
+++ b/src/domains/community/detail/tab/DetailTabMobile.tsx
@@ -0,0 +1,25 @@
+'use client';
+
+import Share from '@/domains/shared/share/Share';
+import LikeBtn from '../../components/like/LikeBtn';
+
+function DetailTabMobile() {
+ return (
+
+ );
+}
+
+export default DetailTabMobile;
diff --git a/src/domains/community/main/CommunityFilter.tsx b/src/domains/community/main/CommunityFilter.tsx
new file mode 100644
index 0000000..8c33c81
--- /dev/null
+++ b/src/domains/community/main/CommunityFilter.tsx
@@ -0,0 +1,17 @@
+'use client';
+
+import SelectBox from '../../shared/select-box/SelectBox';
+
+function CommunityFilter() {
+ return (
+
+ );
+}
+
+export default CommunityFilter;
diff --git a/src/domains/community/main/CommunityHeader.tsx b/src/domains/community/main/CommunityHeader.tsx
new file mode 100644
index 0000000..9ef4ab6
--- /dev/null
+++ b/src/domains/community/main/CommunityHeader.tsx
@@ -0,0 +1,11 @@
+import PageHeader from '../../shared/pageHeader/PageHeader';
+
+function CommunityHeader() {
+ return (
+
+ );
+}
+
+export default CommunityHeader;
diff --git a/src/domains/community/main/CommunityTab.tsx b/src/domains/community/main/CommunityTab.tsx
new file mode 100644
index 0000000..06ea6ca
--- /dev/null
+++ b/src/domains/community/main/CommunityTab.tsx
@@ -0,0 +1,42 @@
+'use client';
+
+import tw from '@/shared/utills/tw';
+import { useState } from 'react';
+
+const tabItem = [
+ { title: '전체' },
+ { title: '레시피' },
+ { title: '팁' },
+ { title: '질문' },
+ { title: '자유' },
+];
+
+function CommunityTab() {
+ const [selectedIdx, setSelectedIdx] = useState(0);
+
+ return (
+
+
+
+ {tabItem.map(({ title }, idx) => (
+
+ ))}
+
+
+ );
+}
+
+export default CommunityTab;
diff --git a/src/domains/community/main/PostCard.tsx b/src/domains/community/main/PostCard.tsx
new file mode 100644
index 0000000..c08cbc1
--- /dev/null
+++ b/src/domains/community/main/PostCard.tsx
@@ -0,0 +1,35 @@
+import Image from 'next/image';
+import prePost from '@/shared/assets/images/prepost_img.webp';
+
+import PostInfo from './PostInfo';
+import Label from '../../shared/label/Label';
+
+function PostCard({ label }: { label: string }) {
+ return (
+
+
+
+
+
+
칵테일 만들 때 준비물
+
+
칵테일 처음 만들어 보는데 랄랄
+
가나다라마바사아자차카파타하
+
+
+
+ );
+}
+
+export default PostCard;
diff --git a/src/domains/community/main/PostInfo.tsx b/src/domains/community/main/PostInfo.tsx
new file mode 100644
index 0000000..80d7243
--- /dev/null
+++ b/src/domains/community/main/PostInfo.tsx
@@ -0,0 +1,22 @@
+function PostInfo({ hasUserName = false }: { hasUserName?: boolean }) {
+ return (
+
+ {hasUserName && (
+ <>
+ - 실버븬
+ - |
+
+ )}
+ - 3분 전
+ - |
+ - 조회 3
+ - |
+ - 댓글 3
+
+ );
+}
+
+export default PostInfo;
diff --git a/src/domains/community/main/WriteBtn.tsx b/src/domains/community/main/WriteBtn.tsx
new file mode 100644
index 0000000..6b60af7
--- /dev/null
+++ b/src/domains/community/main/WriteBtn.tsx
@@ -0,0 +1,30 @@
+'use client';
+
+import Write from '@/shared/assets/icons/edit_28.svg';
+import { useRouter } from 'next/navigation';
+import Button from '@/shared/components/button/Button';
+
+type RouterType = ReturnType
;
+
+function WriteBtn() {
+ const router = useRouter();
+
+ const handleClick = (router: RouterType) => {
+ router.push('/community/write');
+ };
+
+ return (
+
+ );
+}
+
+export default WriteBtn;
diff --git a/src/domains/login/components/LoginRedirectHandler.tsx b/src/domains/login/components/LoginRedirectHandler.tsx
new file mode 100644
index 0000000..79d03b1
--- /dev/null
+++ b/src/domains/login/components/LoginRedirectHandler.tsx
@@ -0,0 +1,87 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { usePathname, useRouter } from 'next/navigation';
+import { customToast } from '@/shared/components/toast/CustomToastUtils';
+import { getCookie, removeCookie } from '@/domains/shared/auth/utils/cookie';
+import { useAuthStore } from '@/domains/shared/store/auth';
+import Spinner from '@/shared/components/spinner/Spinner';
+import WelcomeModal from '@/domains/login/components/WelcomeModal';
+
+function LoginRedirectHandler() {
+ const pathname = usePathname();
+ const router = useRouter();
+ const { user, updateUser } = useAuthStore();
+ const [loading, setLoading] = useState(true);
+ const [welcomeModalOpen, setWelcomeModalOpen] = useState(false);
+
+ useEffect(() => {
+ if (!user && loading) {
+ updateUser()
+ .then((fetchedUser) => {
+ if (!fetchedUser) {
+ router.replace('/login');
+ }
+ })
+ .catch(() => {
+ router.replace('/login');
+ })
+ .finally(() => setLoading(false));
+ } else {
+ setLoading(false);
+ }
+ }, [user, loading, updateUser, router]);
+
+ useEffect(() => {
+ if (!user || loading) return;
+
+ const preLoginPath = getCookie('preLoginPath') || '/';
+ // 로그인 상태인데 이전 페이지가 /login이면 메인으로 이동
+ if (user && preLoginPath === '/login') {
+ router.replace('/');
+ removeCookie('preLoginPath');
+ return;
+ }
+
+ // 첫 유저일 경우 모달 오픈
+ if (pathname.startsWith('/login/user/first-user')) {
+ setWelcomeModalOpen(true);
+ }
+ // 기존 유저일 경우
+ else if (pathname.startsWith('/login/user/success')) {
+ customToast.success(`${user.nickname}님 \n 로그인 성공 🎉`);
+ router.replace(preLoginPath);
+ removeCookie('preLoginPath');
+ }
+ }, [pathname, user, loading, router]);
+
+ // 환영 모달 닫힐 때 이동
+ const handleCloseWelcomeModal = () => {
+ setWelcomeModalOpen(false);
+ const preLoginPath = getCookie('preLoginPath') || '/';
+ removeCookie('preLoginPath');
+ router.replace(preLoginPath);
+ };
+
+ if (loading) {
+ return (
+
+
+
+ );
+ }
+
+ return (
+ <>
+ {/* 첫 유저 모달 */}
+ {user && (
+
+ )}
+
+ );
+}
+export default LoginRedirectHandler;
diff --git a/src/domains/login/components/LogoutConfirm.tsx b/src/domains/login/components/LogoutConfirm.tsx
new file mode 100644
index 0000000..b7f5f26
--- /dev/null
+++ b/src/domains/login/components/LogoutConfirm.tsx
@@ -0,0 +1,20 @@
+import ConfirmModal from '@/shared/components/modalPop/ConfirmModal';
+
+interface Props {
+ open: boolean;
+ onClose: () => void;
+ onLogout: () => void;
+}
+
+function LogoutConfirm({ open, onClose, onLogout }: Props) {
+ return (
+
+ );
+}
+export default LogoutConfirm;
diff --git a/src/shared/components/auth/Welcome.tsx b/src/domains/login/components/WelcomeModal.tsx
similarity index 71%
rename from src/shared/components/auth/Welcome.tsx
rename to src/domains/login/components/WelcomeModal.tsx
index b479480..f4cd3b1 100644
--- a/src/shared/components/auth/Welcome.tsx
+++ b/src/domains/login/components/WelcomeModal.tsx
@@ -6,21 +6,21 @@ import Button from '@/shared/components/button/Button';
import ModalLayout from '@/shared/components/modalPop/ModalLayout';
import Ssury from '@/shared/assets/ssury/ssury_jump.webp';
import { useRouter } from 'next/navigation';
-import { useModalStore } from '@/shared/@store/modal';
-import { useAuthStore } from '@/shared/@store/auth';
-function Welcome() {
- const router = useRouter();
- const { user } = useAuthStore();
- const { welcomeModal, closeWelcomeModal } = useModalStore();
+interface Props {
+ userNickname: string;
+ open: boolean;
+ onClose: () => void;
+}
- if (!welcomeModal.open || !user) return null;
+function Welcome({ userNickname, open, onClose }: Props) {
+ const router = useRouter();
return (
@@ -28,7 +28,7 @@ function Welcome() {
type="button"
color="purple"
onClick={() => {
- closeWelcomeModal();
+ onClose();
router.push('/recipe');
}}
>
@@ -37,7 +37,7 @@ function Welcome() {