Skip to content

Commit 39684bb

Browse files
authored
Feature(onboarding): story 변경사항 반영 (#113)
* feat: 스토리 변경+헤더 프롭스 변경 * feat: 디테일 반영 * chore: 프리티어 적용
1 parent 1f31ec4 commit 39684bb

9 files changed

Lines changed: 78 additions & 179 deletions

File tree

apps/client/src/assets/onBoarding/storyStep1.svg

Lines changed: 5 additions & 11 deletions
Loading

apps/client/src/assets/onBoarding/storyStep2.svg

Lines changed: 5 additions & 84 deletions
Loading

apps/client/src/assets/onBoarding/storyStep3.svg

Lines changed: 42 additions & 75 deletions
Loading

apps/client/src/pages/onBoarding/OnBoarding.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const OnBoarding = () => {
2020

2121
return (
2222
<div>
23-
<Header />
23+
<Header bg="bg-transparent" />
2424

2525
<Funnel>
2626
<Step name={STEP.STORY}>

apps/client/src/pages/onBoarding/components/OnboardingTimePicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const OnBoardingTimePicker = ({
6868
</div>
6969
</WheelPickerWrapper>
7070

71-
<div className="flex w-full justify-between">
71+
<div className="flex w-full justify-between gap-[1.8rem]">
7272
<CommonBtn
7373
size="medium"
7474
type="gray"

apps/client/src/pages/onBoarding/components/StoryStep.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ const StoryStep = ({ setStep }: StoryStepProps) => {
3939
};
4040

4141
return (
42-
<div className="flex h-dvh w-full flex-col justify-center px-[12rem]">
42+
<div className="flex h-dvh w-full flex-col justify-center bg-[#fffdf8] px-[12rem]">
4343
<div className="flex flex-col items-center">
4444
<Carousel
4545
currentStep={currentStep}
4646
handleCurrentStep={handleCurrentStep}
4747
images={images}
4848
total={total}
4949
/>
50-
<p className="sub3-sb whitespace-pre-line pt-[7.3rem] text-center">
50+
<p className="sub3-sb whitespace-pre-line pt-[7.5rem] text-center">
5151
{STORY_CONTENT[currentStep].content}
5252
</p>
5353
</div>

apps/client/src/pages/onBoarding/constants/storyStep.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export const STORY_CONTENT = [
1212
{
1313
title: 'story3',
1414
content:
15-
'다람쥐 치삐는 정보를 어떻게 활용해야 할지 몰라 매일 도토리를 먹지 못하고 있어요.\n정보를 활용하고 도토리를 모아 치삐를 도와주세요!',
15+
'시골에서 온 다람쥐 치삐는 정보를 어떻게 활용해야 할지 몰라 매일 도토리를 먹지 못하고 있어요.\n정보를 활용하고 도토리를 모아 치삐를 도와주세요!',
1616
},
1717
];

apps/client/src/shared/components/ui/layout/Header.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
import logo from '@assets/brand/logo.svg';
22

3-
const Header = () => {
3+
interface HeaderProps {
4+
bg?: string;
5+
}
6+
7+
const Header = ({ bg = 'bg-background' }: HeaderProps) => {
48
return (
5-
<header className="bg-background fixed left-1/2 top-0 z-50 flex h-[7.4rem] w-[1440px] -translate-x-1/2 items-center px-[6rem] pb-[1.7rem] pt-[2.5rem]">
9+
<header
10+
className={`fixed left-1/2 top-0 z-50 flex h-[7.4rem] w-[1440px] -translate-x-1/2 items-center px-[6rem] pb-[1.7rem] pt-[2.5rem] ${bg}`}
11+
>
612
<img src={logo} className="h-[3.2rem] w-[12.4rem]" alt="로고" />
713
</header>
814
);
Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
11
// 이 파일은 자동 생성 파일입니다. (직접 수정 금지)
2-
export const iconNames = ["close-button","default_order","down_icon","ic_arrow_down","ic_arrow_right","ic_error","main_logo","plus_icon","popup_logo","white_order"] as const;
3-
export type IconName = typeof iconNames[number];
2+
export const iconNames = [
3+
'close-button',
4+
'default_order',
5+
'down_icon',
6+
'ic_arrow_down',
7+
'ic_arrow_right',
8+
'ic_error',
9+
'main_logo',
10+
'plus_icon',
11+
'popup_logo',
12+
'white_order',
13+
] as const;
14+
export type IconName = (typeof iconNames)[number];

0 commit comments

Comments
 (0)