Merge pull request #42 from A-to-P/feat/#40-detailedRequest

Feat/#40 detailed request
A-to-P · Jul 3, 2023 · 34af870 · 34af870
2 parents 3d6be9f + c03afe0
commit 34af870
Show file tree

Hide file tree

Showing 29 changed files with 625 additions and 266 deletions.
diff --git a/account/static/css/login.css b/account/static/css/login.css
@@ -8,19 +8,23 @@
 }
 
 .login_container{
-  height:600px;
-  width:400px;
-  border-radius: 30px;
+  height: 36rem;
+  width: 30rem;
+  border-radius: 2rem;
   background-color: rgb(189, 189, 189);
-  margin: 0 auto; 
-  padding: 50px;
+  margin: 0 auto;
+  padding: 3rem;
 }
 .login_title{
   text-align: center;
-  background-color:rgb(255, 255, 255);
   margin-bottom: 20px;
 }
-
+h1{
+  font-weight: bold;
+}
+.form-control{
+  height: 3rem;
+}
 
 .id{
   height: 70px;
@@ -45,17 +49,14 @@
   border: none;
 }
 
-#login_form label{
-  height: 20px;
+label{
   font-size: large;
-  padding: 0 20px; 
+  font-weight: bold;
+  padding: 0 1rem;
 }
 
-#login_btn{
-  height:50px;
-  border: none;
-  border-radius: 10px;
-  background-color: rgb(255, 255, 255);
-  width:400px; 
-  margin-bottom: 10px;
+.login_btn{
+
+  width:100%;
+  margin:2rem 0;
 }
diff --git a/account/static/css/signup.css b/account/static/css/signup.css
@@ -3,39 +3,6 @@
   margin: 0 0;
 }
 
-/* 내비게이션 바 */
-.nav{
-  background-color: gray;
-  height:30px;
-  padding:10px 30px;
-  margin-bottom: 90px;
-  display: flex;
-  justify-content: space-between;
-}
-.nav span{
-  margin-right: 15px;
-  display: inline-block;
-  height: 20px;
-  width:fit-content; 
-  padding: 10px;
-
-}
-.nav a{
-  margin-left: 15px;
-  display: inline-block;
-  height: 20px;
-  width:fit-content; 
-  padding: 10px;
-}
-
-/* 푸터 */
-footer{
-  padding: 20px 20px;
-  display:flex;
-  justify-content: space-between;
-  margin: 0 200px;
-  background-color: rgb(224, 224, 224);
-}
 
 a{
   text-decoration-line: none;
@@ -54,19 +21,20 @@ a:visited{
   min-height: inherit;
 }
 .signup_container{
-  height: 500px;
-  width: 600px;
+  height: 38rem;
+  width: 40rem;
   margin: 0 auto;
-  border-radius: 20px;
-  padding: 30px;
-  background-color: rgb(198, 198, 198); 
+  border-radius: 2rem;
+  padding: 3rem;
+  background-color: rgb(198, 198, 198);
 }
 .signup_title{
   text-align: center;
   background-color:rgb(255, 255, 255);
   margin-bottom: 20px;
 }
 .choice{
+
   margin-bottom: 80px;
   margin-top: 20px;
   text-align: center;
@@ -75,15 +43,19 @@ a:visited{
   display:flex;
   justify-content: space-between;
 }
+h1{
+  text-align: center;
+  font-weight: bold;
+}
 
 
 
 .restaurant_choice, .consultant_choice {
-  width : fit-content;
-  height: fit-content;
-  margin: 10px 0 ;
-  border-radius:20px;
+  width: 15rem;
+  height: 15rem;
+  margin: 0.5rem;
+  border-radius: 2rem;
   background-color: white;
   text-align: center;
-  padding: 100px 100px;
-}
+  padding: 5rem 3rem;
+}
diff --git a/account/static/css/signupForm.css b/account/static/css/signupForm.css
@@ -2,38 +2,8 @@
   margin:0 0;
 
 }
-/* 내비게이션 바 */
-.nav{
-  background-color: gray;
-  height:30px;
-  padding:10px 30px;
-  margin-bottom: 90px;
-  display: flex;
-  justify-content: space-between;
-}
-.nav span{
-  margin-right: 15px;
-  display: inline-block;
-  height: 20px;
-  width:fit-content; 
-  padding: 10px;
-
-}
-.nav a{
-  margin-left: 15px;
-  display: inline-block;
-  height: 20px;
-  width:fit-content; 
-  padding: 10px;
-}
-
-/* 푸터 */
-footer{
-  padding: 20px 20px;
-  display:flex;
-  justify-content: space-between;
-  margin: 0 200px;
-  background-color: rgb(224, 224, 224);
+h2{
+  font-weight: bold;
 }
 
 a{
@@ -52,42 +22,41 @@ a:visited{
 
 .signup_container{
   background-color: #d6d6d6;
-  width: 500px;
-  height: 700px;
-  margin: 0 auto;
-  border-radius: 20px;
-  padding: 50px;
+  width: 33rem;
+  height: 50rem;
+  margin: 5rem auto;
+  border-radius: 2rem;
+  padding: 4rem;
 }
 
 .signup_title{
   text-align: center;
-
-  margin-bottom: 20px;
+  margin-bottom: 3rem;
 }
 
 .signup_input, select{
-  /* margin-top: 10px; */
   margin: 10px auto;
-  height:50px;
-  width: 435px;
+  height: 3rem;
+  width: 26rem;
   border-radius: 10px;
   border: none;
 }
 
-#signup_form{
-  padding: 0 30px;
-}
+
 #signup_form label{
   height: 20px;
   font-size: large;
 }
 
-#signup_btn{
-  height:50px;
-  border: none;
-  border-radius: 10px;
-  background-color: rgb(145, 145, 145);
-  width:200px; 
-  display: block;
-  margin: 20px auto;
+.signup_btn{
+  width:100%;
+  margin:2rem 0;
+}
+.authenticate .signup_input{
+  background-color: rgb(252, 252, 252);
+  height: 3rem;
+  display: flex;
+  width: auto;
+  justify-content: space-between;
+  padding: 0.5rem;
 }
diff --git a/account/templates/login.html b/account/templates/login.html
@@ -19,19 +19,21 @@ <h1> 로그인 </h1>
     {% endif %}
 
     <form id="login_form" method="POST" actions="{% url 'login' %}">
-    {% csrf_token %}
-      <div class="id">
-        <label for="user_id"> ID </label><br>
-        <input type="text" class="login_input" placeholder="아이디를 입력하세요." id="user_id" name="id"/>
+      {% csrf_token %}
+      <div class="mb-3">
+        <label for="user_id" class="form-label">ID</label>
+        <input type="text" class="form-control" id="user_id" name="id" placeholder="아이디를 입력하세요">
       </div>
-
-      <div class="pw">
-        <label for="user_pw"> PW </label><br>
-        <input type="password" class="login_input" placeholder="비밀번호를 입력하세요." name="pw" id="user_pw"/>
+      <div class="mb-3">
+        <label for="user_id" class="form-label">PW</label>
+        <input type="password" class="form-control" name="pw" id="user_pw" placeholder="비밀번호를 입력하세요">
       </div>
-
-      <p><button id="login_btn">로그인</button></p>
+
+
+      <button type="submit" class="btn btn-primary login_btn">로그인</button>
       <a href="{% url 'signup' %}" style="float:right;" > 회원가입 하기 </a>
+
+
     </form>
   </div>
 </div>

diff --git a/account/templates/signup.html b/account/templates/signup.html
@@ -20,15 +20,15 @@ <h1 style="text-align:center;margin-bottom: 20px;"> 회원가입 </h1>
 
     <div class="signup_choice">
       <div class="restaurant">
-        <p>컨설팅을 받고 싶다면</p>
+        <p style="text-align:center;">컨설팅을 받고 싶다면</p>
         <div class= "restaurant_choice">
-          <a href="{% url 'signup_restaurant' %}" class="restaurant"> 요식업자<br>회원가입 </a>
+          <a href="{% url 'signup_restaurant' %}" class="restaurant"> <h4>요식업자<br>회원가입</h4> </a>
         </div>
       </div>
       <div class="consultant">
-        <p>컨설팅을 하고 싶다면</p>
+        <p style="text-align:center;">컨설팅을 하고 싶다면</p>
         <div class="consultant_choice">
-          <a href="{% url 'signup_consultant' %}" class="consultant"> 컨설턴트<br>회원가입 </a>
+          <a href="{% url 'signup_consultant' %}" class="consultant"> <h4>컨설턴트<br>회원가입</h4> </a>
         </div>
       </div>
     </div>

diff --git a/account/templates/signupForm.html b/account/templates/signupForm.html
@@ -16,7 +16,7 @@ <h1 class="signup_title">{% block FormTitle %} signupForm {%endblock FormTitle %
     {{error}}
     {% endif %}
 
-    <form id="signup_form" method="POST" actions="{% url 'signup_restaurant' %}> 
+    <form id="signup_form" method="POST" actions="{% url 'signup_restaurant' %}"> 
       {% csrf_token %}
       <div class="form_field">
         <label for="user_id"> 이름 </label><br>

diff --git a/account/urls.py b/account/urls.py
@@ -2,9 +2,10 @@
 from . import views
 
 urlpatterns = [
-    path('login/', views.login, name="login"),
-    path('logout/', views.logout, name="logout"),
-    path('signup/', views.signup, name="signup"),
-    path('signup_restaurant/', views.signup_restaurant, name="signup_restaurant"),
-    path('signup_consultant/', views.signup_consultant, name="signup_consultant"),
+    path('login', views.login, name="login"),
+    path('logout', views.logout, name="logout"),
+    path('signup', views.signup, name="signup"),
+    path('signup_restaurant', views.signup_restaurant, name="signup_restaurant"),
+    path('signup_consultant', views.signup_consultant, name="signup_consultant"),
+
 ]
diff --git a/base/templates/base.html b/base/templates/base.html
@@ -3,6 +3,9 @@
 <html lang="en">
   <head>
     <link rel="stylesheet" href="{% static '/css/base.css' %}">
+    <!-- CSS only -->
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+
     {% block static %}{% endblock %}  <!-- base 상속받은 다른 html에 적용할 css 파일 경로 -->
 
     <meta charset="UTF-8" />
@@ -20,12 +23,14 @@
           <a href=""> 소식 </a>
         </div>
         <div class="nav_right">
+        {% block nav_right %}
           {% if user.is_authenticated %}
           <a href="{% url 'logout' %}" > 로그아웃 </a>
           {% else %}
           <a href="{% url 'login' %}" > 로그인 </a>
           <a href="{% url 'signup' %}"> 회원가입 </a>
           {% endif %}
+        {% endblock %}
         </div>
       </div>
       {% endblock %}
@@ -66,8 +71,9 @@
     </div>
 
     <!-- base.html에 적용될 자바스크립트 경로 -->
-    <script  type="text/javascript" src="{% static '/js/base.js' %}"></script>
-
+    <!-- <script  type="text/javascript" src="{% static '/js/base.js' %}"></script> -->
+    <!-- JavaScript Bundle with Popper -->
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
     <!-- 다음 html에 적용할 js 파일 경로 넣는 곳 -->
     {% block js %}{% endblock %}
   </body>

diff --git a/consulting/static/css/history.css b/consulting/static/css/history.css
@@ -0,0 +1,13 @@
+.history{
+  margin: 0 auto;
+  text-align: center;
+  /* display: flex;
+  justify-content: space-between; */
+  border: solid black 1px;
+  padding: 0.5rem;
+  width: 42rem;
+  list-style-type: none;
+}
+span{
+  margin: 0 0.3rem;
+}