Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api/auth/KakaoLoginButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const KakaoLoginButton = () => {
<span className="title2 text-text w-full text-center">
카카오 로그인
</span>
</button>{' '}
</button>
</div>
</div>
);
Expand Down
Binary file added src/app/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
};
Expand Down
2 changes: 1 addition & 1 deletion src/app/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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]"
Expand All @@ -15,7 +15,7 @@
alt="위시풀 로고"
/>
<h2 className="head1 mb-[0.4rem]">마음을 선물할 때,</h2>
<img src="/images/logoText.svg" />

Check warning on line 18 in src/app/login/page.tsx

View workflow job for this annotation

GitHub Actions / build

img elements must have an alt prop, either with meaningful text, or an empty string for decorative images

Check warning on line 18 in src/app/login/page.tsx

View workflow job for this annotation

GitHub Actions / build

Using `<img>` could result in slower LCP and higher bandwidth. Consider using `<Image />` from `next/image` or a custom image loader to automatically optimize images. This may incur additional usage or cost from your provider. See: https://nextjs.org/docs/messages/no-img-element

Check warning on line 18 in src/app/login/page.tsx

View workflow job for this annotation

GitHub Actions / build

img elements must have an alt prop, either with meaningful text, or an empty string for decorative images

Check warning on line 18 in src/app/login/page.tsx

View workflow job for this annotation

GitHub Actions / build

Using `<img>` could result in slower LCP and higher bandwidth. Consider using `<Image />` from `next/image` or a custom image loader to automatically optimize images. This may incur additional usage or cost from your provider. See: https://nextjs.org/docs/messages/no-img-element
</div>
<KakaoLoginButton />
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/app/pick/invite/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</>
Expand Down
2 changes: 1 addition & 1 deletion src/app/pick/invite/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 3 additions & 0 deletions src/app/wishpool/(builder)/preview/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -120,6 +122,7 @@ const PreviewPage = () => {
textColor="black"
backgroundColor="light"
textSize="sm"
type="button"
onClick={() => {
history.back();
}}
Expand Down
2 changes: 1 addition & 1 deletion src/app/wishpool/join/[id]/complete/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</>
);
};
Expand Down
9 changes: 1 addition & 8 deletions src/app/wishpool/join/[id]/complete/page.tsx
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -26,7 +19,7 @@ const CompletePage = () => {
height={180}
/>
</div>
{hasToken ? null : <FeedbackBox />}
<FeedbackBox />
</>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/assets/icons/svg/icon_kakao.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 13 additions & 11 deletions src/components/common/Form/GiftField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
if (!imageKey) return;
onChangeImage(imageKey);
patchGift(index, { imageUrl: imageKey });
}, [imageKey]);

Check warning on line 56 in src/components/common/Form/GiftField.tsx

View workflow job for this annotation

GitHub Actions / build

React Hook useEffect has missing dependencies: 'index' and 'onChangeImage'. Either include them or remove the dependency array. If 'onChangeImage' changes too often, find the parent component that defines it and wrap that definition in useCallback

Check warning on line 56 in src/components/common/Form/GiftField.tsx

View workflow job for this annotation

GitHub Actions / build

React Hook useEffect has missing dependencies: 'index' and 'onChangeImage'. Either include them or remove the dependency array. If 'onChangeImage' changes too often, find the parent component that defines it and wrap that definition in useCallback

const handleDeleteImage = () => {
reset();
Expand Down Expand Up @@ -122,7 +122,7 @@
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"
/>
<span className="absolute top-[0.6rem] left-[6rem]">
<button
Expand All @@ -136,22 +136,24 @@
</div>
) : (
<div className="mt-[1.2rem]">
<div className="flex h-[5.6rem] w-full gap-[1.2rem] rounded-[12px] border border-gray-400 px-[1.6rem] py-[1.6rem] focus:border-gray-400 focus:outline-none">
<button
type="button"
onClick={() => fileInputRef.current?.click()}
aria-label="선물 이미지 추가"
disabled={isUploading}
>
<button
type="button"
className="w-full"
onClick={() => fileInputRef.current?.click()}
aria-label="선물 이미지 추가"
disabled={isUploading}
>
<div className="flex h-[5.6rem] gap-[1.2rem] rounded-[12px] border border-gray-400 px-[1.6rem] py-[1.6rem] focus:border-gray-400 focus:outline-none">
<Icon
name="photo"
width={24}
height={24}
className="text-gray-600"
/>
</button>
<p className="body1 text-text">선물 사진 추가</p>
</div>

<p className="body1 text-text">선물 사진 추가</p>
</div>
</button>
<p className="caption2 text-blue-primary mt-[0.8rem]">
*사진을 추가하지 않을 때는 기본 이미지로 보여줄게요.
</p>
Expand Down
20 changes: 13 additions & 7 deletions src/components/pick/list/GiftCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,19 @@ const GiftCard = ({
<div
className={`bg-background-01 flex grow-1 flex-col items-center gap-[2.4rem] rounded-[16px] ${isSmall ? 'p-[2.2rem]' : 'p-[6.4rem]'}`}
>
<Image
src={finalSrc}
alt={`선물 카드 이미지 - ${giftId}`}
width={isSmall ? 126 : 170}
height={isSmall ? 126 : 170}
className={`rounded-[12px] object-cover`}
/>
<div
className={`relative overflow-hidden rounded-[12px] ${
isSmall ? 'h-[12.6rem] w-[12.6rem]' : 'h-[17.1rem] w-[17.1rem]'
}`}
>
<Image
src={finalSrc}
alt={`선물 카드 이미지 - ${giftId}`}
fill
className="object-cover"
/>
</div>

<span
className={`subtitle2 text-text line-clamp-2 h-[4.8rem] text-center ${isSmall ? 'w-[12.6rem]' : ''}`}
>
Expand Down
Loading