From ec2a01b7df4948dff89114bc8d546e7eb09338cd Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Mon, 26 Aug 2024 21:55:41 +0900 Subject: [PATCH 001/403] =?UTF-8?q?feat:=20=ED=98=84=EC=9E=AC=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=EA=B3=BC=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=EC=9D=84=20=EB=B9=84=EA=B5=90=ED=95=98=EB=8A=94=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MoimCreationPage/MoimCreationPage.util.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/MoimCreationPage/MoimCreationPage.util.ts b/frontend/src/pages/MoimCreationPage/MoimCreationPage.util.ts index b91d25e9f..c6335041d 100644 --- a/frontend/src/pages/MoimCreationPage/MoimCreationPage.util.ts +++ b/frontend/src/pages/MoimCreationPage/MoimCreationPage.util.ts @@ -19,7 +19,24 @@ export const validateTime = (time: string) => { if (time === '') { return true; } - return POLICIES.hhmmRegex.test(time); + if (!POLICIES.hhmmRegex.test(time)) { + return false; + } + + const now = new Date(); + const [inputHour, inputMinute] = time.split(':').map(Number); + const inputTime = new Date( + now.getFullYear(), + now.getMonth(), + now.getDate(), + inputHour, + inputMinute, + ); + + if (inputTime < now) { + return false; + } + return true; }; export const validatePlace = (place: string) => { From fb4945ff146f0a4186a37ed95c9aaad1714bda1c Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Mon, 26 Aug 2024 21:56:10 +0900 Subject: [PATCH 002/403] =?UTF-8?q?test:=20=ED=98=84=EC=9E=AC=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EB=B9=84=EA=B5=90=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=EC=97=90=20=EB=94=B0=EB=A5=B8=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MoimCreationPage.util.test.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/MoimCreationPage/MoimCreationPage.util.test.tsx b/frontend/src/pages/MoimCreationPage/MoimCreationPage.util.test.tsx index 143008333..2aef62806 100644 --- a/frontend/src/pages/MoimCreationPage/MoimCreationPage.util.test.tsx +++ b/frontend/src/pages/MoimCreationPage/MoimCreationPage.util.test.tsx @@ -23,7 +23,7 @@ describe('Validation Tests', () => { describe('validateDate', () => { beforeAll(() => { jest.useFakeTimers(); - jest.setSystemTime(new Date('2024-07-23T00:00:00Z')); + jest.setSystemTime(new Date('2024-07-23T10:00:00Z')); }); afterAll(() => { @@ -44,9 +44,17 @@ describe('Validation Tests', () => { }); describe('validateTime', () => { + beforeAll(() => { + jest.useFakeTimers(); + jest.setSystemTime(new Date('2024-07-23T10:00:00')); + }); + + afterAll(() => { + jest.useRealTimers(); + }); it('00:00 형식이어야 true를 반환한다.', () => { - expect(validateTime('12:34')).toBe(true); - expect(validateTime('00:00')).toBe(true); + expect(validateTime('09:59')).toBe(false); // 현재 시간보다 이전 + expect(validateTime('10:01')).toBe(true); // 현재 시간보다 이후 expect(validateTime('23:59')).toBe(true); }); From 4450f27ea2db989754dcdee4ac570ba66595b9dc Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Mon, 26 Aug 2024 22:07:14 +0900 Subject: [PATCH 003/403] =?UTF-8?q?feat:=20=EC=97=90=EB=9F=AC=20=EC=83=81?= =?UTF-8?q?=ED=99=A9=EC=9D=BC=EB=95=8C=20alert=EC=B0=BD=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/queryClient.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/queryClient.ts b/frontend/src/queryClient.ts index 4483e86f8..d2bcbef8b 100644 --- a/frontend/src/queryClient.ts +++ b/frontend/src/queryClient.ts @@ -34,6 +34,7 @@ const handleApiError = (error: Error) => { Sentry.captureException(error); console.log(error); if (error instanceof ApiError) { + console.log(1); if (error.status === 401) { removeToken(); window.location.href = ROUTES.home; @@ -49,10 +50,13 @@ const handleApiError = (error: Error) => { if (error.message === '모임이 존재하지 않습니다.') { window.location.href = GET_ROUTES.nowDarakbang.main(); return; + } else { + alert(error.message); } } else { alert(error instanceof Error ? error.message : 'An error occurred'); } + console.log(3); }; export default createQueryClient; From 9d4ef38a811d699ef0a3e473e530b15c69ae9cc1 Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Mon, 26 Aug 2024 23:35:53 +0900 Subject: [PATCH 004/403] =?UTF-8?q?feat:=20NotificationCard=20Skeleton=20U?= =?UTF-8?q?I=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationCardSkeleton.style.ts | 19 +++++++++++++++++++ .../NotificationCardSkeleton.tsx | 13 +++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.style.ts create mode 100644 frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.tsx diff --git a/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.style.ts b/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.style.ts new file mode 100644 index 000000000..59eb63a4f --- /dev/null +++ b/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.style.ts @@ -0,0 +1,19 @@ +import { css } from '@emotion/react'; + +export const cardBox = css` + display: flex; + gap: 1rem; + + width: 100%; + padding: 2rem 2.4rem; + + background: white; + border-radius: 2.5rem; + box-shadow: rgb(0 0 0 / 24%) 0 3px 8px; +`; + +export const TextInfoBox = css` + display: flex; + flex-direction: column; + gap: 0.5rem; +`; diff --git a/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.tsx b/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.tsx new file mode 100644 index 000000000..68e4b524a --- /dev/null +++ b/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.tsx @@ -0,0 +1,13 @@ +import SkeletonPiece from '@_components/Skeleton/SkeletonPiece'; +import * as S from './NotificationCardSkeleton.style'; +export default function NotificationCardSkeleton() { + return ( +
+ +
+ + +
+
+ ); +} From ff3ed2138996f6875863179db92f334bbd9d0f26 Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Mon, 26 Aug 2024 23:37:33 +0900 Subject: [PATCH 005/403] =?UTF-8?q?test:=20NotificationCard=20Skeleton=20U?= =?UTF-8?q?I=20=EC=8A=A4=ED=86=A0=EB=A6=AC=EB=B6=81=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationCardSkeleton.stories.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.stories.tsx diff --git a/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.stories.tsx b/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.stories.tsx new file mode 100644 index 000000000..250972618 --- /dev/null +++ b/frontend/src/components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton.stories.tsx @@ -0,0 +1,15 @@ +import type { Meta, StoryObj } from '@storybook/react'; +import NotificationCardSkeleton from './NotificationCardSkeleton'; + +const meta = { + component: NotificationCardSkeleton, + title: 'Components/NotificationCardSkeleton', +} satisfies Meta; + +export default meta; + +type Story = StoryObj; + +export const Default: Story = { + render: (args) => , +}; From cdd15ea70c40e2d7d506172e9e504f72173a6e45 Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Mon, 26 Aug 2024 23:38:07 +0900 Subject: [PATCH 006/403] =?UTF-8?q?feat:=20NotificationList=20Skeleton=20U?= =?UTF-8?q?I=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationListSkeleton.tsx | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 frontend/src/components/NotificationList/NotificationListSkeleton/NotificationListSkeleton.tsx diff --git a/frontend/src/components/NotificationList/NotificationListSkeleton/NotificationListSkeleton.tsx b/frontend/src/components/NotificationList/NotificationListSkeleton/NotificationListSkeleton.tsx new file mode 100644 index 000000000..59037e2e7 --- /dev/null +++ b/frontend/src/components/NotificationList/NotificationListSkeleton/NotificationListSkeleton.tsx @@ -0,0 +1,13 @@ +import NotificationCardSkeleton from '@_components/NotificationCard/NotificationCardSkeleton/NotificationCardSkeleton'; +import * as S from '@_components/NotificationList/NotificationList.style'; + +export default function NotificationListSkeleton() { + return ( +
+ + + + +
+ ); +} From 09440721b4a4f1d6cc0ea694c727f75383bb27ef Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Mon, 26 Aug 2024 23:39:35 +0900 Subject: [PATCH 007/403] =?UTF-8?q?test:=20NotificationListSkeleton=20?= =?UTF-8?q?=EC=8A=A4=ED=86=A0=EB=A6=AC=EB=B6=81=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationListSkeleton.stories.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 frontend/src/components/NotificationList/NotificationListSkeleton/NotificationListSkeleton.stories.tsx diff --git a/frontend/src/components/NotificationList/NotificationListSkeleton/NotificationListSkeleton.stories.tsx b/frontend/src/components/NotificationList/NotificationListSkeleton/NotificationListSkeleton.stories.tsx new file mode 100644 index 000000000..8a3db555a --- /dev/null +++ b/frontend/src/components/NotificationList/NotificationListSkeleton/NotificationListSkeleton.stories.tsx @@ -0,0 +1,15 @@ +import type { Meta, StoryObj } from '@storybook/react'; +import NotificationListSkeleton from './NotificationListSkeleton'; + +const meta = { + component: NotificationListSkeleton, + title: 'Components/NotificationListSkeleton', +} satisfies Meta; + +export default meta; + +type Story = StoryObj; + +export const Default: Story = { + render: () => , +}; From 0eeccb4e22a63931b4024de4c7750a446fdc3f4b Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Mon, 26 Aug 2024 23:40:11 +0900 Subject: [PATCH 008/403] =?UTF-8?q?feat:=20=EC=95=8C=EB=A6=BC=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EC=8B=9C,=20=ED=91=9C=EC=8B=9C=20=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationList/NotificationList.tsx | 18 +++++++++++------- .../NotificationPage/NotificationPage.tsx | 11 ++--------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/NotificationList/NotificationList.tsx b/frontend/src/components/NotificationList/NotificationList.tsx index 3ed8dc603..4462a2c0b 100644 --- a/frontend/src/components/NotificationList/NotificationList.tsx +++ b/frontend/src/components/NotificationList/NotificationList.tsx @@ -1,21 +1,23 @@ import NotificationCard from '@_components/NotificationCard/NotificationCard'; -import { Notification } from '@_types/index'; import * as S from '@_components/NotificationList/NotificationList.style'; import { useNavigate } from 'react-router-dom'; +import useNotification from '@_hooks/queries/useNotification'; +import NotificationListSkeleton from './NotificationListSkeleton/NotificationListSkeleton'; +import MissingFallback from '@_components/MissingFallback/MissingFallback'; -interface NotificationListProps { - notifications: Notification[]; -} -export default function NotificationList(props: NotificationListProps) { - const { notifications } = props; +export default function NotificationList() { const navigate = useNavigate(); + const { notifications, isLoading } = useNotification(); const handleClickNotificationCard = (url: string) => { const parsedUrl = new URL(url); const relativePath = parsedUrl.pathname + parsedUrl.search + parsedUrl.hash; navigate(relativePath); }; - return ( + if (isLoading) { + return ; + } + return notifications && notifications.length > 0 ? (
{notifications.map((notification, index) => { return ( @@ -29,5 +31,7 @@ export default function NotificationList(props: NotificationListProps) { ); })}
+ ) : ( + ); } diff --git a/frontend/src/pages/NotificationPage/NotificationPage.tsx b/frontend/src/pages/NotificationPage/NotificationPage.tsx index 297be1fe0..ec836f042 100644 --- a/frontend/src/pages/NotificationPage/NotificationPage.tsx +++ b/frontend/src/pages/NotificationPage/NotificationPage.tsx @@ -3,7 +3,6 @@ import GET_ROUTES from '@_common/getRoutes'; import InformationLayout from '@_layouts/InformationLayout/InformationLayout'; import NotificationList from '@_components/NotificationList/NotificationList'; import { useNavigate } from 'react-router-dom'; -import useNotification from '@_hooks/queries/useNotification'; import { Fragment, useEffect, useState } from 'react'; import Modal from '@_components/Modal/Modal'; import Button from '@_components/Button/Button'; @@ -13,7 +12,6 @@ import * as S from './NotificationPage.style'; export default function NotificationPage() { const navigate = useNavigate(); const theme = useTheme(); - const { notifications, isLoading } = useNotification(); const [isModalOpen, setIsModalOpen] = useState(false); useEffect(() => { if (window.Notification && window.Notification.permission === 'denied') { @@ -24,12 +22,7 @@ export default function NotificationPage() { const handleModalClose = () => { setIsModalOpen(false); }; - if (isLoading) { - return
Loading...
; - } - if (!notifications) { - return
Failed to load my information.
; - } + return ( @@ -44,7 +37,7 @@ export default function NotificationPage() { - + {isModalOpen && ( From 56b8de0db9a5f10db0d119157d7fa1bd4a7fbd5c Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Sat, 31 Aug 2024 21:26:05 +0900 Subject: [PATCH 009/403] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20console.log=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/queryClient.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/src/queryClient.ts b/frontend/src/queryClient.ts index d2bcbef8b..a23d171f7 100644 --- a/frontend/src/queryClient.ts +++ b/frontend/src/queryClient.ts @@ -32,9 +32,7 @@ const createQueryClient = () => { const handleApiError = (error: Error) => { Sentry.captureException(error); - console.log(error); if (error instanceof ApiError) { - console.log(1); if (error.status === 401) { removeToken(); window.location.href = ROUTES.home; @@ -56,7 +54,6 @@ const handleApiError = (error: Error) => { } else { alert(error instanceof Error ? error.message : 'An error occurred'); } - console.log(3); }; export default createQueryClient; From a00876b30857d521ca99e88fe73d50288347e615 Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Sun, 1 Sep 2024 00:07:49 +0900 Subject: [PATCH 010/403] =?UTF-8?q?feat:=20=EC=83=88=EB=A1=9C=EA=B3=A0?= =?UTF-8?q?=EC=B9=A8=20=EB=B2=84=ED=8A=BC=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/common/assets/refresh.svg | 4 ++++ .../RefreshButton/RefreshButton.style.ts | 7 +++++++ .../RefreshButton/RefreshButton.tsx | 20 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 frontend/src/common/assets/refresh.svg create mode 100644 frontend/src/components/RefreshButton/RefreshButton.style.ts create mode 100644 frontend/src/components/RefreshButton/RefreshButton.tsx diff --git a/frontend/src/common/assets/refresh.svg b/frontend/src/common/assets/refresh.svg new file mode 100644 index 000000000..6a9f30923 --- /dev/null +++ b/frontend/src/common/assets/refresh.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/src/components/RefreshButton/RefreshButton.style.ts b/frontend/src/components/RefreshButton/RefreshButton.style.ts new file mode 100644 index 000000000..3815bcf7f --- /dev/null +++ b/frontend/src/components/RefreshButton/RefreshButton.style.ts @@ -0,0 +1,7 @@ +import { css } from '@emotion/react'; + +export const noneBaackgroundButton = css` + background: none; + border: none; + cursor: pointer; +`; diff --git a/frontend/src/components/RefreshButton/RefreshButton.tsx b/frontend/src/components/RefreshButton/RefreshButton.tsx new file mode 100644 index 000000000..d87fc929a --- /dev/null +++ b/frontend/src/components/RefreshButton/RefreshButton.tsx @@ -0,0 +1,20 @@ +import { useQueryClient } from '@tanstack/react-query'; +import QUERY_KEYS from '@_constants/queryKeys'; +import { getLastDarakbangId } from '@_common/lastDarakbangManager'; +import Refresh from '@_common/assets/refresh.svg'; +import { noneBaackgroundButton } from './RefreshButton.style'; +export default function RefreshButton() { + const queryClient = useQueryClient(); + return ( + + ); +} From 3536bbcb8691ab9a02288bc66dd32c72d13f3d58 Mon Sep 17 00:00:00 2001 From: jaeml06 Date: Sun, 1 Sep 2024 00:08:59 +0900 Subject: [PATCH 011/403] =?UTF-8?q?feat:=20=EA=B0=81=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=ED=97=A4=EB=8D=94=EC=97=90=20=EC=83=88=EB=A1=9C?= =?UTF-8?q?=EA=B3=A0=EC=B9=A8=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/MainPage/MainPage.tsx | 2 ++ frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx | 12 +++++++----- .../src/pages/NotificationPage/NotificationPage.tsx | 4 ++++ frontend/src/pages/PleasePage/PleasePage.tsx | 12 +++++++++--- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/frontend/src/pages/MainPage/MainPage.tsx b/frontend/src/pages/MainPage/MainPage.tsx index 140b522b0..a97fe3afc 100644 --- a/frontend/src/pages/MainPage/MainPage.tsx +++ b/frontend/src/pages/MainPage/MainPage.tsx @@ -31,6 +31,7 @@ import useServeToken from '@_hooks/mutaions/useServeToken'; import Modal from '@_components/Modal/Modal'; import { useTheme } from '@emotion/react'; import Button from '@_components/Button/Button'; +import RefreshButton from '@_components/RefreshButton/RefreshButton'; export default function MainPage() { const navigate = useNavigate(); @@ -164,6 +165,7 @@ export default function MainPage() { + {isDarakbangMenuOpened && darakbangMenu} diff --git a/frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx b/frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx index 28f0ce9b7..dbe0cc976 100644 --- a/frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx +++ b/frontend/src/pages/MoimDetailPage/MoimDetailPage.tsx @@ -29,6 +29,7 @@ import useOpenChat from '@_hooks/mutaions/useOpenChat'; import useReopenMoim from '@_hooks/mutaions/useReopenMoim'; import { useTheme } from '@emotion/react'; import useZzimMine from '@_hooks/queries/useZzimMine'; +import RefreshButton from '@_components/RefreshButton/RefreshButton'; export default function MoimDetailPage() { const navigate = useNavigate(); @@ -112,7 +113,7 @@ export default function MoimDetailPage() { const button = useMemo(() => { return isChamyoMineLoading ? ( - <> + '' ) : role === 'MOIMER' ? ( moim?.status === 'MOIMING' ? ( - - ); -} diff --git a/frontend/src/components/MenuItemList/MenuItemList.stories.tsx b/frontend/src/components/MenuItemList/MenuItemList.stories.tsx deleted file mode 100644 index 25db4c04b..000000000 --- a/frontend/src/components/MenuItemList/MenuItemList.stories.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import type { Meta, StoryObj } from '@storybook/react'; - -import MenuItemList from './MenuItemList'; - -const meta: Meta = { - component: MenuItemList, -}; - -export default meta; -type Story = StoryObj; - -export const Default: Story = { - args: { - menus: [ - { - description: '멤버목록', - onClick: () => { - alert('멤버목록'); - }, - }, - { description: '수정하기', onClick: () => {} }, - ], - }, -}; diff --git a/frontend/src/components/MenuItemList/MenuItemList.tsx b/frontend/src/components/MenuItemList/MenuItemList.tsx deleted file mode 100644 index 1acf3a219..000000000 --- a/frontend/src/components/MenuItemList/MenuItemList.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import MenuItem from '@_components/MenuItem/MenuItem'; - -interface Menu { - description: string; - onClick: () => void; -} - -interface MenuItemListProps { - menus: Menu[]; -} - -export default function MenuItemList(props: MenuItemListProps) { - const { menus } = props; - return ( -
- {menus.map((menu, index) => ( - - ))} -
- ); -} diff --git a/frontend/src/layouts/ChattingRoomLayout/ChattingRoomLayout.stories.tsx b/frontend/src/layouts/ChattingRoomLayout/ChattingRoomLayout.stories.tsx index ed320af64..49d1cf357 100644 --- a/frontend/src/layouts/ChattingRoomLayout/ChattingRoomLayout.stories.tsx +++ b/frontend/src/layouts/ChattingRoomLayout/ChattingRoomLayout.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryObj } from '@storybook/react'; import { Chat } from '@_types/index'; -import ChatList from '@_components/ChatList/ChatList'; -import ChattingFooter from '@_components/ChattingFooter/ChattingFooter'; +import ChatList from '@_pages/Chatting/ChatPage/Components/ChatList/ChatList'; +import ChattingFooter from '@_pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter'; import ChattingRoomLayout from './ChattingRoomLayout'; const meta: Meta = { diff --git a/frontend/src/pages/Chatting/ChatPage/ChatPage.tsx b/frontend/src/pages/Chatting/ChatPage/ChatPage.tsx index 4a3808a1b..ab275068c 100644 --- a/frontend/src/pages/Chatting/ChatPage/ChatPage.tsx +++ b/frontend/src/pages/Chatting/ChatPage/ChatPage.tsx @@ -1,4 +1,5 @@ -import ChattingPreview from '@_components/ChattingPreview/ChattingPreview'; +import ChatCardListSkeleton from './ChatListSkeleton/ChatCardListSkeleton'; +import ChattingPreview from '../ChattingRoomPage/ChattingPreview/ChattingPreview'; import ChattingPreviewLayout from '@_layouts/ChattingPreviewLayout/ChattingPreviewLayout'; import DarakbangNameWrapper from '@_components/DarakbangNameWrapper/DarakbangNameWrapper'; import GET_ROUTES from '@_common/getRoutes'; @@ -10,7 +11,6 @@ import useChatPreviews from '@_hooks/queries/useChatPreiview'; import { useNavigate } from 'react-router-dom'; import useNowDarakbangName from '@_hooks/queries/useNowDarakbangNameById'; import { useTheme } from '@emotion/react'; -import ChatCardListSkeleton from './ChatListSkeleton/ChatCardListSkeleton'; export default function ChatPage() { const theme = useTheme(); diff --git a/frontend/src/components/Chat/Chat.stories.tsx b/frontend/src/pages/Chatting/ChatPage/Components/Chat/Chat.stories.tsx similarity index 100% rename from frontend/src/components/Chat/Chat.stories.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/Chat/Chat.stories.tsx diff --git a/frontend/src/components/Chat/Chat.tsx b/frontend/src/pages/Chatting/ChatPage/Components/Chat/Chat.tsx similarity index 100% rename from frontend/src/components/Chat/Chat.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/Chat/Chat.tsx diff --git a/frontend/src/components/Chat/Chatstyle.ts b/frontend/src/pages/Chatting/ChatPage/Components/Chat/Chatstyle.ts similarity index 100% rename from frontend/src/components/Chat/Chatstyle.ts rename to frontend/src/pages/Chatting/ChatPage/Components/Chat/Chatstyle.ts diff --git a/frontend/src/components/ChatBottomMenu/ChatBottomMenu.stories.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.stories.tsx similarity index 94% rename from frontend/src/components/ChatBottomMenu/ChatBottomMenu.stories.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.stories.tsx index 79f3e851b..20e23157c 100644 --- a/frontend/src/components/ChatBottomMenu/ChatBottomMenu.stories.tsx +++ b/frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import ChatBottomMenu from './ChatBottomMenu'; -import ChatMenuItem from '@_components/ChatMenuItem/ChatMenuItem'; +import ChatMenuItem from '@_pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem'; import { Fragment } from 'react'; import Plus from '@_common/assets/plus.svg'; import { css } from '@emotion/react'; diff --git a/frontend/src/components/ChatBottomMenu/ChatBottomMenu.style.ts b/frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.style.ts similarity index 100% rename from frontend/src/components/ChatBottomMenu/ChatBottomMenu.style.ts rename to frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.style.ts diff --git a/frontend/src/components/ChatBottomMenu/ChatBottomMenu.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.tsx similarity index 100% rename from frontend/src/components/ChatBottomMenu/ChatBottomMenu.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.tsx diff --git a/frontend/src/components/ChatBubble/ChatBubble.stories.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatBubble.stories.tsx similarity index 100% rename from frontend/src/components/ChatBubble/ChatBubble.stories.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatBubble.stories.tsx diff --git a/frontend/src/components/ChatBubble/ChatBubble.style.ts b/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatBubble.style.ts similarity index 100% rename from frontend/src/components/ChatBubble/ChatBubble.style.ts rename to frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatBubble.style.ts diff --git a/frontend/src/components/ChatBubble/ChatBubble.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatBubble.tsx similarity index 100% rename from frontend/src/components/ChatBubble/ChatBubble.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatBubble.tsx diff --git a/frontend/src/components/ChatBubble/ChatChildren/ChatChildren.style.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.style.tsx similarity index 100% rename from frontend/src/components/ChatBubble/ChatChildren/ChatChildren.style.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.style.tsx diff --git a/frontend/src/components/ChatBubble/ChatChildren/ChatChildren.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.tsx similarity index 94% rename from frontend/src/components/ChatBubble/ChatChildren/ChatChildren.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.tsx index 288f3bd4b..5ae93c4a6 100644 --- a/frontend/src/components/ChatBubble/ChatChildren/ChatChildren.tsx +++ b/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.tsx @@ -6,7 +6,7 @@ import { } from '@_utils/formatters'; import { Chat } from '@_types/index'; -import ChatBubble from '@_components/ChatBubble/ChatBubble'; +import ChatBubble from '@_pages/Chatting/ChatPage/Components/ChatBubble/ChatBubble'; import { useTheme } from '@emotion/react'; interface ChatChildrenProps { diff --git a/frontend/src/components/ChatList/ChatList.stories.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.stories.tsx similarity index 100% rename from frontend/src/components/ChatList/ChatList.stories.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.stories.tsx diff --git a/frontend/src/components/ChatList/ChatList.style.ts b/frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.style.ts similarity index 100% rename from frontend/src/components/ChatList/ChatList.style.ts rename to frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.style.ts diff --git a/frontend/src/components/ChatList/ChatList.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.tsx similarity index 80% rename from frontend/src/components/ChatList/ChatList.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.tsx index 39356210a..aefa45b78 100644 --- a/frontend/src/components/ChatList/ChatList.tsx +++ b/frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.tsx @@ -1,7 +1,7 @@ import { useEffect, useRef } from 'react'; -import Chat from '@_components/Chat/Chat'; -import { ChatChildren } from '@_components/ChatBubble/ChatChildren/ChatChildren'; +import Chat from '@_pages/Chatting/ChatPage/Components/Chat/Chat'; +import { ChatChildren } from '@_pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren'; import { Chat as ChatType } from '@_types/index'; import { list } from './ChatList.style'; import { useTheme } from '@emotion/react'; diff --git a/frontend/src/components/ChatMenuItem/ChatMenuItem.stories.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem.stories.tsx similarity index 100% rename from frontend/src/components/ChatMenuItem/ChatMenuItem.stories.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem.stories.tsx diff --git a/frontend/src/components/ChatMenuItem/ChatMenuItem.style.ts b/frontend/src/pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem.style.ts similarity index 100% rename from frontend/src/components/ChatMenuItem/ChatMenuItem.style.ts rename to frontend/src/pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem.style.ts diff --git a/frontend/src/components/ChatMenuItem/ChatMenuItem.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem.tsx similarity index 100% rename from frontend/src/components/ChatMenuItem/ChatMenuItem.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem.tsx diff --git a/frontend/src/components/ChattingFooter/ChattingFooter.stories.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.stories.tsx similarity index 100% rename from frontend/src/components/ChattingFooter/ChattingFooter.stories.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.stories.tsx diff --git a/frontend/src/components/ChattingFooter/ChattingFooter.style.ts b/frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.style.ts similarity index 100% rename from frontend/src/components/ChattingFooter/ChattingFooter.style.ts rename to frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.style.ts diff --git a/frontend/src/components/ChattingFooter/ChattingFooter.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.tsx similarity index 100% rename from frontend/src/components/ChattingFooter/ChattingFooter.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.tsx diff --git a/frontend/src/components/DateTimeModalContent/DateTimeModalContent.stories.tsx b/frontend/src/pages/Chatting/ChatPage/Components/DateTimeModalContent/DateTimeModalContent.stories.tsx similarity index 100% rename from frontend/src/components/DateTimeModalContent/DateTimeModalContent.stories.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/DateTimeModalContent/DateTimeModalContent.stories.tsx diff --git a/frontend/src/components/DateTimeModalContent/DateTimeModalContent.style.ts b/frontend/src/pages/Chatting/ChatPage/Components/DateTimeModalContent/DateTimeModalContent.style.ts similarity index 100% rename from frontend/src/components/DateTimeModalContent/DateTimeModalContent.style.ts rename to frontend/src/pages/Chatting/ChatPage/Components/DateTimeModalContent/DateTimeModalContent.style.ts diff --git a/frontend/src/components/DateTimeModalContent/DateTimeModalContent.tsx b/frontend/src/pages/Chatting/ChatPage/Components/DateTimeModalContent/DateTimeModalContent.tsx similarity index 100% rename from frontend/src/components/DateTimeModalContent/DateTimeModalContent.tsx rename to frontend/src/pages/Chatting/ChatPage/Components/DateTimeModalContent/DateTimeModalContent.tsx diff --git a/frontend/src/components/ChattingPreview/ChattingPreview.stories.tsx b/frontend/src/pages/Chatting/ChattingRoomPage/ChattingPreview/ChattingPreview.stories.tsx similarity index 100% rename from frontend/src/components/ChattingPreview/ChattingPreview.stories.tsx rename to frontend/src/pages/Chatting/ChattingRoomPage/ChattingPreview/ChattingPreview.stories.tsx diff --git a/frontend/src/components/ChattingPreview/ChattingPreview.style.ts b/frontend/src/pages/Chatting/ChattingRoomPage/ChattingPreview/ChattingPreview.style.ts similarity index 100% rename from frontend/src/components/ChattingPreview/ChattingPreview.style.ts rename to frontend/src/pages/Chatting/ChattingRoomPage/ChattingPreview/ChattingPreview.style.ts diff --git a/frontend/src/components/ChattingPreview/ChattingPreview.tsx b/frontend/src/pages/Chatting/ChattingRoomPage/ChattingPreview/ChattingPreview.tsx similarity index 100% rename from frontend/src/components/ChattingPreview/ChattingPreview.tsx rename to frontend/src/pages/Chatting/ChattingRoomPage/ChattingPreview/ChattingPreview.tsx diff --git a/frontend/src/pages/Chatting/ChattingRoomPage/ChattingRoomPage.tsx b/frontend/src/pages/Chatting/ChattingRoomPage/ChattingRoomPage.tsx index fb29b0caf..158639d0e 100644 --- a/frontend/src/pages/Chatting/ChattingRoomPage/ChattingRoomPage.tsx +++ b/frontend/src/pages/Chatting/ChattingRoomPage/ChattingRoomPage.tsx @@ -3,12 +3,12 @@ import { useNavigate, useParams } from 'react-router-dom'; import Back from '@_common/assets/back.svg'; import CalenderClock from '@_components/Icons/CalenderClock'; -import ChatBottomMenu from '@_components/ChatBottomMenu/ChatBottomMenu'; -import ChatList from '@_components/ChatList/ChatList'; -import ChatMenuItem from '@_components/ChatMenuItem/ChatMenuItem'; -import ChattingFooter from '@_components/ChattingFooter/ChattingFooter'; +import ChatBottomMenu from '@_pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu'; +import ChatList from '@_pages/Chatting/ChatPage/Components/ChatList/ChatList'; +import ChatMenuItem from '@_pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem'; +import ChattingFooter from '@_pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter'; import ChattingRoomLayout from '@_layouts/ChattingRoomLayout/ChattingRoomLayout'; -import DateTimeModalContent from '@_components/DateTimeModalContent/DateTimeModalContent'; +import DateTimeModalContent from '../ChatPage/Components/DateTimeModalContent/DateTimeModalContent'; import MissingFallback from '@_components/MissingFallback/MissingFallback'; import Modal from '@_components/Modal/Modal'; import Picker from '@_components/Icons/Picker'; diff --git a/frontend/src/components/MenuItem/MenuItem.stories.tsx b/frontend/src/pages/Darakbang/DarakbangManagementPage/components/MenuItem/MenuItem.stories.tsx similarity index 100% rename from frontend/src/components/MenuItem/MenuItem.stories.tsx rename to frontend/src/pages/Darakbang/DarakbangManagementPage/components/MenuItem/MenuItem.stories.tsx diff --git a/frontend/src/components/MenuItem/MenuItem.style.tsx b/frontend/src/pages/Darakbang/DarakbangManagementPage/components/MenuItem/MenuItem.style.tsx similarity index 100% rename from frontend/src/components/MenuItem/MenuItem.style.tsx rename to frontend/src/pages/Darakbang/DarakbangManagementPage/components/MenuItem/MenuItem.style.tsx diff --git a/frontend/src/components/MenuItem/MenuItem.tsx b/frontend/src/pages/Darakbang/DarakbangManagementPage/components/MenuItem/MenuItem.tsx similarity index 100% rename from frontend/src/components/MenuItem/MenuItem.tsx rename to frontend/src/pages/Darakbang/DarakbangManagementPage/components/MenuItem/MenuItem.tsx diff --git a/frontend/src/components/MemberCard/MemberCard.stories.tsx b/frontend/src/pages/Darakbang/DarakbangMembersPage/components/MemberCard/MemberCard.stories.tsx similarity index 100% rename from frontend/src/components/MemberCard/MemberCard.stories.tsx rename to frontend/src/pages/Darakbang/DarakbangMembersPage/components/MemberCard/MemberCard.stories.tsx diff --git a/frontend/src/components/MemberCard/MemberCard.style.ts b/frontend/src/pages/Darakbang/DarakbangMembersPage/components/MemberCard/MemberCard.style.ts similarity index 100% rename from frontend/src/components/MemberCard/MemberCard.style.ts rename to frontend/src/pages/Darakbang/DarakbangMembersPage/components/MemberCard/MemberCard.style.ts diff --git a/frontend/src/components/MemberCard/MemberCard.tsx b/frontend/src/pages/Darakbang/DarakbangMembersPage/components/MemberCard/MemberCard.tsx similarity index 100% rename from frontend/src/components/MemberCard/MemberCard.tsx rename to frontend/src/pages/Darakbang/DarakbangMembersPage/components/MemberCard/MemberCard.tsx diff --git a/frontend/src/pages/Moim/MainPage/MainPage.tsx b/frontend/src/pages/Moim/MainPage/MainPage.tsx index a97fe3afc..94e30f3db 100644 --- a/frontend/src/pages/Moim/MainPage/MainPage.tsx +++ b/frontend/src/pages/Moim/MainPage/MainPage.tsx @@ -10,15 +10,18 @@ import { setLastDarakbangId, } from '@_common/lastDarakbangManager'; +import Button from '@_components/Button/Button'; import DarakbangNameWrapper from '@_components/DarakbangNameWrapper/DarakbangNameWrapper'; import GET_ROUTES from '@_common/getRoutes'; import HomeLayout from '@_layouts/HomeLayout.tsx/HomeLayout'; -import HomeMainContent from '@_components/HomeMainContent/HomeMainContent'; +import HomeMainContent from './components/HomeMainContent/HomeMainContent'; +import Modal from '@_components/Modal/Modal'; import NavigationBar from '@_components/NavigationBar/NavigationBar'; import NavigationBarWrapper from '@_layouts/components/NavigationBarWrapper/NavigationBarWrapper'; import Notification from '@_common/assets/notification.svg'; import PlusButton from '@_components/PlusButton/PlusButton'; import ROUTES from '@_constants/routes'; +import RefreshButton from '@_components/RefreshButton/RefreshButton'; import SolidArrow from '@_components/Icons/SolidArrow'; import { common } from '@_common/common.style'; import { removeToken } from '@_utils/tokenManager'; @@ -28,10 +31,7 @@ import useMyRoleInDarakbang from '@_hooks/queries/useMyDarakbangRole'; import { useNavigate } from 'react-router-dom'; import useNowDarakbangName from '@_hooks/queries/useNowDarakbangNameById'; import useServeToken from '@_hooks/mutaions/useServeToken'; -import Modal from '@_components/Modal/Modal'; import { useTheme } from '@emotion/react'; -import Button from '@_components/Button/Button'; -import RefreshButton from '@_components/RefreshButton/RefreshButton'; export default function MainPage() { const navigate = useNavigate(); diff --git a/frontend/src/components/HomeMainContent/HomeMainContent.tsx b/frontend/src/pages/Moim/MainPage/components/HomeMainContent/HomeMainContent.tsx similarity index 100% rename from frontend/src/components/HomeMainContent/HomeMainContent.tsx rename to frontend/src/pages/Moim/MainPage/components/HomeMainContent/HomeMainContent.tsx diff --git a/frontend/src/pages/Moim/MoimCreationPage/MoimCreationPage.tsx b/frontend/src/pages/Moim/MoimCreationPage/MoimCreationPage.tsx index 68c036d15..a0b92ad6a 100644 --- a/frontend/src/pages/Moim/MoimCreationPage/MoimCreationPage.tsx +++ b/frontend/src/pages/Moim/MoimCreationPage/MoimCreationPage.tsx @@ -1,13 +1,13 @@ -import BackArrowButton from '@_components/BackArrowButton/BackArrowButton'; -import FunnelStepIndicator from '@_components/Funnel/FunnelStepIndicator/FunnelStepIndicator'; -import FunnelLayout from '@_layouts/FunnelLayout/FunnelLayout'; -import TitleStep from './Steps/TitleStep'; -import PlaceStep from './Steps/PlaceStep'; +import BackArrowButton from '@_components/Icons/BackArrowButton/BackArrowButton'; import DateAndTimeStep from './Steps/DateAndTimeStep'; -import MaxPeopleStep from './Steps/MaxPeopleStep'; import DescriptionStep from './Steps/DescriptionStep'; -import useMoimCreationForm from './MoimCreationPage.hook'; +import FunnelLayout from '@_layouts/FunnelLayout/FunnelLayout'; +import FunnelStepIndicator from '@_components/Funnel/FunnelStepIndicator/FunnelStepIndicator'; +import MaxPeopleStep from './Steps/MaxPeopleStep'; +import PlaceStep from './Steps/PlaceStep'; +import TitleStep from './Steps/TitleStep'; import useFunnel from '@_hooks/useFunnel'; +import useMoimCreationForm from './MoimCreationPage.hook'; export type MoimCreationStep = | '이름입력' From d322326b4c4b8c29122a8c1191c5a697bb8f23f4 Mon Sep 17 00:00:00 2001 From: cys4585 Date: Thu, 12 Sep 2024 21:56:46 +0900 Subject: [PATCH 030/403] =?UTF-8?q?fix:=20import=20=EB=8C=80=EC=86=8C?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChattingRoomLayout.stories.tsx | 4 ++-- .../ChatBottomMenu/ChatBottomMenu.stories.tsx | 2 +- .../ChatBubble/ChatChildren/ChatChildren.tsx | 2 +- .../ChatPage/Components/ChatList/ChatList.tsx | 4 ++-- .../ChattingFooter/ChattingFooter.tsx | 18 ++++++------------ .../ChattingRoomPage/ChattingRoomPage.tsx | 12 ++++++------ .../DarakbangManagementPage.tsx | 2 +- .../DarakbangMembersPage.tsx | 2 +- 8 files changed, 20 insertions(+), 26 deletions(-) diff --git a/frontend/src/layouts/ChattingRoomLayout/ChattingRoomLayout.stories.tsx b/frontend/src/layouts/ChattingRoomLayout/ChattingRoomLayout.stories.tsx index 49d1cf357..8778b9621 100644 --- a/frontend/src/layouts/ChattingRoomLayout/ChattingRoomLayout.stories.tsx +++ b/frontend/src/layouts/ChattingRoomLayout/ChattingRoomLayout.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryObj } from '@storybook/react'; import { Chat } from '@_types/index'; -import ChatList from '@_pages/Chatting/ChatPage/Components/ChatList/ChatList'; -import ChattingFooter from '@_pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter'; +import ChatList from '@_pages/Chatting/ChatPage/components/ChatList/ChatList'; +import ChattingFooter from '@_pages/Chatting/ChatPage/components/ChattingFooter/ChattingFooter'; import ChattingRoomLayout from './ChattingRoomLayout'; const meta: Meta = { diff --git a/frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.stories.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.stories.tsx index 20e23157c..ffd520594 100644 --- a/frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.stories.tsx +++ b/frontend/src/pages/Chatting/ChatPage/Components/ChatBottomMenu/ChatBottomMenu.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import ChatBottomMenu from './ChatBottomMenu'; -import ChatMenuItem from '@_pages/Chatting/ChatPage/Components/ChatMenuItem/ChatMenuItem'; +import ChatMenuItem from '@_pages/Chatting/ChatPage/components/ChatMenuItem/ChatMenuItem'; import { Fragment } from 'react'; import Plus from '@_common/assets/plus.svg'; import { css } from '@emotion/react'; diff --git a/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.tsx index 5ae93c4a6..deffe9534 100644 --- a/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.tsx +++ b/frontend/src/pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren.tsx @@ -6,7 +6,7 @@ import { } from '@_utils/formatters'; import { Chat } from '@_types/index'; -import ChatBubble from '@_pages/Chatting/ChatPage/Components/ChatBubble/ChatBubble'; +import ChatBubble from '@_pages/Chatting/ChatPage/components/ChatBubble/ChatBubble'; import { useTheme } from '@emotion/react'; interface ChatChildrenProps { diff --git a/frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.tsx index aefa45b78..c0c94edff 100644 --- a/frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.tsx +++ b/frontend/src/pages/Chatting/ChatPage/Components/ChatList/ChatList.tsx @@ -1,7 +1,7 @@ import { useEffect, useRef } from 'react'; -import Chat from '@_pages/Chatting/ChatPage/Components/Chat/Chat'; -import { ChatChildren } from '@_pages/Chatting/ChatPage/Components/ChatBubble/ChatChildren/ChatChildren'; +import Chat from '@_pages/Chatting/ChatPage/components/Chat/Chat'; +import { ChatChildren } from '@_pages/Chatting/ChatPage/components/ChatBubble/ChatChildren/ChatChildren'; import { Chat as ChatType } from '@_types/index'; import { list } from './ChatList.style'; import { useTheme } from '@emotion/react'; diff --git a/frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.tsx b/frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.tsx index 0ed7ee2e3..bf8db6645 100644 --- a/frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.tsx +++ b/frontend/src/pages/Chatting/ChatPage/Components/ChattingFooter/ChattingFooter.tsx @@ -1,11 +1,5 @@ import { ChangeEvent, useRef, useState } from 'react'; -import { - footer, - menuButton, - messageForm, - messageTextArea, - sendingButton, -} from './ChattingFooter.style'; +import * as S from './ChattingFooter.style'; import POLICES from '@_constants/poclies'; import Plus from '@_common/assets/plus.svg'; @@ -28,11 +22,11 @@ export default function ChattingFooter(props: ChattingFooterProps) { const textArea = useRef(null); return ( -
+
{/* TODO: 현재 Button이 유연하지 않아 html 태그를 사용 필요한 점: 테마 적용(백그라운드 컬러 설정 어려움)+disabled를 optional로 주기 */} -
+