From 489b4ae62157e215b9c9b3d449282a296a9bc757 Mon Sep 17 00:00:00 2001
From: rosieyeon <sseyeon956@gmail.com>
Date: Fri, 18 Feb 2022 04:06:35 +0900
Subject: [PATCH 1/3] [#123] feat: Delete signup console.log code

---
 src/components/signup.js       | 47 ++++++++++++----------------------
 src/statics/css/modal.css      | 29 +++++++++++++++++++--
 src/statics/css/modal.css.map  |  2 +-
 src/statics/css/signup.css     | 26 +++++++++++++++++++
 src/statics/css/signup.css.map |  2 +-
 src/statics/scss/modal.scss    | 28 ++++++++++++++++++--
 src/statics/scss/signup.scss   | 25 ++++++++++++++++++
 7 files changed, 123 insertions(+), 36 deletions(-)

diff --git a/src/components/signup.js b/src/components/signup.js
index 98f4b0b..729dbd6 100644
--- a/src/components/signup.js
+++ b/src/components/signup.js
@@ -46,7 +46,6 @@ function SignUp() {
   const onSubmit = useCallback(
     (event) => {
       // event.preventDefault();
-      console.log(email, nickname, password);
       setSignupSuccess(false);
       axios
         .post(
@@ -62,7 +61,6 @@ function SignUp() {
         )
         .then((res) => {
           if (res.data.statusCode === 200) {
-            console.log(res);
             setSignupSuccess(true);
           } else {
             setSignupSuccess(false);
@@ -90,44 +88,34 @@ function SignUp() {
   }, []);
 
   // 이메일 인증 검사(메일 발송)
-  const onClickEmail = useCallback(
-    (event) => {
-      // event.preventDefault();
-      console.log(email);
-      axios
-        .post(process.env.REACT_APP_SERVER_URL + "/emails", {
-          email: email,
-        })
-        .then((res) => {
-          if (res.data.statusCode === 200) {
-            console.log(res.data);
-            setEmailExist(false);
-          } else {
-            setEmailExist(true);
-            setEmailAuthMsg("이미 가입된 이메일입니다");
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-          console.log("hi");
+  const onClickEmail = useCallback(() => {
+    axios
+      .post(process.env.REACT_APP_SERVER_URL + "/emails", {
+        email: email,
+      })
+      .then((res) => {
+        if (res.data.statusCode === 200) {
+          setEmailExist(false);
+        } else {
           setEmailExist(true);
           setEmailAuthMsg("이미 가입된 이메일입니다");
-        });
-    },
-    [email]
-  );
+        }
+      })
+      .catch((err) => {
+        setEmailExist(true);
+        setEmailAuthMsg("이미 가입된 이메일입니다");
+      });
+  }, [email]);
 
   // 이메일 인증 코드 검증
   const onClickAuthEmail = useCallback(
     (event) => {
-      console.log(emailAuth);
       axios
         .post(process.env.REACT_APP_SERVER_URL + "/emails/auth", {
           email: email,
           authCode: emailAuth,
         })
         .then((res) => {
-          console.log(res);
           if (res.data.statusCode === 200) {
             setIsEmailAuth(true);
             setEmailMessage("이메일 인증이 완료되었습니다");
@@ -159,7 +147,7 @@ function SignUp() {
           nickname: nicknameCurrent,
         })
         .then((res) => {
-          console.log(res);
+          // console.log(res);
           if (res.data.statusCode === 200) {
             checkExNickname(true);
             setExNicknameMsg("사용 가능한 닉네임입니다");
@@ -167,7 +155,6 @@ function SignUp() {
             setIsNickname(true);
           } else {
             checkExNickname(false);
-            console.log("hi");
             setExNicknameMsg("이미 사용중인 닉네임입니다");
             setIsNickname(false);
           }
diff --git a/src/statics/css/modal.css b/src/statics/css/modal.css
index 94035f3..a324e95 100644
--- a/src/statics/css/modal.css
+++ b/src/statics/css/modal.css
@@ -38,7 +38,7 @@
   text-align: center;
 }
 .modal > section > main .body-heading1 {
-  font-size: 20px;
+  font-size: 18px;
   line-height: 19px;
   color: #434343;
   margin-bottom: 10px;
@@ -87,6 +87,7 @@
   color: white;
   margin-left: 6px;
   margin-bottom: 1.5px;
+  font-size: 12px;
 }
 .modal > section > main .btn-m {
   cursor: pointer;
@@ -97,7 +98,7 @@
   width: 20%;
   border: none;
   background: #6667ab;
-  border-radius: 10px;
+  border-radius: 7px;
 }
 .modal > section > footer {
   padding: 12px 16px;
@@ -117,4 +118,28 @@
   animation: modal-bg-show 0.3s;
 }
 
+.btn-xs {
+  cursor: pointer;
+  height: 32px;
+  width: 15%;
+  border: 1px solid #6667ab;
+  background-color: #6667ab;
+  border-radius: 5px;
+  color: white;
+  margin-left: 6px;
+  margin-bottom: 1.5px;
+}
+
+.btn-m {
+  cursor: pointer;
+  color: white;
+  font-size: 16px;
+  line-height: 17px;
+  height: 36px;
+  width: 20%;
+  border: none;
+  background: #6667ab;
+  border-radius: 7px;
+}
+
 /*# sourceMappingURL=modal.css.map */
diff --git a/src/statics/css/modal.css.map b/src/statics/css/modal.css.map
index ad29615..db90864 100644
--- a/src/statics/css/modal.css.map
+++ b/src/statics/css/modal.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/modal.scss"],"names":[],"mappings":"AAAQ;AAcR;EACE;;;ACbF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EAEE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;;AAGF;EACE;EACA;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA,kBD5EI;EC6EJ;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;;AAKR;EACE;EACA;EACA","file":"modal.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/modal.scss"],"names":[],"mappings":"AAAQ;AAcR;EACE;;;ACbF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EAEE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;;AAGF;EACE;EACA;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA,kBD5EI;EC6EJ;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;;AAKR;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA,kBDvHU;ECwHV;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA","file":"modal.css"}
\ No newline at end of file
diff --git a/src/statics/css/signup.css b/src/statics/css/signup.css
index 0bf3aed..be457cf 100644
--- a/src/statics/css/signup.css
+++ b/src/statics/css/signup.css
@@ -159,6 +159,7 @@
 .signup .signup-feat .signup-feat-box .signup-feat-box-content .input-email .input-email-header .content {
   display: flex;
   justify-content: center;
+  align-items: center;
   padding-bottom: 25px;
 }
 .signup .signup-feat .signup-feat-box .signup-feat-box-content .input-email .input-email-header .content img {
@@ -239,4 +240,29 @@
   color: #6667ab;
 }
 
+.btn-xs {
+  cursor: pointer;
+  height: 32px;
+  width: 15%;
+  border: 1px solid #6667ab;
+  background-color: #6667ab;
+  border-radius: 5px;
+  color: white;
+  margin-left: 6px;
+  margin-bottom: 1.5px;
+  font-size: 12px;
+}
+
+.btn-m {
+  cursor: pointer;
+  color: white;
+  font-size: 16px;
+  line-height: 17px;
+  height: 36px;
+  width: 20%;
+  border: none;
+  background: #6667ab;
+  border-radius: 7px;
+}
+
 /*# sourceMappingURL=signup.css.map */
diff --git a/src/statics/css/signup.css.map b/src/statics/css/signup.css.map
index 5e746c4..9273156 100644
--- a/src/statics/css/signup.css.map
+++ b/src/statics/css/signup.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/signup.scss"],"names":[],"mappings":"AAAQ;AAcR;EACE;;;ACbF;EAsDE,aDrDY;ECsDZ;EACA;EACA;EACA;EACA;;AAzDA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAIF;EACE;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;AAYF;EACE;EACA;;AACA;EACE;;AAKJ;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA,ODlFE;ECmFF;;AAGJ;EACE;EACA;EACA;EACA;EACA,kBD3FI;EC4FJ;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;;AAGA;EACE;EACA;EACA;;AAGA;EACE;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAKJ;EA0BE;EACA;EACA;EACA;EACA;;AA7BA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEA;EACE,ODhJF;ECiJE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAYN;EACE;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;EAEA;EACA;;AAMR;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AAGE;EACE;EACA;EACA;EACA;;AACA;EACE,OD1MN;;AC4MI;EAGE;EACA;;AAOV;EACE;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA,kBDrOA;ECsOA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEF;EACE;EACA,OD1QE","file":"signup.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/signup.scss"],"names":[],"mappings":"AAAQ;AAcR;EACE;;;ACbF;EAsDE,aDrDY;ECsDZ;EACA;EACA;EACA;EACA;;AAzDA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAIF;EACE;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;AAYF;EACE;EACA;;AACA;EACE;;AAKJ;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA,ODlFE;ECmFF;;AAGJ;EACE;EACA;EACA;EACA;EACA,kBD3FI;EC4FJ;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;;AAGA;EACE;EACA;EACA;;AAGA;EACE;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAKJ;EA0BE;EACA;EACA;EACA;EACA;;AA7BA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEA;EACE,ODhJF;ECiJE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAYN;EACE;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EAEA;EACA;;AAMR;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AAGE;EACE;EACA;EACA;EACA;;AACA;EACE,OD3MN;;AC6MI;EAGE;EACA;;AAOV;EACE;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA,kBDtOA;ECuOA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEF;EACE;EACA,OD3QE;;;ACiRZ;EACE;EACA;EACA;EACA;EACA,kBDtRU;ECuRV;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA","file":"signup.css"}
\ No newline at end of file
diff --git a/src/statics/scss/modal.scss b/src/statics/scss/modal.scss
index 0602a76..85ae292 100644
--- a/src/statics/scss/modal.scss
+++ b/src/statics/scss/modal.scss
@@ -35,7 +35,7 @@
       padding: 5px 16px 40px 16px;
       text-align: center;
       .body-heading1 {
-        font-size: 20px;
+        font-size: 18px;
         line-height: 19px;
         color: #434343;
         margin-bottom: 10px;
@@ -85,6 +85,7 @@
         color: white;
         margin-left: 6px;
         margin-bottom: 1.5px;
+        font-size: 12px;
       }
       .btn-m {
         cursor: pointer;
@@ -95,7 +96,7 @@
         width: 20%;
         border: none;
         background: #6667ab;
-        border-radius: 10px;
+        border-radius: 7px;
         // margin: 20px;
       }
     }
@@ -117,3 +118,26 @@
   align-items: center;
   animation: modal-bg-show 0.3s;
 }
+.btn-xs {
+  cursor: pointer;
+  height: 32px;
+  width: 15%;
+  border: 1px solid $mainColor;
+  background-color: $mainColor;
+  border-radius: 5px;
+  color: white;
+  margin-left: 6px;
+  margin-bottom: 1.5px;
+}
+.btn-m {
+  cursor: pointer;
+  color: white;
+  font-size: 16px;
+  line-height: 17px;
+  height: 36px;
+  width: 20%;
+  border: none;
+  background: #6667ab;
+  border-radius: 7px;
+  // margin: 20px;
+}
diff --git a/src/statics/scss/signup.scss b/src/statics/scss/signup.scss
index dec9e4e..181dea4 100644
--- a/src/statics/scss/signup.scss
+++ b/src/statics/scss/signup.scss
@@ -179,6 +179,7 @@
             .content {
               display: flex;
               justify-content: center;
+              align-items: center;
               padding-bottom: 25px;
               img {
                 height: 20px;
@@ -276,3 +277,27 @@
     }
   }
 }
+.btn-xs {
+  cursor: pointer;
+  height: 32px;
+  width: 15%;
+  border: 1px solid $mainColor;
+  background-color: $mainColor;
+  border-radius: 5px;
+  color: white;
+  margin-left: 6px;
+  margin-bottom: 1.5px;
+  font-size: 12px;
+}
+.btn-m {
+  cursor: pointer;
+  color: white;
+  font-size: 16px;
+  line-height: 17px;
+  height: 36px;
+  width: 20%;
+  border: none;
+  background: #6667ab;
+  border-radius: 7px;
+  // margin: 20px;
+}

From eefff6f2baf6614d89bbee0dd2c30ee35422f01b Mon Sep 17 00:00:00 2001
From: rosieyeon <sseyeon956@gmail.com>
Date: Fri, 18 Feb 2022 04:26:01 +0900
Subject: [PATCH 2/3] [#123] feat: Edit signup page issues

---
 src/components/signup.js     | 7 ++++---
 src/statics/css/app.css      | 4 ++++
 src/statics/css/app.css.map  | 2 +-
 src/statics/css/signup.css   | 2 +-
 src/statics/scss/app.scss    | 7 ++++---
 src/statics/scss/signup.scss | 2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/signup.js b/src/components/signup.js
index 729dbd6..2b627bd 100644
--- a/src/components/signup.js
+++ b/src/components/signup.js
@@ -1,11 +1,12 @@
 import axios from "axios";
 import React, { useState, useCallback } from "react";
-import { Link } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
 import Modal from "./modal";
 import "../statics/css/signup.css";
 
 function SignUp() {
   // const router = useRouter();
+  const navigate = useNavigate();
   const [email, setEmail] = useState("");
   const [nickname, setNickname] = useState("");
   const [password, setPassword] = useState("");
@@ -416,10 +417,10 @@ function SignUp() {
             </span>
             <span className="signup-success-heading1">
               <img src="icons/_paper-plane.svg" alt=""></img>
-              <img src="icons/_paper-plane-darkmode.svg" alt=""></img>
+              {/* <img src="icons/_paper-plane-darkmode.svg" alt=""></img> */}
               공습에 오신 걸 환영합니다
             </span>
-            <button to="/login">로그인</button>
+            <button onClick={() => navigate("/login")}>로그인</button>
           </div>
         )}
       </div>
diff --git a/src/statics/css/app.css b/src/statics/css/app.css
index 6f0c057..358d974 100644
--- a/src/statics/css/app.css
+++ b/src/statics/css/app.css
@@ -1,4 +1,8 @@
 @import "main.css";
+.main {
+  background-color: var(--htmlbgColor);
+}
+
 .outlet {
   min-height: calc(100vh - 180px);
 }
diff --git a/src/statics/css/app.css.map b/src/statics/css/app.css.map
index 4ed3703..021e8be 100644
--- a/src/statics/css/app.css.map
+++ b/src/statics/css/app.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/app.scss"],"names":[],"mappings":"AAAQ;AAER;EACE","file":"app.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/app.scss"],"names":[],"mappings":"AAAQ;AAER;EACE;;;AAEF;EACE","file":"app.css"}
\ No newline at end of file
diff --git a/src/statics/css/signup.css b/src/statics/css/signup.css
index be457cf..930c3e8 100644
--- a/src/statics/css/signup.css
+++ b/src/statics/css/signup.css
@@ -87,7 +87,7 @@
   border: 1px solid #6667ab;
   background-color: #6667ab;
   border-radius: 5px;
-  color: var(--textColor);
+  color: #eeeeee;
   margin-left: 6px;
   margin-bottom: 1.5px;
 }
diff --git a/src/statics/scss/app.scss b/src/statics/scss/app.scss
index d03e629..981a27a 100644
--- a/src/statics/scss/app.scss
+++ b/src/statics/scss/app.scss
@@ -1,8 +1,9 @@
 @import "main.css";
 
+.main {
+  background-color: var(--htmlbgColor);
+}
 .outlet {
   min-height: calc(100vh - 180px);
-  // padding-bottom: 120px;
-  // position: absolute;
-  // bottom: 0;
+  // background-color: var(--htmlbgColor);
 }
diff --git a/src/statics/scss/signup.scss b/src/statics/scss/signup.scss
index 181dea4..1959549 100644
--- a/src/statics/scss/signup.scss
+++ b/src/statics/scss/signup.scss
@@ -97,7 +97,7 @@
         border: 1px solid $mainColor;
         background-color: $mainColor;
         border-radius: 5px;
-        color: var(--textColor);
+        color: #eeeeee;
         margin-left: 6px;
         margin-bottom: 1.5px;
       }

From 0c34a16cce92859e6e3db400c0028e1dd7e85a74 Mon Sep 17 00:00:00 2001
From: rosieyeon <sseyeon956@gmail.com>
Date: Fri, 18 Feb 2022 04:38:13 +0900
Subject: [PATCH 3/3] [#123] feat: Edit signup page issues

---
 src/statics/css/app.css     | 1 +
 src/statics/css/app.css.map | 2 +-
 src/statics/scss/app.scss   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/statics/css/app.css b/src/statics/css/app.css
index 358d974..edd18ed 100644
--- a/src/statics/css/app.css
+++ b/src/statics/css/app.css
@@ -5,6 +5,7 @@
 
 .outlet {
   min-height: calc(100vh - 180px);
+  background-color: var(--htmlbgColor);
 }
 
 /*# sourceMappingURL=app.css.map */
diff --git a/src/statics/css/app.css.map b/src/statics/css/app.css.map
index 021e8be..6a44209 100644
--- a/src/statics/css/app.css.map
+++ b/src/statics/css/app.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/app.scss"],"names":[],"mappings":"AAAQ;AAER;EACE;;;AAEF;EACE","file":"app.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/app.scss"],"names":[],"mappings":"AAAQ;AAER;EACE;;;AAEF;EACE;EACA","file":"app.css"}
\ No newline at end of file
diff --git a/src/statics/scss/app.scss b/src/statics/scss/app.scss
index 981a27a..abbd707 100644
--- a/src/statics/scss/app.scss
+++ b/src/statics/scss/app.scss
@@ -5,5 +5,5 @@
 }
 .outlet {
   min-height: calc(100vh - 180px);
-  // background-color: var(--htmlbgColor);
+  background-color: var(--htmlbgColor);
 }