Skip to content
This repository has been archived by the owner on Feb 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' of https://github.com/Yoochangmin/4-School_ties
Browse files Browse the repository at this point in the history
  • Loading branch information
@swa05142
swa05142 committed Nov 19, 2021
2 parents 83f0956 + 59f7cca commit 9f92519
Show file tree
Hide file tree
Showing 22 changed files with 832 additions and 175 deletions.
3 changes: 2 additions & 1 deletion account/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class CustomUserAdmin(UserAdmin):

fieldsets = (
(None, {"fields": ("username", "password", "real_name", "email",
"uni_num", "status", "card", "approval","rank_count" 'is_staff')},),
"uni_num", "status", "card", "approval","rank_count","is_staff")},),
)


Expand All @@ -25,4 +25,5 @@ class CustomUserAdmin(UserAdmin):
"card",
"approval",
"rank_count",
"is_staff"
)
2 changes: 1 addition & 1 deletion account/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.9 on 2021-11-18 17:33
# Generated by Django 3.2.9 on 2021-11-19 14:15

import django.contrib.auth.models
import django.contrib.auth.validators
Expand Down
49 changes: 49 additions & 0 deletions account/static/css/check.css
View file
Original file line number Diff line number Diff line change
@@ -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;
}
55 changes: 55 additions & 0 deletions account/static/css/check_detail.css
View file
Original file line number Diff line number Diff line change
@@ -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);
}
74 changes: 54 additions & 20 deletions account/templates/check.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,54 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=, initial-scale=1.0">
<title>Document</title>
</head>
<body>
[회원가입 승인]
<br>
<br>
{%for a in check_users%}
{{a.username}}|{{a.real_name}}|{{a.uni_num}}|{{a.email}}|{{a.status}}|{{a.approval}}</p>
<a href = "{% url 'check_detail' a.id %}">관리</a>
<br>
<br>
{%endfor%}
</body>
</html>
{% extends 'base.html' %}
{% load static %}

{% block link %}{% static 'css/check.css' %} {% endblock %}
{% block content %}
<div class="upmargin"></div>
<div class="gridContainner">

<div class="LMarginLayout"></div>
<div class="RMarginLayout"></div>
<div class="main">
<div id="board_name">
<h2>회원관리</h2>
</div>

<div class="boardcontainner">
<div class="">
[회원관리 상태]
</div>
<br>
<br>
<div class="bc">
<table class="bulletin_board_table">
<tr class="test"><!-- 첫번째 줄 시작 -->
<div class="hh">
<td class="id">아이디</td>
<td class="realname">이름</td>
<td class="classnumber">학번</td>
<td class="email">이메일</td>
<td class="등록형태">등록형태</td>
<td class="등록형태">승인상태</td>
</div>
</tr>
{% for a in check_users %}
<tr class="test"><!-- 첫번째 줄 시작 -->
<div class="gg">
<td class="id"> {{ a.username }}</td>
<td class="realname">{{ a.real_name }}</td>
<td class="classnumber">{{ a.uni_num }}</td>
<td class="email">{{ a.email }}</td>
<td class="등록형태">{{ a.status }} </td>
<td class="등록형태">{{ a.approval }}</td>
</div>
</tr>
{% endfor %}
</table>
</div>
</div>
</div>
</div>
<div class="undermargin"></div>


{% endblock %}
50 changes: 36 additions & 14 deletions account/templates/check_detail.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,36 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<body>
<p><img src="{{check_detail_user.card.url}}" width = "200" height ="200" alt ="x"/></p>
<a href="{% url 'update_status' check_detail_user.id %}"><input type="submit" value="승인완료"></a>
<a href="{% url 'delete_user' check_detail_user.id %}"><input type="submit" value="삭제"></a>
</body>
</html>
{% extends 'base.html' %}
{% load static %}

{% block link %}{% static 'css/check_detail.css' %} {% endblock %}
{% block content %}

<div class="upmargin"></div>
<div class="gridContainner">

<div class="LMarginLayout"></div>
<div class="RMarginLayout"></div>

<div class="main">
<div id="board_name">
<h2>회원관리</h2>
</div>

<div class="boardcontainner">
<div class="">
[회원관리 승인]
</div>
<br>
<br>
<div class="check_containner">
<p><img src="{{ check_detail_user.card.url }}" width="500" height="500" alt="x"/></p>
<div class="complete"><a href="{% url 'update_status' check_detail_user.id %}"><button type="submit" value="승인완료" class="btn btn-info">승인완료</a></div>
<div class="delete"><a href="{% url 'delete_user' check_detail_user.id %}"><button type="submit" value="삭제" class="btn btn-info">삭제</a></div>
</div>
</div>
</div>
</div>
</div>
<div class="undermargin"></div>


{% endblock %}
2 changes: 1 addition & 1 deletion account/templates/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<input class="email_submit_bar" type="text" name="username" placeholder="아이디를 입력하세요."><br>
<div class="submit">비밀번호</div>
<input class="email_submit_bar" type="password" name="password" placeholder="비밀번호를 입력하세요.">
<div class ="sureLogin"><button id="button">로그인</button></div>
<div class ="sureLogin"><button type="submit" id="button">로그인</button></div>
<p>{{ error }}</p>
</form>
{# <div class="email">#}
Expand Down
14 changes: 11 additions & 3 deletions school/admin.py
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
from django.contrib import admin
from .models import Notice, Free_board, Notice_Comment, Study_board, Club_board, Contest_board, Graduate_board, Market_board
from .models import *

# Register your models here.
admin.site.register(Notice)
admin.site.register(Notice_Comment)
admin.site.register(Schedule)
admin.site.register(Free_board)
admin.site.register(Study_board)
admin.site.register(Contest_board)
admin.site.register(Graduate_board)
admin.site.register(Club_board)
admin.site.register(Market_board)
admin.site.register(Market_board)

admin.site.register(Notice_Comment)
admin.site.register(Free_Comment)
admin.site.register(Study_Comment)
admin.site.register(Contest_Comment)
admin.site.register(Graduate_Comment)
admin.site.register(Club_Comment)
admin.site.register(Market_Comment)
Loading

0 comments on commit 9f92519

Please sign in to comment.