From 810e43ce27882dc296dbbcb9711a5b0eae54d182 Mon Sep 17 00:00:00 2001 From: flowersayo Date: Mon, 8 May 2023 17:48:15 +0900 Subject: [PATCH] chore: change base_url source --- client/src/Constants.js | 5 +++++ client/src/components/gameroom/RPSSelection.js | 2 +- client/src/pages/GameResultPage.js | 3 +-- client/src/pages/LandingPage.js | 6 +++--- client/src/pages/MobileGameResultScreen.js | 2 +- client/src/pages/MobileLandingScreen.js | 5 +++-- client/src/pages/MobileWatingRoomScreen.js | 4 ++-- client/src/pages/WatingGamePage.js | 4 ++-- client/src/utils/WebSocketProvider.js | 6 +++++- 9 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 client/src/Constants.js diff --git a/client/src/Constants.js b/client/src/Constants.js new file mode 100644 index 0000000..d2991c6 --- /dev/null +++ b/client/src/Constants.js @@ -0,0 +1,5 @@ +/*세팅 값*/ +export const COOL_TIME = 1; +export const TIME_DURATION = 60; // 게임 시간 +export const TIME_OFFSET = 5; // +export const RESULT_TIME = 20; // 결과창 보는시간 diff --git a/client/src/components/gameroom/RPSSelection.js b/client/src/components/gameroom/RPSSelection.js index 74d1492..bd8d335 100644 --- a/client/src/components/gameroom/RPSSelection.js +++ b/client/src/components/gameroom/RPSSelection.js @@ -8,7 +8,7 @@ import { useParams } from "react-router-dom"; import { useContext } from "react"; import { WebsocketContext } from "../../utils/WebSocketProvider"; import useInterval from "../../utils/useInterval"; -import { COOL_TIME } from "../../Config"; +import { COOL_TIME } from "../../Constants"; import { GradientText } from "../../styles/font"; import { isMobile } from "react-device-detect"; diff --git a/client/src/pages/GameResultPage.js b/client/src/pages/GameResultPage.js index 3e82086..7351008 100644 --- a/client/src/pages/GameResultPage.js +++ b/client/src/pages/GameResultPage.js @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import ResultBoard from "../components/gameroom/ResultBoard"; import Button from "../components/common/Button"; import styled from "styled-components"; - +import { RESULT_TIME } from "../Constants"; import { useParams } from "react-router-dom"; import { useNavigate, useLocation } from "react-router-dom"; import { getUserId } from "../utils/User"; @@ -15,7 +15,6 @@ import { Medium } from "../styles/font"; import { useMediaQuery } from "react-responsive"; import SizedBox from "../components/common/SizedBox"; import useInterval from "../utils/useInterval"; -import { RESULT_TIME } from "../Config"; export default function GameResultPage() { const mode = useContext(LanguageContext); diff --git a/client/src/pages/LandingPage.js b/client/src/pages/LandingPage.js index 0a7dbe0..44c4023 100644 --- a/client/src/pages/LandingPage.js +++ b/client/src/pages/LandingPage.js @@ -18,9 +18,10 @@ import { useRef, createContext, useEffect } from "react"; import { LanguageContext } from "../utils/LanguageProvider"; import { getUserName, setUserName } from "../utils/User"; import { Language } from "../db/Language"; -import { BASE_WEBSOCKET_URL } from "../Config"; + import { WebsocketContext } from "../utils/WebSocketProvider"; import { useMediaQuery } from "react-responsive"; +import { BASE_SERVER_URL } from "../Config"; import qs from "qs"; function RuleBox() { const mode = useContext(LanguageContext); @@ -68,10 +69,9 @@ function LoginBox() { client_secret: "", }; - console.log(process.env.REACT_APP_BASE_SERVER_URL); axios .post( - `${process.env.REACT_APP_BASE_SERVER_URL}/token`, + `${BASE_SERVER_URL}/token`, /*json을 queryString 타입의 text로 변환*/ qs.stringify(body), { diff --git a/client/src/pages/MobileGameResultScreen.js b/client/src/pages/MobileGameResultScreen.js index ecfa855..7007f27 100644 --- a/client/src/pages/MobileGameResultScreen.js +++ b/client/src/pages/MobileGameResultScreen.js @@ -14,7 +14,7 @@ import { LanguageContext } from "../utils/LanguageProvider"; import { Medium } from "../styles/font"; import { useMediaQuery } from "react-responsive"; import SizedBox from "../components/common/SizedBox"; -import { RESULT_TIME } from "../Config"; +import { RESULT_TIME } from "../Constants"; import useInterval from "../utils/useInterval"; export default function MobileGameResultScreen() { diff --git a/client/src/pages/MobileLandingScreen.js b/client/src/pages/MobileLandingScreen.js index 033be94..746b1c5 100644 --- a/client/src/pages/MobileLandingScreen.js +++ b/client/src/pages/MobileLandingScreen.js @@ -19,11 +19,12 @@ import { LanguageContext } from "../utils/LanguageProvider"; import { getUserName, setUserName } from "../utils/User"; import { Language } from "../db/Language"; -import { BASE_WEBSOCKET_URL } from "../Config"; + import { WebsocketContext } from "../utils/WebSocketProvider"; import { useMediaQuery } from "react-responsive"; import axios from "axios"; import qs from "qs"; +import { BASE_SERVER_URL } from "../Config"; function Tabs({ currentTab, setCurrentTab }) { const mode = useContext(LanguageContext); return ( @@ -135,7 +136,7 @@ function LoginBox() { axios .post( - `${process.env.REACT_APP_BASE_SERVER_URL}/token`, + `${BASE_SERVER_URL}/token`, /*json을 queryString 타입의 text로 변환*/ qs.stringify(body), { diff --git a/client/src/pages/MobileWatingRoomScreen.js b/client/src/pages/MobileWatingRoomScreen.js index f4f495f..725fd96 100644 --- a/client/src/pages/MobileWatingRoomScreen.js +++ b/client/src/pages/MobileWatingRoomScreen.js @@ -20,8 +20,8 @@ import { import { WebsocketContext } from "../utils/WebSocketProvider"; import { useContext } from "react"; import { useRef } from "react"; -import { RESULT_TIME, TIME_DURATION, TIME_OFFSET } from "../Config"; -import { PASSWORD } from "../Config"; +import { RESULT_TIME, TIME_DURATION, TIME_OFFSET } from "../Constants"; + import { Language } from "../db/Language"; import { LanguageContext } from "../utils/LanguageProvider"; import { MediumOutline } from "../styles/font"; diff --git a/client/src/pages/WatingGamePage.js b/client/src/pages/WatingGamePage.js index eeba5b4..841bc1d 100644 --- a/client/src/pages/WatingGamePage.js +++ b/client/src/pages/WatingGamePage.js @@ -20,8 +20,8 @@ import { import { WebsocketContext } from "../utils/WebSocketProvider"; import { useContext } from "react"; import { useRef } from "react"; -import { TIME_DURATION, TIME_OFFSET } from "../Config"; -import { PASSWORD } from "../Config"; +import { TIME_DURATION, TIME_OFFSET } from "../Constants"; + import { Language } from "../db/Language"; import { LanguageContext } from "../utils/LanguageProvider"; import { MediumOutline } from "../styles/font"; diff --git a/client/src/utils/WebSocketProvider.js b/client/src/utils/WebSocketProvider.js index d9b4632..b7268f1 100644 --- a/client/src/utils/WebSocketProvider.js +++ b/client/src/utils/WebSocketProvider.js @@ -6,6 +6,7 @@ import { setIsLogin } from "./User"; import { Language } from "../db/Language"; import { LanguageContext } from "./LanguageProvider"; import { useContext } from "react"; +import { BASE_WEBSOCKET_URL } from "../Config"; export const WebsocketContext = createContext([ () => {}, false, @@ -33,7 +34,7 @@ export const WebsocketProvider = ({ children }) => { console.log(token); const socket = new WebSocket( - `${process.env.REACT_APP_BASE_WEBSOCKET_URL}/signin?name=${name}&token=${token}` + `${BASE_WEBSOCKET_URL}/signin?name=${name}&token=${token}` ); socket.onopen = (event) => { @@ -43,6 +44,9 @@ export const WebsocketProvider = ({ children }) => { socket.onclose = (event) => { console.log("onclose!", event); + + // 방목록에서 <- 버튼 눌렀을때는 제외하구 + alert(Language[mode].reconnection_request); setIsReady(false); navigate("/");