Skip to content

Commit 3592761

Browse files
authored
Merge pull request #179 from WishPool-dev/feat/#176-final-qa
[FEAT] 최종 QA
2 parents 5052a92 + cfbc2ee commit 3592761

12 files changed

Lines changed: 40 additions & 33 deletions

File tree

src/api/auth/KakaoLoginButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const KakaoLoginButton = () => {
2020
<span className="title2 text-text w-full text-center">
2121
카카오 로그인
2222
</span>
23-
</button>{' '}
23+
</button>
2424
</div>
2525
</div>
2626
);

src/app/icon.png

63.4 KB
Loading

src/app/layout.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import ReactQueryProvider from '@/components/ReactQueryProvider';
77
import { suite } from '@/styles/font';
88

99
export const metadata: Metadata = {
10+
icons: {
11+
icon: [{ url: '/icon.png', type: 'image/png', sizes: '32x32' }],
12+
},
1013
title: 'WishPooL',
1114
description: '선물 준비의 모든 과정을 한 곳에, WishPooL',
1215
};

src/app/login/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import logoIcon from '@/assets/images/logo-icon.png';
55

66
const LoginPage = () => {
77
return (
8-
<div className="bg-background-01 flex h-[100vh] flex-col items-center px-[2rem] pb-[4rem]">
8+
<div className="bg-background-01 flex flex-col items-center px-[2rem] pt-[22rem] pb-[4rem]">
99
<div className="text-text flex h-full flex-col items-center justify-center self-center text-center">
1010
<Image
1111
className="mb-[4rem]"

src/app/pick/invite/layout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import HomeHeader from '@/components/layout/Header/HomeHeader';
33
const InviteLayout = ({ children }: { children: React.ReactNode }) => {
44
return (
55
<>
6-
<HomeHeader />
7-
<main className="from-Background-02 to-blue-5 pt-header min-h-screen bg-gradient-to-b px-[2rem]">
6+
<HomeHeader bgColor="background02" />
7+
<main className="from-background-02 to-blue-5 pt-header min-h-screen bg-gradient-to-b px-[2rem] pb-[21.6rem]">
88
{children}
99
</main>
1010
</>

src/app/pick/invite/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const InviteHandler = () => {
4141
: WishpoolCardImage;
4242
return (
4343
<>
44-
<div className="relative mt-[9rem] w-full rounded-[16px] bg-white">
44+
<div className="relative mt-[7rem] mb-[4rem] w-full rounded-[16px] bg-white">
4545
<Icon
4646
name="ribbon"
4747
width={120}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ const PreviewPage = () => {
4747
const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
4848
e.preventDefault();
4949

50+
if (createMutation.isPending || createMutation.isSuccess) return;
51+
5052
try {
5153
const res = await createMutation.mutateAsync(data);
5254

@@ -120,6 +122,7 @@ const PreviewPage = () => {
120122
textColor="black"
121123
backgroundColor="light"
122124
textSize="sm"
125+
type="button"
123126
onClick={() => {
124127
history.back();
125128
}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const CompleteLayout = ({ children }: { children: React.ReactNode }) => {
2525
onClick={handleClose}
2626
bgColor="white"
2727
/>
28-
<main className="mt-header p-[2rem]">{children}</main>
28+
<main className="mt-header px-[2rem] pb-[2rem]">{children}</main>
2929
</>
3030
);
3131
};

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
'use client';
22
import Image from 'next/image';
3-
import { useEffect, useState } from 'react';
43

54
import CongratsImage from '@/assets/images/congrats.png';
65
import FeedbackBox from '@/components/common/FeedbackBox';
76

87
const CompletePage = () => {
9-
const [hasToken, setHasToken] = useState(false);
10-
useEffect(() => {
11-
const token = localStorage.getItem('accessToken');
12-
if (token) setHasToken(true);
13-
}, []);
14-
158
return (
169
<>
1710
<div className="flex flex-col items-center">
@@ -26,7 +19,7 @@ const CompletePage = () => {
2619
height={180}
2720
/>
2821
</div>
29-
{hasToken ? null : <FeedbackBox />}
22+
<FeedbackBox />
3023
</>
3124
);
3225
};

src/assets/icons/svg/icon_kakao.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)