From f911983c049f24d94db060e34a2bb9cfedc1f770 Mon Sep 17 00:00:00 2001 From: SEONGJOON KIM Date: Sun, 10 Jul 2022 18:25:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/views.cpython-39.pyc | Bin 965 -> 1145 bytes .../addproject/migrations/0001_initial.py | 4 ++-- .../0002_alter_project_followers.py | 21 ------------------ .../__pycache__/0001_initial.cpython-39.pyc | Bin 1694 -> 1683 bytes runningmate/addproject/views.py | 16 +++++++++---- .../mateapp/__pycache__/models.cpython-39.pyc | Bin 2501 -> 2521 bytes .../mateapp/__pycache__/views.cpython-39.pyc | Bin 5470 -> 5562 bytes .../mateapp/migrations/0001_initial.py | 5 +++-- .../__pycache__/0001_initial.cpython-39.pyc | Bin 1983 -> 1995 bytes runningmate/mateapp/models.py | 1 + .../templates/mateapp/project_post.html | 4 +++- runningmate/mateapp/views.py | 8 ++++--- .../users/__pycache__/forms.cpython-39.pyc | Bin 2674 -> 2674 bytes runningmate/users/migrations/0001_initial.py | 2 +- .../__pycache__/0001_initial.cpython-39.pyc | Bin 1217 -> 1217 bytes 15 files changed, 27 insertions(+), 34 deletions(-) delete mode 100644 runningmate/addproject/migrations/0002_alter_project_followers.py diff --git a/runningmate/addproject/__pycache__/views.cpython-39.pyc b/runningmate/addproject/__pycache__/views.cpython-39.pyc index 15ead1c40ece2038bf6465dd7e1933d1213f7b8d..1a00de77a5e2782d2743904fa10151b087a2a789 100644 GIT binary patch delta 461 zcmX|8u}T9$5Z&3k++7lLi9u9Qh{VS01g&f=3|5jxYy=ZFxi#jvybNpRj*mXKUwd4DK?sGyC3~x3C}fkK?jJAxCgEo<3Wv=9}9F*TmMsIKqfu z(=pV>b^=W&ApuOOpP2!6*#xG!83B?&ke@CgX3qeKEcljhPiT!??2hO{;Ux5#ywDkp zjKmP~Pa)l)7|_JoLhaP|i)vMW6NfeM#T2!QddiiiSPb?R(4V2Hj~WQ&W^R6kW-MDB=WV#_X1>>}3>& z(U6N+8O--pMzDSdUC%V%j#>e4%UBpF@Jumx&iDDSIS`RX6m%7^v_rS6n@AyGfxFla zo;qA8g9+<~sH6;5(sx=vE+bQDK3ayMpjdfyK3r^R$oWrMtdzYl(~4OC41pYoYI`73hP3~8pe3` z8pZ`23mF(0N;p&4ni+!`G}$K`F{z7G3FIc0q$U;=SQTgFm**yC=4oquxhB$B0x?t3y@%7KO;E~UOi}J- z;!029*#mw4l8bC)DsZGAZtj4AbVrp$-31nn*12Nqu bhqInww4SWM<|bti5?}?3q7v?t8`$IkN+359 delta 282 zcmbQtJCBzuk(ZZ?0SKl=ZR84Ntd~fUOl8YrPm$_nPGd@uPUXrHPGL+H$r8=t$`Z>G z2g}KTJX|@w}Gia)Ae!-Z+$bE}5Ek7qGzdSQ9eX3LG8O+*jnm`8^sZT!1tj4AX zVrp;x${fhZ<_==JPxfIw!DusCl+De;0VKc*7DXjIfZSUgHo5sJr8%i~%s^f-2aw=k LCn!J0 diff --git a/runningmate/addproject/views.py b/runningmate/addproject/views.py index b3ca40a..79835b0 100644 --- a/runningmate/addproject/views.py +++ b/runningmate/addproject/views.py @@ -9,12 +9,20 @@ def newproject(request): def createproject(request): new_project = Project() - new_project.title = request.POST.get('title') - new_project.body = request.POST.get('body') - new_project.startday = request.POST.get('startday') - new_project.endday = request.POST.get('endday') + new_project.title = request.POST.get('title') # 과목명 + new_project.body = request.POST.get('body') # 프로젝트명 + new_project.startday = request.POST.get('startday') # 프로젝트 시작일을 받음 + new_project.endday = request.POST.get('endday') # 프로젝트 마감일을 받음 + new_project.writer = request.user new_project.color = request.POST.get('color') new_project.save() + new_project.followers.add(request.user) + for i in range(1,7): + a = request.POST.get(f"teammate{i}") + if a: + new_project.followers.add(User.objects.get(username=a)) + + return redirect('mateapp:showmain') def project(request): diff --git a/runningmate/mateapp/__pycache__/models.cpython-39.pyc b/runningmate/mateapp/__pycache__/models.cpython-39.pyc index 7d09fdbd459b5a7d8febb0d91b60c15ced791760..4a52940fd452d0657319f17763fdd38a8b0c7d8a 100644 GIT binary patch delta 139 zcmX>qd{dY=k(ZZ?0SFwYo=RH2k++kTF=Fy`R#l?~919tuI8&LkxKg=OSb;Q83R^F8 z6fanW56ovz;Q)&8r*NilwJ<~pOn%0?1gN>2O=@xiht%Z#YyxbCK!b}ECZA^WkYlqfyDB4N(qw0jDU8vRZ*aU}k(ZZ?0SF>4o=oc8$lJ-v7%+J{tEyHOM=ECuYbtXVR|;D%a}+m_#gWPb z=Ch}807ZCHI8(S<7^3(lzhhk@6Am<@mS5r^S~qAC#*QdKSpapA%V4%~V}d#E^aK&x3FOnE&m^{1aBtX=czkOC!7`{$Ud*YD%1`sh+yVR+Px9u?>4Ov!X`1 zRN62+ZIi8NQBR!l^q9p;ta;gWbydBVaSU-%naDq4iFKzL1kEpe9*TM8ILnKN%Jd12 z%M#TMf<(L03?r`4+|d(*`=2lSG%wPem$1oL;>|nNz~=)rdz9g0qNrXSD9|Lsb};2% zP3dDc>tlTUr)Bj|g-wW=?7_*Mw9H2c678Pv@q^HXgGn@r^l~?Z>8) zcxH~2rTM;USaz4AMcP)akY$g*gdOq`yC6x|6^^^5$LS5-YxJPGP;G>?9GV0fX2M^U z9~Fz%U;Fpt*c*TYfJp#?!w&=A1RN28J=^Nu+Hsw~f@K+#u9-Y^u$8C_e)M94Sk*%J zuFqBM?z*9-Zk&MjIG_`6VTj4&!8&(#5Z#nQEh#R?=*=fhcj?*Q96i zof3QV=S}3nVSI|sij1j8mnnB^Auvc8tKIGEU{gKM13Ib0(xYSULk!pGO0IM z8=9wi`lhnVR*cAwbuYWBteCO6k&6xL4VLT;Mr=`UP-BhO&2?S&2Wy7+(u1f$C`+F? zO#D!oYJujSsEw-C9H|3y>FF2MPNO3Ck0tb8c9Z^Q5x(R znjD4F@boo}WuhK08?#jf4R?lLAS1lXWRTd=(&m7&Nke-;l>2sX>jsho-EiVTywg3? z4gr%%Hf63Xz_i|oGuV6;@LcLt&%HNiBY)+n8U_BGCFS|1cTYy|NE$=g5_0X9fE_=R zt#<6vxY-JQDRM(9zbVH1*IFGP6Qe>copPRN_eSm zHFceqMAL9mMsFI@4B*2pYpKTuKiqMd{+Qq%m5{6+d9QrI9L{XxpKyz%(ceiK_7P+x z@od&ZPW7+>#&3zQi(d}IE#keja*1S)qTug|$k+?%n_MhLlNeTST9TXQg3wTNnd3m?O#q2iaNi z)xf)F#&LQIa1?MFAe-wsNZ~Qk0f9C6uUX)23-l`Xi)OE#qAhM~)q4 zH-(msEEEn%kkhCKphyXb0|Fr-IMD+_;=~2@7VQCXM1ubT-Z$&mA+1;Yd1m&_n|a^+ z-ur3rkE6+AGHEOHd;i1V-W>ft`Ix12nwj)Y(CbZ$f7rm#W_(LoQ+<1hVYF#F+7?^W z{6wHQdcXoT&>Z8Twyw=8`Ixw*4v4yXinWPH>g2IdD^@C@ex>I5TqTcrJv6!d_Nq(s z49$5vAWQJI!h6MO?P|7-CJNin)PHr=W*Np0{qTjht+Hpud$FP6F4*rU2=#kzk%z`| zt?DoG4lL&Yoq&BX(8^VxcZ==Vg`R^npSPT%?-r`7%RCR8qkxPUGk@;s#ZW>Yjl#IM zSbN94>sI|9(P@3dM#L}H^;jB4?czYZry$*D%3h(k>MxR6xkR2F-UADHiDxj9@v0nW zM`7+c#;DX5%2iIEJ&QnL7NdAIJ}Mr>|9q|=+g<=X4>$%$0bT^W1Q-^d*w^c=Q=6gl z0eqI6wA>`I24A7J;QCK@h_AX=yz6oe)~ztKD2$h}dIHdlrHf0>(k1SKUaz$1I;$1; zzW5+ ziB|~b<2y%s5zD8sXvlL~x0IKZiu;&8dq|Q(+R8A|mrSz^B{(N0l9w&em1lgP_%u1P zAXzkMB}(c^jAZJK$*JkHv-}JeP65DHK1y|HuJGDh<%+xaa9Dp%uO|zR*=mNR=;3F? zaOxm?S9E0#&*@8S$)IvlH`tot$Ee^8D!rI*2FjAPsX3aXZ>j5S&Gh4e;TY@cniW`^ zc3@IL#$`dqf;b8?(CNGR(2zxG&4}&P__!>!bGR<*E!0=2DD!Q5RV$-B04vBTG$(4y z%Or6=C~l?u`XT1frU;kZl3yr05#>#%{G#|Q-FxQ(wl@_L2_&_%$#MN+x$+g6c({i` zqE9v6EdASz&(dlM)wAoT#qgD2zpVmwJfOZ$|38j2(NZ z)|}$Kc^iBe{IdUqG{Pf^M)kntM{?jn<2%gQDm^Tx@f)JvzEN)m6PhLJeUzI}hu$cx zn>hO-0I}WgSf+}kQaUM5j(GoH!dr0;U=vz@L=%YS(|~IL$&}Q%$tPt$LzJX+L_{Kx z`IqO)8_Z$P-t;#jEJbqqRXomivw87%_Mu Q%~_U}wP;|at&ElU4<#6bTmS$7 diff --git a/runningmate/mateapp/migrations/0001_initial.py b/runningmate/mateapp/migrations/0001_initial.py index 84842db..692a71b 100644 --- a/runningmate/mateapp/migrations/0001_initial.py +++ b/runningmate/mateapp/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.4 on 2022-07-10 13:50 +# Generated by Django 4.0.4 on 2022-07-10 18:02 import colorfield.fields from django.conf import settings @@ -11,8 +11,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('addproject', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('addproject', '0001_initial'), ] operations = [ @@ -22,6 +22,7 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('day', models.DateField(auto_now_add=True)), ('title', models.CharField(max_length=30)), + ('body', models.TextField()), ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='posts', to='addproject.project')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='작성자')), ], diff --git a/runningmate/mateapp/migrations/__pycache__/0001_initial.cpython-39.pyc b/runningmate/mateapp/migrations/__pycache__/0001_initial.cpython-39.pyc index 3c90c422aa6421245fd06a9118d39186934209c5..3e4916976d2d07257577656060f7f2f380bdc40e 100644 GIT binary patch delta 511 zcmaJ-Jx>Bb5WU^oJ7D3CZ;%f~4*~fBMq@!ufsLV}17|UwM3R$2Y)mYS4F%cQLt}4g zVq$5cjWw;6mA!>=?xMzP+-df`H*dZkqR&yYYZzR?cYpoVONOWBO>sdKMJOEtN{0gJ zsDjNjq1%Bu0XltYG-u{q=~FNTx1%Cv$8ByW>?A}X2JwlCO2V(WUPwa9)edw>PpDva z2r{xo%I8_kHDC!M6N1hhq7)E}JQTcIMSm?=hLwN1lqS^IV-*rJ(dvHVWnJIT@IsWG)-r^;BOz$+-8^Tyt)sCLU zTRS;qpmZ8?zm1IOEy?d9jwd;3Q9qAIOE}yS_=@WF^oeO?egA`U0+`dq)5O delta 503 zcmaJ-zfZzY5bk?@E${*@KPv(v6$Kd`3>$+nx)29rV(bQ9H8vz9wF9`AxOX7WFyrFx z=;Ug2VP<#nUmzh~i4s_Rx7>H%-S^$QPyJ2TTCo_H@C~hx_7@*$&xJ9OBwMlwNEQWR z$v|y3Qf$=;J(0n<(Qq_dcj69r5>65{&>`;2R}>O9UuJ@SNJ1*$t`$i8sNzH*Gnka` z4Q!3U8bp19gIPo=AQ%iqDNmvUA|BaJgu7*L;3D6 zHCQESVs#R}^;)h6t$vNTrZ{0$g|)lT7an_8bHP|%94IehrZlsWGrQ*<-Pj$N@XKze w>s|#pHk_*urBmz;QzlcwXG~>;(lpU9a-=Y&GseYK-6!8-FVrT-;xSbJ0m^B7&;S4c diff --git a/runningmate/mateapp/models.py b/runningmate/mateapp/models.py index e46335c..0d37646 100644 --- a/runningmate/mateapp/models.py +++ b/runningmate/mateapp/models.py @@ -79,6 +79,7 @@ class Meta: class Post(models.Model): day = models.DateField(auto_now_add=True) # 현재 생성일자를 출력 title = models.CharField(max_length=30) # 할 일 리스트를 게시판 형식 제목으로 받음 + body = models.TextField() user = models.ForeignKey(User,verbose_name="작성자",on_delete=models.CASCADE) # 옆에 작성한 사람 얼굴이 떠야하니까 유저 모델 및 on_delete 적용 project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name="posts") diff --git a/runningmate/mateapp/templates/mateapp/project_post.html b/runningmate/mateapp/templates/mateapp/project_post.html index aef063d..8821d53 100644 --- a/runningmate/mateapp/templates/mateapp/project_post.html +++ b/runningmate/mateapp/templates/mateapp/project_post.html @@ -95,6 +95,8 @@

{{project.summary}}

{{post.day}}
{{post.title}}
+
{{post.body}}
+
{%csrf_token%} @@ -110,7 +112,7 @@

{{project.summary}}

- +
{{comment.user}}
diff --git a/runningmate/mateapp/views.py b/runningmate/mateapp/views.py index 6423df1..539dbae 100644 --- a/runningmate/mateapp/views.py +++ b/runningmate/mateapp/views.py @@ -18,7 +18,8 @@ def showmain(request): calendar = Calendar.objects.filter(writer=request.user, endday__contains=datetime.date.today( )).order_by('endday') # 글을 작성한 유저의 캘린더 정보만 가져오겠다. 가까운 날짜 순으로 정렬 - projects = Project.objects.all() + projects = Project.objects.filter(followers=request.user) + profile = Profile.objects.all() posts = Post.objects.all().order_by('-day') return render(request, 'mateapp/mainpage.html', {'calendar': calendar, 'projects':projects,'posts':posts, }) @@ -163,7 +164,7 @@ def timetable(request): return redirect('mateapp:showmain') # render 보단 redirect 가 낫다. def project_detail(request, project_id): - projects = Project.objects.all() + projects = Project.objects.filter(followers=request.user) project = Project.objects.get(pk=project_id) posts = Post.objects.all() post = Post.objects.filter(project=project) @@ -186,7 +187,8 @@ def create_post(request, project_id): if request.method == "POST": # project = Project.objects.get(title=project_title) post_title = request.POST['title'] - Post.objects.create(title=post_title, user=request.user, project=project) # post는 세가지 필드가 있는데, + post_body = request.POST['body'] + Post.objects.create(title=post_title, user=request.user, project=project, body=post_body) # post는 세가지 필드가 있는데, # 어떤 모델이든간에 pk가 있어야함 Foreign key는 생략이 될 수가 없음, 일대다 관계일때 쓴다는건데 # return redirect('mateapp:project_detail', project_id) diff --git a/runningmate/users/__pycache__/forms.cpython-39.pyc b/runningmate/users/__pycache__/forms.cpython-39.pyc index 4a2ab844aebc1e90f3b2c0f4105af655f2e22f3d..e9d489e4fcb6f341779f841090e9160e5a1a2159 100644 GIT binary patch delta 19 Zcmew)@=1g%k(ZZ?0SKP8ZRE<}0suG|1vLNw delta 19 Zcmew)@=1g%k(ZZ?0SNk=HgaWf0RT1n1lj-q diff --git a/runningmate/users/migrations/0001_initial.py b/runningmate/users/migrations/0001_initial.py index 6187be1..65e6b85 100644 --- a/runningmate/users/migrations/0001_initial.py +++ b/runningmate/users/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.4 on 2022-07-10 13:50 +# Generated by Django 4.0.4 on 2022-07-10 18:02 from django.conf import settings from django.db import migrations, models diff --git a/runningmate/users/migrations/__pycache__/0001_initial.cpython-39.pyc b/runningmate/users/migrations/__pycache__/0001_initial.cpython-39.pyc index 17edb8d57ed84cd7aed3ecb970f7e2910b56eb4c..d387bd99c310f3bcff613221b978e6177a4b235f 100644 GIT binary patch delta 19 ZcmX@ed61JUk(ZZ?0SNX?-N?0_1pqIl1nU3* delta 19 ZcmX@ed61JUk(ZZ?0SKl=ZRFa{0st+V1d0Fv From f62673fe5422bd2e03c19b205464a2f020ca67f2 Mon Sep 17 00:00:00 2001 From: yaena1223 Date: Sun, 10 Jul 2022 21:04:08 +0900 Subject: [PATCH 2/2] =?UTF-8?q?0710=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/models.cpython-310.pyc | Bin 1904 -> 1910 bytes .../__pycache__/views.cpython-310.pyc | Bin 1010 -> 1198 bytes .../__pycache__/models.cpython-310.pyc | Bin 2538 -> 2564 bytes .../mateapp/__pycache__/urls.cpython-310.pyc | Bin 804 -> 810 bytes .../mateapp/__pycache__/views.cpython-310.pyc | Bin 5718 -> 5816 bytes .../mateapp/templates/mateapp/calendar.html | 4 ++-- .../mateapp/templates/mateapp/project.html | 5 +++-- .../templates/mateapp/project_post.html | 9 +++++---- .../runningmate/static/css/calender.css | 2 +- .../runningmate/static/css/project.css | 11 +++++++++++ 10 files changed, 22 insertions(+), 9 deletions(-) diff --git a/runningmate/addproject/__pycache__/models.cpython-310.pyc b/runningmate/addproject/__pycache__/models.cpython-310.pyc index 1c471a9efe30b137d05e9de55a0c2b64f491fc69..b6163de9a3c5d3fb31fb535ad67634e789f8fb64 100644 GIT binary patch delta 48 zcmeys_l=J$pO=@50SKY`T4 z%m5xMM6!0sU%=9}T|4;C8M=(YPT_zPSS z*l+evIFI=8gi1CXN1P^V0B-`pM93=0&NmSD1S0gKAg0jGet zx_DrE{u02Ewa^RwIqEs@pUlvPK?-!`{6I^X;R1{Pe})X=dW;GjmcN2!e%Y0curh~% z)2$xql8j`+v^z?}GfmV}^mtp8jGy1WIo=V;=)}72f+i;!6P!-idBaxdbh?{;PV)(k zc(?5lJRQ-6&``qo+)l$7zzJITM-2Gz@h~P=0KtzO{Hi9mVXE%mg-s zt}E7)tDNP-sYq={L!^PK@95>LX9nUyu-U}iHUemY3y%O@5-d9E4vpF^0~BrR0MjH9 n$V#KNw0N#=@I&~wCc7{z ziwOWl*%(cxiWIW| Z2`)wf#v+Ny#w_-1ATc1bg2j}P3jhZHI)(rM diff --git a/runningmate/mateapp/__pycache__/models.cpython-310.pyc b/runningmate/mateapp/__pycache__/models.cpython-310.pyc index 999ffe0a6d1d4571912c1d5fe51e21f0efbf801c..1dd4f01666a177e7b675814a9b65f856b9904780 100644 GIT binary patch delta 188 zcmaDQ+#L={g!e(~fo4%Nxe*aX;&LBdLtKe2go^8uM03_OfH aj2xR?*cBNWlP0HeOk#|l{FCDYBM$&l|1h-x delta 167 zcmZn>c_qx3&&$ij00d_QP9=R7+{m|(i7{>R1||pYqSCy)%)Ip6#FEs_jLfH)7y~As zVO7=2;z;F8VNGSu;!0ubWsc$ovN%$Cz(s^DPYVdU8y$F9i8m^itCV-jQ3 KWMR$^jNAYl3@dy9 diff --git a/runningmate/mateapp/__pycache__/urls.cpython-310.pyc b/runningmate/mateapp/__pycache__/urls.cpython-310.pyc index c147299282a2fd4aa60160e67b367cefc97d6fef..454bb555fa7237f07bc09c286a6c1bfa0bdf6469 100644 GIT binary patch delta 47 zcmZ3&wu+4_pO=@50SK#F#a?kI6wWs5CDxGcP?iu_QGSM( delta 41 vcmZ3*wuFrv*d(S!FJ>T)K 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 LEzGo;NyPsLL0W+> diff --git a/runningmate/mateapp/templates/mateapp/calendar.html b/runningmate/mateapp/templates/mateapp/calendar.html index 3456a6b..09cadfc 100644 --- a/runningmate/mateapp/templates/mateapp/calendar.html +++ b/runningmate/mateapp/templates/mateapp/calendar.html @@ -156,9 +156,9 @@
-
+
-
+
diff --git a/runningmate/mateapp/templates/mateapp/project.html b/runningmate/mateapp/templates/mateapp/project.html index 217394a..84ff831 100644 --- a/runningmate/mateapp/templates/mateapp/project.html +++ b/runningmate/mateapp/templates/mateapp/project.html @@ -124,8 +124,9 @@

{{project.summary}}

-
- +
+
{{post.day}}
diff --git a/runningmate/mateapp/templates/mateapp/project_post.html b/runningmate/mateapp/templates/mateapp/project_post.html index 8dc1c6a..6bd40f5 100644 --- a/runningmate/mateapp/templates/mateapp/project_post.html +++ b/runningmate/mateapp/templates/mateapp/project_post.html @@ -95,12 +95,12 @@

{{project.summary}}

{{post.day}}
{{post.title}}
-
{{post.body}}
+
{{post.body}}
{%csrf_token%} -
+
@@ -112,8 +112,9 @@

{{project.summary}}

-
- +
+
{{comment.user}}
diff --git a/runningmate/runningmate/static/css/calender.css b/runningmate/runningmate/static/css/calender.css index 9fd346d..91df7e9 100644 --- a/runningmate/runningmate/static/css/calender.css +++ b/runningmate/runningmate/static/css/calender.css @@ -3,7 +3,7 @@ .container2{ display:grid; grid-template-columns: 2fr 1.5fr 2fr; - grid-template-rows: 1fr 5fr 1fr 2.5fr 1.5fr 1.5fr 1.5fr 15px; + grid-template-rows: 1fr 5fr 1fr 1.5fr 1.5fr 1.5fr 1.5fr 15px; height: 100%; row-gap: 15px; column-gap: 20px; diff --git a/runningmate/runningmate/static/css/project.css b/runningmate/runningmate/static/css/project.css index c2edead..898abdc 100644 --- a/runningmate/runningmate/static/css/project.css +++ b/runningmate/runningmate/static/css/project.css @@ -389,4 +389,15 @@ h4{ font-family: 'AppleSDGothicNeoM'; font-weight: 500; font-size: 1.8vmin; +} + +#post_body{ + margin-left: 20px; + + font-family: 'AppleSDGothicNeoM'; + font-style: normal; + font-weight: 400; + font-size: 20px; + line-height: 30px; + color: #222B45; } \ No newline at end of file