From 8a0dfda0ef4686894ba9729cdfd6c3beddaa99bf Mon Sep 17 00:00:00 2001 From: minsun24 Date: Mon, 3 Jul 2023 00:36:17 +0900 Subject: [PATCH 1/4] 07.03 --- account/static/css/signup.css | 2 +- account/static/css/signupForm.css | 31 +++-- account/templates/signupForm.html | 12 +- account/templates/signup_consultant.html | 15 ++- account/urls.py | 9 ++ base/templates/base.html | 3 + consulting/static/css/history.css | 13 ++ consulting/templates/consultingHistory.html | 60 +++++++++ consulting/templates/consultingSpace.html | 13 +- consulting/urls.py | 4 + consulting/views.py | 2 + myProfile/models.py | 1 + myProfile/static/css/editMyprofile.css | 22 ++++ myProfile/static/css/myProfile.css | 23 +++- myProfile/static/css/profile.css | 1 + myProfile/static/css/star.png | Bin 146006 -> 0 bytes myProfile/templates/editMyprofile.html | 132 +++++++++++++++++++- myProfile/templates/myProfile.html | 47 ++++++- myProfile/templates/profile_template.html | 7 +- point/templates/chargePoint.html | 8 +- 20 files changed, 362 insertions(+), 43 deletions(-) create mode 100644 consulting/static/css/history.css create mode 100644 consulting/templates/consultingHistory.html delete mode 100644 myProfile/static/css/star.png diff --git a/account/static/css/signup.css b/account/static/css/signup.css index af33965..0953a53 100644 --- a/account/static/css/signup.css +++ b/account/static/css/signup.css @@ -86,4 +86,4 @@ a:visited{ background-color: white; text-align: center; padding: 100px 100px; -} \ No newline at end of file +} diff --git a/account/static/css/signupForm.css b/account/static/css/signupForm.css index 092deb7..0d84132 100644 --- a/account/static/css/signupForm.css +++ b/account/static/css/signupForm.css @@ -52,11 +52,11 @@ a:visited{ .signup_container{ background-color: #d6d6d6; - width: 500px; - height: 700px; - margin: 0 auto; - border-radius: 20px; - padding: 50px; + width: 30rem; + height: 50rem; + margin: 5rem auto; + border-radius: 2rem; + padding: 3rem; } .signup_title{ @@ -66,10 +66,9 @@ a:visited{ } .signup_input, select{ - /* margin-top: 10px; */ margin: 10px auto; - height:50px; - width: 435px; + height: 3rem; + width: 26rem; border-radius: 10px; border: none; } @@ -83,11 +82,19 @@ a:visited{ } #signup_btn{ - height:50px; + height: 3rem; border: none; - border-radius: 10px; + border-radius: 1rem; background-color: rgb(145, 145, 145); - width:200px; + width: 15rem; display: block; - margin: 20px auto; + margin: 5rem auto 0 auto; +} +.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/signupForm.html b/account/templates/signupForm.html index 812903a..be177f0 100644 --- a/account/templates/signupForm.html +++ b/account/templates/signupForm.html @@ -15,7 +15,11 @@

{% block FormTitle %} signupForm {%endblock FormTitle %
-
+
+ +
+
+
@@ -24,15 +28,15 @@

{% block FormTitle %} signupForm {%endblock FormTitle %


- +
- +
{% block selectForm %} {% endblock selectForm %} -

+
diff --git a/account/templates/signup_consultant.html b/account/templates/signup_consultant.html index 24549ec..5cb7af3 100644 --- a/account/templates/signup_consultant.html +++ b/account/templates/signup_consultant.html @@ -16,12 +16,21 @@ - +

- -
+ +
diff --git a/account/urls.py b/account/urls.py index b61bb62..4a2b4c9 100644 --- a/account/urls.py +++ b/account/urls.py @@ -2,10 +2,19 @@ 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"), ] \ No newline at end of file diff --git a/base/templates/base.html b/base/templates/base.html index f20e731..8827091 100644 --- a/base/templates/base.html +++ b/base/templates/base.html @@ -3,6 +3,7 @@ + {% block static %}{% endblock %} @@ -20,12 +21,14 @@ 소식
+ {% block nav_right %} {% if user.is_authenticated %} 로그아웃 {% else %} 로그인 회원가입 {% endif %} + {% endblock %}
{% endblock %} diff --git a/consulting/static/css/history.css b/consulting/static/css/history.css new file mode 100644 index 0000000..694f436 --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/consulting/templates/consultingHistory.html b/consulting/templates/consultingHistory.html new file mode 100644 index 0000000..a17710c --- /dev/null +++ b/consulting/templates/consultingHistory.html @@ -0,0 +1,60 @@ +{% extends 'profile_template.html' %} +{% load static %} + +{% block static %} + + + +{% endblock %} + + +{% block title %}컨설턴트 포트폴리오/히스토리{% endblock %} + + +{% block profile_title %} + consulting Space +{% endblock %} + + + + + + +{% block menu %} +

+ 현재 컨설팅 +

+

+ 컨설팅 포트폴리오 +

+{% endblock %} + + +{% block nav_right %} + Consulting Space + 알람 + 마이프로필 + + +{% endblock %} + + +{% block maincontent %} +
과거 진행한 컨설팅
+ + + + +{% endblock %} + + diff --git a/consulting/templates/consultingSpace.html b/consulting/templates/consultingSpace.html index ceaf294..410d6e1 100644 --- a/consulting/templates/consultingSpace.html +++ b/consulting/templates/consultingSpace.html @@ -6,9 +6,7 @@ 컨설팅 스페이스 {% endblock %} -{% block maincontent %} - 여기는 Consulting Space 입니다. -{% endblock %} + @@ -21,6 +19,13 @@ 현재 컨설팅

- 컨설팅 포트폴리오 + 컨설팅 포트폴리오

+{% endblock %} + + + + + 인증 완료 + + + + + +
+ + + + + + +
+ + + + + + +
+

자기소개

+
+ + +
+
+ +
+

컨설팅 정보

+
+
컨설팅 분야
+
+ +
+
+
+
연락 가능 시간
+
+ +
+ 언제든지 가능 +
+ + + ~ + + + + +
+
+
+
컨설팅 횟수
+
+ 회 +
+
+ + + +
+ + + +{% endblock %} \ No newline at end of file diff --git a/myProfile/templates/myProfile.html b/myProfile/templates/myProfile.html index 2624465..de2bb1c 100644 --- a/myProfile/templates/myProfile.html +++ b/myProfile/templates/myProfile.html @@ -13,8 +13,35 @@ Profile {% endblock %} +{% block menu %} + + +{% endblock %} + +{% block nav_right %} + Consulting Space + 알람 + 마이프로필 + + +{% endblock %} + + + + {% block maincontent %} +
+ + 수정하기 + + + + + + + +
이름 : @@ -29,7 +56,18 @@
학력 :
- + + + + + + + + + + + +
@@ -77,10 +115,13 @@

컨설팅 리뷰

-
더보기
+ + +
더보기
-{% endblock maincontent %} + +{% endblock %} diff --git a/myProfile/templates/profile_template.html b/myProfile/templates/profile_template.html index b1b356f..1f14c4b 100644 --- a/myProfile/templates/profile_template.html +++ b/myProfile/templates/profile_template.html @@ -26,11 +26,12 @@
-

닉네임:

+

이름: + +

분야:

- @@ -41,7 +42,7 @@

{% block profile_title %}{% endblock %}

{% block menu %} - + {% endblock %}
diff --git a/point/templates/chargePoint.html b/point/templates/chargePoint.html index 1cb133c..e76b3f7 100644 --- a/point/templates/chargePoint.html +++ b/point/templates/chargePoint.html @@ -33,11 +33,11 @@
충전금액을 선택해주세요.
-
+ {% csrf_token %} - - - + + +
From 19828fdb716e963e9067034286dd21dab4049b4f Mon Sep 17 00:00:00 2001 From: minsun24 Date: Mon, 3 Jul 2023 20:28:18 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/static/css/login.css | 35 +++--- account/static/css/signup.css | 58 +++------ account/static/css/signupForm.css | 56 ++------- account/templates/login.html | 22 ++-- account/templates/signup.html | 8 +- account/templates/signupForm.html | 32 +++-- account/templates/signup_consultant.html | 11 ++ atop/settings.py | 2 + base/templates/base.html | 7 +- myProfile/static/css/editMyprofile.css | 19 ++- myProfile/static/css/myProfile.css | 18 +-- myProfile/static/css/profile.css | 6 +- myProfile/templates/editMyprofile.html | 138 +++++++++++++--------- myProfile/templates/myProfile.html | 43 ++++--- myProfile/templates/profile_template.html | 12 +- point/static/css/point.css | 66 ++--------- point/templates/chargePoint.html | 65 ++++------ point/templates/consultPoint.html | 2 +- point/urls.py | 1 + 19 files changed, 277 insertions(+), 324 deletions(-) diff --git a/account/static/css/login.css b/account/static/css/login.css index 8a674d0..90088fb 100644 --- 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; } \ No newline at end of file diff --git a/account/static/css/signup.css b/account/static/css/signup.css index 0953a53..0e03e30 100644 --- 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,12 +21,12 @@ 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; @@ -67,6 +34,7 @@ a:visited{ 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 index 0d84132..dd285ed 100644 --- 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,17 +22,16 @@ a:visited{ .signup_container{ background-color: #d6d6d6; - width: 30rem; + width: 33rem; height: 50rem; margin: 5rem auto; border-radius: 2rem; - padding: 3rem; + padding: 4rem; } .signup_title{ text-align: center; - - margin-bottom: 20px; + margin-bottom: 3rem; } .signup_input, select{ @@ -73,22 +42,15 @@ a:visited{ border: none; } -#signup_form{ - padding: 0 30px; -} + #signup_form label{ height: 20px; font-size: large; } -#signup_btn{ - height: 3rem; - border: none; - border-radius: 1rem; - background-color: rgb(145, 145, 145); - width: 15rem; - display: block; - margin: 5rem auto 0 auto; +.signup_btn{ + width:100%; + margin:2rem 0; } .authenticate .signup_input{ background-color: rgb(252, 252, 252); diff --git a/account/templates/login.html b/account/templates/login.html index 461b33a..b342e25 100644 --- a/account/templates/login.html +++ b/account/templates/login.html @@ -19,19 +19,21 @@

로그인

{% endif %}
- {% csrf_token %} -
-
- + {% csrf_token %} +
+ +
- -
-
- +
+ +
- -

+ + + 회원가입 하기 + +
diff --git a/account/templates/signup.html b/account/templates/signup.html index fdc7a18..1657735 100644 --- a/account/templates/signup.html +++ b/account/templates/signup.html @@ -20,15 +20,15 @@

회원가입

diff --git a/account/templates/signupForm.html b/account/templates/signupForm.html index be177f0..4c37532 100644 --- a/account/templates/signupForm.html +++ b/account/templates/signupForm.html @@ -10,33 +10,31 @@