Merge remote-tracking branch 'origin/dev' into feat/recipeSearch#22

Author: mtm-git1018

src/app/mypage/my-active/my-comment/page.tsx

@@ -1,4 +1,4 @@
-// import CommentList from '@/domains/shared/components/comment/CommentList';
+import MyComment from '@/domains/mypage/components/pages/my-active/MyComment';
 import { Metadata } from 'next';
 
 export const metadata: Metadata = {
@@ -7,6 +7,6 @@ export const metadata: Metadata = {
 };
 
 function Page() {
-  return <>{/* <CommentList /> */}</>;
+  return <MyComment />;
 }
 export default Page;

src/app/mypage/my-active/my-like/page.tsx

@@ -1,4 +1,5 @@
 // import PostCard from '@/domains/community/main/PostCard';
+import MyLike from '@/domains/mypage/components/pages/my-active/MyLike';
 import { Metadata } from 'next';
 
 export const metadata: Metadata = {
@@ -7,6 +8,6 @@ export const metadata: Metadata = {
 };
 
 function Page() {
-  return <section>{/* <PostCard posts={posts} isLoading={isLoading} /> */}</section>;
+  // return <MyLike />;
 }
 export default Page;

src/app/mypage/my-active/my-post/page.tsx

@@ -1,4 +1,4 @@
-// import PostCard from '@/domains/community/main/PostCard';
+import MyPost from '@/domains/mypage/components/pages/my-active/MyPost';
 import { Metadata } from 'next';
 
 export const metadata: Metadata = {
@@ -7,6 +7,6 @@ export const metadata: Metadata = {
 };
 
 function Page() {
-  return <div>{/* <PostCard posts={posts} isLoading={isLoading} /> */}</div>;
+  return <MyPost />;
 }
 export default Page;

src/app/mypage/my-alarm/page.tsx

@@ -1,4 +1,4 @@
-import Alarm from '@/domains/mypage/components/Alarm';
+import MyAlarm from '@/domains/mypage/components/pages/my-alarm/MyAlarm';
 
 import { Metadata } from 'next';
 
@@ -10,10 +10,7 @@ export const metadata: Metadata = {
 function Page() {
   return (
     <div className="flex flex-col gap-3">
-      <Alarm></Alarm>
-      <Alarm></Alarm>
-      <Alarm></Alarm>
-      <Alarm></Alarm>
+      <MyAlarm />
     </div>
   );
 }

src/app/mypage/my-bar/page.tsx

@@ -1,4 +1,4 @@
-import CocktailCard from '@/domains/shared/components/cocktail-card/CocktailCard';
+import MyBar from '@/domains/mypage/components/pages/my-bar/MyBar';
 import { Metadata } from 'next';
 
 export const metadata: Metadata = {
@@ -7,19 +7,6 @@ export const metadata: Metadata = {
 };
 
 function Page() {
-  return (
-    <div
-      className="grid grid-cols-1 justify-items-center mt-10 gap-8  sm:[grid-template-columns:repeat(2,minmax(0,320px))]  sm:justify-evenly md:[grid-template-columns:repeat(3,minmax(0,250px))]  
-  "
-    >
-      <CocktailCard
-        src=""
-        textSize1="text-xl"
-        name="Old Pashioned"
-        nameKo="올드 패션드"
-        keep={false}
-      ></CocktailCard>
-    </div>
-  );
+  return <MyBar />;
 }
 export default Page;

src/app/recommend/page.tsx

@@ -1,14 +1,20 @@
+'use client';
+
 import ChatSection from '@/domains/recommend/components/ChatSection';
 import Bg from '@/shared/assets/images/recommend_bg.webp';
+import { useAuthStore } from '@/domains/shared/store/auth';
+import ChatPreview from '@/domains/recommend/components/ChatPreview';
 
 function Page() {
+  const { user } = useAuthStore();
+
   return (
     <div
       className="relative bg-repeat bg-auto w-full flex flex-col"
       style={{ backgroundImage: `url(${Bg.src})` }}
     >
       <h1 className="sr-only">취향추천하기</h1>
-      <ChatSection />
+      {user ? <ChatSection /> : <ChatPreview />}
     </div>
   );
 }

src/domains/login/components/LoginRedirectHandler.tsx

@@ -2,7 +2,7 @@
 
 import Spinner from '@/shared/components/spinner/Spinner';
 import WelcomeModal from '@/domains/login/components/WelcomeModal';
-import { useLoginRedirect } from '../hook/useAuthHooks';
+import { useLoginRedirect } from '../hook/useLoginRedirect';
 
 function LoginRedirectHandler() {
   const { loading, welcomeModalOpen, handleCloseWelcomeModal, user } = useLoginRedirect();

src/domains/login/components/LogoutConfirm.tsx

@@ -1,5 +1,5 @@
 import ConfirmModal from '@/shared/components/modal-pop/ConfirmModal';
-import { useLogout } from '../hook/useAuthHooks';
+import { useLogout } from '../hook/useLogout';
 
 interface Props {
   open: boolean;

src/domains/login/hook/useAuthHooks.ts renamed to src/domains/login/hook/useLoginRedirect.ts

@@ -1,27 +1,9 @@
 import { useAuthStore } from '@/domains/shared/store/auth';
-import { useCallback } from 'react';
 import { useEffect, useState } from 'react';
 import { usePathname, useRouter } from 'next/navigation';
 import { getCookie, removeCookie } from '@/domains/shared/auth/utils/cookie';
 import { useToast } from '@/shared/hook/useToast';
 
-export const useLogout = () => {
-  const logout = useAuthStore((state) => state.logout);
-  const { toastSuccess, toastError } = useToast();
-
-  const handleLogout = useCallback(async () => {
-    try {
-      await logout();
-      toastSuccess('로그아웃 되었습니다.');
-    } catch (err) {
-      console.error('로그아웃 실패', err);
-      toastError('로그아웃 실패 ❌ 다시 시도해주세요.');
-    }
-  }, [logout, toastSuccess, toastError]);
-
-  return handleLogout;
-};
-
 export const useLoginRedirect = () => {
   const router = useRouter();
   const pathname = usePathname();

src/domains/login/hook/useLogout.ts

@@ -0,0 +1,27 @@
+import { useAuthStore } from '@/domains/shared/store/auth';
+import { useToast } from '@/shared/hook/useToast';
+import { useCallback } from 'react';
+import { useRouter } from 'next/navigation';
+
+export const useLogout = () => {
+  const logout = useAuthStore((state) => state.logout);
+  const { toastSuccess, toastError } = useToast();
+  const router = useRouter();
+
+  const handleLogout = useCallback(async () => {
+    try {
+      await logout();
+      toastSuccess('로그아웃 되었습니다.');
+
+      // 마이페이지 일 시 메인페이지로 이동
+      if (window.location.pathname.startsWith('/mypage')) {
+        router.push('/');
+      }
+    } catch (err) {
+      console.error('로그아웃 실패', err);
+      toastError('로그아웃 실패 ❌ 다시 시도해주세요.');
+    }
+  }, [logout, toastSuccess, toastError, router]);
+
+  return handleLogout;
+};