Merge branch 'dev' into feat/write#19

Author: EunbinJung

next.config.ts

@@ -2,7 +2,12 @@ import type { NextConfig } from 'next';
 
 const nextConfig: NextConfig = {
   images: {
-    domains: ['www.thecocktaildb.com'],
+    remotePatterns: [
+      {
+        protocol: 'https',
+        hostname:'www.thecocktaildb.com'
+      }
+    ]
   },
   env: {
     NPUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,

src/app/api/kakao/KaKaoScript.tsx

@@ -0,0 +1,17 @@
+'use client';
+
+import Script from 'next/script';
+
+declare global {
+  interface Window {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    Kakao: any;
+  }
+}
+function KaKaoScript() {
+  const onLoad = () => {
+    window.Kakao.init(process.env.NEXT_PUBLIC_KAKAO_JAVASCRIPT_KEY);
+  };
+  return <Script src="https://developers.kakao.com/sdk/js/kakao.js" async onLoad={onLoad} />;
+}
+export default KaKaoScript;

src/app/community/page.tsx

@@ -3,7 +3,7 @@ import PageHeader from '@/domains/shared/components/page-header/PageHeader';
 import { Metadata } from 'next';
 
 export const metadata: Metadata = {
-  title: 'SSOUL | 커뮤니티',
+  title: '커뮤니티',
   description: '칵테일에 관한 모든 이야기',
 };
 

src/app/layout.tsx

@@ -4,8 +4,11 @@ import { Toaster } from 'react-hot-toast';
 import Header from '@/shared/components/header/Header';
 import FooterWrapper from '@/shared/components/footer/FooterWrapper';
 import ScrollTopBtnWrapper from '@/shared/components/scroll-top/ScrollTopBtnWrapper';
+import KaKaoScript from './api/kakao/KaKaoScript';
+
 export const metadata: Metadata = {
-  title: 'SSOUL',
+  title: { default: 'SSOUL', template: 'SSOUL | %s' },
+  metadataBase: new URL('http://www.ssoul.life'),
   description: '칵테일을 좋아하는 사람들을 위한 서비스',
 };
 
@@ -35,6 +38,7 @@ export default function RootLayout({
 
         <ScrollTopBtnWrapper />
       </body>
+      <KaKaoScript />
     </html>
   );
 }

src/app/login/page.tsx

@@ -4,7 +4,7 @@ import loginBg from '@/shared/assets/images/login_bg.webp';
 import SocialLogin from '@/domains/login/main/SocialLogin';
 
 export const metadata: Metadata = {
-  title: 'SSOUL | 로그인',
+  title: '로그인',
   description: '칵테일을 좋아하는 사람들을 위한 서비스 로그인 페이지',
 };
 

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

@@ -1,12 +1,12 @@
-// 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 = {
-  title: 'SSOUL | 마이페이지',
+  title: '마이페이지',
   description: 'SSOUL 서비스에서 나의 활동을 관리할 수 있는 페이지입니다',
 };
 
 function Page() {
-  return <>{/* <CommentList /> */}</>;
+  return <MyComment />;
 }
 export default Page;

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

@@ -1,12 +1,13 @@
 // 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 = {
-  title: 'SSOUL | 마이페이지',
+  title: '마이페이지',
   description: 'SSOUL 서비스에서 나의 활동을 관리할 수 있는 페이지입니다',
 };
 
 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,12 +1,12 @@
-// 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 = {
-  title: 'SSOUL | 마이페이지',
+  title: '마이페이지',
   description: 'SSOUL 서비스에서 나의 활동을 관리할 수 있는 페이지입니다',
 };
 
 function Page() {
-  return <div>{/* <PostCard posts={posts} isLoading={isLoading} /> */}</div>;
+  return <MyPost />;
 }
 export default Page;

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

@@ -1,19 +1,16 @@
-import Alarm from '@/domains/mypage/components/Alarm';
+import MyAlarm from '@/domains/mypage/components/pages/my-alarm/MyAlarm';
 
 import { Metadata } from 'next';
 
 export const metadata: Metadata = {
-  title: 'SSOUL | 마이페이지',
+  title: '마이페이지',
   description: 'SSOUL 서비스에서 나의 활동을 관리할 수 있는 페이지입니다',
 };
 
 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,25 +1,12 @@
-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 = {
-  title: 'SSOUL | 마이페이지',
+  title: '마이페이지',
   description: 'SSOUL 서비스에서 나의 활동을 관리할 수 있는 페이지입니다',
 };
 
 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;