From d4672581683bb35dea221e254a4d6276aa91ea33 Mon Sep 17 00:00:00 2001
From: Spark <loot04@korea.ac.kr>
Date: Mon, 2 Aug 2021 15:44:01 +0900
Subject: [PATCH] =?UTF-8?q?usingaircon=20=EA=B8=B0=EB=8A=A5=20=EB=B3=B5?=
 =?UTF-8?q?=EA=B5=AC,=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=9B=B9=EC=82=AC?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20opn=3D>replace=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD,=20=EB=A1=9C=EC=BB=AC=EC=A1=B4=EC=9E=AC=EC=8B=9C=20?=
 =?UTF-8?q?=EC=B2=AB=EB=B3=80=EA=B2=BD=20cancel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/App.js                        |  4 +--
 client/src/components/LoginComp.js       | 13 ++++------
 client/src/components/UsingAircon.js     | 31 +++++++++---------------
 client/src/pages/GetLocFirst.js          | 24 +++++++++++++++---
 server/src/controllers/userController.js | 12 ++++-----
 5 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/client/src/App.js b/client/src/App.js
index 974e125..84b9e7e 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -12,7 +12,7 @@ import GetLocFirst from './pages/GetLocFirst';
 
 
 function App() {
-
+  
   const isLs = localStorage.getItem('login')
 
   function loginDefault() {
@@ -29,7 +29,7 @@ function App() {
         <Route path='/signup' component={SignupPage} />
         <Route path='/login' component={LoginPage} />
         <Route path='/first-local-code' component={GetLocFirst} />
-        
+
         <PrivateRoute path='/edit'>
           <EditPage />
         </PrivateRoute>
diff --git a/client/src/components/LoginComp.js b/client/src/components/LoginComp.js
index 5e2e930..4b0b7e7 100644
--- a/client/src/components/LoginComp.js
+++ b/client/src/components/LoginComp.js
@@ -36,15 +36,12 @@ function LoginComp() {
 
     function addressUrl() {
         const afterAt = emailAddress.split('@')[1]
-        if (afterAt == ('naver.com' || 'gmail.com' || 'daum.net')) {
+        if (afterAt) {
             const newLink = 'https://www.' + afterAt;
-            window.open(newLink);
+            window.location.replace(newLink);
         }
-        if (afterAt == 'korea.ac.kr') {
-            window.open('https://www.gmail.com');
-        }
-        else {
-            window.open();
+        else if (afterAt == 'korea.ac.kr') {
+            window.location.replace('https://www.gmail.com');
         }
     }
 
@@ -97,7 +94,7 @@ function LoginComp() {
 
                     <Form style={inboxstyled} onSubmit={handleSubmit}>
                         <FloatingLabel label="Email">
-                            <Form.Control type="email" placeholder="Email" onChange={handleChange} required/>
+                            <Form.Control type="email" placeholder="Email" onChange={handleChange} required />
                         </FloatingLabel>
                         <Button variant='light' className='mt-3' id='formbtn' type='submit'>
                             LOGIN
diff --git a/client/src/components/UsingAircon.js b/client/src/components/UsingAircon.js
index 10cf9fe..72e3a50 100644
--- a/client/src/components/UsingAircon.js
+++ b/client/src/components/UsingAircon.js
@@ -1,35 +1,26 @@
 import axios from "axios";
 import React, { useEffect, useState } from "react";
 import { Form } from "react-bootstrap";
-import { callUserInfo, checkCookies } from "../utils/CheckDB";
+import { callUserInfo } from "../utils/CheckDB";
 import { isLogined } from "./../utils/Auth";
 import { routesClient } from './../routesClient';
 
 function UsingAircon() {
-  const [airUsing, setAirUsing] = useState(false);
+  const [airUsing, setAirUsing] = useState('');
 
-  // useEffect(() => {
-  //     callUserInfo().then((res) => {
-  //         if (isLogined()) {
-  //             setAirUsing(res.using_aircon)
-  //         }
-  //         else {
-  //             console.log(res)
-  //         }
-  //     })
-  // }, [checkCookies()])
+  console.log("change airUsing", airUsing);
 
-  function airChange() {
+  async function airChange() {
     setAirUsing(!airUsing);
-    async function Useair() {
-      const res = await axios.get(routesClient.usingAircon);
-      console.log(res);
-    }
-
-    Useair();
+    await axios.get(routesClient.usingAircon, { using_aircon: !airUsing })
   }
 
-  console.log("airUsing", airUsing);
+  useEffect(() => {
+    callUserInfo().then((res) => {
+      setAirUsing(res[0]['using_aircon'])
+    })
+  }, [])
+
 
   return (
     <>
diff --git a/client/src/pages/GetLocFirst.js b/client/src/pages/GetLocFirst.js
index 982a0bb..c6e109c 100644
--- a/client/src/pages/GetLocFirst.js
+++ b/client/src/pages/GetLocFirst.js
@@ -8,6 +8,7 @@ import ChartLine from '../components/ChartLine';
 import ChartDoughnut from '../components/ChartDoughnut';
 import Donation from '../components/Donation';
 import LocCodeChange from '../components/LocCodeChange';
+import { callUserInfo } from '../utils/CheckDB';
 
 function GetLocFirst() {
     const constyled = {
@@ -31,13 +32,28 @@ function GetLocFirst() {
         padding: '0'
     }
 
+    const [existLoc, setExistLoc] = useState('')
+    const [show, setShow] = useState(false)
+
+
     useEffect(() => {
-        setTimeout(function () {
-            setShow(true)
-        }, 1500)
+        callUserInfo().then((res) => {
+            setExistLoc(res[0]['loc_code'])
+        })
     }, [])
 
-    const [show, setShow] = useState(false)
+    useEffect(() => {
+        if (existLoc === '') {
+            setTimeout(function () {
+                setShow(true)
+            }, 1500)
+        }
+        else {
+            setShow(false)
+            window.location.replace('/')
+        }
+    }, [existLoc])
+
 
     return (
         <Container className='m-auto d-flex position-relative'
diff --git a/server/src/controllers/userController.js b/server/src/controllers/userController.js
index 9a3fba4..341fe07 100644
--- a/server/src/controllers/userController.js
+++ b/server/src/controllers/userController.js
@@ -25,13 +25,10 @@ const postMail = async (email, token) => {
     from: `EUE Auth Supply <${envs.api.nodemailer.user}>`,
     to: email,
     subject: "EUE 사용자 계정 확인용 메일.",
-    html: `<a href="${envs.server.protocol}://${envs.server.host}:${
-      envs.server.port
-    }${routes.base + routes.confirm}?token=${token}">${
-      envs.server.protocol
-    }://${envs.server.host}:${envs.server.port}${
-      routes.base + routes.confirm
-    }?token=${token}</a>`,
+    html: `<a href="${envs.server.protocol}://${envs.server.host}:${envs.server.port
+      }${routes.base + routes.confirm}?token=${token}">${envs.server.protocol
+      }://${envs.server.host}:${envs.server.port}${routes.base + routes.confirm
+      }?token=${token}</a>`,
   };
 
   try {
@@ -161,6 +158,7 @@ export const getConfirm = async (req, res) => {
         `${envs.client.protocol}://${envs.client.host}:${envs.client.port}/first-local-code`
       );
   } catch (err) {
+    console.log('22', err);
     res.json({ msg: resForm.msg.err, contents: { error: err } });
   }
 };
-- 
GitLab