#}
diff --git a/school/admin.py b/school/admin.py
index f6341eb..b30db5f 100644
--- a/school/admin.py
+++ b/school/admin.py
@@ -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)
\ No newline at end of file
+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)
\ No newline at end of file
diff --git a/school/migrations/0001_initial.py b/school/migrations/0001_initial.py
index 134b41f..9060024 100644
--- a/school/migrations/0001_initial.py
+++ b/school/migrations/0001_initial.py
@@ -1,5 +1,6 @@
-# Generated by Django 3.2.9 on 2021-11-18 16:46
+# Generated by Django 3.2.9 on 2021-11-19 14:15
+from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
@@ -9,6 +10,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
@@ -17,10 +19,10 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Club_title', models.CharField(max_length=2000)),
- ('Club_author', models.CharField(max_length=50)),
- ('Club_pub_date', models.DateField()),
+ ('Club_pub_date', models.DateTimeField(auto_now=True)),
('Club_body', models.TextField()),
- ('Club_image', models.ImageField(blank=True, null=True, upload_to='Graduate_board/')),
+ ('Club_image', models.ImageField(blank=True, null=True, upload_to='Club_board/')),
+ ('Club_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
@@ -28,10 +30,10 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Contest_title', models.CharField(max_length=2000)),
- ('Contest_author', models.CharField(max_length=50)),
- ('Contest_pub_date', models.DateField()),
+ ('Contest_pub_date', models.DateTimeField(auto_now=True)),
('Contest_body', models.TextField()),
('Contest_image', models.ImageField(blank=True, null=True, upload_to='Contest_board/')),
+ ('Contest_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
@@ -39,10 +41,10 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Free_title', models.CharField(max_length=2000)),
- ('Free_author', models.CharField(max_length=50)),
- ('Free_pub_date', models.DateField()),
+ ('Free_pub_date', models.DateTimeField(auto_now=True)),
('Free_body', models.TextField()),
('Free_image', models.ImageField(blank=True, null=True, upload_to='Free_board/')),
+ ('Free_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
@@ -50,10 +52,10 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Graduate_title', models.CharField(max_length=2000)),
- ('Graduate_author', models.CharField(max_length=50)),
- ('Graduate_pub_date', models.DateField()),
+ ('Graduate_pub_date', models.DateTimeField(auto_now=True)),
('Graduate_body', models.TextField()),
('Graduate_image', models.ImageField(blank=True, null=True, upload_to='Graduate_board/')),
+ ('Graduate_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
@@ -61,10 +63,10 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Market_title', models.CharField(max_length=2000)),
- ('Market_author', models.CharField(max_length=50)),
- ('Market_pub_date', models.DateField()),
+ ('Market_pub_date', models.DateTimeField(auto_now=True)),
('Market_body', models.TextField()),
- ('Market_image', models.ImageField(blank=True, null=True, upload_to='Graduate_board/')),
+ ('Market_image', models.ImageField(blank=True, null=True, upload_to='Market_board/')),
+ ('Market_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
@@ -72,10 +74,17 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Notice_title', models.CharField(max_length=2000)),
- ('Notice_author', models.CharField(max_length=50)),
- ('Notice_pub_date', models.DateField()),
+ ('Notice_pub_date', models.DateTimeField(auto_now=True)),
('Notice_body', models.TextField()),
('Notice_image', models.ImageField(blank=True, null=True, upload_to='notice/')),
+ ('Notice_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Schedule',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('sche_pub_date', models.DateTimeField(auto_now=True)),
],
),
migrations.CreateModel(
@@ -83,10 +92,20 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Study_title', models.CharField(max_length=2000)),
- ('Study_author', models.CharField(max_length=50)),
- ('Study_pub_date', models.DateField()),
+ ('Study_pub_date', models.DateTimeField(auto_now=True)),
('Study_body', models.TextField()),
('Study_image', models.ImageField(blank=True, null=True, upload_to='Study_board/')),
+ ('Study_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Study_Comment',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('study_content', models.CharField(max_length=500)),
+ ('study_at', models.DateTimeField(auto_now=True)),
+ ('study', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='school.study_board')),
+ ('study_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
@@ -94,9 +113,59 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('notice_content', models.CharField(max_length=500)),
- ('notice_author', models.CharField(max_length=50)),
('notice_at', models.DateTimeField(auto_now=True)),
('notice', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='school.notice')),
+ ('notice_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Market_Comment',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('market_content', models.CharField(max_length=500)),
+ ('market_at', models.DateTimeField(auto_now=True)),
+ ('market', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='school.market_board')),
+ ('market_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Graduate_Comment',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('graduate_content', models.CharField(max_length=500)),
+ ('graduate_at', models.DateTimeField(auto_now=True)),
+ ('graduate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='school.graduate_board')),
+ ('graduate_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Free_Comment',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('free_content', models.CharField(max_length=500)),
+ ('free_at', models.DateTimeField(auto_now=True)),
+ ('free', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='school.free_board')),
+ ('free_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Contest_Comment',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('contest_content', models.CharField(max_length=500)),
+ ('contest_at', models.DateTimeField(auto_now=True)),
+ ('contest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='school.contest_board')),
+ ('contest_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Club_Comment',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('club_content', models.CharField(max_length=500)),
+ ('club_at', models.DateTimeField(auto_now=True)),
+ ('club', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='school.club_board')),
+ ('club_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
diff --git a/school/models.py b/school/models.py
index 8e6884d..b5bafd1 100644
--- a/school/models.py
+++ b/school/models.py
@@ -4,8 +4,8 @@
# 공지 게시판(공지 게시판 데이터 쌓이는 곳)
class Notice(models.Model) :
Notice_title = models.CharField(max_length=2000)
- Notice_author = models.CharField(max_length=50)
- Notice_pub_date = models.DateField()
+ Notice_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ Notice_pub_date = models.DateTimeField(auto_now=True)
Notice_body = models.TextField()
Notice_image = models.ImageField(upload_to = "notice/", blank=True, null=True)
@@ -15,75 +15,145 @@ def __str__(self):
# 공지 게시판 댓글
class Notice_Comment(models.Model):
notice_content = models.CharField(max_length=500)
- notice_author = models.CharField(max_length=50)
+ notice_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
notice = models.ForeignKey(Notice, on_delete=models.CASCADE, related_name="comments" )
notice_at = models.DateTimeField(auto_now=True)
def __str__(self):
return self.notice_content
+# 학과공지 게시판
+class Schedule(models.Model):
+ sche_title: models.CharField(max_length=100)
+ sche_pub_date = models.DateTimeField(auto_now=True)
+ sche_author: models.ForeignKey('account.User', on_delete=models.CASCADE)
+ sche_image: models.ImageField(upload_to = "schedule/", blank=True, null=True)
+ def __str__(self):
+ return self.sche_title
+
+
# 자유 게시판
class Free_board(models.Model) :
Free_title = models.CharField(max_length=2000)
- Free_author = models.CharField(max_length=50)
- Free_pub_date = models.DateField()
+ Free_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ Free_pub_date = models.DateTimeField(auto_now=True)
Free_body = models.TextField()
Free_image = models.ImageField(upload_to = "Free_board/", blank=True, null=True)
def __str__(self):
return self.Free_title
+# 자유 게시판 댓글
+class Free_Comment(models.Model):
+ free_content = models.CharField(max_length=500)
+ free_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ free = models.ForeignKey(Free_board, on_delete=models.CASCADE, related_name="comments" )
+ free_at = models.DateTimeField(auto_now=True)
+
+ def __str__(self):
+ return self.free_content
+
# 스터디 게시판
class Study_board(models.Model) :
Study_title = models.CharField(max_length=2000)
- Study_author = models.CharField(max_length=50)
- Study_pub_date = models.DateField()
+ Study_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ Study_pub_date = models.DateTimeField(auto_now=True)
Study_body = models.TextField()
Study_image = models.ImageField(upload_to = "Study_board/", blank=True, null=True)
def __str__(self):
return self.Study_title
+# 스터디 게시판 댓글
+class Study_Comment(models.Model):
+ study_content = models.CharField(max_length=500)
+ study_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ study = models.ForeignKey(Study_board, on_delete=models.CASCADE, related_name="comments" )
+ study_at = models.DateTimeField(auto_now=True)
+
+ def __str__(self):
+ return self.study_content
+
# 공모전 게시판
class Contest_board(models.Model) :
Contest_title = models.CharField(max_length=2000)
- Contest_author = models.CharField(max_length=50)
- Contest_pub_date = models.DateField()
+ Contest_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ Contest_pub_date = models.DateTimeField(auto_now=True)
Contest_body = models.TextField()
Contest_image = models.ImageField(upload_to = "Contest_board/", blank=True, null=True)
def __str__(self):
return self.Contest_title
+# 공모전 게시판 댓글
+class Contest_Comment(models.Model):
+ contest_content = models.CharField(max_length=500)
+ contest_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ contest = models.ForeignKey(Contest_board, on_delete=models.CASCADE, related_name="comments" )
+ contest_at = models.DateTimeField(auto_now=True)
+
+# def __str__(self):
+# return self.contest_content
+
# 졸업생 게시판
class Graduate_board(models.Model) :
Graduate_title = models.CharField(max_length=2000)
- Graduate_author = models.CharField(max_length=50)
- Graduate_pub_date = models.DateField()
+ Graduate_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ Graduate_pub_date = models.DateTimeField(auto_now=True)
Graduate_body = models.TextField()
Graduate_image = models.ImageField(upload_to = "Graduate_board/", blank=True, null=True)
def __str__(self):
return self.Graduate_title
+# 졸업생 게시판 댓글
+class Graduate_Comment(models.Model):
+ graduate_content = models.CharField(max_length=500)
+ graduate_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ graduate = models.ForeignKey(Graduate_board, on_delete=models.CASCADE, related_name="comments" )
+ graduate_at = models.DateTimeField(auto_now=True)
+
+ def __str__(self):
+ return self.graduate_content
+
# 동아리 게시판
class Club_board(models.Model) :
Club_title = models.CharField(max_length=2000)
- Club_author = models.CharField(max_length=50)
- Club_pub_date = models.DateField()
+ Club_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ Club_pub_date = models.DateTimeField(auto_now=True)
Club_body = models.TextField()
- Club_image = models.ImageField(upload_to = "Graduate_board/", blank=True, null=True)
+ Club_image = models.ImageField(upload_to = "Club_board/", blank=True, null=True)
def __str__(self):
return self.Club_title
+# 동아리 게시판 댓글
+class Club_Comment(models.Model):
+ club_content = models.CharField(max_length=500)
+ club_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ club = models.ForeignKey(Club_board, on_delete=models.CASCADE, related_name="comments" )
+ club_at = models.DateTimeField(auto_now=True)
+
+ def __str__(self):
+ return self.club_content
+
# 중고 서적 게시판
class Market_board(models.Model) :
Market_title = models.CharField(max_length=2000)
- Market_author = models.CharField(max_length=50)
- Market_pub_date = models.DateField()
+ Market_author = models.ForeignKey('account.User', on_delete = models.CASCADE)
+ Market_pub_date = models.DateTimeField(auto_now=True)
Market_body = models.TextField()
- Market_image = models.ImageField(upload_to = "Graduate_board/", blank=True, null=True)
+ Market_image = models.ImageField(upload_to = "Market_board/", blank=True, null=True)
+
+ def __str__(self):
+ return self.Market_title
+
+# 중고 서적 게시판 댓글
+class Market_Comment(models.Model):
+ market_content = models.CharField(max_length=500)
+ market_author =models.ForeignKey('account.User', on_delete = models.CASCADE)
+ market = models.ForeignKey(Market_board, on_delete=models.CASCADE, related_name="comments" )
+ market_at = models.DateTimeField(auto_now=True)
def __str__(self):
- return self.Market_title
\ No newline at end of file
+ return self.market_content
\ No newline at end of file
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 @@
자유게시판
제목