From a46f583437e9b66ebec6fa22e27567a71b17b497 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 21 Jul 2024 16:13:58 +0900 Subject: react router --- frontend/src/watch/App.jsx | 63 ---------------------------------- frontend/src/watch/WatchState.js | 6 ---- frontend/src/watch/apps/Connecting.jsx | 7 ---- frontend/src/watch/apps/Failed.jsx | 7 ---- frontend/src/watch/apps/Gaming.jsx | 29 ---------------- frontend/src/watch/apps/Waiting.jsx | 7 ---- 6 files changed, 119 deletions(-) delete mode 100644 frontend/src/watch/App.jsx delete mode 100644 frontend/src/watch/WatchState.js delete mode 100644 frontend/src/watch/apps/Connecting.jsx delete mode 100644 frontend/src/watch/apps/Failed.jsx delete mode 100644 frontend/src/watch/apps/Gaming.jsx delete mode 100644 frontend/src/watch/apps/Waiting.jsx (limited to 'frontend/src/watch') diff --git a/frontend/src/watch/App.jsx b/frontend/src/watch/App.jsx deleted file mode 100644 index fe415bf..0000000 --- a/frontend/src/watch/App.jsx +++ /dev/null @@ -1,63 +0,0 @@ -import { useState, useEffect } from 'react'; -import useWebSocket, { ReadyState } from 'react-use-websocket'; -import Connecting from './apps/Connecting.jsx'; -import Waiting from './apps/Waiting.jsx'; -import Gaming from './apps/Gaming.jsx'; -import Failed from './apps/Failed.jsx'; -import { WATCH_STATE_CONNECTING, WATCH_STATE_WAITING, WATCH_STATE_GAMING, WATCH_STATE_FINISHED, WATCH_STATE_FAILED } from './WatchState.js'; - -export default ({ gameId }) => { - // const socketUrl = `wss://t.nil.ninja/iosdc/2024/sock/golf/${gameId}/watch/`; - const socketUrl = `ws://localhost:8002/sock/golf/${gameId}/watch/`; - - const { lastJsonMessage, readyState } = useWebSocket(socketUrl); - - const [watchState, setWatchState] = useState(WATCH_STATE_CONNECTING); - - const [problem, setProblem] = useState(null); - - const [scoreA, setScoreA] = useState(null); - const [codeA, setCodeA] = useState(null); - const [scoreB, setScoreB] = useState(null); - const [codeB, setCodeB] = useState(null); - - useEffect(() => { - if (readyState === ReadyState.UNINSTANTIATED) { - setWatchState(WATCH_STATE_FAILED); - } else if (readyState === ReadyState.CLOSING || readyState === ReadyState.CLOSED) { - if (watchState !== WATCH_STATE_FINISHED) { - setWatchState(WATCH_STATE_FAILED); - } - } else if (readyState === ReadyState.CONNECTING) { - setWatchState(WATCH_STATE_CONNECTING); - } else if (readyState === ReadyState.OPEN) { - if (lastJsonMessage !== null) { - if (lastJsonMessage.type === 'watch') { - const { problem, scoreA: scoreA_, codeA: codeA_, scoreB: scoreB_, codeB: codeB_ } = lastJsonMessage.data; - setProblem(problem); - setScoreA(scoreA_); - setCodeA(codeA_); - setScoreB(scoreB_); - setCodeB(codeB_); - setWatchState(WATCH_STATE_GAMING); - } else { - setWatchState(WATCH_STATE_FAILED); - } - } else { - setWatchState(WATCH_STATE_WAITING); - } - } - }, [readyState, lastJsonMessage]); - - return ( -
-

Game #{gameId} watching

-
- { watchState === WATCH_STATE_CONNECTING ? () - : watchState === WATCH_STATE_WAITING ? () - : watchState === WATCH_STATE_GAMING || watchState === WATCH_STATE_FINISHED ? () - : () } -
-
- ); -}; diff --git a/frontend/src/watch/WatchState.js b/frontend/src/watch/WatchState.js deleted file mode 100644 index 71f0ba6..0000000 --- a/frontend/src/watch/WatchState.js +++ /dev/null @@ -1,6 +0,0 @@ -export const WATCH_STATE_CONNECTING = 'connecting'; -export const WATCH_STATE_WAITING = 'waiting'; -export const WATCH_STATE_STARTING = 'starting'; -export const WATCH_STATE_GAMING = 'gaming'; -export const WATCH_STATE_FINISHED = 'finished'; -export const WATCH_STATE_FAILED = 'failed'; diff --git a/frontend/src/watch/apps/Connecting.jsx b/frontend/src/watch/apps/Connecting.jsx deleted file mode 100644 index 464af23..0000000 --- a/frontend/src/watch/apps/Connecting.jsx +++ /dev/null @@ -1,7 +0,0 @@ -export default () => { - return ( -
- 接続中です...... -
- ); -} diff --git a/frontend/src/watch/apps/Failed.jsx b/frontend/src/watch/apps/Failed.jsx deleted file mode 100644 index f96e999..0000000 --- a/frontend/src/watch/apps/Failed.jsx +++ /dev/null @@ -1,7 +0,0 @@ -export default () => { - return ( -
- エラー -
- ); -} diff --git a/frontend/src/watch/apps/Gaming.jsx b/frontend/src/watch/apps/Gaming.jsx deleted file mode 100644 index c844c46..0000000 --- a/frontend/src/watch/apps/Gaming.jsx +++ /dev/null @@ -1,29 +0,0 @@ -export default ({ problem, scoreA, codeA, scoreB, codeB }) => { - return ( - <> -
-
- {problem} -
-
-
-
- {scoreA} -
-
-
{codeA}
-
-
-
-
- {scoreB} -
-
-
{codeB}
-
-
-
-
- - ); -}; diff --git a/frontend/src/watch/apps/Waiting.jsx b/frontend/src/watch/apps/Waiting.jsx deleted file mode 100644 index 27fdd76..0000000 --- a/frontend/src/watch/apps/Waiting.jsx +++ /dev/null @@ -1,7 +0,0 @@ -export default () => { - return ( -
- 対戦相手が現れるのを待っています...... -
- ); -} -- cgit v1.2.3-70-g09d2