From a87eb6a0e7108088a17b1af4e8efd9b340e2f448 Mon Sep 17 00:00:00 2001 From: Lee Jeong Ron <83465749+JeongRon@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:13:06 +0900 Subject: [PATCH 001/639] =?UTF-8?q?[Bug]=20storybook=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=EB=A1=9C=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8?= =?UTF-8?q?=EB=93=A4=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Error: No QueryClient set, use QueryClientProvider to set one at useQueryClient 에러 발생 및 해결 --- .storybook/preview.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 263ca1299..4242b9ec8 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -2,6 +2,10 @@ import React from 'react'; import type { Preview } from '@storybook/react'; import { StoryFn } from '@storybook/react'; import { RecoilRoot } from 'recoil'; +import { QueryClient } from 'react-query'; +import { QueryClientProvider } from 'react-query'; + +const queryClient = new QueryClient(); const preview: Preview = { parameters: { @@ -20,7 +24,9 @@ const preview: Preview = { decorators: [ (Story: StoryFn) => ( - + + + ), ], From 2f4a01224afb5a0acc3327814c09bae7cde0a823 Mon Sep 17 00:00:00 2001 From: Lee Jeong Ron <83465749+JeongRon@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:16:04 +0900 Subject: [PATCH 002/639] =?UTF-8?q?[Refactor]=20=EC=9D=B4=EC=A0=84=20story?= =?UTF-8?q?book=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20pingpong=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stories/{ => pingpong}/drawer/MenuBar.stories.tsx | 2 +- stories/{ => pingpong}/drawer/NotiBar.stories.tsx | 2 +- stories/{ => pingpong}/drawer/NotiItem.stories.tsx | 2 +- stories/{ => pingpong}/error.stories.tsx | 2 +- stories/{ => pingpong}/game/GameResultBigItem.stories.tsx | 2 +- stories/{ => pingpong}/game/GameResultSmallItem.stories.tsx | 2 +- stories/{ => pingpong}/game/ModeRadiobox.stories.tsx | 2 +- stories/{ => pingpong}/header/Header.stories.tsx | 2 +- stories/{ => pingpong}/layout/CurrentMatch.stories.tsx | 2 +- stories/{ => pingpong}/layout/Megaphone.stories.tsx | 2 +- stories/{ => pingpong}/mainProfile/MainPageProfile.stories.tsx | 2 +- stories/{ => pingpong}/modal/AfterGameModalNormal.stories.tsx | 2 +- stories/{ => pingpong}/modal/AfterGameModalRank.stories.tsx | 2 +- stories/{ => pingpong}/modal/AfterGame_Guide.stories.tsx | 2 +- stories/{ => pingpong}/modal/AnnouncementModal.stories.tsx | 2 +- stories/{ => pingpong}/modal/EditProfileModal.stories.tsx | 2 +- stories/{ => pingpong}/modal/ExpStat.stories.tsx | 2 +- stories/{ => pingpong}/modal/Logout.stories.tsx | 2 +- stories/{ => pingpong}/modal/MatchCancelModal.stories.tsx | 2 +- stories/{ => pingpong}/modal/MatchEnrollModal.stories.tsx | 2 +- stories/{ => pingpong}/modal/MatchManualModal.stories.tsx | 2 +- stories/{ => pingpong}/modal/MatchRejectModal.stories.tsx | 2 +- stories/{ => pingpong}/modal/PppStat.stories.tsx | 2 +- stories/{ => pingpong}/modal/ReportModal.stories.tsx | 2 +- stories/{ => pingpong}/modal/StoreManualModal.stories.tsx | 2 +- stories/{ => pingpong}/modal/WelcomModal.stories.tsx | 2 +- stories/{ => pingpong}/mode/UserGameSearchBar.stories.tsx | 2 +- stories/{ => pingpong}/profile/profilepage.stories.tsx | 2 +- stories/{ => pingpong}/rank/normallistitem.stories.tsx | 2 +- stories/{ => pingpong}/rank/ranklistitem.stories.tsx | 2 +- stories/{ => pingpong}/rank/ranklisttrophy.stories.tsx | 2 +- stories/{ => pingpong}/store/InventoryItem.stories.tsx | 2 +- stories/{ => pingpong}/store/Modal/BuyModal.stories.tsx | 2 +- .../store/Modal/ChangeProfileEdgeModal.stories.tsx | 2 +- stories/{ => pingpong}/store/Modal/CoinHistoryModal.stories.tsx | 2 +- .../{ => pingpong}/store/Modal/EditMegaphoneModal.stories.tsx | 2 +- stories/{ => pingpong}/store/Modal/GiftModal.stories.tsx | 2 +- .../{ => pingpong}/store/Modal/NewMegaphoneModal.stories.tsx | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) rename stories/{ => pingpong}/drawer/MenuBar.stories.tsx (98%) rename stories/{ => pingpong}/drawer/NotiBar.stories.tsx (96%) rename stories/{ => pingpong}/drawer/NotiItem.stories.tsx (98%) rename stories/{ => pingpong}/error.stories.tsx (95%) rename stories/{ => pingpong}/game/GameResultBigItem.stories.tsx (97%) rename stories/{ => pingpong}/game/GameResultSmallItem.stories.tsx (97%) rename stories/{ => pingpong}/game/ModeRadiobox.stories.tsx (95%) rename stories/{ => pingpong}/header/Header.stories.tsx (96%) rename stories/{ => pingpong}/layout/CurrentMatch.stories.tsx (97%) rename stories/{ => pingpong}/layout/Megaphone.stories.tsx (89%) rename stories/{ => pingpong}/mainProfile/MainPageProfile.stories.tsx (95%) rename stories/{ => pingpong}/modal/AfterGameModalNormal.stories.tsx (97%) rename stories/{ => pingpong}/modal/AfterGameModalRank.stories.tsx (97%) rename stories/{ => pingpong}/modal/AfterGame_Guide.stories.tsx (92%) rename stories/{ => pingpong}/modal/AnnouncementModal.stories.tsx (97%) rename stories/{ => pingpong}/modal/EditProfileModal.stories.tsx (96%) rename stories/{ => pingpong}/modal/ExpStat.stories.tsx (95%) rename stories/{ => pingpong}/modal/Logout.stories.tsx (89%) rename stories/{ => pingpong}/modal/MatchCancelModal.stories.tsx (90%) rename stories/{ => pingpong}/modal/MatchEnrollModal.stories.tsx (94%) rename stories/{ => pingpong}/modal/MatchManualModal.stories.tsx (93%) rename stories/{ => pingpong}/modal/MatchRejectModal.stories.tsx (89%) rename stories/{ => pingpong}/modal/PppStat.stories.tsx (95%) rename stories/{ => pingpong}/modal/ReportModal.stories.tsx (89%) rename stories/{ => pingpong}/modal/StoreManualModal.stories.tsx (92%) rename stories/{ => pingpong}/modal/WelcomModal.stories.tsx (89%) rename stories/{ => pingpong}/mode/UserGameSearchBar.stories.tsx (89%) rename stories/{ => pingpong}/profile/profilepage.stories.tsx (89%) rename stories/{ => pingpong}/rank/normallistitem.stories.tsx (91%) rename stories/{ => pingpong}/rank/ranklistitem.stories.tsx (93%) rename stories/{ => pingpong}/rank/ranklisttrophy.stories.tsx (96%) rename stories/{ => pingpong}/store/InventoryItem.stories.tsx (96%) rename stories/{ => pingpong}/store/Modal/BuyModal.stories.tsx (90%) rename stories/{ => pingpong}/store/Modal/ChangeProfileEdgeModal.stories.tsx (88%) rename stories/{ => pingpong}/store/Modal/CoinHistoryModal.stories.tsx (88%) rename stories/{ => pingpong}/store/Modal/EditMegaphoneModal.stories.tsx (89%) rename stories/{ => pingpong}/store/Modal/GiftModal.stories.tsx (90%) rename stories/{ => pingpong}/store/Modal/NewMegaphoneModal.stories.tsx (89%) diff --git a/stories/drawer/MenuBar.stories.tsx b/stories/pingpong/drawer/MenuBar.stories.tsx similarity index 98% rename from stories/drawer/MenuBar.stories.tsx rename to stories/pingpong/drawer/MenuBar.stories.tsx index a9c858337..6c0db1f86 100644 --- a/stories/drawer/MenuBar.stories.tsx +++ b/stories/pingpong/drawer/MenuBar.stories.tsx @@ -9,7 +9,7 @@ import HeaderStateContext, { } from 'components/Layout/HeaderContext'; const meta: Meta = { - title: 'Drawer/MenuBar', + title: 'PingPong/Drawer/MenuBar', component: Header, tags: ['autodocs'], decorators: [ diff --git a/stories/drawer/NotiBar.stories.tsx b/stories/pingpong/drawer/NotiBar.stories.tsx similarity index 96% rename from stories/drawer/NotiBar.stories.tsx rename to stories/pingpong/drawer/NotiBar.stories.tsx index a8d7835d4..84be639b9 100644 --- a/stories/drawer/NotiBar.stories.tsx +++ b/stories/pingpong/drawer/NotiBar.stories.tsx @@ -6,7 +6,7 @@ import HeaderStateContext, { } from 'components/Layout/HeaderContext'; const meta: Meta = { - title: 'Drawer/NotiBar', + title: 'PingPong/Drawer/NotiBar', component: Header, tags: ['autodocs'], decorators: [ diff --git a/stories/drawer/NotiItem.stories.tsx b/stories/pingpong/drawer/NotiItem.stories.tsx similarity index 98% rename from stories/drawer/NotiItem.stories.tsx rename to stories/pingpong/drawer/NotiItem.stories.tsx index 7b62be2ae..3f50c4386 100644 --- a/stories/drawer/NotiItem.stories.tsx +++ b/stories/pingpong/drawer/NotiItem.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import NotiItem from 'components/Layout/NotiBar/NotiItem'; const meta: Meta = { - title: 'Drawer/NotiItem', + title: 'PingPong/Drawer/NotiItem', component: NotiItem, tags: ['autodocs'], argTypes: { diff --git a/stories/error.stories.tsx b/stories/pingpong/error.stories.tsx similarity index 95% rename from stories/error.stories.tsx rename to stories/pingpong/error.stories.tsx index addffa1d4..07fdfa9cf 100644 --- a/stories/error.stories.tsx +++ b/stories/pingpong/error.stories.tsx @@ -5,7 +5,7 @@ import { errorState } from 'utils/recoil/error'; import ErrorPage from 'components/error/Error'; const meta: Meta = { - title: '/ErrorPage', + title: 'PingPong/ErrorPage', component: ErrorPage, }; diff --git a/stories/game/GameResultBigItem.stories.tsx b/stories/pingpong/game/GameResultBigItem.stories.tsx similarity index 97% rename from stories/game/GameResultBigItem.stories.tsx rename to stories/pingpong/game/GameResultBigItem.stories.tsx index d3fa6f4b8..9ebc8f0d9 100644 --- a/stories/game/GameResultBigItem.stories.tsx +++ b/stories/pingpong/game/GameResultBigItem.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import GameResultBigItem from 'components/game/big/GameResultBigItem'; const meta: Meta = { - title: 'Game/GameResultBigItem', + title: 'PingPong/Game/GameResultBigItem', component: GameResultBigItem, tags: ['autodocs'], argTypes: { diff --git a/stories/game/GameResultSmallItem.stories.tsx b/stories/pingpong/game/GameResultSmallItem.stories.tsx similarity index 97% rename from stories/game/GameResultSmallItem.stories.tsx rename to stories/pingpong/game/GameResultSmallItem.stories.tsx index db421640e..a5a2e6f13 100644 --- a/stories/game/GameResultSmallItem.stories.tsx +++ b/stories/pingpong/game/GameResultSmallItem.stories.tsx @@ -35,7 +35,7 @@ const RANKTEAMS = { }; const meta: Meta = { - title: 'Game/GameResultSmallItem', + title: 'PingPong/Game/GameResultSmallItem', component: GameResultSmallItem, tags: ['autodocs'], argTypes: { diff --git a/stories/game/ModeRadiobox.stories.tsx b/stories/pingpong/game/ModeRadiobox.stories.tsx similarity index 95% rename from stories/game/ModeRadiobox.stories.tsx rename to stories/pingpong/game/ModeRadiobox.stories.tsx index c8b339887..2c2993f7f 100644 --- a/stories/game/ModeRadiobox.stories.tsx +++ b/stories/pingpong/game/ModeRadiobox.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import ModeRadiobox from 'components/mode/modeItems/ModeRadiobox'; const meta: Meta = { - title: 'Game/ModeRadiobox', + title: 'PingPong/Game/ModeRadiobox', component: ModeRadiobox, tags: ['autodocs'], argTypes: { diff --git a/stories/header/Header.stories.tsx b/stories/pingpong/header/Header.stories.tsx similarity index 96% rename from stories/header/Header.stories.tsx rename to stories/pingpong/header/Header.stories.tsx index c5821362d..a5014f029 100644 --- a/stories/header/Header.stories.tsx +++ b/stories/pingpong/header/Header.stories.tsx @@ -6,7 +6,7 @@ import Header from 'components/Layout/Header'; import HeaderStateContext from 'components/Layout/HeaderContext'; const meta: Meta = { - title: 'Header/Header', + title: 'PingPong/Header/Header', component: Header, tags: ['autodocs'], decorators: [ diff --git a/stories/layout/CurrentMatch.stories.tsx b/stories/pingpong/layout/CurrentMatch.stories.tsx similarity index 97% rename from stories/layout/CurrentMatch.stories.tsx rename to stories/pingpong/layout/CurrentMatch.stories.tsx index 223d528ed..51fd76972 100644 --- a/stories/layout/CurrentMatch.stories.tsx +++ b/stories/pingpong/layout/CurrentMatch.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import { CurrentMatchContent } from 'components/Layout/CurrentMatch'; const meta: Meta = { - title: 'Layout/CurrentMatch', + title: 'PingPong/Layout/CurrentMatch', component: CurrentMatchContent, tags: ['autodocs'], argTypes: { diff --git a/stories/layout/Megaphone.stories.tsx b/stories/pingpong/layout/Megaphone.stories.tsx similarity index 89% rename from stories/layout/Megaphone.stories.tsx rename to stories/pingpong/layout/Megaphone.stories.tsx index 0ffeab9a2..4412f1be4 100644 --- a/stories/layout/Megaphone.stories.tsx +++ b/stories/pingpong/layout/Megaphone.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import Megaphone from 'components/Layout/MegaPhone'; const meta: Meta = { - title: 'Layout/Megaphone', + title: 'PingPong/Layout/Megaphone', component: Megaphone, tags: ['autodocs'], argTypes: {}, diff --git a/stories/mainProfile/MainPageProfile.stories.tsx b/stories/pingpong/mainProfile/MainPageProfile.stories.tsx similarity index 95% rename from stories/mainProfile/MainPageProfile.stories.tsx rename to stories/pingpong/mainProfile/MainPageProfile.stories.tsx index ef36c341d..47a77ad98 100644 --- a/stories/mainProfile/MainPageProfile.stories.tsx +++ b/stories/pingpong/mainProfile/MainPageProfile.stories.tsx @@ -5,7 +5,7 @@ import { userState } from 'utils/recoil/layout'; import MainPageProfile from 'components/Layout/MainPageProfile'; const meta: Meta = { - title: 'MainPageProfile/MainPageProfile', + title: 'PingPong/MainPageProfile/MainPageProfile', component: MainPageProfile, tags: ['autodocs'], }; diff --git a/stories/modal/AfterGameModalNormal.stories.tsx b/stories/pingpong/modal/AfterGameModalNormal.stories.tsx similarity index 97% rename from stories/modal/AfterGameModalNormal.stories.tsx rename to stories/pingpong/modal/AfterGameModalNormal.stories.tsx index 86bfdd97d..7feb3de41 100644 --- a/stories/modal/AfterGameModalNormal.stories.tsx +++ b/stories/pingpong/modal/AfterGameModalNormal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import NormalGame from 'components/modal/afterGame/NormalGame'; const meta: Meta = { - title: 'Modal/AfterGameModalNormal', + title: 'PingPong/Modal/AfterGameModalNormal', component: NormalGame, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/AfterGameModalRank.stories.tsx b/stories/pingpong/modal/AfterGameModalRank.stories.tsx similarity index 97% rename from stories/modal/AfterGameModalRank.stories.tsx rename to stories/pingpong/modal/AfterGameModalRank.stories.tsx index a59df3467..e527261a8 100644 --- a/stories/modal/AfterGameModalRank.stories.tsx +++ b/stories/pingpong/modal/AfterGameModalRank.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import RankGame from 'components/modal/afterGame/ScoreGame'; const meta: Meta = { - title: 'Modal/AfterGameModalRank', + title: 'PingPong/Modal/AfterGameModalRank', component: RankGame, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/AfterGame_Guide.stories.tsx b/stories/pingpong/modal/AfterGame_Guide.stories.tsx similarity index 92% rename from stories/modal/AfterGame_Guide.stories.tsx rename to stories/pingpong/modal/AfterGame_Guide.stories.tsx index 98b9d27ab..21698f7d1 100644 --- a/stories/modal/AfterGame_Guide.stories.tsx +++ b/stories/pingpong/modal/AfterGame_Guide.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import Guide from 'components/modal/afterGame/Guide'; const meta: Meta = { - title: 'Modal/AfterGameModal_Guide', + title: 'PingPong/Modal/AfterGameModal_Guide', component: Guide, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/AnnouncementModal.stories.tsx b/stories/pingpong/modal/AnnouncementModal.stories.tsx similarity index 97% rename from stories/modal/AnnouncementModal.stories.tsx rename to stories/pingpong/modal/AnnouncementModal.stories.tsx index 03a88e089..7eeb73760 100644 --- a/stories/modal/AnnouncementModal.stories.tsx +++ b/stories/pingpong/modal/AnnouncementModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import AnnouncementModal from 'components/modal/event/AnnouncementModal'; const meta: Meta = { - title: 'Modal/AnnouncementModal', + title: 'PingPong/Modal/AnnouncementModal', component: AnnouncementModal, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/EditProfileModal.stories.tsx b/stories/pingpong/modal/EditProfileModal.stories.tsx similarity index 96% rename from stories/modal/EditProfileModal.stories.tsx rename to stories/pingpong/modal/EditProfileModal.stories.tsx index ce99582b8..3706a3c1b 100644 --- a/stories/modal/EditProfileModal.stories.tsx +++ b/stories/pingpong/modal/EditProfileModal.stories.tsx @@ -4,7 +4,7 @@ import { profileState } from 'utils/recoil/user'; import EditProfileModal from 'components/modal/profile/EditProfileModal'; const meta: Meta = { - title: 'Modal/EditProfileModal', + title: 'PingPong/Modal/EditProfileModal', component: EditProfileModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/modal/ExpStat.stories.tsx b/stories/pingpong/modal/ExpStat.stories.tsx similarity index 95% rename from stories/modal/ExpStat.stories.tsx rename to stories/pingpong/modal/ExpStat.stories.tsx index c98cb6099..2a17f191e 100644 --- a/stories/modal/ExpStat.stories.tsx +++ b/stories/pingpong/modal/ExpStat.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import ExpStat from 'components/modal/statChange/ExpStat'; const meta: Meta = { - title: 'Modal/ExpStat', + title: 'PingPong/Modal/ExpStat', component: ExpStat, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/Logout.stories.tsx b/stories/pingpong/modal/Logout.stories.tsx similarity index 89% rename from stories/modal/Logout.stories.tsx rename to stories/pingpong/modal/Logout.stories.tsx index 8ebeef8fe..16a5366c4 100644 --- a/stories/modal/Logout.stories.tsx +++ b/stories/pingpong/modal/Logout.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import LogoutModal from 'components/modal/menu/LogoutModal'; const meta: Meta = { - title: 'Modal/LogoutModal', + title: 'PingPong/Modal/LogoutModal', component: LogoutModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/modal/MatchCancelModal.stories.tsx b/stories/pingpong/modal/MatchCancelModal.stories.tsx similarity index 90% rename from stories/modal/MatchCancelModal.stories.tsx rename to stories/pingpong/modal/MatchCancelModal.stories.tsx index c7a7be13d..6c2280ac9 100644 --- a/stories/modal/MatchCancelModal.stories.tsx +++ b/stories/pingpong/modal/MatchCancelModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import MatchCancelModal from 'components/modal/match/MatchCancelModal'; const meta: Meta = { - title: 'Modal/MatchCancelModal', + title: 'PingPong/Modal/MatchCancelModal', component: MatchCancelModal, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/MatchEnrollModal.stories.tsx b/stories/pingpong/modal/MatchEnrollModal.stories.tsx similarity index 94% rename from stories/modal/MatchEnrollModal.stories.tsx rename to stories/pingpong/modal/MatchEnrollModal.stories.tsx index 5e5f8aabb..ebfcb21d3 100644 --- a/stories/modal/MatchEnrollModal.stories.tsx +++ b/stories/pingpong/modal/MatchEnrollModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import MatchEnrollModal from 'components/modal/match/MatchEnrollModal'; const meta: Meta = { - title: 'Modal/MatchEnrollModal', + title: 'PingPong/Modal/MatchEnrollModal', component: MatchEnrollModal, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/MatchManualModal.stories.tsx b/stories/pingpong/modal/MatchManualModal.stories.tsx similarity index 93% rename from stories/modal/MatchManualModal.stories.tsx rename to stories/pingpong/modal/MatchManualModal.stories.tsx index 654dd1c01..d3eb738e4 100644 --- a/stories/modal/MatchManualModal.stories.tsx +++ b/stories/pingpong/modal/MatchManualModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import MatchManualModal from 'components/modal/match/MatchManualModal'; const meta: Meta = { - title: 'Modal/MatchManualModal', + title: 'PingPong/Modal/MatchManualModal', component: MatchManualModal, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/MatchRejectModal.stories.tsx b/stories/pingpong/modal/MatchRejectModal.stories.tsx similarity index 89% rename from stories/modal/MatchRejectModal.stories.tsx rename to stories/pingpong/modal/MatchRejectModal.stories.tsx index 4bee8ecd2..d424ddcd1 100644 --- a/stories/modal/MatchRejectModal.stories.tsx +++ b/stories/pingpong/modal/MatchRejectModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import MatchRejectModal from 'components/modal/match/MatchRejectModal'; const meta: Meta = { - title: 'Modal/MatchRejectModal', + title: 'PingPong/Modal/MatchRejectModal', component: MatchRejectModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/modal/PppStat.stories.tsx b/stories/pingpong/modal/PppStat.stories.tsx similarity index 95% rename from stories/modal/PppStat.stories.tsx rename to stories/pingpong/modal/PppStat.stories.tsx index 57cf85312..608933386 100644 --- a/stories/modal/PppStat.stories.tsx +++ b/stories/pingpong/modal/PppStat.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import PppStat from 'components/modal/statChange/PppStat'; const meta: Meta = { - title: 'Modal/PppStat', + title: 'PingPong/Modal/PppStat', component: PppStat, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/ReportModal.stories.tsx b/stories/pingpong/modal/ReportModal.stories.tsx similarity index 89% rename from stories/modal/ReportModal.stories.tsx rename to stories/pingpong/modal/ReportModal.stories.tsx index e503f59a2..ecdabd255 100644 --- a/stories/modal/ReportModal.stories.tsx +++ b/stories/pingpong/modal/ReportModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import ReportModal from 'components/modal/menu/ReportModal'; const meta: Meta = { - title: 'Modal/ReportModal', + title: 'PingPong/Modal/ReportModal', component: ReportModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/modal/StoreManualModal.stories.tsx b/stories/pingpong/modal/StoreManualModal.stories.tsx similarity index 92% rename from stories/modal/StoreManualModal.stories.tsx rename to stories/pingpong/modal/StoreManualModal.stories.tsx index 1097b52b8..81c6629ff 100644 --- a/stories/modal/StoreManualModal.stories.tsx +++ b/stories/pingpong/modal/StoreManualModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import StoreManualModal from 'components/modal/store/StoreManualModal'; const meta: Meta = { - title: 'Modal/StoreManualModal', + title: 'PingPong/Modal/StoreManualModal', component: StoreManualModal, tags: ['autodocs'], argTypes: { diff --git a/stories/modal/WelcomModal.stories.tsx b/stories/pingpong/modal/WelcomModal.stories.tsx similarity index 89% rename from stories/modal/WelcomModal.stories.tsx rename to stories/pingpong/modal/WelcomModal.stories.tsx index 7031b6457..85c92c47f 100644 --- a/stories/modal/WelcomModal.stories.tsx +++ b/stories/pingpong/modal/WelcomModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import WelcomeModal from 'components/modal/event/WelcomeModal'; const meta: Meta = { - title: 'Modal/WelcomeModal', + title: 'PingPong/Modal/WelcomeModal', component: WelcomeModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/mode/UserGameSearchBar.stories.tsx b/stories/pingpong/mode/UserGameSearchBar.stories.tsx similarity index 89% rename from stories/mode/UserGameSearchBar.stories.tsx rename to stories/pingpong/mode/UserGameSearchBar.stories.tsx index dae9ad4b7..b8772b7c9 100644 --- a/stories/mode/UserGameSearchBar.stories.tsx +++ b/stories/pingpong/mode/UserGameSearchBar.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import UserGameSearchBar from 'components/mode/modeItems/UserGameSearchBar'; const meta: Meta = { - title: 'Mode/UserGameSearchBar', + title: 'PingPong/Mode/UserGameSearchBar', component: UserGameSearchBar, tags: ['autodocs'], argTypes: {}, diff --git a/stories/profile/profilepage.stories.tsx b/stories/pingpong/profile/profilepage.stories.tsx similarity index 89% rename from stories/profile/profilepage.stories.tsx rename to stories/pingpong/profile/profilepage.stories.tsx index 99450a70d..9bb13c58e 100644 --- a/stories/profile/profilepage.stories.tsx +++ b/stories/pingpong/profile/profilepage.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import User from 'pages/users/detail'; const meta: Meta = { - title: 'profile/Userprofile', + title: 'PingPong/profile/Userprofile', component: User, tags: ['autodocs'], args: { diff --git a/stories/rank/normallistitem.stories.tsx b/stories/pingpong/rank/normallistitem.stories.tsx similarity index 91% rename from stories/rank/normallistitem.stories.tsx rename to stories/pingpong/rank/normallistitem.stories.tsx index 695d3b489..68a96f54b 100644 --- a/stories/rank/normallistitem.stories.tsx +++ b/stories/pingpong/rank/normallistitem.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import { NormalListItem } from 'components/rank/NormalListItem'; const meta: Meta = { - title: 'rank/NormalListItem', + title: 'PingPong/rank/NormalListItem', component: NormalListItem, }; diff --git a/stories/rank/ranklistitem.stories.tsx b/stories/pingpong/rank/ranklistitem.stories.tsx similarity index 93% rename from stories/rank/ranklistitem.stories.tsx rename to stories/pingpong/rank/ranklistitem.stories.tsx index 9aff3f1cd..e4022fe0c 100644 --- a/stories/rank/ranklistitem.stories.tsx +++ b/stories/pingpong/rank/ranklistitem.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import { RankListItem } from 'components/rank/RankListItem'; const meta: Meta = { - title: 'rank/RankListItem', + title: 'PingPong/rank/RankListItem', component: RankListItem, }; diff --git a/stories/rank/ranklisttrophy.stories.tsx b/stories/pingpong/rank/ranklisttrophy.stories.tsx similarity index 96% rename from stories/rank/ranklisttrophy.stories.tsx rename to stories/pingpong/rank/ranklisttrophy.stories.tsx index 277012947..56f2a3a5a 100644 --- a/stories/rank/ranklisttrophy.stories.tsx +++ b/stories/pingpong/rank/ranklisttrophy.stories.tsx @@ -8,7 +8,7 @@ interface RankListMainProps { } const meta: Meta = { - title: 'RANK/RanklistMain', + title: 'PingPong/RANK/RanklistMain', component: RankListMain, tags: ['autodocs'], argTypes: {}, diff --git a/stories/store/InventoryItem.stories.tsx b/stories/pingpong/store/InventoryItem.stories.tsx similarity index 96% rename from stories/store/InventoryItem.stories.tsx rename to stories/pingpong/store/InventoryItem.stories.tsx index eb627c893..978890ff4 100644 --- a/stories/store/InventoryItem.stories.tsx +++ b/stories/pingpong/store/InventoryItem.stories.tsx @@ -6,7 +6,7 @@ import { InvetoryItem } from 'components/store/InventoryItem'; // } const meta: Meta = { - title: 'Store/InvetoryItem', + title: 'PingPong/Store/InvetoryItem', component: InvetoryItem, tags: ['autodocs'], }; diff --git a/stories/store/Modal/BuyModal.stories.tsx b/stories/pingpong/store/Modal/BuyModal.stories.tsx similarity index 90% rename from stories/store/Modal/BuyModal.stories.tsx rename to stories/pingpong/store/Modal/BuyModal.stories.tsx index 7fd212a55..a367d3044 100644 --- a/stories/store/Modal/BuyModal.stories.tsx +++ b/stories/pingpong/store/Modal/BuyModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import BuyModal from 'components/modal/store/purchase/BuyModal'; const meta: Meta = { - title: 'store/Modal/BuyModal', + title: 'PingPong/store/Modal/BuyModal', component: BuyModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/store/Modal/ChangeProfileEdgeModal.stories.tsx b/stories/pingpong/store/Modal/ChangeProfileEdgeModal.stories.tsx similarity index 88% rename from stories/store/Modal/ChangeProfileEdgeModal.stories.tsx rename to stories/pingpong/store/Modal/ChangeProfileEdgeModal.stories.tsx index 61c95795b..70fcde47d 100644 --- a/stories/store/Modal/ChangeProfileEdgeModal.stories.tsx +++ b/stories/pingpong/store/Modal/ChangeProfileEdgeModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import ChangeProfileEdgeModal from 'components/modal/store/inventory/ChangeProfileEdgeModal'; const meta: Meta = { - title: 'store/Modal/ChangeProfileEdgeModal', + title: 'PingPong/store/Modal/ChangeProfileEdgeModal', component: ChangeProfileEdgeModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/store/Modal/CoinHistoryModal.stories.tsx b/stories/pingpong/store/Modal/CoinHistoryModal.stories.tsx similarity index 88% rename from stories/store/Modal/CoinHistoryModal.stories.tsx rename to stories/pingpong/store/Modal/CoinHistoryModal.stories.tsx index bbc56fb48..8f07495be 100644 --- a/stories/store/Modal/CoinHistoryModal.stories.tsx +++ b/stories/pingpong/store/Modal/CoinHistoryModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import UserCoinHistoryModal from 'components/modal/store/UserCoinHistoryModal'; const meta: Meta = { - title: 'store/Modal/UserCoinHistoryModal', + title: 'PingPong/store/Modal/UserCoinHistoryModal', component: UserCoinHistoryModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/store/Modal/EditMegaphoneModal.stories.tsx b/stories/pingpong/store/Modal/EditMegaphoneModal.stories.tsx similarity index 89% rename from stories/store/Modal/EditMegaphoneModal.stories.tsx rename to stories/pingpong/store/Modal/EditMegaphoneModal.stories.tsx index 37c382d04..6dd2f2449 100644 --- a/stories/store/Modal/EditMegaphoneModal.stories.tsx +++ b/stories/pingpong/store/Modal/EditMegaphoneModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import EditMegaphoneModal from 'components/modal/store/inventory/EditMegaphoneModal'; const meta: Meta = { - title: 'store/Modal/EditMegaphoneModal', + title: 'PingPong/store/Modal/EditMegaphoneModal', component: EditMegaphoneModal, tags: ['autodocs'], argTypes: { receiptId: { control: { type: 'number' } } }, diff --git a/stories/store/Modal/GiftModal.stories.tsx b/stories/pingpong/store/Modal/GiftModal.stories.tsx similarity index 90% rename from stories/store/Modal/GiftModal.stories.tsx rename to stories/pingpong/store/Modal/GiftModal.stories.tsx index 7f12c824d..601f66cd8 100644 --- a/stories/store/Modal/GiftModal.stories.tsx +++ b/stories/pingpong/store/Modal/GiftModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import GiftModal from 'components/modal/store/purchase/GiftModal'; const meta: Meta = { - title: 'store/Modal/GiftModal', + title: 'PingPong/store/Modal/GiftModal', component: GiftModal, tags: ['autodocs'], argTypes: {}, diff --git a/stories/store/Modal/NewMegaphoneModal.stories.tsx b/stories/pingpong/store/Modal/NewMegaphoneModal.stories.tsx similarity index 89% rename from stories/store/Modal/NewMegaphoneModal.stories.tsx rename to stories/pingpong/store/Modal/NewMegaphoneModal.stories.tsx index 832446293..08ee38c45 100644 --- a/stories/store/Modal/NewMegaphoneModal.stories.tsx +++ b/stories/pingpong/store/Modal/NewMegaphoneModal.stories.tsx @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'; import NewMegaphoneModal from 'components/modal/store/inventory/NewMegaphoneModal'; const meta: Meta = { - title: 'store/Modal/NewMegaphoneModal', + title: 'PingPong/store/Modal/NewMegaphoneModal', component: NewMegaphoneModal, tags: ['autodocs'], argTypes: { receiptId: { control: { type: 'number' } } }, From 48cfd3de52cc89b350061e79695c8281ce17954a Mon Sep 17 00:00:00 2001 From: Lee Jeong Ron <83465749+JeongRon@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:16:42 +0900 Subject: [PATCH 003/639] =?UTF-8?q?[Feat]=20storybook=20agenda=20=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=20=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tmp/TMP.tsx | 21 ++++++++++++++++++++ stories/agenda/tmp/tmp.stories.tsx | 31 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 components/tmp/TMP.tsx create mode 100644 stories/agenda/tmp/tmp.stories.tsx diff --git a/components/tmp/TMP.tsx b/components/tmp/TMP.tsx new file mode 100644 index 000000000..0000b206c --- /dev/null +++ b/components/tmp/TMP.tsx @@ -0,0 +1,21 @@ +type tmpProps = { + item: { + color: string; + backgroundColor: string; + fontSize: number; + }; +}; + +export default function TMP({ item }: tmpProps) { + return ( +
+ TMP +
+ ); +} diff --git a/stories/agenda/tmp/tmp.stories.tsx b/stories/agenda/tmp/tmp.stories.tsx new file mode 100644 index 000000000..95324a931 --- /dev/null +++ b/stories/agenda/tmp/tmp.stories.tsx @@ -0,0 +1,31 @@ +import type { Meta, StoryObj } from '@storybook/react'; +import TMP from 'components/tmp/TMP'; + +const meta: Meta = { + title: 'Agenda/tmp', + component: TMP, + tags: ['autodocs'], +}; + +export default meta; +type Story = StoryObj; + +export const DarkMode: Story = { + args: { + item: { + color: '#ffffff', + backgroundColor: '#000000', + fontSize: 20, + }, + }, +}; + +export const WhiteMode: Story = { + args: { + item: { + color: '#000000', + backgroundColor: '#ffffff', + fontSize: 20, + }, + }, +}; From 59945350896e81138475496b49bff734fab6cdab Mon Sep 17 00:00:00 2001 From: irenee-14 Date: Wed, 3 Jul 2024 13:56:34 +0900 Subject: [PATCH 004/639] =?UTF-8?q?[Refactor]=20pages=20=EB=82=B4=EC=9D=98?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EB=B0=8F=20=ED=8F=B4=EB=8D=94=20pages/?= =?UTF-8?q?takgu=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Layout/Layout.tsx | 35 ++++++++++--------- components/main/Section.tsx | 2 +- pages/admin/coin.tsx | 9 ----- pages/admin/store.tsx | 11 ------ pages/index.tsx | 28 ++++++--------- pages/{ => takgu}/admin/announcement.tsx | 0 pages/takgu/admin/coin.tsx | 9 +++++ pages/{ => takgu}/admin/feedback.tsx | 0 pages/{ => takgu}/admin/games.tsx | 0 pages/{ => takgu}/admin/index.tsx | 0 pages/{ => takgu}/admin/notification.tsx | 0 pages/{ => takgu}/admin/partyCategory.tsx | 0 pages/{ => takgu}/admin/partyPenalty.tsx | 0 pages/{ => takgu}/admin/partyReport.tsx | 0 pages/{ => takgu}/admin/partyRoom.tsx | 0 pages/{ => takgu}/admin/partyTemplate.tsx | 0 pages/{ => takgu}/admin/penalty.tsx | 0 pages/{ => takgu}/admin/receipt.tsx | 0 pages/{ => takgu}/admin/recruitments.tsx | 0 pages/{ => takgu}/admin/season.tsx | 0 pages/{ => takgu}/admin/slot.tsx | 0 pages/takgu/admin/store.tsx | 9 +++++ pages/{ => takgu}/admin/tournament.tsx | 0 pages/{ => takgu}/admin/usageHistory.tsx | 0 pages/{ => takgu}/admin/users.tsx | 0 .../api/pingpong/admin/announcement/index.tsx | 0 .../api/pingpong/admin/coinpolicy/index.ts | 0 .../api/pingpong/admin/feedback/index.ts | 0 .../api/pingpong/admin/feedback/is-solved.ts | 0 .../api/pingpong/admin/games/index.ts | 0 .../api/pingpong/admin/images/index.ts | 0 .../api/pingpong/admin/items/[itemId].ts | 0 .../api/pingpong/admin/items/history/index.ts | 0 .../admin/megaphones/[megaphoneId].ts | 0 .../admin/megaphones/history/index.ts | 0 .../pingpong/admin/notifications/[intraId].ts | 0 .../api/pingpong/admin/notifications/index.ts | 0 .../admin/penalty/users/[intraId]/detail.ts | 0 .../admin/penalty/users/[intraId]/index.ts | 0 .../api/pingpong/admin/penalty/users/index.ts | 0 .../api/pingpong/admin/receipt/index.ts | 0 .../api/pingpong/admin/recruitments/[id].ts | 0 .../api/pingpong/admin/recruitments/index.ts | 0 .../admin/recruitments/result/message.ts | 0 .../[tournamentId]/users/[userId].ts | 0 .../tournaments/[tournamentId]/users/index.ts | 0 .../api/pingpong/admin/users/[intraId].ts | 0 .../api/pingpong/admin/users/coin.ts | 0 .../api/pingpong/admin/users/index.ts | 0 .../pingpong/admin/users/intraId/penalty.ts | 0 .../api/pingpong/announcement/index.tsx | 0 pages/{ => takgu}/api/pingpong/exp/index.ts | 0 .../{ => takgu}/api/pingpong/games/normal.ts | 0 pages/{ => takgu}/api/pingpong/games/rank.ts | 0 .../api/pingpong/items/gift/[itemId]/index.ts | 0 pages/{ => takgu}/api/pingpong/items/index.ts | 0 .../items/purchases/[itemId]/index.ts | 0 pages/{ => takgu}/api/pingpong/items/store.ts | 0 .../api/pingpong/megaphones/[megaphoneId].ts | 0 .../api/pingpong/megaphones/index.ts | 0 .../megaphones/receipt/[receiptId].ts | 0 .../party/rooms/[roomId]/start/index.ts | 0 pages/{ => takgu}/api/pingpong/rank/NORMAL.ts | 0 pages/{ => takgu}/api/pingpong/rank/RANK.ts | 0 .../{ => takgu}/api/pingpong/rank/rankpage.ts | 0 .../api/pingpong/ranks/single/index.ts | 0 .../api/pingpong/recruitments/[id].ts | 0 .../recruitments/[id]/applications.ts | 0 .../[id]/applications/[applicationId].ts | 0 .../applications/[applicationId]/result.ts | 0 .../api/pingpong/recruitments/index.ts | 0 pages/{ => takgu}/api/pingpong/stat/visit.ts | 0 .../games/dummyTournamentGame.ts | 0 .../games/generateTournamentGames.ts | 0 .../tournaments/[tournamentId]/games/index.ts | 0 .../[tournamentId]/users/dummyData.ts | 0 .../tournaments/[tournamentId]/users/index.ts | 0 .../tournaments/dummyTournamentData.ts | 0 .../api/pingpong/tournaments/index.ts | 0 .../api/pingpong/users/attendance.ts | 0 .../api/pingpong/users/background.ts | 0 pages/{ => takgu}/api/pingpong/users/coin.ts | 0 pages/{ => takgu}/api/pingpong/users/edge.ts | 0 .../{ => takgu}/api/pingpong/users/intraId.ts | 0 .../api/pingpong/users/profile-image.ts | 0 .../api/pingpong/users/text-color.ts | 0 pages/{ => takgu}/api/pingpong/users/user.ts | 0 pages/{ => takgu}/game.tsx | 0 pages/takgu/index.tsx | 25 +++++++++++++ pages/{ => takgu}/load.tsx | 0 pages/{ => takgu}/match.tsx | 6 +++- pages/{ => takgu}/party/[roomId]/index.tsx | 0 pages/{ => takgu}/party/create.tsx | 0 pages/{ => takgu}/party/index.tsx | 0 pages/{ => takgu}/party/room.tsx | 0 pages/{ => takgu}/rank.tsx | 18 +++++----- pages/{ => takgu}/recruit/apply.tsx | 0 pages/{ => takgu}/recruit/detail.tsx | 0 pages/{ => takgu}/recruit/index.tsx | 0 pages/{ => takgu}/recruit/my-application.tsx | 0 pages/{ => takgu}/statistics.tsx | 0 pages/{ => takgu}/store.tsx | 0 pages/{ => takgu}/tournament-record.tsx | 0 pages/{ => takgu}/tournament.tsx | 0 pages/{ => takgu}/users/detail.tsx | 0 105 files changed, 87 insertions(+), 65 deletions(-) delete mode 100644 pages/admin/coin.tsx delete mode 100644 pages/admin/store.tsx rename pages/{ => takgu}/admin/announcement.tsx (100%) create mode 100644 pages/takgu/admin/coin.tsx rename pages/{ => takgu}/admin/feedback.tsx (100%) rename pages/{ => takgu}/admin/games.tsx (100%) rename pages/{ => takgu}/admin/index.tsx (100%) rename pages/{ => takgu}/admin/notification.tsx (100%) rename pages/{ => takgu}/admin/partyCategory.tsx (100%) rename pages/{ => takgu}/admin/partyPenalty.tsx (100%) rename pages/{ => takgu}/admin/partyReport.tsx (100%) rename pages/{ => takgu}/admin/partyRoom.tsx (100%) rename pages/{ => takgu}/admin/partyTemplate.tsx (100%) rename pages/{ => takgu}/admin/penalty.tsx (100%) rename pages/{ => takgu}/admin/receipt.tsx (100%) rename pages/{ => takgu}/admin/recruitments.tsx (100%) rename pages/{ => takgu}/admin/season.tsx (100%) rename pages/{ => takgu}/admin/slot.tsx (100%) create mode 100644 pages/takgu/admin/store.tsx rename pages/{ => takgu}/admin/tournament.tsx (100%) rename pages/{ => takgu}/admin/usageHistory.tsx (100%) rename pages/{ => takgu}/admin/users.tsx (100%) rename pages/{ => takgu}/api/pingpong/admin/announcement/index.tsx (100%) rename pages/{ => takgu}/api/pingpong/admin/coinpolicy/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/feedback/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/feedback/is-solved.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/games/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/images/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/items/[itemId].ts (100%) rename pages/{ => takgu}/api/pingpong/admin/items/history/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/megaphones/[megaphoneId].ts (100%) rename pages/{ => takgu}/api/pingpong/admin/megaphones/history/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/notifications/[intraId].ts (100%) rename pages/{ => takgu}/api/pingpong/admin/notifications/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/penalty/users/[intraId]/detail.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/penalty/users/[intraId]/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/penalty/users/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/receipt/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/recruitments/[id].ts (100%) rename pages/{ => takgu}/api/pingpong/admin/recruitments/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/recruitments/result/message.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/tournaments/[tournamentId]/users/[userId].ts (100%) rename pages/{ => takgu}/api/pingpong/admin/tournaments/[tournamentId]/users/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/users/[intraId].ts (100%) rename pages/{ => takgu}/api/pingpong/admin/users/coin.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/users/index.ts (100%) rename pages/{ => takgu}/api/pingpong/admin/users/intraId/penalty.ts (100%) rename pages/{ => takgu}/api/pingpong/announcement/index.tsx (100%) rename pages/{ => takgu}/api/pingpong/exp/index.ts (100%) rename pages/{ => takgu}/api/pingpong/games/normal.ts (100%) rename pages/{ => takgu}/api/pingpong/games/rank.ts (100%) rename pages/{ => takgu}/api/pingpong/items/gift/[itemId]/index.ts (100%) rename pages/{ => takgu}/api/pingpong/items/index.ts (100%) rename pages/{ => takgu}/api/pingpong/items/purchases/[itemId]/index.ts (100%) rename pages/{ => takgu}/api/pingpong/items/store.ts (100%) rename pages/{ => takgu}/api/pingpong/megaphones/[megaphoneId].ts (100%) rename pages/{ => takgu}/api/pingpong/megaphones/index.ts (100%) rename pages/{ => takgu}/api/pingpong/megaphones/receipt/[receiptId].ts (100%) rename pages/{ => takgu}/api/pingpong/party/rooms/[roomId]/start/index.ts (100%) rename pages/{ => takgu}/api/pingpong/rank/NORMAL.ts (100%) rename pages/{ => takgu}/api/pingpong/rank/RANK.ts (100%) rename pages/{ => takgu}/api/pingpong/rank/rankpage.ts (100%) rename pages/{ => takgu}/api/pingpong/ranks/single/index.ts (100%) rename pages/{ => takgu}/api/pingpong/recruitments/[id].ts (100%) rename pages/{ => takgu}/api/pingpong/recruitments/[id]/applications.ts (100%) rename pages/{ => takgu}/api/pingpong/recruitments/[id]/applications/[applicationId].ts (100%) rename pages/{ => takgu}/api/pingpong/recruitments/[id]/applications/[applicationId]/result.ts (100%) rename pages/{ => takgu}/api/pingpong/recruitments/index.ts (100%) rename pages/{ => takgu}/api/pingpong/stat/visit.ts (100%) rename pages/{ => takgu}/api/pingpong/tournaments/[tournamentId]/games/dummyTournamentGame.ts (100%) rename pages/{ => takgu}/api/pingpong/tournaments/[tournamentId]/games/generateTournamentGames.ts (100%) rename pages/{ => takgu}/api/pingpong/tournaments/[tournamentId]/games/index.ts (100%) rename pages/{ => takgu}/api/pingpong/tournaments/[tournamentId]/users/dummyData.ts (100%) rename pages/{ => takgu}/api/pingpong/tournaments/[tournamentId]/users/index.ts (100%) rename pages/{ => takgu}/api/pingpong/tournaments/dummyTournamentData.ts (100%) rename pages/{ => takgu}/api/pingpong/tournaments/index.ts (100%) rename pages/{ => takgu}/api/pingpong/users/attendance.ts (100%) rename pages/{ => takgu}/api/pingpong/users/background.ts (100%) rename pages/{ => takgu}/api/pingpong/users/coin.ts (100%) rename pages/{ => takgu}/api/pingpong/users/edge.ts (100%) rename pages/{ => takgu}/api/pingpong/users/intraId.ts (100%) rename pages/{ => takgu}/api/pingpong/users/profile-image.ts (100%) rename pages/{ => takgu}/api/pingpong/users/text-color.ts (100%) rename pages/{ => takgu}/api/pingpong/users/user.ts (100%) rename pages/{ => takgu}/game.tsx (100%) create mode 100644 pages/takgu/index.tsx rename pages/{ => takgu}/load.tsx (100%) rename pages/{ => takgu}/match.tsx (93%) rename pages/{ => takgu}/party/[roomId]/index.tsx (100%) rename pages/{ => takgu}/party/create.tsx (100%) rename pages/{ => takgu}/party/index.tsx (100%) rename pages/{ => takgu}/party/room.tsx (100%) rename pages/{ => takgu}/rank.tsx (70%) rename pages/{ => takgu}/recruit/apply.tsx (100%) rename pages/{ => takgu}/recruit/detail.tsx (100%) rename pages/{ => takgu}/recruit/index.tsx (100%) rename pages/{ => takgu}/recruit/my-application.tsx (100%) rename pages/{ => takgu}/statistics.tsx (100%) rename pages/{ => takgu}/store.tsx (100%) rename pages/{ => takgu}/tournament-record.tsx (100%) rename pages/{ => takgu}/tournament.tsx (100%) rename pages/{ => takgu}/users/detail.tsx (100%) diff --git a/components/Layout/Layout.tsx b/components/Layout/Layout.tsx index 177777b3d..e2d8f6499 100644 --- a/components/Layout/Layout.tsx +++ b/components/Layout/Layout.tsx @@ -10,7 +10,7 @@ import HeaderStateContext from 'components/Layout/HeaderContext'; import MainPageProfile from 'components/Layout/MainPageProfile'; import Megaphone from 'components/Layout/MegaPhone'; import RecruitLayout from 'components/recruit/RecruitLayout'; -import Statistics from 'pages/statistics'; +import Statistics from 'pages/takgu/statistics'; import useAnnouncementCheck from 'hooks/Layout/useAnnouncementCheck'; import useGetUserSeason from 'hooks/Layout/useGetUserSeason'; import useLiveCheck from 'hooks/Layout/useLiveCheck'; @@ -54,20 +54,21 @@ export default function AppLayout({ children }: AppLayoutProps) { ); - - return ( - - -
- - -
- - {openCurrentMatch && } - {presentPath === '/' && } -
- {children} -