diff --git a/src/api/auth/KakaoLoginButton.tsx b/src/api/auth/KakaoLoginButton.tsx index bc3b2d87..65029f0d 100644 --- a/src/api/auth/KakaoLoginButton.tsx +++ b/src/api/auth/KakaoLoginButton.tsx @@ -20,7 +20,7 @@ const KakaoLoginButton = () => { 카카오 로그인 - {' '} + ); diff --git a/src/app/icon.png b/src/app/icon.png new file mode 100644 index 00000000..0a147cec Binary files /dev/null and b/src/app/icon.png differ diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 40e11a03..32fa4e94 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -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', }; diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index b8c2e1be..49343eed 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -5,7 +5,7 @@ import logoIcon from '@/assets/images/logo-icon.png'; const LoginPage = () => { return ( -
+
{ return ( <> - -
+ +
{children}
diff --git a/src/app/pick/invite/page.tsx b/src/app/pick/invite/page.tsx index 70f04799..449a09ac 100644 --- a/src/app/pick/invite/page.tsx +++ b/src/app/pick/invite/page.tsx @@ -41,7 +41,7 @@ const InviteHandler = () => { : WishpoolCardImage; return ( <> -
+
{ const handleSubmit = async (e: React.FormEvent) => { 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(); }} diff --git a/src/app/wishpool/join/[id]/complete/layout.tsx b/src/app/wishpool/join/[id]/complete/layout.tsx index ed845770..463dc2ff 100644 --- a/src/app/wishpool/join/[id]/complete/layout.tsx +++ b/src/app/wishpool/join/[id]/complete/layout.tsx @@ -25,7 +25,7 @@ const CompleteLayout = ({ children }: { children: React.ReactNode }) => { onClick={handleClose} bgColor="white" /> -
{children}
+
{children}
); }; diff --git a/src/app/wishpool/join/[id]/complete/page.tsx b/src/app/wishpool/join/[id]/complete/page.tsx index eaabda39..ef4baaa6 100644 --- a/src/app/wishpool/join/[id]/complete/page.tsx +++ b/src/app/wishpool/join/[id]/complete/page.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 ( <>
@@ -26,7 +19,7 @@ const CompletePage = () => { height={180} />
- {hasToken ? null : } + ); }; diff --git a/src/assets/icons/svg/icon_kakao.svg b/src/assets/icons/svg/icon_kakao.svg index e4b9843d..b4cdd17c 100644 --- a/src/assets/icons/svg/icon_kakao.svg +++ b/src/assets/icons/svg/icon_kakao.svg @@ -1,4 +1,4 @@ - + diff --git a/src/components/common/Form/GiftField.tsx b/src/components/common/Form/GiftField.tsx index 5c5de9bf..eb1fda59 100644 --- a/src/components/common/Form/GiftField.tsx +++ b/src/components/common/Form/GiftField.tsx @@ -122,7 +122,7 @@ const GiftField = ({ alt="선물 이미지 미리보기" width={82} height={82} - className="h-[8.2rem] w-[8.2rem] rounded-[12px] border border-gray-400" + className="h-[8.2rem] w-[8.2rem] rounded-[12px] border border-gray-400 object-cover" /> -

선물 사진 추가

-
+ +

선물 사진 추가

+
+

*사진을 추가하지 않을 때는 기본 이미지로 보여줄게요.

diff --git a/src/components/pick/list/GiftCard.tsx b/src/components/pick/list/GiftCard.tsx index 4748033b..956bc1ee 100644 --- a/src/components/pick/list/GiftCard.tsx +++ b/src/components/pick/list/GiftCard.tsx @@ -26,13 +26,19 @@ const GiftCard = ({
- {`선물 +
+ {`선물 +
+