change config variables to env variables

salt26 · May 8, 2023 · 02ac2ed · 02ac2ed
1 parent cecc594
commit 02ac2ed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -10,7 +10,6 @@ import {
   MobileRoomListScreen,
 } from "./pages";
 import { Route, Routes } from "react-router-dom";
-import { BASE_WEBSOCKET_URL } from "./Config";
 import styled from "styled-components";
 import "./App.css";
 import { useState, useRef, useEffect, createContext } from "react";

diff --git a/client/src/pages/LandingPage.js b/client/src/pages/LandingPage.js
@@ -21,7 +21,7 @@ import { Language } from "../db/Language";
 
 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);
@@ -64,10 +64,11 @@ function LoginBox() {
     if (!isLoading) {
       setIsLoading(true);
       console.log("요청!");
+
       var body = {
         grant_type: "",
-        username: "rpsbro",
-        password: "rpsDance",
+        username: process.env.RPS_USERNAME,
+        password: process.env.RPS_PASSWORD,
         scope: "",
         client_id: "",
         client_secret: "",
@@ -76,7 +77,7 @@ function LoginBox() {
       try {
         /*비동기 요청*/
         const response = await axios.post(
-          `${BASE_SERVER_URL}/token`,
+          `${process.env.RPS_BASE_SERVER_URL}/token`,
           qs.stringify(body),
           {
             headers: {

diff --git a/client/src/pages/MobileLandingScreen.js b/client/src/pages/MobileLandingScreen.js
@@ -24,7 +24,7 @@ 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 (
@@ -131,8 +131,8 @@ function LoginBox() {
       console.log("요청!");
       var body = {
         grant_type: "",
-        username: "rpsbro",
-        password: "rpsDance",
+        username: process.env.RPS_USERNAME,
+        password: process.env.RPS_PASSWORD,
         scope: "",
         client_id: "",
         client_secret: "",
@@ -141,7 +141,7 @@ function LoginBox() {
       try {
         /*비동기 요청*/
         const response = await axios.post(
-          `${BASE_SERVER_URL}/token`,
+          `${process.env.RPS_BASE_SERVER_URL}/token`,
           qs.stringify(body),
           {
             headers: {

diff --git a/client/src/utils/WebSocketProvider.js b/client/src/utils/WebSocketProvider.js
@@ -6,7 +6,6 @@ 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([
   () => {},
@@ -37,7 +36,7 @@ export const WebsocketProvider = ({ children }) => {
       console.log(token);
 
       const socket = new WebSocket(
-        `${BASE_WEBSOCKET_URL}/signin?name=${name}&token=${token}`
+        `${process.env.RPS_BASE_WEBSOCKET_URL}/signin?name=${name}&token=${token}`
       );
 
       socket.onopen = (event) => {