Merge pull request #180 from WishPool-dev/develop

최종 배포

Author: kwonsaebom

src/api/auth/KakaoLoginButton.tsx

@@ -20,7 +20,7 @@ const KakaoLoginButton = () => {
           <span className="title2 text-text w-full text-center">
             카카오 로그인
           </span>
-        </button>{' '}
+        </button>
       </div>
     </div>
   );

src/app/icon.png

@@ -7,6 +7,9 @@ import ReactQueryProvider from '@/components/ReactQueryProvider';
 import { suite } from '@/styles/font';
 
 export const metadata: Metadata = {
+  icons: {
+    icon: [{ url: '/icon.png', type: 'image/png', sizes: '32x32' }],
+  },
   title: 'WishPooL',
   description: '선물 준비의 모든 과정을 한 곳에, WishPooL',
 };

src/app/layout.tsx

@@ -5,7 +5,7 @@ import logoIcon from '@/assets/images/logo-icon.png';
 
 const LoginPage = () => {
   return (
-    <div className="bg-background-01 flex h-[100vh] flex-col items-center px-[2rem] pb-[4rem]">
+    <div className="bg-background-01 flex flex-col items-center px-[2rem] pt-[22rem] pb-[4rem]">
       <div className="text-text flex h-full flex-col items-center justify-center self-center text-center">
         <Image
           className="mb-[4rem]"

src/app/login/page.tsx

@@ -3,8 +3,8 @@ import HomeHeader from '@/components/layout/Header/HomeHeader';
 const InviteLayout = ({ children }: { children: React.ReactNode }) => {
   return (
     <>
-      <HomeHeader />
-      <main className="from-Background-02 to-blue-5 pt-header min-h-screen bg-gradient-to-b px-[2rem]">
+      <HomeHeader bgColor="background02" />
+      <main className="from-background-02 to-blue-5 pt-header min-h-screen bg-gradient-to-b px-[2rem] pb-[21.6rem]">
         {children}
       </main>
     </>

src/app/pick/invite/layout.tsx

@@ -41,7 +41,7 @@ const InviteHandler = () => {
     : WishpoolCardImage;
   return (
     <>
-      <div className="relative mt-[9rem] w-full rounded-[16px] bg-white">
+      <div className="relative mt-[7rem] mb-[4rem] w-full rounded-[16px] bg-white">
         <Icon
           name="ribbon"
           width={120}

src/app/pick/invite/page.tsx

@@ -47,6 +47,8 @@ const PreviewPage = () => {
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
+    if (createMutation.isPending || createMutation.isSuccess) return;
+
     try {
       const res = await createMutation.mutateAsync(data);
 
@@ -120,6 +122,7 @@ const PreviewPage = () => {
               textColor="black"
               backgroundColor="light"
               textSize="sm"
+              type="button"
               onClick={() => {
                 history.back();
               }}

src/app/wishpool/(builder)/preview/page.tsx

@@ -25,7 +25,7 @@ const CompleteLayout = ({ children }: { children: React.ReactNode }) => {
         onClick={handleClose}
         bgColor="white"
       />
-      <main className="mt-header p-[2rem]">{children}</main>
+      <main className="mt-header px-[2rem] pb-[2rem]">{children}</main>
     </>
   );
 };

src/app/wishpool/join/[id]/complete/layout.tsx

@@ -1,17 +1,10 @@
 'use client';
 import Image from 'next/image';
-import { useEffect, useState } from 'react';
 
 import CongratsImage from '@/assets/images/congrats.png';
 import FeedbackBox from '@/components/common/FeedbackBox';
 
 const CompletePage = () => {
-  const [hasToken, setHasToken] = useState(false);
-  useEffect(() => {
-    const token = localStorage.getItem('accessToken');
-    if (token) setHasToken(true);
-  }, []);
-
   return (
     <>
       <div className="flex flex-col items-center">
@@ -26,7 +19,7 @@ const CompletePage = () => {
           height={180}
         />
       </div>
-      {hasToken ? null : <FeedbackBox />}
+      <FeedbackBox />
     </>
   );
 };