Merge remote-tracking branch 'origin/jaeyeon' into ourMaster

client/.gitignore

@@ -20,4 +20,5 @@
 
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
\ No newline at end of file
+yarn-error.log*
+package-lock.json
\ No newline at end of file

client/package-lock.json

@@ -16694,4 +16694,4 @@
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     }
   }
-}
+}
\ No newline at end of file

client/src/Pages/Signup.js

@@ -5,11 +5,34 @@ import SubNav from '../Components/SubNav';
 
 function Signup() {
 
+
     return (
-        <div>
+        <div class="form-container">
             <MainNav />
             <SubNav />
+            <form id="form" class="form">
+                <h1>회원가입</h1>
+                <div class="form-control">
+                    <label for="id">아이디</label>
+                    <input type="text" id="id" placeholder="아이디를 입력하세요"></input>
+
+                    <label for="name">본명</label>
+                    <input type="text" id="name" placeholder="본명을 입력하세요"></input>
+
+                    <label for="password">비밀번호</label>
+                    <input type="password" id="password" placeholder="비밀번호를 입력하세요"></input>
+
+                    <label for="password2">비밀번호 확인</label>
+                    <input type="password" id="password2" placeholder="비밀번호를 한번 더 입력하세요"></input>
+
+                    <label for="tel">휴대폰 번호</label>
+                    <input type="text" id="tel" placeholder="휴대폰 번호를 입력하세요"></input>
+
+                    <label for="add">주소</label>
+                </div>
+            </form>
         </div>
+
     )
 }