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; 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} 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/CardGameSkeleton.jsx b/src/mainPage/features/fcfs/cardGame/CardGameSkeleton.jsx new file mode 100644 index 00000000..13cd9dd3 --- /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) => ( + + ))} +
+ + ); +} + +export default CardGameSkeleton; diff --git a/src/mainPage/features/fcfs/cardGame/index.jsx b/src/mainPage/features/fcfs/cardGame/index.jsx index 75cfabad..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); @@ -23,8 +24,8 @@ function CardGamePariticipatedInitializer() { function CardGameSection() { return ( - 에러남
}> - 로딩중}> + }> + }>