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/app/pick/preview/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const PreviewPage = () => {
<>
<h1 className="text-blue-primary caption1">최종 점검</h1>
<h2 className="head1 text-text">최종 선택한 선물</h2>
<section className="my-[2.8rem] space-y-[1.2rem]">
<section className="my-[2.8rem] flex flex-col space-y-[1.2rem]">
{pickedItems.map(({ giftId, itemName, itemUrl, imageUrl }) => (
<GiftCard
key={giftId}
Expand Down
4 changes: 3 additions & 1 deletion src/app/wishpool/(builder)/intro/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ const IntroLayout = ({ children }: { children: React.ReactNode }) => {
return (
<>
<BackHeader title="위시풀 만들기" bgColor="background02" />
<main className="bg-background-02 mt-header p-[2rem]">{children}</main>
<main className="bg-background-02 mt-header h-[100vh] p-[2rem]">
{children}
</main>
</>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/app/wishpool/(viewer)/[id]/final/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const FinalPage = () => {
</p>
</div>

<section className="relative mt-[9.1rem] space-y-[1.2rem] pb-[20rem]">
<section className="relative mt-[9.1rem] flex flex-col space-y-[1.2rem] pb-[20rem]">
<Icon
name="ribbon"
width={120}
Expand Down
2 changes: 1 addition & 1 deletion src/app/wishpool/join/[id]/add/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ const AddPage = () => {
title="선물 추가 버튼 아이콘"
className="text-text"
/>
<span className="text-text title1">선물 더 제안</span>
<span className="text-text title1">선물 더 제안하기</span>
</div>
</button>
<ButtonContainer
Expand Down
2 changes: 2 additions & 0 deletions src/assets/icons/iconMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import StarIcon from '@/assets/icons/svg/icon_star.svg';
import SwipeIcon from '@/assets/icons/svg/icon_swipe.svg';
import TrashIcon from '@/assets/icons/svg/icon_trash.svg';
import UpIcon from '@/assets/icons/svg/icon_up.svg';
import VacantIcon from '@/assets/icons/svg/icon_vacant.svg';
import WishIcon from '@/assets/icons/svg/icon_wish.svg';

export const iconMap = {
Expand Down Expand Up @@ -56,6 +57,7 @@ export const iconMap = {
ribbon: RibbonIcon,
loading: LoadingIcon,
delete: DeleteIcon,
vacant: VacantIcon,
} as const;

export type IconName = keyof typeof iconMap;
57 changes: 57 additions & 0 deletions src/assets/icons/svg/icon_vacant.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/home/ActiveEventSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ const ActiveEventSection = ({ planType, wishpools }: activeEventProps) => {
</>
) : (
<>
<div className="mt-[3.5rem] flex items-center justify-center py-[2.6rem]">
<Icon name="photo" width={28} height={28} />
<div className="mt-[2rem] flex items-center justify-center py-[2.6rem]">
<Icon name="vacant" width={56} height={56} />
</div>
<p className="body2 text-text mb-[10.7rem] py-[0.4rem] text-center">
지금 진행되고 있는 이벤트가 없어요 <br />
Expand Down
Loading