From 3374495ef54e872c860176be4239aa95a802c473 Mon Sep 17 00:00:00 2001 From: greetings1012 Date: Sat, 7 Dec 2024 21:31:33 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=92=84=20Disabled=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/_common/IconButton/IconButton.styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/_common/IconButton/IconButton.styles.ts b/frontend/src/components/_common/IconButton/IconButton.styles.ts index 1a4a2d10..eb7ce7ec 100644 --- a/frontend/src/components/_common/IconButton/IconButton.styles.ts +++ b/frontend/src/components/_common/IconButton/IconButton.styles.ts @@ -126,7 +126,7 @@ export const Layout = styled.button` } &:disabled { - background-color: ${theme.color.black[100]}; + background-color: transparent; cursor: default; From b22d0b9b8e4f1749fed4ff58331ecfe7366de24a Mon Sep 17 00:00:00 2001 From: greetings1012 Date: Sat, 7 Dec 2024 21:32:05 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=92=84=20=ED=83=80=EC=9D=B4=EB=A8=B8?= =?UTF-8?q?=20=EC=B9=B4=EB=93=9C=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/PairRoom/TimerCard/TimerCard.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/components/PairRoom/TimerCard/TimerCard.tsx b/frontend/src/components/PairRoom/TimerCard/TimerCard.tsx index dad41957..296fd9ee 100644 --- a/frontend/src/components/PairRoom/TimerCard/TimerCard.tsx +++ b/frontend/src/components/PairRoom/TimerCard/TimerCard.tsx @@ -59,6 +59,7 @@ const TimerCard = ({ accessCode, defaultTime, defaultTimeleft, onTimerStop }: Ti } + size="lg" color={theme.color.secondary[500]} disabled={isActive} onClick={handleStart} @@ -66,6 +67,7 @@ const TimerCard = ({ accessCode, defaultTime, defaultTimeleft, onTimerStop }: Ti /> } + size="lg" color={theme.color.secondary[500]} disabled={!isActive} onClick={handlePause} From 0ccefc1e00e59409104e7b6a4bfce8582b882775 Mon Sep 17 00:00:00 2001 From: greetings1012 Date: Sat, 7 Dec 2024 21:40:25 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=92=84=20Disabled=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/_common/IconButton/IconButton.styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/_common/IconButton/IconButton.styles.ts b/frontend/src/components/_common/IconButton/IconButton.styles.ts index eb7ce7ec..be051bb1 100644 --- a/frontend/src/components/_common/IconButton/IconButton.styles.ts +++ b/frontend/src/components/_common/IconButton/IconButton.styles.ts @@ -131,7 +131,7 @@ export const Layout = styled.button` cursor: default; svg { - color: ${theme.color.black[200]}; + color: ${theme.color.black[400]}; } } `; From 3b2b477794dec50fe60bc9325c8504a43d4078a2 Mon Sep 17 00:00:00 2001 From: GimGayeon Date: Mon, 9 Dec 2024 15:15:19 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=92=84=20=ED=8E=98=EC=96=B4=EB=A3=B8?= =?UTF-8?q?=20=EC=99=84=EB=A3=8C=ED=95=98=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=8A=A4=ED=86=A0=EB=A6=AC=EB=B6=81=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EB=B0=8F=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompleteRoomButton.stories.tsx | 54 +++++++++++++++++++ .../CompleteRoomButton.styles.ts | 4 +- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.stories.tsx diff --git a/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.stories.tsx b/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.stories.tsx new file mode 100644 index 00000000..d00495f2 --- /dev/null +++ b/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.stories.tsx @@ -0,0 +1,54 @@ +import type { Meta, StoryObj } from '@storybook/react'; + +import CompleteRoomButton from '@/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton'; + +import useUserStore from '@/stores/userStore'; + +const USER_NAME = 'CODUO'; + +const meta = { + title: 'component/PairRoom/PairListCard/CompleteRoomButton', + component: CompleteRoomButton, + decorators: [ + (Story) => { + const { setUser } = useUserStore.getState(); + setUser(USER_NAME, 'SIGNED_IN'); + + return ; + }, + ], + argTypes: { + isOpen: { + control: 'boolean', + }, + }, +} satisfies Meta; + +export default meta; + +type Story = StoryObj; + +export const LoggedIn: Story = { + args: { + isOpen: true, + }, +}; + +export const ClosedLoggedIn: Story = { + args: { + isOpen: false, + }, +}; + +export const LoggedOut: Story = { + decorators: [ + (Story) => { + const { resetUser } = useUserStore.getState(); + resetUser(); + return ; + }, + ], + args: { + isOpen: true, + }, +}; diff --git a/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.styles.ts b/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.styles.ts index 5d0d5d0d..c64e60c5 100644 --- a/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.styles.ts +++ b/frontend/src/components/PairRoom/PairListCard/CompleteRoomButton/CompleteRoomButton.styles.ts @@ -17,8 +17,8 @@ export const Layout = styled.button<{ disabled: boolean }>` margin-top: auto; border-radius: 0 0 2rem 2rem; - background-color: ${({ theme, disabled }) => (disabled ? theme.color.black[100] : theme.color.danger[200])}; - color: ${({ theme, disabled }) => (disabled ? theme.color.black[400] : theme.color.danger[600])}; + background-color: ${({ theme, disabled }) => (disabled ? theme.color.black[100] : theme.color.danger[100])}; + color: ${({ theme, disabled }) => (disabled ? theme.color.black[400] : theme.color.danger[500])}; font-size: ${({ theme }) => theme.fontSize.base}; text-overflow: ellipsis; white-space: nowrap; From f8a8ff1b721de5bb6a659b8f9d4287dde3053fbc Mon Sep 17 00:00:00 2001 From: GimGayeon Date: Mon, 9 Dec 2024 15:15:44 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=92=84=20=ED=8E=98=EC=96=B4=EB=A3=B8?= =?UTF-8?q?=20=EC=9E=85=EC=9E=A5=20=EC=8B=9C=20=EA=B0=80=EC=9D=B4=EB=93=9C?= =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=EC=8A=A4=ED=86=A0=EB=A6=AC=EB=B6=81=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GuideModal/GuideModal.stories.tsx | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 frontend/src/components/PairRoom/GuideModal/GuideModal.stories.tsx diff --git a/frontend/src/components/PairRoom/GuideModal/GuideModal.stories.tsx b/frontend/src/components/PairRoom/GuideModal/GuideModal.stories.tsx new file mode 100644 index 00000000..adb8a4f0 --- /dev/null +++ b/frontend/src/components/PairRoom/GuideModal/GuideModal.stories.tsx @@ -0,0 +1,27 @@ +import type { Meta, StoryObj } from '@storybook/react'; + +import GuideModal from '@/components/PairRoom/GuideModal/GuideModal'; + +const ACCESS_CODE = 'CODUO'; + +const meta = { + title: 'component/PairRoom/GuideModal', + component: GuideModal, + + argTypes: { + isOpen: { + control: 'boolean', + }, + }, +} satisfies Meta; + +export default meta; + +type Story = StoryObj; + +export const Default: Story = { + args: { + isOpen: true, + accessCode: ACCESS_CODE, + }, +}; From 50b0e3fde00f47cb534912d28eaf88f0dd459454 Mon Sep 17 00:00:00 2001 From: GimGayeon Date: Mon, 9 Dec 2024 16:08:11 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=92=84=20=EC=99=84=EB=A3=8C=EB=90=9C?= =?UTF-8?q?=20=ED=8E=98=EC=96=B4=EB=A3=B8=20=EC=83=89=EC=83=81=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/CompletedPairRoom/CompletedPairRoom.styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/CompletedPairRoom/CompletedPairRoom.styles.ts b/frontend/src/pages/CompletedPairRoom/CompletedPairRoom.styles.ts index 6814dc3c..0567fb85 100644 --- a/frontend/src/pages/CompletedPairRoom/CompletedPairRoom.styles.ts +++ b/frontend/src/pages/CompletedPairRoom/CompletedPairRoom.styles.ts @@ -53,7 +53,7 @@ export const PairInfoWrapper = styled.div` padding: 1.2rem 1.5rem; border-radius: 1rem; - background-color: ${({ theme }) => theme.color.black[300]}; + background-color: ${({ theme }) => theme.color.black[200]}; color: ${({ theme }) => theme.color.black[700]}; font-size: ${({ theme }) => theme.fontSize.base}; font-weight: ${({ theme }) => theme.fontWeight.medium}; From ad5fd438059cc314d7994701eb3eb5e92fc1eaf0 Mon Sep 17 00:00:00 2001 From: GimGayeon Date: Mon, 9 Dec 2024 16:08:35 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=92=84=20Textarea=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=8A=A4=ED=86=A0=EB=A6=AC?= =?UTF-8?q?=EB=B6=81=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Retrospect/Textarea/Textarea.stories.tsx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 frontend/src/components/Retrospect/Textarea/Textarea.stories.tsx diff --git a/frontend/src/components/Retrospect/Textarea/Textarea.stories.tsx b/frontend/src/components/Retrospect/Textarea/Textarea.stories.tsx new file mode 100644 index 00000000..64c41d43 --- /dev/null +++ b/frontend/src/components/Retrospect/Textarea/Textarea.stories.tsx @@ -0,0 +1,14 @@ +import type { Meta, StoryObj } from '@storybook/react'; + +import Textarea from '@/components/Retrospect/Textarea/Textarea'; + +const meta = { + title: 'component/Retrospect/Textarea', + component: Textarea, +} satisfies Meta; + +export default meta; + +type Story = StoryObj; + +export const Default: Story = {};