From 916300eaab7aced081059284f6ce283af49cf1c7 Mon Sep 17 00:00:00 2001 From: lybell-art Date: Fri, 16 Aug 2024 12:15:18 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[refactor]=20ellipsis=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EC=A7=A7=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/adminPage/features/eventList/table/SearchResultItem.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adminPage/features/eventList/table/SearchResultItem.jsx b/src/adminPage/features/eventList/table/SearchResultItem.jsx index 6ae58d09..08bfad76 100644 --- a/src/adminPage/features/eventList/table/SearchResultItem.jsx +++ b/src/adminPage/features/eventList/table/SearchResultItem.jsx @@ -25,7 +25,7 @@ function SearchResultItem({
{eventId}
{name} From 382a30e8d772f7d40f36a4968dcc607722c00f51 Mon Sep 17 00:00:00 2001 From: lybell-art Date: Fri, 16 Aug 2024 12:18:30 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[fix]=20=EC=97=90=EB=9F=AC=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=EA=B0=80=20html=EB=A1=9C=20=ED=8A=80?= =?UTF-8?q?=EC=96=B4=EB=82=98=EC=99=80=EC=84=9C=20html=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EC=8B=9C=20json=20=ED=8C=8C=EC=8B=B1=ED=95=98?= =?UTF-8?q?=EB=8A=94=EA=B1=B0=20=EC=82=AD=EC=A0=9C=20+=20=EC=B9=B4?= =?UTF-8?q?=EB=93=9C=EA=B2=8C=EC=9E=84=20=EC=9E=90=EC=B2=B4=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=97=90=EB=9F=AC=EB=82=AC=EC=9D=84=20=EB=95=8C=20?= =?UTF-8?q?=EC=98=A4=ED=94=84=EB=9D=BC=EC=9D=B8=20=ED=8F=B4=EB=B0=B1=20?= =?UTF-8?q?=ED=8A=80=EC=96=B4=EB=82=98=EC=98=A4=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/dataFetch/fetchServer.js | 3 --- src/common/dataFetch/getQuery.js | 1 + src/mainPage/features/fcfs/cardGame/index.jsx | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/dataFetch/fetchServer.js b/src/common/dataFetch/fetchServer.js index d63afbb5..9ba0310a 100644 --- a/src/common/dataFetch/fetchServer.js +++ b/src/common/dataFetch/fetchServer.js @@ -52,9 +52,6 @@ async function fetchServerBase(url, options = {}) { throw new HTTPError(response); return await response.json(); } catch (e) { - if (e instanceof HTTPError) { - e.data = await e.response.json(); - } if (e instanceof TypeError && e.message === "Failed to fetch") { throw new ServerCloseError(); } diff --git a/src/common/dataFetch/getQuery.js b/src/common/dataFetch/getQuery.js index 730bc6f0..0fc9f741 100644 --- a/src/common/dataFetch/getQuery.js +++ b/src/common/dataFetch/getQuery.js @@ -108,6 +108,7 @@ export function useMutation(key, promiseFn, { onSuccess, onError } = {}) { const value = await promiseFn(); updateSubscribedQuery(key); onSuccess?.(value); + return value; } catch (e) { onError?.(e); if (onError === undefined) throw e; diff --git a/src/mainPage/features/fcfs/cardGame/index.jsx b/src/mainPage/features/fcfs/cardGame/index.jsx index 75cfabad..d0bd6709 100644 --- a/src/mainPage/features/fcfs/cardGame/index.jsx +++ b/src/mainPage/features/fcfs/cardGame/index.jsx @@ -23,7 +23,7 @@ function CardGamePariticipatedInitializer() { function CardGameSection() { return ( - 에러남
}> + }> 로딩중}> From 7e11aea6c01e49e1e1e667f616dd4762ac696629 Mon Sep 17 00:00:00 2001 From: lybell-art Date: Fri, 16 Aug 2024 12:25:18 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[feat]=20=EC=B9=B4=EB=93=9C=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=8A=A4=EC=BC=88=EB=A0=88=ED=86=A4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fcfs/cardGame/CardGameSkeleton.jsx | 30 +++++++++++++++++++ src/mainPage/features/fcfs/cardGame/index.jsx | 3 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx diff --git a/src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx b/src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx new file mode 100644 index 00000000..546010a6 --- /dev/null +++ b/src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx @@ -0,0 +1,30 @@ +import Card from "./Card.jsx"; +import DelaySkeleton from "@common/components/DelaySkeleton.jsx"; + +function CardGameSkeleton() { + + return ( + <> +
+ +

+ 로딩중... +

+ +
+
+ {[1, 2, 3, 4].map((index, i) => ( + + ))} +
+ + ); +} + +export default CardGameSkeleton; diff --git a/src/mainPage/features/fcfs/cardGame/index.jsx b/src/mainPage/features/fcfs/cardGame/index.jsx index d0bd6709..966aa9af 100644 --- a/src/mainPage/features/fcfs/cardGame/index.jsx +++ b/src/mainPage/features/fcfs/cardGame/index.jsx @@ -4,6 +4,7 @@ import ErrorBoundary from "@common/components/ErrorBoundary.jsx"; import useFcfsStore from "@main/realtimeEvent/store.js"; import useAuthStore from "@main/auth/store.js"; import CardGame from "./CardGame.jsx"; +import CardGameSkeleton from "./CardGameSkeleton.jsx"; function CardGameInitializer() { const getData = useFcfsStore((store) => store.getData); @@ -24,7 +25,7 @@ function CardGamePariticipatedInitializer() { function CardGameSection() { return ( }> - 로딩중}> + }> From d1d1cb031a4de5eef977409343f07db022e320e6 Mon Sep 17 00:00:00 2001 From: lybell-art Date: Fri, 16 Aug 2024 12:27:25 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[feat]=20=EC=96=B4=EB=93=9C=EB=AF=BC=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=EB=93=B1=EB=A1=9D=20=EC=84=A0?= =?UTF-8?q?=EC=B0=A9=EC=88=9C=20=EC=83=81=EB=8B=A8=EB=B6=80=EB=B6=84=20?= =?UTF-8?q?=EC=95=84=EC=A3=BC=EC=95=BD=EA=B0=84=EB=A7=8C=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/eventEdit/FcfsInput.jsx | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/adminPage/features/eventEdit/FcfsInput.jsx b/src/adminPage/features/eventEdit/FcfsInput.jsx index 33674930..11a090e2 100644 --- a/src/adminPage/features/eventEdit/FcfsInput.jsx +++ b/src/adminPage/features/eventEdit/FcfsInput.jsx @@ -1,5 +1,29 @@ +import { useState } from "react"; +import { Input } from "@admin/components/SmallInput.jsx"; +import Checkbox from "@common/components/Checkbox.jsx"; + function FcfsInput() { - return <>선착순 이벤트임; + const [isOpenTimeBatch, SetOpenTimeBatch] = useState(false); + const [isCloseTimeBatch, SetCloseTimeBatch] = useState(false); + + return
+
+ + + +
+
+ {} +
+
; } export default FcfsInput; From ec36fb2034189aae4cef6b68915d6820317bfaf6 Mon Sep 17 00:00:00 2001 From: lybell-art Date: Fri, 16 Aug 2024 13:16:52 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[fix]=20=EB=A6=B0=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx b/src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx index 546010a6..13cd9dd3 100644 --- a/src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx +++ b/src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx @@ -15,7 +15,7 @@ function CardGameSkeleton() {
- {[1, 2, 3, 4].map((index, i) => ( + {[1, 2, 3, 4].map((index) => (