From 9bf80e716946946bd928c0a0ca9522750c11e71f Mon Sep 17 00:00:00 2001 From: Yoochangmin Date: Sat, 20 Nov 2021 01:57:17 +0900 Subject: [PATCH] =?UTF-8?q?[FE][=EC=B0=BD=EB=AF=BC]=20::=20check=20,chcekd?= =?UTF-8?q?etail=20study=20=ED=8F=BC=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 템플릿 연결 필요 --- account/static/css/check.css | 49 +++++ account/static/css/check_detail.css | 55 ++++++ account/templates/check.html | 74 ++++++-- account/templates/check_detail.html | 50 +++-- {account => school}/static/css/boardform.css | 0 school/static/css/mainpage.css | 1 + school/static/css/study.css | 187 +++++++++++++++++++ school/templates/boardform.html | 8 +- school/templates/study.html | 120 +++++++++--- 9 files changed, 481 insertions(+), 63 deletions(-) create mode 100644 account/static/css/check.css create mode 100644 account/static/css/check_detail.css rename {account => school}/static/css/boardform.css (100%) create mode 100644 school/static/css/study.css diff --git a/account/static/css/check.css b/account/static/css/check.css new file mode 100644 index 0000000..b653b89 --- /dev/null +++ b/account/static/css/check.css @@ -0,0 +1,49 @@ +:root { + --maincolor: #CDF0FF; /*메인 색상*/ + --font50: 50px; /*메인 폰트 사이즈*/ + --font30: 30px; + --font15: 15px; + --fonit20: 20px; +} + +.gridContainner{ + display: grid; + + grid-template-areas: + 'LMarginLayout main RMarginLayout'; + grid-template-rows: auto; + grid-template-columns: 1fr 1200px 1fr; +} + +.LMarginLayout{ + grid-area: LMarginLayout; +} +.RMarginLayout{ + grid-area: RMarginLayout; +} + +.upmargin{ + height: 60px; +} +.undermargin{ + height: 60px; +} +.bc{ + display: flex; + background-color: var(--maincolor); + border-radius: 60px; + flex-direction: column; + justify-content: center; + padding: 30px; +} +tr td{ + padding-bottom: 30px; + border: white 2px solid; + vertical-align: center; + justify-items: center; +} + +table{ + border: white 2px solid; + border-radius: 60px; +} \ No newline at end of file diff --git a/account/static/css/check_detail.css b/account/static/css/check_detail.css new file mode 100644 index 0000000..5627082 --- /dev/null +++ b/account/static/css/check_detail.css @@ -0,0 +1,55 @@ +:root { + --maincolor: #CDF0FF; /*메인 색상*/ + --font50: 50px; /*메인 폰트 사이즈*/ + --font30: 30px; + --font15: 15px; + --fonit20: 20px; +} + +.gridContainner{ + display: grid; + + grid-template-areas: + 'LMarginLayout main RMarginLayout'; + grid-template-rows: auto; + grid-template-columns: 1fr 1200px 1fr; +} + +.main{ + grid-area:main ; + background-color: var(--maincolor); + padding: 20px; + border-radius: 50px; +} +.LMarginLayout{ + grid-area: LMarginLayout; +} +.RMarginLayout{ + grid-area: RMarginLayout; +} + +.upmargin{ + height: 60px; +} +.undermargin{ + height: 60px; +} +.check_containner{ + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; +} + + +.complete{ + padding-bottom: 20px; + color: white; +} +button{ +background-color: var(--maincolor); +} +img{ + border: 2px solid white; + background-color: var(--maincolor); +} \ No newline at end of file diff --git a/account/templates/check.html b/account/templates/check.html index ef93dd2..b121215 100644 --- a/account/templates/check.html +++ b/account/templates/check.html @@ -1,20 +1,54 @@ - - - - - - - Document - - - [회원가입 승인] -
-
- {%for a in check_users%} - {{a.username}}|{{a.real_name}}|{{a.uni_num}}|{{a.email}}|{{a.status}}|{{a.approval}}

- 관리 -
-
- {%endfor%} - - \ No newline at end of file +{% extends 'base.html' %} +{% load static %} + +{% block link %}{% static 'css/check.css' %} {% endblock %} +{% block content %} +
+
+ +
+
+
+
+

회원관리

+
+ +
+
+ [회원관리 상태] +
+
+
+
+ + +
+
+ + + + + + + + {% for a in check_users %} + +
+
+ + + + + + + + {% endfor %} +
아이디이름학번등록형태승인상태
{{ a.username }}{{ a.real_name }}{{ a.uni_num }}{{ a.status }} {{ a.approval }}
+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/account/templates/check_detail.html b/account/templates/check_detail.html index 594e961..51b6c19 100644 --- a/account/templates/check_detail.html +++ b/account/templates/check_detail.html @@ -1,14 +1,36 @@ - - - - - - - Document - - -

x

- - - - \ No newline at end of file +{% extends 'base.html' %} +{% load static %} + +{% block link %}{% static 'css/check_detail.css' %} {% endblock %} +{% block content %} + +
+
+ +
+
+ +
+
+

회원관리

+
+ +
+
+ [회원관리 승인] +
+
+
+
+

x

+
+
+
+
+
+
+ +
+ + +{% endblock %} diff --git a/account/static/css/boardform.css b/school/static/css/boardform.css similarity index 100% rename from account/static/css/boardform.css rename to school/static/css/boardform.css diff --git a/school/static/css/mainpage.css b/school/static/css/mainpage.css index 63d2832..3b8c6b4 100644 --- a/school/static/css/mainpage.css +++ b/school/static/css/mainpage.css @@ -103,6 +103,7 @@ html{ height: auto; border-bottom: black 1px solid ; padding: 10px; + background-color: var(--maincolor); } .writeList > .title{ diff --git a/school/static/css/study.css b/school/static/css/study.css new file mode 100644 index 0000000..733046b --- /dev/null +++ b/school/static/css/study.css @@ -0,0 +1,187 @@ + @font-face { + font-family: 'IM_Hyemin-Bold'; + src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2106@1.1/IM_Hyemin-Bold.woff2') format('woff'); + font-weight: normal; + font-style: normal; +} +html{ + height: 100vh; + width: 100vw; + overflow: auto; +} +:root{ + --maincolor: #CDF0FF; /*메인 색상*/ + --font50: 50px; /*메인 폰트 사이즈*/ + --font30:30px; + --font15: 15px; + --fonit20:20px; + --font40:40px; + +} +.pagination{ + display: flex; + margin-top: 20px; + justify-content: center; +} + .containner { + display: grid; + grid-template-areas: + 'marginL header marginR' + 'marginL boardnav marginR' + 'marginL main marginR' + 'marginL undermargin marginR'; + + grid-template-columns: 1fr 1200px 1fr; /*세로 좌:300px고정 가운데 1fr: 유동식 우 300px 고정*/ + grid-template-rows: 90px 160px 1fr 140px; /*가로 */ + } +.containner div { + display: grid; + +} + +.header { + grid-area: header; +} + +.marginL { + grid-area: marginL; +} + +.main { + grid-area: main; + margin-top: 2vh; +} + +.marginR { + grid-area: marginR; + height: 100vh; +} + +.undermargin { + grid-area: undermargin; +} + +.navbr { + justify-items: center; + align-items: center; + width: 100%; +} +.boardnav { /*아직 안정함*/ + grid-area: boardnav; + background-color: var(--maincolor); + border-radius: 10px; + padding: 8px; + margin-bottom: 20px; + height: 160px; +} + +.middleboard{ + padding: 8px; + background-color: white; + +} +.mainboard{ + + background-color: var(--maincolor); +} +.introduce{ + +} +.writetext{ + display: flex !important; + background-color: var(--maincolor); + border-radius: 30px; + height: 15vh; + padding : 1rem 0.8rem 1rem 0.8rem; + flex-direction: row ; +} +.writetext div{ + border: 3px solid black; +} +.writeList{ + overflow:auto; + height: auto; + border-bottom: black 1px solid ; + padding: 10px; + background-color: var(--maincolor); +} + +.writeList > .title{ + margin: 2vh 0 10px 1vh; + font-size: var(--fonit20); + +} +.sort_bar{ + background-color: var(--maincolor); +} +.writearea{ + + border-color: var(--maincolor); + font-family: 'IM_Hyemin-Bold'; + font-size: var(--fonit20); +} +.test1{ + width: 95%; +} +.writeList > .mainstory{ + border: 1px solid black ; + position: relative; + height: 6vh; + border-radius: 10px; + margin: 0 1vw 1vh 1vw; + background-color: white; +} +.number{ + background-color: var(--maincolor); + height: 120px; +} + +.nextnav{ + display: flex; + justify-content: center; +} +.nextnav span{ + margin: 0 1vw 0 1vw; +} +.content{ + font-family: 'IM_Hyemin-Bold'; + + display:flex; + align-items: center; + justify-content: center; + margin: 0 20px 0 20px; +} +.imagesize{ + width: 40px; + height: 40px; + border: black 1px solid; +} + +.mainboard{ + height: 100%; + border-radius: 20px; +} +.content a{ + margin: 0 3vw 0 3vw; + border-left: solid white 2px; + border-right: solid white 2px; + padding: 10px; +} +.h{ + height: 50px; +} +.name{ + font-size: 2.0vw; + vertical-align: center; + margin-top: 40px; +} + +.sort_bar{ + display: flex; + flex-direction: row; + height: 100%; + margin-bottom: 15px; +} +/*.likebutton_bar {*/ +/* display: flex;*/ +/*}*/ diff --git a/school/templates/boardform.html b/school/templates/boardform.html index b07f793..6fd4bce 100644 --- a/school/templates/boardform.html +++ b/school/templates/boardform.html @@ -15,14 +15,10 @@

자유게시판

제목 -
- -
+ -
+
diff --git a/school/templates/study.html b/school/templates/study.html index 56afbfc..297f063 100644 --- a/school/templates/study.html +++ b/school/templates/study.html @@ -1,24 +1,98 @@ +{% extends 'base.html' %} {% load static %} - - - - - - - Document - - -

<공지사항 CRUD 테스트 중>

- {%for a in Study_boards%} -
- 글쓰기 -

{{a.Study_title}}

-

{{a.Study_pub_date}}

-

{{a.Study_author}}

-

{{a.Study_body}}

-

X

-
- {%endfor%} - - \ No newline at end of file +{% block title %} 공부 게시판{% endblock %} +{% block link %}{% static 'css/study.css' %}{% endblock %} + +{% block content %} +
+
+
+
+
+
+ + 자유 게시판 + 스터디 게시판 + 공모전 게시판 + 졸업생 게시판 + 동아리 게시판 + +
+
+
+
+
+
자유게시판
+
+ +
+
+ +
+
+ +
+
+ + +
+ +
+
+
ㅎ2ㅎ2
+ +
+
help...
+
+ +
+ +
+
+
+ +
+ +{% endblock %} + + + + + + + + + +
+ {% for a in Study_boards %} +
+ 글쓰기 + 제목 +

{{ a.Study_title }}

+
+ +

{{ a.Study_pub_date }}

+

{{ a.Study_author }}

+

{{ a.Study_body }}

+

X

+
+ {% endfor %} +