Merge remote-tracking branch 'origin/jaeyeon2' into jiweon827

client/src/components/Profile/InfoUpdate.js

 import { Link } from "react-router-dom";
 
 const InfoUpdate = () => {
+
+  function inputfile(){
+    console.log('aa')
+  }
   const id = 1;
+  const number = 1234;
   return (
     <div className="container" style={{ background: "#FCF4FF" }}>
       <div className="row">
@@ -22,32 +27,59 @@ const InfoUpdate = () => {
                 fontWeight: "bold",
               }}
             >
-             돌아가기
+              돌아가기
             </button>
           </Link>
         </div>
       </div>
-      <div className="col"></div>
+
       <div className="col">
         <div>
           <div className="row">
             <div className="d-flex justify-content-center">
               <img
                 src="/cherry.jpg"
+                id="imgfile"
                 className="rounded-circle mt-2"
                 style={{ height: "320px", width: "320px" }}
               />
             </div>
-            <div
-              className="row justify-content-center  my-4 ms-1"
-              style={{ fontSize: "25px", fontWeight: "bold" }}
-            >
-              CHERRY #0805
+            <div className="mt-2 d-flex justify-content-end">
+              <label for='inputfile' style={{ fontSize: "13px", fontWeight: "bold" }}>사진 선택</label>
+              <input type="file" id='inputfile' style={{display:'none'}}/>
+            </div>
+            <div className="col d-flex justify-content-center">
+              <input
+                type="text"
+                className="form-control my-4 "
+                placeholder="사용자명 입력"
+                style={{
+                  background: "#fcf4ff",
+                  borderTop: "0",
+                  borderRight: "0",
+                  borderLeft: "0",
+                  borderBottom: "1",
+                  borderColor: "#E8B7FF",
+                  height: "38px",
+                  width: "130px",
+                }}
+              />
+              <div
+                className="justify-content-center ms-2 my-4"
+                style={{ fontSize: "25px", fontWeight: "bold" }}
+              >
+                #{number}
+              </div>
             </div>
+
             <div className="d-flex justify-content-center">
               <label
                 class="form-label me-3"
-                style={{ fontSize: "13px", fontWeight: "bold" }}
+                style={{
+                  outline: "none",
+                  fontSize: "13px",
+                  fontWeight: "bold",
+                }}
               >
                 현재 비밀번호
               </label>
@@ -57,16 +89,16 @@ const InfoUpdate = () => {
                 style={{ height: "38px", width: "200px" }}
               />
               <button
-              type="button"
-              className="btn btn-outline-white ms-2"
-              style={{
-                background: "#E8B7FF",
-                fontSize: "13px",
-                fontWeight: "bold",
-              }}
-            >
-            수정하기
-            </button>
+                type="button"
+                className="btn btn-outline-white ms-2"
+                style={{
+                  background: "#E8B7FF",
+                  fontSize: "13px",
+                  fontWeight: "bold",
+                }}
+              >
+                수정하기
+              </button>
             </div>
             <div class="col-6">
               <div class="input-group mx-2 my-3">
@@ -115,7 +147,6 @@ const InfoUpdate = () => {
           </div>
         </div>
       </div>
-      <div className="col"></div>
     </div>
   );
 };

client/src/components/SignUp.js

@@ -80,7 +80,7 @@ const Signup = () => {
             <div className="d-flex text-center">
               <div className="col-4">
                 <input
-                  className="m-2 form-control"
+                  className="mt-2 form-control"
                   id="idNumber1"
                   type="text"
                   name="idNumber1"
@@ -89,19 +89,21 @@ const Signup = () => {
                   onChange={handleChange}
                 />
               </div>
-              <div className="col-1">ㅡ</div>
+              <div className="col-1 pt-3 ps-2">ㅡ</div>
               <div className="col-1">
                 <input
-                  className="m-2 form-control"
+                  className="mt-2 ms-2 form-control"
                   id="idNumber2"
                   type="text"
+                  style={{width:'35px'}}
                   name="idNumber2"
                   placeholder="●"
                   value={idNumber2}
                   onChange={handleChange}
+                  maxLength='1'
                 />
               </div>
-              ******
+              <div className="pt-3 ps-4">* * * * * *</div>
             </div>
           </div>
           <div className="p-2">