Merge branch 'main' of https://github.com/daldal-Mango/Miracle30 into…

… main

Miracle30/templates/shared/_navbar.html

@@ -32,15 +32,15 @@ <h4 class="nav_star">⭐<span id="cash">{{request.user.profile.cash}}</span>별<
           {% for goal in request.user.goal_set.all %}
           {% if goal.category == 'study' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
 
           {% for goal in request.user.members.all %}
           {% if goal.category == 'study' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
@@ -55,15 +55,15 @@ <h4 class="nav_star">⭐<span id="cash">{{request.user.profile.cash}}</span>별<
           {% for goal in request.user.goal_set.all %}
           {% if goal.category == 'hobby' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
 
           {% for goal in request.user.members.all %}
           {% if goal.category == 'hobby' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
@@ -78,15 +78,15 @@ <h4 class="nav_star">⭐<span id="cash">{{request.user.profile.cash}}</span>별<
           {% for goal in request.user.goal_set.all %}
           {% if goal.category == 'etc' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}
 
           {% for goal in request.user.members.all %}
           {% if goal.category == 'etc' %}
           <li class="nav_goal">
-            <a href="{% url 'groups:main' goal.id %}" class="a_deco">{{ goal.name }}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{ goal.name }}</a>
           </li>
           {% endif %}
           {% endfor %}

groups/templates/groups/main.html

@@ -172,6 +172,14 @@ <h2>{{dates|index_1:0}} ~ {{dates|index_1:29}}</h2>
         </div>
       </article>
       <article id="tab3" class="content-container__content certify_container">
+          {{goal.manager}}
+        {% for member in goal.member.all %}
+        {% if request.user == goal.manager %}
+            <a href="{% url 'groups:delete_member' goal.id member.id %}">{{member}}</a>
+        {% else %}
+            {{member}}
+        {% endif %}
+        {% endfor %}
         {% for certify in certifies %}
         <ul class="certify_list">
           <li>아이디<span>{{ certify.user }}</span></li>

groups/urls.py

@@ -7,5 +7,8 @@
     path('<int:goal_id>/certify/', views.certify, name="certify"),
     path('group_list/', views.group_list, name="group_list"),
     path('group_detail/', views.group_detail, name="group_detail"),
-    path('make_group/', views.make_group, name="make_group")
+    path('make_group/', views.make_group, name="make_group"),
+    path('<int:goal_id>/date_check', views.date_check, name="date_check"),
+    path('<int:goal_id>/<int:user_id>/delete_member', views.delete_member, name="delete_member"),
+
 ]

groups/views.py

@@ -1,10 +1,17 @@
 from django.shortcuts import render, get_object_or_404, redirect
 from main.models import Goal
-from .models import Certify
+from .models import Certify, User
 from datetime import datetime, timedelta
 import datetime
 from django.utils import timezone
 
+def date_check(request, goal_id):
+    goal = get_object_or_404(Goal, pk=goal_id)
+    today = datetime.date.today()
+    if today < goal.start_date:
+        return redirect('main:goal_detail', goal_id)
+    else:
+        return redirect('groups:main', goal_id)
 
 def main(request, goal_id):
     level = []
@@ -128,3 +135,11 @@ def group_detail(request):
 
 def make_group(request):
     return render(request, 'groups/make_group.html')
+
+
+def delete_member(request, goal_id, user_id):
+    goal = Goal.objects.get(pk=goal_id)
+
+    delete_user = User.objects.get(pk=user_id)
+    delete_user.members.remove(goal)
+    return redirect('groups:main', goal_id)

main/templates/main/goal_main.html

@@ -9,9 +9,11 @@ <h1 class="title">그룹 참여하기</h1>
   <div class="container">
     <div class="main_container">
       {% for goal in goals %}
+      {% if goal.member_limit > goal.member.count %}
       <div class="main_card">
         <a href="{% url 'main:goal_detail' goal.pk %}" class="a_deco">{{goal.name}}</a>
       </div>
+      {% endif %}
       {% endfor %}
     </div>
     <a href="{% url 'main:add_goal' %}" class="btn1 btn_center a_deco">그룹 만들기</a>

main/views.py

@@ -1,6 +1,9 @@
 from django.shortcuts import render, redirect
 from django.utils import *
 from .models import Goal
+from datetime import datetime
+import datetime
+
 
 def main_login(request):
     return render(request, 'main/main_login.html')
@@ -11,7 +14,8 @@ def main_logout(request):
 
 
 def goal_main(request):
-    goals = Goal.objects.all()
+    today = datetime.date.today()
+    goals = Goal.objects.filter(deadline__gte=today)    
     return render(request, 'main/goal_main.html', {'goals':goals})
 
 

users/templates/users/mypage.html

@@ -18,7 +18,7 @@ <h3>내가 개설한 목표</h3>
         <div class="my_make">
           {% for goal in my_goal %}
           <div class="my_goalItem">
-            <a href="{% url 'groups:main' goal.pk %}" class="a_deco">{{goal.name}}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{goal.name}}</a>
           </div>
           {% endfor %}
         </div>
@@ -28,7 +28,7 @@ <h3>내가 참여한 목표</h3>
         <div class="my_join">
           {% for goal in participate_goal %}
           <div class="my_goalItem">
-            <a href="{% url 'groups:main' goal.pk %}" class="a_deco">{{goal.name}}</a>
+            <a href="{% url 'groups:date_check' goal.id %}" class="a_deco">{{goal.name}}</a>
           </div>
           {% endfor %}
         </div>