From 116f9e166cc40b4fa10a945f5983dcff615b47f6 Mon Sep 17 00:00:00 2001 From: yaena1223 Date: Sun, 10 Jul 2022 06:59:15 +0900 Subject: [PATCH 01/10] =?UTF-8?q?0710=20=EB=A9=94=EC=9D=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=B5=9C=EA=B7=BC=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EC=A0=9D=ED=8A=B8=20=EC=A0=9C=EB=AA=A9=EB=9D=84=EC=9A=B0?= =?UTF-8?q?=EA=B8=B0,=20=EA=B7=B8=20=EC=99=B8=20=EC=82=AC=EC=86=8C?= =?UTF-8?q?=ED=95=9C=20=EC=9E=91=EC=97=85=EB=93=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mateapp/__pycache__/views.cpython-310.pyc | Bin 5614 -> 5640 bytes .../mateapp/templates/mateapp/mainpage.html | 18 ++++++++++++++---- .../templates/mateapp/project_post.html | 2 +- runningmate/runningmate/static/css/style.css | 6 ++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/runningmate/mateapp/__pycache__/views.cpython-310.pyc b/runningmate/mateapp/__pycache__/views.cpython-310.pyc index 8cb5da26b641affdefe8b8427489020ad5587522..35ee2ba6c9add938e0233d60ec0a6ee73202c5e8 100644 GIT binary patch delta 218 zcmaE--J!#q&&$ij00jSko=n=hkyne0al>Ro9^uK}T%3$vlS8>eTo!Ppa4cl3VT$Lg zVaQ@j;gne4U}Pu}OyO!~3}z@{&0<_2w2+~esYJMjA%(k!sfICyXAV;{ zb1;J@@8tVj5{x>NKXausicF5?wqVf#S~+Vz`wG6n z#yvU7>F%!mZOMg{oFoh0&++Cen;fwTcokhU;QfwbWuocG)im->1SIrTc8eYf(^Evb z6Is(RuZiNCYAA7_+f러닝메이트
- + {% for project in projects %} + + {%empty%} +
아직 등록된 프로젝트가 없어요.
+ {%endfor%}
아직 등록된 러닝메이트가 없어요.
@@ -142,13 +146,19 @@
최근 프로젝트
-
아직 등록된 프로젝트가 없어요.
+ {% for project in projects %} + + {%empty%} +
아직 등록된 프로젝트가 없어요.
+ {%endfor%} +
{{projects.0.title}}
+
- +
{{projects.1.title}}
- +
{{projects.2.title}}
diff --git a/runningmate/mateapp/templates/mateapp/project_post.html b/runningmate/mateapp/templates/mateapp/project_post.html index ee460bf..84e1c25 100644 --- a/runningmate/mateapp/templates/mateapp/project_post.html +++ b/runningmate/mateapp/templates/mateapp/project_post.html @@ -20,7 +20,7 @@ padding-right: 10px; } - #calender_logo { + #emer_logo { width: 30px; height: 30px; background-image: url("{% static 'images/calender.png' %}"); diff --git a/runningmate/runningmate/static/css/style.css b/runningmate/runningmate/static/css/style.css index 37adae1..621a076 100644 --- a/runningmate/runningmate/static/css/style.css +++ b/runningmate/runningmate/static/css/style.css @@ -727,4 +727,10 @@ input{ color: #5D7285; justify-content: center; align-items: center; +} + +#recentpro_title{ + font-family: AppleSDGothicNeoM; + margin-left: 13px; + margin-top: 15px; } \ No newline at end of file From d876fc978efe8dd499331c088a792bce4a8c5f83 Mon Sep 17 00:00:00 2001 From: yaena1223 Date: Sun, 10 Jul 2022 07:31:08 +0900 Subject: [PATCH 02/10] =?UTF-8?q?0710=20=EB=AF=B8=EB=AA=A8=EC=A7=80=20?= =?UTF-8?q?=EC=9E=84=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mateapp/templates/mateapp/mainpage.html | 39 +++++++++++++++---- .../mateapp/templates/mateapp/project.html | 20 +++++++++- .../runningmate/static/css/project.css | 8 ++++ 3 files changed, 58 insertions(+), 9 deletions(-) diff --git a/runningmate/mateapp/templates/mateapp/mainpage.html b/runningmate/mateapp/templates/mateapp/mainpage.html index a3efcf6..ff40058 100644 --- a/runningmate/mateapp/templates/mateapp/mainpage.html +++ b/runningmate/mateapp/templates/mateapp/mainpage.html @@ -32,6 +32,8 @@ display: inline-block; padding-right: 10px; } + +
@@ -128,17 +130,15 @@ {% for project in projects %} {%empty%} -
아직 등록된 프로젝트가 없어요.
+
아직 등록된 러닝메이트가 없어요.
{%endfor%} -
아직 등록된 러닝메이트가 없어요.
- - +

이예나

@@ -147,12 +147,37 @@
최근 프로젝트
{% for project in projects %} - + {%empty%}
아직 등록된 프로젝트가 없어요.
{%endfor%}
{{projects.0.title}}
- + +
{{projects.1.title}}
diff --git a/runningmate/mateapp/templates/mateapp/project.html b/runningmate/mateapp/templates/mateapp/project.html index 6e77025..50350c9 100644 --- a/runningmate/mateapp/templates/mateapp/project.html +++ b/runningmate/mateapp/templates/mateapp/project.html @@ -65,6 +65,10 @@ #meeting_date{ color: {{project.color}}; } + + #friend1, #friend2, #friend3, #friend4,#friend5, #friend6{ + background-color: {{project.color}};; + }
@@ -76,8 +80,20 @@

{{project.title}}

{{project.summary}}

-
러닝메이트
-
+
러닝메이트 + +
+
+ +
+

이영서

+

오준서

+

윤영서

+

김성준

+

류슬기

+

이예나

+ +
러닝스페이스 diff --git a/runningmate/runningmate/static/css/project.css b/runningmate/runningmate/static/css/project.css index 3891dd6..c2edead 100644 --- a/runningmate/runningmate/static/css/project.css +++ b/runningmate/runningmate/static/css/project.css @@ -381,4 +381,12 @@ a{ color: white; font-family: 'AppleSDGothicNeoB'; +} + +h4{ + text-align:center; + margin: 0; + font-family: 'AppleSDGothicNeoM'; + font-weight: 500; + font-size: 1.8vmin; } \ No newline at end of file From eb3f87aeb084c95d0099b9aa53bda04dbf9c94b2 Mon Sep 17 00:00:00 2001 From: yaena1223 Date: Sun, 10 Jul 2022 08:43:14 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EC=BA=98=EB=A6=B0=EB=8D=94=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=B2=AB=ED=99=94=EB=A9=B4=20=EB=8B=A4?= =?UTF-8?q?=EB=A5=B8=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/models.cpython-310.pyc | Bin 1532 -> 1552 bytes .../__pycache__/views.cpython-310.pyc | Bin 990 -> 1010 bytes .../__pycache__/models.cpython-310.pyc | Bin 2518 -> 2538 bytes .../mateapp/__pycache__/urls.cpython-310.pyc | Bin 784 -> 804 bytes .../mateapp/__pycache__/views.cpython-310.pyc | Bin 5640 -> 5660 bytes .../mateapp/templates/mateapp/mainpage.html | 8 +++----- 6 files changed, 3 insertions(+), 5 deletions(-) diff --git a/runningmate/addproject/__pycache__/models.cpython-310.pyc b/runningmate/addproject/__pycache__/models.cpython-310.pyc index f8ce3a53c96c8fa74e9dd5007060679741b798b4..461ee9cd3c469065bb16e74ef324bb013a854f13 100644 GIT binary patch delta 53 zcmeyvJ%NWipO=@50SL|roZ84O!o-+4S%Jw+^iB7g*Bhq1ZCeskRGOEUnU|iMSdzLq IoM|aD0LrQpMF0Q* delta 33 ncmbQh^M{)|pO=@50SGLvpWMhT!o(OlS%Jxn(P(ov(^6&tib@D5 diff --git a/runningmate/addproject/__pycache__/views.cpython-310.pyc b/runningmate/addproject/__pycache__/views.cpython-310.pyc index 2e9acbcb24b14f665ac2bcbb76313e482d496301..d485f1e2febeb656b78101640e44b8398c807f3e 100644 GIT binary patch delta 52 zcmcb|{)wGCpO=@50SL|roSMk}hcRO^2cwzjo9;EQH%xikwj`#gG%qhRFFiN0Bz3br H<9sFn=gbrg delta 32 mcmeywevh3ypO=@50SGLvpPb13hcRR_2csFI(dJ;r`Ah(oEC}xa diff --git a/runningmate/mateapp/__pycache__/models.cpython-310.pyc b/runningmate/mateapp/__pycache__/models.cpython-310.pyc index 156860dcf76a1d92e86f89aa85d332c87984147b..999ffe0a6d1d4571912c1d5fe51e21f0efbf801c 100644 GIT binary patch delta 53 zcmca6{7RTRpO=@50SL|roZ85}go!b2@&+a|(Kp>|UT>K4wrxpFQE6UYW?p)3VoB=e I=S=U}0RF!ff&c&j delta 33 ocmaDQd`*};pO=@50SGLvpWMj3go!a|@&+a|Mx)KYnclMj0HfUsWdHyG diff --git a/runningmate/mateapp/__pycache__/urls.cpython-310.pyc b/runningmate/mateapp/__pycache__/urls.cpython-310.pyc index a5faae16260a4442041665cec4cc2f46cea1f1b7..c147299282a2fd4aa60160e67b367cefc97d6fef 100644 GIT binary patch delta 52 zcmbQhwuFs4pO=@50SL|roZ86U#Kf2~xsS3==Mx)IJ%x{DMs(T8I diff --git a/runningmate/mateapp/templates/mateapp/mainpage.html b/runningmate/mateapp/templates/mateapp/mainpage.html index 02dc6f9..ec797be 100644 --- a/runningmate/mateapp/templates/mateapp/mainpage.html +++ b/runningmate/mateapp/templates/mateapp/mainpage.html @@ -82,7 +82,7 @@
- {% if calendar.count == 0 %} + {% if calendar.0.title == None %}
아직 등록된 일정이 없어요
{% else %}
@@ -101,10 +101,8 @@ {% endif %}
- {% if calendar.count == 0 %} -
아직 등록된 일정이 없어요
- {% elif calendar.count == 1 %} -
아직 등록된 일정이 없어요
+ {% if calendar.1.title == None %} +
아직 등록된 일정이 없어요
{% else %}
{{calendar.1.title}}
From ffca2c7b4f0749ad62ed34c7118756675cef508f Mon Sep 17 00:00:00 2001 From: yaena1223 Date: Sun, 10 Jul 2022 13:32:46 +0900 Subject: [PATCH 04/10] =?UTF-8?q?0710=20=EB=A9=94=EC=9D=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20post=20=EB=9C=A8=EA=B2=8C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mateapp/__pycache__/views.cpython-310.pyc | Bin 5660 -> 5701 bytes .../mateapp/migrations/0001_initial.py | 2 +- .../mateapp/templates/mateapp/mainpage.html | 46 ++++++------------ runningmate/mateapp/views.py | 3 +- 4 files changed, 19 insertions(+), 32 deletions(-) diff --git a/runningmate/mateapp/__pycache__/views.cpython-310.pyc b/runningmate/mateapp/__pycache__/views.cpython-310.pyc index 17e99aa9fa93ecddfb0fda090a6be8c7c2af9b48..4f068a71eede3377e70e233622715ae3080676ad 100644 GIT binary patch delta 1621 zcmZ`(%Wu?19Nw|LYwt6g&F&^FG$CqIaPtBw;<4owAs{aaC{%=UaG4{K2tpM?;?lxjP_>65wd$cKivx#N{R`-!monc>uptCX{^S||p5O1ASs(pn zH0x%wsThA=oPGY)s~@tzlAOj@I)6{{*PCa5k+GqxWFz??wxQeV1M;ovr#mrQ>yVDp zQSJD;`ki_qW+vFj%J9H#ZOpcA{a0#QzGJo96HTk$YFjJLc+GD%OqE$mF&V_$uIGDZ zhTTx+%s@NGS5)E2OfArpWl6Za{&<;~4E{FO^Oq!xv?eAj|!{)UvwN{(dgw3by zj{b9{AD;pS;FI)f?hWU<)AIXR&3Hv7*_X*{q|E+EmZvK)6*+d|OEjWTgqHPh2^DX+ zE1VPl+cP*ABt`NhrP2dzJoRE|5N>0Dy?}8*4ln`O2iVWX(_gGbS;NlgFn)`cqcBkd_69krp#HV$L=5FqTOmkM6GmZ<~wyyco>uQr^UY)57fIl`tg z56MCHcjnyMb`wZ&WjHOHiXNhDhRh}=e;nD4aac^giS0=`k76_KySD2^<%nv8X72Fc z9;T7!v}%Ms%X$XbFbOTQiQMFhASupw!$8wO~lo>33WWRSmO2}T=H-$=K4gt&TUSa23haw_Y%o|slY#o;xod;YLegH9O zJt~h+8>Mi0hnR`_6%0Vz{1FZ z!9C&Vnd!HPjv5ffibFoa&KD~);${&nUPjC?5WRxsdBEp@?R1eAjY(1b#-0^j@(CL% y4U-dWwlrPY4Yx_a0l*P}IE_>6NvSU%H7>pe*q^0?-MX=07)HV9=GbNAGwIhz$VLJH delta 1617 zcmZuxU2oG!6z$mgaFaMVZ9<{6sSxGEqOdF~3zRPbYN3T{3*F@-fI_gnG$@J7*ad+q z^?@f|cwi7h2!X_Eg?OwGyd#0cuKEisR^ovlurDi~5PQ!U>~3i!pNwbbo|${@xqdtF zXh3&$J<~?N1>>(vFX#0?nYfbC*^v0iwsg$4+3GBtRqVtg<(4|xW+ufBWxcqltm;w% z&8jt=mR;k4HqG5Dj^%r1R@_&PmAOKErW&NVb9Kh?d~VP?FAzL$<2@py&Kfv!B}*~o zOGfEny!_&UdPn_nCH8d@1c@6C5ht5&%b(&MnC=7=0VQlu>n)$J5~tH+r8V?k(d?S< zR9iDmz7cyiiC5`2-8~pe=tWGsH|1V;t~o8gOWf1`W!uF+dQm)XzfhHwM%}B{X8b8y zuUo`s^VNu#2X|v6(^5Fjli7sSF@Lh*Uaq%XTJ|&ojb)g@GAbVwmCXD8K7?%sYyb=Z z@_;RXt$-gyCHw1Kd}@>~Ux#I>LrkM%4qSnH+3}Yr#A?E;U30jK-EkUfn8r@b{sf4$ zQh2Y}mMgOBVmP;vjL^*e&UT1`J~6jk9a6RFX>vg*RZOpi^s?~#K);uu((YMPjy=+-{F%9>zQMhM#00HL0|)8DZnH@)#z49hSnk9scj7>I(D z#T{w@sbwf#I;`iSw*KSlY$h_*;{qJNA^lZph#g=*Tsqkzrx^j@VsKZH$ zAc2a|E3#;>wE~G+!l#wF{N&$|DzT(;;Swblkmg$2T2GVD8 zkwfAH)B t?SMhR5J0vnT7XXiP5~-_^MF_iIqDUkOFIiG?Tn^r9a@2Kg=XZk{{iY6Kk@(o diff --git a/runningmate/mateapp/migrations/0001_initial.py b/runningmate/mateapp/migrations/0001_initial.py index cade670..f7d8401 100644 --- a/runningmate/mateapp/migrations/0001_initial.py +++ b/runningmate/mateapp/migrations/0001_initial.py @@ -41,7 +41,7 @@ class Migration(migrations.Migration): name='Calendar', fields=[ ('id', models.AutoField(primary_key=True, serialize=False)), - ('title', models.CharField(max_length=20, null=True)), + ('title', models.ForeignKey(default='', on_delete=django.db.models.deletion.PROTECT, to='addproject.project')), ('startday', models.DateField(null=True)), ('endday', models.DateField(null=True)), ('starttime', models.TimeField(null=True)), diff --git a/runningmate/mateapp/templates/mateapp/mainpage.html b/runningmate/mateapp/templates/mateapp/mainpage.html index ec797be..da824fa 100644 --- a/runningmate/mateapp/templates/mateapp/mainpage.html +++ b/runningmate/mateapp/templates/mateapp/mainpage.html @@ -143,44 +143,30 @@
최근 프로젝트
- {% for project in projects %} + {% for post in posts %} {%empty%}
아직 등록된 프로젝트가 없어요.
{%endfor%} -
{{projects.0.title}}
- - + {% for project in projects %} + {% if project.title == posts.0.project %} +
{{posts.0.project}}
+
{{posts.0.title}}
+ + {% endif %} + {% endfor %} + +
-
{{projects.1.title}}
+
{{posts.1.project}}
+
{{posts.1.title}}
+
-
{{projects.2.title}}
+
{{posts.2.project}}
+
{{posts.2.title}}
+
diff --git a/runningmate/mateapp/views.py b/runningmate/mateapp/views.py index 8add262..429c89d 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() - return render(request, 'mateapp/mainpage.html', {'calendar': calendar, 'projects':projects }) + posts = Post.objects.all().order_by('-day') + return render(request, 'mateapp/mainpage.html', {'calendar': calendar, 'projects':projects,'posts':posts, }) def showevent(request): if request.method == 'POST': From 2ad70e7986123caadbfa6efe50c776c736f11ec9 Mon Sep 17 00:00:00 2001 From: yaena1223 Date: Sun, 10 Jul 2022 14:18:46 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mateapp/migrations/0001_initial.py | 2 +- .../mateapp/templates/mateapp/mainpage.html | 3 ++ runningmate/runningmate/static/css/style.css | 28 ++++++++++++++++++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/runningmate/mateapp/migrations/0001_initial.py b/runningmate/mateapp/migrations/0001_initial.py index f7d8401..cade670 100644 --- a/runningmate/mateapp/migrations/0001_initial.py +++ b/runningmate/mateapp/migrations/0001_initial.py @@ -41,7 +41,7 @@ class Migration(migrations.Migration): name='Calendar', fields=[ ('id', models.AutoField(primary_key=True, serialize=False)), - ('title', models.ForeignKey(default='', on_delete=django.db.models.deletion.PROTECT, to='addproject.project')), + ('title', models.CharField(max_length=20, null=True)), ('startday', models.DateField(null=True)), ('endday', models.DateField(null=True)), ('starttime', models.TimeField(null=True)), diff --git a/runningmate/mateapp/templates/mateapp/mainpage.html b/runningmate/mateapp/templates/mateapp/mainpage.html index f26a4ce..b1ad232 100644 --- a/runningmate/mateapp/templates/mateapp/mainpage.html +++ b/runningmate/mateapp/templates/mateapp/mainpage.html @@ -153,17 +153,20 @@
{{posts.0.project}}
{{posts.0.title}}
+
{{posts.0.day}}
{{posts.1.project}}
{{posts.1.title}}
+
{{posts.1.day}}
{{posts.2.project}}
{{posts.2.title}}
+
{{posts.2.day}}
diff --git a/runningmate/runningmate/static/css/style.css b/runningmate/runningmate/static/css/style.css index 621a076..fc8d141 100644 --- a/runningmate/runningmate/static/css/style.css +++ b/runningmate/runningmate/static/css/style.css @@ -729,8 +729,34 @@ input{ align-items: center; } +#recentpro_project{ + font-family: AppleSDGothicNeoB; + margin-left: 13px; + margin-top: 10px; +} + #recentpro_title{ + font-family: AppleSDGothicNeoB; + margin-left: 13px; + margin-top: 2px; + font-style: normal; + font-weight: 400; + font-size: 20px; + line-height: 19px; + letter-spacing: 1px; + color: #222B45; + +} + +#recentpro_date{ font-family: AppleSDGothicNeoM; margin-left: 13px; - margin-top: 15px; + margin-top: 5px; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 14px; + letter-spacing: 0.75px; + + color: #8F9BB3; } \ No newline at end of file From ba1f61fcc4def30390bf260b9ea185a1805775a2 Mon Sep 17 00:00:00 2001 From: SEONGJOON KIM Date: Sun, 10 Jul 2022 14:21:07 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=EA=B3=BC=EB=AA=A9=EB=B3=84=20manyfield?= =?UTF-8?q?=20=EB=B0=8F=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/admin.cpython-39.pyc | Bin 507 -> 535 bytes .../__pycache__/models.cpython-39.pyc | Bin 1503 -> 1979 bytes runningmate/addproject/admin.py | 2 ++ .../addproject/migrations/0001_initial.py | 24 ++++++++++++++---- .../__pycache__/0001_initial.cpython-39.pyc | Bin 1400 -> 1694 bytes runningmate/addproject/models.py | 22 +++++++++++----- .../mateapp/migrations/0001_initial.py | 4 +-- .../__pycache__/0001_initial.cpython-39.pyc | Bin 1983 -> 1983 bytes .../mateapp/templates/mateapp/mainpage.html | 8 ++++++ .../users/__pycache__/forms.cpython-39.pyc | Bin 2490 -> 2570 bytes runningmate/users/migrations/0001_initial.py | 2 +- .../__pycache__/0001_initial.cpython-39.pyc | Bin 1217 -> 1217 bytes 12 files changed, 48 insertions(+), 14 deletions(-) diff --git a/runningmate/addproject/__pycache__/admin.cpython-39.pyc b/runningmate/addproject/__pycache__/admin.cpython-39.pyc index fc38eab997784468e272cc51dcd6caae4004d401..f2c6fe10c34e35579e548d740f4944bf6be39038 100644 GIT binary patch delta 82 zcmey(Je`Fvk(ZZ?0SLB5pGsn5oX97`=rB>+m?xDni+ureD#t=bMuv@XdW?*mlY1E* k`EIckXO^ViVsp#S$;mIDe2!6>hXbgYhmnJYgHePT08LpFVgLXD delta 52 zcmbQv@|&42k(ZZ?0SNfdolJVkFp*D&(PW~w@y0AYMn?9@GZ`HxzhG46VgoARVdP-p GU<3eRAq$QG diff --git a/runningmate/addproject/__pycache__/models.cpython-39.pyc b/runningmate/addproject/__pycache__/models.cpython-39.pyc index 96ac859e3eac1857afa8e5601b7d2630257b0e98..53e463ba4d9f215f42b06662ea2837679681bfdd 100644 GIT binary patch delta 946 zcmZuvJ8u&~5Z>AK#pn0=5j!CSC=%d=u#kc%sE{H#73LAroP;9d-S~m=g}JkU2q{I< zTEaRZ8VaC5q^Cjr0Ypo8O=|uC5~5-Df=w{l(|kKSJM+!X+#IGp=dz7VCdp|1xc~Km zV~nz|z#6@O2rq&H+}e=lP&k%M$mBkA@-ijUv=>xSW@L7s?SWGwJtwV5pKURje+N!k zRa99PhTzP};ySZSVf;3_UDfozf1yNn@EVq`q)7`CTW+uCK2hj}Gqp&yd6-7kYxqiT z_8X5>828)g4qENt5SHc+pl(BG_#MBe4j_zqs<(B(upBJ#4_1j7u{?oF@Qq*GZ2}p_ zOY59umBiCUKWAO`2HvuDh6Os>9J92AM$;YieViuLSK0B4HzS{UvU!@4@tyLYBCE$- z1o7yXuO0D2#D5~OIgVO9Mrln`2EX_Q%m;VG-F%V!!o)rG)US0^PvWWIqgXk2lwgkT za6vnm+vsj9^q-;T#WTTAad!1@lOnC6ZxRH$CEjTQlbc{dn!W;9+!UtZkc`9>k!N$1 zpWnSso{BjjnZuRn#*{%gBVov$cyu-==foP5T#9`r#U6K(GDc%zV2%iEzzl6ol7E)| zS2svJi(s5Zf+HlSSh16;?M4Gry{Y^LO-*dzDGcLOt{$|y9m8b`#Pb?15QMowzw>yY zHhs6H{Ivn323=J}`<7Gme(NNW}qCxi&uWHbtCnbr> f)=%1`LC$sF3< znqcZMlUbJ<&9Veb!kcSrEOmpZ%k$i2=?S6*W*=x?CW`Ngpu=0k*)xp0mk+31N`ptO zDqcZ_FVj|Lod5s; diff --git a/runningmate/addproject/admin.py b/runningmate/addproject/admin.py index df4cb75..bef1703 100644 --- a/runningmate/addproject/admin.py +++ b/runningmate/addproject/admin.py @@ -6,3 +6,5 @@ @admin.register(Project) class ProjectAdmin(admin.ModelAdmin): list_display = ['id', 'startday', 'endday', 'title', 'body', 'writer', 'color'] + +admin.site.register(Follow) diff --git a/runningmate/addproject/migrations/0001_initial.py b/runningmate/addproject/migrations/0001_initial.py index 8317f15..343bada 100644 --- a/runningmate/addproject/migrations/0001_initial.py +++ b/runningmate/addproject/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.4 on 2022-07-10 06:52 +# Generated by Django 4.0.4 on 2022-07-10 13:50 import colorfield.fields from django.conf import settings @@ -12,14 +12,14 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('auth', '0012_alter_user_first_name_max_length'), ] operations = [ migrations.CreateModel( - name='User', + name='Follow', fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=10)), + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ], ), migrations.CreateModel( @@ -31,8 +31,22 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=200)), ('body', models.TextField(null=True)), ('color', colorfield.fields.ColorField(default='#FFFFFF', image_field=None, max_length=18, samples=[('#50cfbc', '1'), ('#fe7782', '2'), ('#45bfff', '3'), ('#ffbc54', '4'), ('#735bf2', '5')])), - ('followers', models.ManyToManyField(related_name='following', to=settings.AUTH_USER_MODEL)), + ('followers', models.ManyToManyField(related_name='following', through='addproject.Follow', to=settings.AUTH_USER_MODEL)), ('writer', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.AddField( + model_name='follow', + name='project', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='addproject.project'), + ), + migrations.AddField( + model_name='follow', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AlterUniqueTogether( + name='follow', + unique_together={('user', 'project')}, + ), ] diff --git a/runningmate/addproject/migrations/__pycache__/0001_initial.cpython-39.pyc b/runningmate/addproject/migrations/__pycache__/0001_initial.cpython-39.pyc index d868cc41400bf78d5deac0544a0f67564611403b..0f6071369fa2ab6e2ced31cfe140f37e769faaf0 100644 GIT binary patch delta 900 zcmZvazi-n(6vut%i<7wd(KczCrayo}Rau~_z=~8Vq_jeyIFxqD z#OMK8Vni(i68{5#0SnAGFtD>%NEF^VQA;KKq|@_zpZERVoqcA$FP5BQ(bVvH*ZQ)* zk$YSEI9wx|#!b;MJPfkCRi`?q3M@UbTWON;$?r*pMq(qK-JY?<^zG6vVvJ0 zn}#~fsjWdH*0DB^wF(ek^=Ew3ulciSZ$b6k+<0qsScE0TT~crjuE!K^#CTM{K15*o zDv-)tB6CRG>=3vWQ#aFUK;@}st;qbY=L#qC!rq=mC36N*N3N`|-@Ru$LBxeU=;PA% zL_e~7PM6zV=d~U1o{N~#41*v%l+=T!ObD%P$cY2tbsceJzu-qQkE5Owc*k58UU9J> z_IawIe3X_n+8z&}FSAcX==0}Ma)&OJEF#TIljJddLu$!4x;#9dasUoS{#=7`XBvq&7#6W zRt;=v=w^09lt{fqS&3xQBS@yM3E?#b-^K;=v|k?dyq5!RN1@B34l?t}sy<9U>kam( z9(!`eX*-Cbqv$Kt9jxyaO z^qd)tP+I+Skr5N4gwY^XvT%m=A`%$Y-z+oAYU7NZvmeQKHcuWTzgV;JP&s5$o2$!q I(#kCT1zn~9bpQYW delta 657 zcmX|7O>fgc5cRItj=hQ9B+W;geyBp?USDM$y;(i^gM2;_ip*~@R#+$ z|1$rhGBkz+j3EUwG?ATIXeX6(5|N>UEOCK?i9D$S0S4BB9#gPYUV{oa3vx^&3hsiI zOkOfQ#njv?)D}#!J>+NpxuKAMh1N=iI?PK6XsC2e4K=kOtYbZCBu!{R8#<8z-OmIz zN~ul7TZf)D2wSCnlSwfoYf{tOjYGN&A(Ea}Ptv`A z5{eQQAK6y%opp#;{ALF&o}J?A3e&HK*jK}1zj$Va2R9USC^PwAW-&r(o%omZl2tTr y5w5~l(IZW=y;Sw3u=HXs8%J51iSiORSN9P8V$UA*?r3dI`oHB0-7VhQyZ->$1huCC diff --git a/runningmate/addproject/models.py b/runningmate/addproject/models.py index 94d9eac..8444c2e 100644 --- a/runningmate/addproject/models.py +++ b/runningmate/addproject/models.py @@ -14,13 +14,21 @@ class Project(models.Model): #프로젝트 추가 title = models.CharField(max_length=200) body = models.TextField(null=True) writer = models.ForeignKey(User,on_delete=models.CASCADE, null=True) - followers = models.ManyToManyField(User, related_name='following') - + followers = models.ManyToManyField(User, related_name='followers', through = 'Follow') + def __str__(self): return self.title def summary(self): return self.body[:30] + + @property + def follower_count(self): + return self.followers.count() + + @property + def follower(self): + return self.followers COLOR_PALETTE = [ ("#50cfbc","1",),("#fe7782","2",),("#45bfff","3",),("#ffbc54","4",),("#735bf2","5",), @@ -28,9 +36,11 @@ def summary(self): color = ColorField(samples=COLOR_PALETTE) -class User(models.Model): - id = models.AutoField(primary_key=True) - name = models.CharField(max_length=10) - +class Follow(models.Model): + user = models.ForeignKey(User, on_delete=models.CASCADE) + project = models.ForeignKey(Project, on_delete=models.CASCADE) + + class Meta: + unique_together = (('user', 'project')) diff --git a/runningmate/mateapp/migrations/0001_initial.py b/runningmate/mateapp/migrations/0001_initial.py index cade670..84842db 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 06:52 +# Generated by Django 4.0.4 on 2022-07-10 13:50 import colorfield.fields from django.conf import settings @@ -11,8 +11,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('addproject', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ diff --git a/runningmate/mateapp/migrations/__pycache__/0001_initial.cpython-39.pyc b/runningmate/mateapp/migrations/__pycache__/0001_initial.cpython-39.pyc index 6f065273ca345971969f5b82eb139fe129cf07d5..3c90c422aa6421245fd06a9118d39186934209c5 100644 GIT binary patch delta 44 zcmdnbzn`Bwk(ZZ?0SKl=otntKlP85Km1O~IDq9x&LdK03*x8tw7`Z0jVtWbz0!|Dt delta 44 zcmdnbzn`Bwk(ZZ?0SKCYoSewLlP8sB0c$E-7W+cR6sC러닝메이트
+
@@ -161,6 +162,13 @@ {% if projects %} {% for project in projects %} + + {% for follower in project.followers.all %} + + + + {% endfor %} +
{{project.startday}}~{{project.endday}}
diff --git a/runningmate/users/__pycache__/forms.cpython-39.pyc b/runningmate/users/__pycache__/forms.cpython-39.pyc index 7ce58b32e50afc74d38006b4ccaef2ac6b08c1bd..24343429f20f9d10537e73fcc23f5abefafdcb18 100644 GIT binary patch delta 1052 zcma))TWb?R6vub=mhEMe^xoPgZB5littb?0y=yh#i&XO<1Yun>+nTUR%4{McTk_CA zLC8ZL5QPe@h>wEclh9`ozrpAS(5jE^o5gcBHHrwj%l!DynX_ll%zxf=J?IYGrr9dN zv$6f|_Wj68_yhU0vdO9@?QoR5K_j%2wyw&wtxjlrUCFdTRHa?;b_eS{w70q5S64Ib z5H)E(9iV&aawZ&P57MC^H$r30T&xvYmgWeJ)8U$ti7rd3l<7!I$q^BqsqhW*exCwu zeXYF`YT3D0-on|pC-p5IqfcLdc~J`_Uz49#&qAy$m5DDc$!oGt*2$vmgIbq}R92Rx zMa7qW#ZrAKudV46)?pU%l}3gy!*AuQLURhGd@gAS&8sXpj2Tc>sGfb-5usUDn#;M4 zP%ECpM0?hC?4m<0YL{)HaG}KY3CLzg`HnIhJp?ih!wUl>66Lql1nJ~8HCGiauI-hr zqFr!A>s*fg)Y`(GQV~K|3iiB{$~i7&N%&T11v_723@ZxLva;~Cmvvm%ve4 z3V|)7ogM=ivPxul_3yf_5}n99I?rfh{H4(eBgEetCV!|+l8-B!3BIXa`={yMv?nmK zm-aP{?B6wAMay?>9&E0n&1PWp5RHM&;lSnyoOfJA)1_?AcGJ1}Vr3y!Vg#3*7fB7qn~>_;3xjPvnOta=*c|6T-21|+x!`XASTU4$CR5IcxfQwThK zb{G+Od;}FHv15qf@B=TVq%N3a_A?kw^S48ZYLuP8+-bx~goZeUz?Rt=1m0qH4$*-) zkGOyces&2}(8^_0e{&zZy$Pe?K54qIac)ffX8R~f@z2KNo?v&s3N<#tAGIXN^&b+h B_fG%- delta 903 zcma)(%WKp?7{D{hB%9rC_Pu>*w^mkdSH*&~YU=~-!B!8p;z8I;8h2)Gmh6K`Ry;&1 zSSToq$beW-XhA%9_E0={6MTT)6e4)^VC$byaK5Zm5f3KJk8d9NzRCByn|ql}ScVak z#Pj;Y+iObVLE;N~$G6oYH_%)uP0}Pom6}enBu8S8Wzy3@B;Ud19T7W!csYPMJf&P&*)>nCMs+_d9nFyIlvyh>9wO`;m2x+zn7n) zi@c@emZX|O(17I2Cidkud0j%1r{0lnDZcD0rsj+NwFr^dk(lYe(mmnJqJ(lOzzwTT z1C`dBHMQ-YE8x< zLtvO@#j#wsLLJ96*|=Ei;wVHD0JtS6a2NQZI)!399nJDL>Nt8OM0j&T0m+6EawNYa zq4$>r3<|>CBpKM*jdzrCJk+s^>=rtVP)9=aYLI``?1?t`_`b2Rd4H7^;0_2d1lR)@ z2J8hC0s8>^`Rzyn&Hk?|A`6#_8Ts2(tZFmYGr<=-Bl4DXHVWyd0njpb5CDeQAwcK^ zPO>oo^sUfsVc0$RhLz63G`!3? yi2h{_?t57bcR@f$7|G(*wlx(ZjepWdLz5$DnomX_<-_0mohOVY__t^g&HM!at;qoZ diff --git a/runningmate/users/migrations/0001_initial.py b/runningmate/users/migrations/0001_initial.py index fe19ee1..6187be1 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 06:52 +# Generated by Django 4.0.4 on 2022-07-10 13:50 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 a21aef6317a6f7fa5f0fd35bf12bc0632d6ca68c..17edb8d57ed84cd7aed3ecb970f7e2910b56eb4c 100644 GIT binary patch delta 20 acmX@ed61Jkk(ZZ?0SKl=o!ZE~jRgQSu?1BC delta 20 acmX@ed61Jkk(ZZ?0SKCYoZQI0jRgQV)CJxE From 909c0bb736b8494c4ab39715ac32359a8ad05d24 Mon Sep 17 00:00:00 2001 From: yaena1223 Date: Sun, 10 Jul 2022 16:54:39 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=EB=AF=B8=EB=AA=A8=EC=A7=80=20=EB=9D=84?= =?UTF-8?q?=EC=9A=B0=EA=B8=B0=20=EC=99=84=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/models.cpython-310.pyc | Bin 1552 -> 2024 bytes .../0002_alter_project_followers.py | 21 ++++++++++ .../mateapp/templates/mateapp/mainpage.html | 37 ++++++++++++------ .../mateapp/templates/mateapp/project.html | 19 +++++---- .../templates/mateapp/project_post.html | 12 +++++- 5 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 runningmate/addproject/migrations/0002_alter_project_followers.py diff --git a/runningmate/addproject/__pycache__/models.cpython-310.pyc b/runningmate/addproject/__pycache__/models.cpython-310.pyc index 461ee9cd3c469065bb16e74ef324bb013a854f13..9beb38113e3c0573872411a3ab761d14f5d2c851 100644 GIT binary patch delta 995 zcmZuv%}*0i5Pu)L?Y8t|TPUSL^q>JYCTOC@#FK_lFIWg4G1*H4eGh0|S)AQQB_uu2 zgBKFW#(43d9!&U8j8|`a;fiPP#+k(uMBZk8J8yR8H}Cy+4s)l)f}hW48Lp}I@9Xc( zqrwMnAANnn52G?)SXI`6bZwPU**Liyw9c)1Z0| zW6^Ih-D`0S3>NtUZ5Az{`xEOY{u!BJ7`Kjq0={Ci<#)G3xJ*c&3WLKplbjmH0;0@{ z-O<1Iow<-Ak%ulZ4`oa`Yr>NzSF&4!(uo0YO6=N~d80|W%4^Y{Tq=!VUYuFcZ^C+8 zdkV&*6M3(9)_~3i*C@f-0e?qB_!h2H>;}d1vkUVJOU=b6^K&aJbC9MO-rMuxf`*Bj zV^ottAjJY=u$Uz*p2MfiZH~SaGRw&pen8GnXso3N1T^HW5>b9|$*{ z?5*>C<|$J`$v#tZU$|Li;0&2iL;{CHo(R$YS@bs_qXjm?po`+JR03<|?ohp#OxMga z9j@Vs8QnlboJK8ZDjSXglUN8-1k(s{vAf-V)z!_=-_+rjzEX(TAhz3>9vBFy1c!&{ zG@PMJbYQaQ$UK7|fhHL45Zosqec%BBm0qbgU7Su9SO^xgQRlKqK=Py7Ko$j)j2 delta 542 zcmZutJ5L)y5Z<|m@6Nun&(B0@l1N0!RTNMl(SUeV2wTKyuCW}?2HBiBv^FmZiG~&g zS|K_L3MBpjb;=0QrMq7c%KU@OIL{)x+Hb#|*`06a`&K&li)j$#1&zn>;bUxF6tBR$ zxZQ$1U4iEOsS$_hqIV+VGUl;Bdu3Cge*=Co8gkiGHK7bn(^tuNI`)%opnz7{Ms*P0uh z*5cYqyS<_uj@i95N!33B6R8@%@d((aQG>u0uHk}DvjRmRZt83M#j#1L1->&yAVmx) zVndn(3jq!C$tIpd6D{Hn+SFQ3ai49nrLd#=!>&5)Y{|nX7E%R*^~hB(`S6P2HG@r% zd5gQ_bkbvH^ijRxm^I6e{`d1N!eu6|y26JLCc^7cs2k2@_}9^&4eQU&Td4m4OO -
러닝메이트
- +
러닝메이트 + + +
+
- {% for project in projects %} + {% for project in projects %} - {%empty%} -
아직 등록된 러닝메이트가 없어요.
- {%endfor%} + {% for follower in project.followers.all %} -

이영서

+
+ {% endfor %} + + {% endfor %} +
@@ -181,17 +187,22 @@ {% if projects %} {% for project in projects %} - {% for follower in project.followers.all %} - - - {% endfor %}
{{project.startday}}~{{project.endday}}

{{project.title}}

-

{{project.summary}}

+

{{project.summary}}

+
+ + + {% for follower in project.followers.all %} +
+ {% endfor %} + +
{% endfor %} diff --git a/runningmate/mateapp/templates/mateapp/project.html b/runningmate/mateapp/templates/mateapp/project.html index 50350c9..9906fef 100644 --- a/runningmate/mateapp/templates/mateapp/project.html +++ b/runningmate/mateapp/templates/mateapp/project.html @@ -83,15 +83,18 @@

{{project.summary}}

러닝메이트
-
+
+ -
-

이영서

-

오준서

-

윤영서

-

김성준

-

류슬기

-

이예나

+ + {% for follower in project.followers.all %} + +
+ + {% endfor %} + +
diff --git a/runningmate/mateapp/templates/mateapp/project_post.html b/runningmate/mateapp/templates/mateapp/project_post.html index 84e1c25..aef063d 100644 --- a/runningmate/mateapp/templates/mateapp/project_post.html +++ b/runningmate/mateapp/templates/mateapp/project_post.html @@ -78,7 +78,15 @@

{{project.summary}}

러닝메이트
-
+
+ + {% for follower in project.followers.all %} + +
+ + {% endfor %} +
러닝스페이스
- +
From 05c7f900cf48f25b51c701c696107cc5b242b665 Mon Sep 17 00:00:00 2001 From: SEONGJOON KIM Date: Sun, 10 Jul 2022 16:59:56 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=8F=BC=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/models.cpython-39.pyc | Bin 1979 -> 1853 bytes .../0002_alter_project_followers.py | 21 +++++++ runningmate/addproject/models.py | 7 +-- .../mateapp/__pycache__/views.cpython-39.pyc | Bin 5451 -> 5451 bytes .../mateapp/templates/mateapp/mainpage.html | 58 +++++++++++++----- .../users/__pycache__/forms.cpython-39.pyc | Bin 2570 -> 2674 bytes runningmate/users/forms.py | 4 ++ runningmate/users/views.py | 2 +- 8 files changed, 71 insertions(+), 21 deletions(-) create mode 100644 runningmate/addproject/migrations/0002_alter_project_followers.py diff --git a/runningmate/addproject/__pycache__/models.cpython-39.pyc b/runningmate/addproject/__pycache__/models.cpython-39.pyc index 53e463ba4d9f215f42b06662ea2837679681bfdd..fdfa5abdce6da81fe82488567cc0ff1b5ac537b2 100644 GIT binary patch delta 241 zcmdnZzn70Uk(ZZ?0SLa8o=Otl$jidW*fLp&u}~tNA%%YtW0YvBSgL4>KrdsIc#2>! zgQn2t<&5VUP59IDb8_;_Q;Uk@lk-dSN+f|M6f=R$VX6`jD9X=DO)k+xQ!`nZC6rNO zawf}`$x5u2KvoQ^1S8AjO4j|{DnN}zsvtsbvNM~Wy9SU6Hjaa_$P~!-)8sBfQUg-R o3LIs!YDh_LNZy0E;6w!vFvP delta 333 zcmdnXx0|0gk(ZZ?0SLauo=S?^$jidWIAO97W1&i_a0-8lKnp`NW0Yt*LyF)c#wf8= z@l>%CpR3#Qrl%JKF zT%w1nWb!{o6`mp?pb|~SB0eBB`5}|28V5{~EKmeyf&jV+ljkvqGD=SV!n}p4NN(~{ z78^MkpmGi-4n__}9v~EA6ky_D=3r)Gi@ayZ*lMp*zcbV*DA diff --git a/runningmate/addproject/migrations/0002_alter_project_followers.py b/runningmate/addproject/migrations/0002_alter_project_followers.py new file mode 100644 index 0000000..72b74c0 --- /dev/null +++ b/runningmate/addproject/migrations/0002_alter_project_followers.py @@ -0,0 +1,21 @@ +# Generated by Django 4.0.4 on 2022-07-10 16:00 + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('addproject', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='project', + name='followers', + field=models.ManyToManyField(related_name='followers', through='addproject.Follow', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/runningmate/addproject/models.py b/runningmate/addproject/models.py index 8444c2e..1530279 100644 --- a/runningmate/addproject/models.py +++ b/runningmate/addproject/models.py @@ -23,13 +23,10 @@ def summary(self): return self.body[:30] @property - def follower_count(self): + def followers_count(self): return self.followers.count() - @property - def follower(self): - return self.followers - + COLOR_PALETTE = [ ("#50cfbc","1",),("#fe7782","2",),("#45bfff","3",),("#ffbc54","4",),("#735bf2","5",), ] diff --git a/runningmate/mateapp/__pycache__/views.cpython-39.pyc b/runningmate/mateapp/__pycache__/views.cpython-39.pyc index e04ca717be9de5590aeaf0e130f1b6a458b7688f..18317808200add8a50ff4d6dc8fe481c886ed0b8 100644 GIT binary patch delta 19 ZcmX@Dby|xnk(ZZ?0SKP7ZRBzk1pqZU1oZ#_ delta 19 ZcmX@Dby|xnk(ZZ?0SIIRH*z_O0st?D1Ni^| diff --git a/runningmate/mateapp/templates/mateapp/mainpage.html b/runningmate/mateapp/templates/mateapp/mainpage.html index f10728d..4ef6368 100644 --- a/runningmate/mateapp/templates/mateapp/mainpage.html +++ b/runningmate/mateapp/templates/mateapp/mainpage.html @@ -32,6 +32,8 @@ display: inline-block; padding-right: 10px; } + +
@@ -80,7 +82,7 @@
- {% if calendar.count == 0 %} + {% if calendar.0.title == None %}
아직 등록된 일정이 없어요
{% else %}
@@ -99,10 +101,8 @@ {% endif %}
- {% if calendar.count == 0 %} -
아직 등록된 일정이 없어요
- {% elif calendar.count == 1 %} -
아직 등록된 일정이 없어요
+ {% if calendar.1.title == None %} +
아직 등록된 일정이 없어요
{% else %}
{{calendar.1.title}}
@@ -122,13 +122,22 @@
러닝메이트
- + {% for follower in project.followers.all %} + + {% endfor %} +
- -
아직 등록된 러닝메이트가 없어요.
+ {% for project in projects %} - + {%empty%} +
아직 등록된 러닝메이트가 없어요.
+ {%endfor%} + {% for follower in project.followers.all %} + + + + {% endfor %}