diff --git a/src/components/AlarmList/index.tsx b/src/components/AlarmList/index.tsx index f5333f63..d58de282 100644 --- a/src/components/AlarmList/index.tsx +++ b/src/components/AlarmList/index.tsx @@ -2,8 +2,7 @@ import { RefObject } from 'react'; import classNames from 'classnames/bind'; -import AlarmCard from '@/components/cards/AlarmCard'; -import EmptyAlarm from '@/components/cards/EmptyAlarmCard'; +import { AlarmCard, EmptyAlarmCard } from '../cards'; import styles from './AlarmList.module.scss'; @@ -57,7 +56,7 @@ const AlarmList = ({ ))} ) : ( - + )} diff --git a/src/stories/Alarm.stories.ts b/src/stories/Alarm.stories.ts index 12ec9f43..61e5fb13 100644 --- a/src/stories/Alarm.stories.ts +++ b/src/stories/Alarm.stories.ts @@ -1,9 +1,9 @@ -import Alarm from '@/components/header/Alarm'; +import Alarm from '@/components/Alarm'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/Alarm', + title: 'Alarm/Alarm', component: Alarm, } satisfies Meta; diff --git a/src/stories/AlarmCard.stories.ts b/src/stories/AlarmCard.stories.ts index 122f40db..da72d800 100644 --- a/src/stories/AlarmCard.stories.ts +++ b/src/stories/AlarmCard.stories.ts @@ -1,9 +1,9 @@ -import AlarmCard from '@/components/header/AlarmCard'; +import { AlarmCard } from '@/components/cards'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/AlarmList/AlarmCard', + title: 'Cards/AlarmCard', component: AlarmCard, } satisfies Meta; @@ -13,8 +13,8 @@ type Story = StoryObj; export const Example: Story = { args: { id: 0, - content: '함께하면 즐거운 스트릿 댄스(2024-04-16 15:00~18:00) 예약이 승인되었어요.', - createdAt: '30분 전', + content: 'message', + createdAt: '1 hour age', onClick: () => {}, }, }; diff --git a/src/stories/AlarmList.stories.ts b/src/stories/AlarmList.stories.ts index 66bf6309..8fdabddf 100644 --- a/src/stories/AlarmList.stories.ts +++ b/src/stories/AlarmList.stories.ts @@ -1,9 +1,9 @@ -import AlarmList from '@/components/header/AlarmList'; +import AlarmList from '@/components/AlarmList'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/AlarmList', + title: 'AlarmList/AlarmList', component: AlarmList, } satisfies Meta; @@ -12,11 +12,13 @@ type Story = StoryObj; export const Example: Story = { args: { + alarmText: 'Alarm', + deleteAllText: 'Delete All', notifications: [ { id: 0, - content: '함께하면 즐거운 스트릿 댄스(2024-04-16 15:00~18:00) 예약이 승인되었어요.', - createdAt: '30분 전', + content: 'messag ', + createdAt: '1 hour age', }, ], totalCount: 1, diff --git a/src/stories/DrawerMenu.stories.ts b/src/stories/DrawerMenu.stories.ts index 01348eba..cf75df66 100644 --- a/src/stories/DrawerMenu.stories.ts +++ b/src/stories/DrawerMenu.stories.ts @@ -1,9 +1,9 @@ -import DrawerMenu from '@/components/header/DrawerMenu'; +import DrawerMenu from '@/components/DrawerMenu'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/DrawerMenu', + title: 'DrawerMenu/DrawerMenu', component: DrawerMenu, } satisfies Meta; @@ -12,7 +12,12 @@ type Story = StoryObj; export const Example: Story = { args: { - menuList: ['LEAGUE OF LEGENDS', 'BATTLEGROUNDS', 'OVERWATCH 2', 'MINECRAFT'], + menuList: [ + { menu: 'LEAGUE OF LEGENDS', path: 'lol' }, + { menu: 'BATTLEGROUNDS', path: 'bg' }, + { menu: 'OVERWATCH 2', path: 'ow' }, + { menu: 'MINECRAFT', path: 'mc' }, + ], onClick: () => {}, }, }; diff --git a/src/stories/EmptyAlarm.stories.ts b/src/stories/EmptyAlarm.stories.ts deleted file mode 100644 index fb6816fe..00000000 --- a/src/stories/EmptyAlarm.stories.ts +++ /dev/null @@ -1,17 +0,0 @@ -import EmptyAlarm from '@/components/header/EmptyAlarm'; - -import type { Meta, StoryObj } from '@storybook/react'; - -const meta = { - title: 'header/AlarmList/EmptyAlarm', - component: EmptyAlarm, -} satisfies Meta; - -export default meta; -type Story = StoryObj; - -export const Example: Story = { - args: { - emptyAlarmText: '알림이 없습니다', - }, -}; diff --git a/src/stories/EmptyAlarmCard.stories.ts b/src/stories/EmptyAlarmCard.stories.ts new file mode 100644 index 00000000..f07f30a7 --- /dev/null +++ b/src/stories/EmptyAlarmCard.stories.ts @@ -0,0 +1,17 @@ +import { EmptyAlarmCard } from '@/components/cards'; + +import type { Meta, StoryObj } from '@storybook/react'; + +const meta = { + title: 'Cards/EmptyAlarmCard', + component: EmptyAlarmCard, +} satisfies Meta; + +export default meta; +type Story = StoryObj; + +export const Example: Story = { + args: { + emptyAlarmText: 'There is no alarm', + }, +}; diff --git a/src/stories/Header.stories.ts b/src/stories/Header.stories.ts index a01fd6fe..3d98095c 100644 --- a/src/stories/Header.stories.ts +++ b/src/stories/Header.stories.ts @@ -1,9 +1,9 @@ -import Header from '@/components/header/Header'; +import Header from '@/components/Header'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/Header', + title: 'Header/Header', component: Header, } satisfies Meta; @@ -13,10 +13,15 @@ type Story = StoryObj; export const Example: Story = { args: { path: '', - logoName: 'GGF', - menuList: ['LEAGUE OF LEGENDS', 'BATTLEGROUNDS', 'OVERWATCH 2', 'MINECRAFT'], - activatedGame: 0, - handleActivatedGame: () => {}, + logoName: 'LOGO', + menuList: [ + { menu: 'MENU 1', path: 'menu1' }, + { menu: 'MENU 2', path: 'menu2' }, + { menu: 'MENU 3', path: 'menu3' }, + { menu: 'MENU 4', path: 'menu4' }, + ], + activatedMenu: 0, + handleActivatedMenu: () => {}, handleOpenDrawerMenu: () => {}, }, }; diff --git a/src/stories/HeaderProfile.stories.ts b/src/stories/HeaderProfile.stories.ts index 81d7fdb9..35f6a2ea 100644 --- a/src/stories/HeaderProfile.stories.ts +++ b/src/stories/HeaderProfile.stories.ts @@ -1,9 +1,9 @@ -import HeaderProfile from '@/components/header/HeaderProfile'; +import HeaderProfile from '@/components/HeaderProfile'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/HeaderProfile', + title: 'HeaderProfile/HeaderProfile', component: HeaderProfile, } satisfies Meta; @@ -12,7 +12,7 @@ type Story = StoryObj; export const Example: Story = { args: { - nickname: 'BattleMan', + nickname: 'UserName', profileImageUrl: '', isActivated: false, onClick: () => {}, diff --git a/src/stories/HeaderSigninButton.stories.ts b/src/stories/HeaderSigninButton.stories.ts index 1e4024f8..37ec323b 100644 --- a/src/stories/HeaderSigninButton.stories.ts +++ b/src/stories/HeaderSigninButton.stories.ts @@ -1,9 +1,9 @@ -import { HeaderSigninButton } from '@/components/header/buttons'; +import { HeaderSigninButton } from '@/components/buttons'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/buttons/HeaderSigninButton', + title: 'buttons/HeaderSigninButton', component: HeaderSigninButton, } satisfies Meta; @@ -12,6 +12,7 @@ type Story = StoryObj; export const Example: Story = { args: { + text: 'SIGNIN', path: '', }, }; diff --git a/src/stories/HeaderSignupButton.stories.ts b/src/stories/HeaderSignupButton.stories.ts index 08b46d17..10e9438b 100644 --- a/src/stories/HeaderSignupButton.stories.ts +++ b/src/stories/HeaderSignupButton.stories.ts @@ -1,9 +1,9 @@ -import { HeaderSignupButton } from '@/components/header/buttons'; +import { HeaderSignupButton } from '@/components/buttons'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/buttons/HeaderSignupButton', + title: 'buttons/HeaderSignupButton', component: HeaderSignupButton, } satisfies Meta; @@ -12,6 +12,7 @@ type Story = StoryObj; export const Example: Story = { args: { + text: 'SIGNUP', path: '', }, }; diff --git a/src/stories/Menu.stories.ts b/src/stories/Menu.stories.ts index 2a45010d..ba8ba63d 100644 --- a/src/stories/Menu.stories.ts +++ b/src/stories/Menu.stories.ts @@ -1,9 +1,9 @@ -import Menu from '@/components/header/Menu'; +import Menu from '@/components/Menu'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/Menu', + title: 'Menu/Menu', component: Menu, } satisfies Meta; @@ -12,8 +12,13 @@ type Story = StoryObj; export const Example: Story = { args: { - menuList: ['LEAGUE OF LEGENDS', 'BATTLEGROUNDS', 'OVERWATCH 2', 'MINECRAFT'], - activatedGame: 0, - handleActivatedGame: () => {}, + menuList: [ + { menu: 'MENU 1', path: 'menu1' }, + { menu: 'MENU 2', path: 'menu2' }, + { menu: 'MENU 3', path: 'menu3' }, + { menu: 'MENU 4', path: 'menu4' }, + ], + activatedMenu: 0, + handleActivatedMenu: () => {}, }, }; diff --git a/src/stories/UserMenu.stories.ts b/src/stories/UserMenu.stories.ts index 7d368e6c..a0a7e332 100644 --- a/src/stories/UserMenu.stories.ts +++ b/src/stories/UserMenu.stories.ts @@ -1,9 +1,9 @@ -import UserMenu from '@/components/header/UserMenu'; +import UserMenu from '@/components/UserMenu'; import type { Meta, StoryObj } from '@storybook/react'; const meta = { - title: 'header/UserMenu', + title: 'UserMenu/UserMenu', component: UserMenu, } satisfies Meta; @@ -13,8 +13,10 @@ type Story = StoryObj; export const Example: Story = { args: { profileImageUrl: '', - nickname: 'BattleMan', - email: 'BattleMan@gmail.com', + nickname: 'username', + email: 'user@email.com', + mypageText: 'My Page', + logoutText: 'Logout', accountPath: '', mypagePath: '', handleCloseUserMenu: () => {},