Merge pull request #6 from SPARCS-Service-Hackathon-2024/feature/chat

Style: 로그인 UI
SPARCS-Service-Hackathon-2024 · Feb 16, 2024 · aeedd6f · aeedd6f
2 parents 5c12eba + 58b5aa9
commit aeedd6f
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 37 deletions.
diff --git a/src/components/Calendar.js b/src/components/Calendar.js
@@ -21,6 +21,7 @@ const CalendarImage = styled.img`
 const Label = styled.label`
     font-family: 'Pretendard', sans-serif;
     font-weight: 500;
+    margin-bottom: 12;
 `;
 
 const CalendarLabelContainer = styled.div`

diff --git a/src/pages/DetailPage.js b/src/pages/DetailPage.js
@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { useParams } from 'react-router-dom';
 import { detail } from '../services/detail';
 import map from '../assets/map-pin.svg';
@@ -13,6 +14,23 @@ const Container = styled.div`
     padding: 0 16px;
 `;
 
+const Button = styled.div`
+    background-color: #864AE1;
+    width: 80%;
+    height: 45px;
+    color: #fff;
+    font-family: 'Pretendard', sans-serif;
+    font-weight: 600;
+    font-size: 14px;
+    border: none;
+    border-radius: 16px;
+    margin: 4vh auto;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+`;
+
 const AptImage = styled.img`
     width: 100%;
     height: 295px;
@@ -94,6 +112,8 @@ const TableData = styled.div`
 `;
 
 function DetailPage() {
+    const navigator = useNavigate();
+
     const { house_id } = useParams();
     const [houseDetail, setHouseDetail] = useState(null);
 
@@ -122,6 +142,10 @@ function DetailPage() {
         </TableRow>
     );
 
+    const handleRegisterClick = () => {
+        navigator('/registerHome');
+    };
+
     return (
         <>
             <AptImage src={houseDetail.image_url} alt="아파트 이미지" />
@@ -147,6 +171,8 @@ function DetailPage() {
                     {renderRow('학교 종류', `${houseDetail.organizationType}`)}
                     {renderRow('학교까지 걸어서', `${houseDetail.walkTime}분`)}
                 </Table>
+
+                <Button onClick={handleRegisterClick}>한달 살기 신청하기</Button>
             </Container>
         </>
     );

diff --git a/src/pages/Register.js b/src/pages/Register.js
@@ -19,21 +19,9 @@ const Form = styled.form`
   align-items: center;
 `;
 
-const Label = styled.label`
-  display: block;
-  margin-bottom: 10px;
-  font-family: 'Pretendard', sans-serif;
-  white-space: pre-wrap;
-  word-break: break-word;
-  text-align: left;
-`;
-
-const InputContainer = styled.div`
-  padding: 0 16px 0 16px;
-`;
 
 const Input = styled.input`
-  width: 100%;
+  width: 80%;
   padding: 10px 0;
   margin-bottom: 10px;
   border: none;
@@ -49,16 +37,33 @@ const Input = styled.input`
   }
 `;
 
+const Label = styled.label`
+  width: 80%; // Match the Input width
+  display: block;
+  margin-bottom: 10px;
+  font-family: 'Pretendard', sans-serif;
+  white-space: pre-wrap;
+  word-break: break-word;
+  text-align: left;
+  padding-bottom: 48px;
+  margin-left: auto; // Center alignment
+  margin-right: auto; // Center alignment
+`;
+
 const Message = styled.p`
-  margin-top: 10px;
+  width: 80%; // Match the Input width
+  margin-bottom: 106px;
   font-family: 'Pretendard', sans-serif;
   font-weight: 400;
   font-size: 14px;
   display: block;
   text-align: left;
   margin-top: 16px;
+  margin-left: auto; // Center alignment
+  margin-right: auto; // Center alignment
 `;
 
+
 const Button = styled.button`
   background-color: #864AE1;
   width: 80%;
@@ -69,7 +74,6 @@ const Button = styled.button`
   font-size: 14px;
   border: none;
   border-radius: 16px;
-  margin: 4vh auto;
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -103,10 +107,10 @@ const Register = () => {
 
   const handleSubmit = async (e) => {
     e.preventDefault();
-    
+
     try {
       const response = await login(nickname, password);
-      
+
       if (response.success) {
         localStorage.setItem('token', response.data.access_token);
         localStorage.setItem('nickname', nickname);
@@ -128,26 +132,24 @@ const Register = () => {
   return (
     <Container>
       <Form onSubmit={handleSubmit}>
-        <InputContainer>
-          <Label>회원이신가요?{'\n'}닉네임과 비밀번호를 입력해주세요</Label>
-          <Input
-            id="nickname"
-            type="text"
-            placeholder="닉네임을 입력해주세요"
-            value={nickname}
-            onChange={handleNicknameChange}
-            required
-          />
-          <Input
-            id="password"
-            type="password"
-            placeholder="비밀번호를 입력해주세요"
-            value={password}
-            onChange={handlePasswordChange}
-            required
-          />
-          <Message>회원이 아니시라면 자동으로 회원가입을 진행합니다</Message>
-        </InputContainer>
+        <Label>회원이신가요?{'\n'}닉네임과 비밀번호를 입력해주세요</Label>
+        <Input
+          id="nickname"
+          type="text"
+          placeholder="닉네임을 입력해주세요"
+          value={nickname}
+          onChange={handleNicknameChange}
+          required
+        />
+        <Input
+          id="password"
+          type="password"
+          placeholder="비밀번호를 입력해주세요"
+          value={password}
+          onChange={handlePasswordChange}
+          required
+        />
+        <Message>회원이 아니시라면 자동으로 회원가입을 진행합니다</Message>
         <Button type="submit" disabled={!isFormValid}>로그인하기</Button>
       </Form>
     </Container>