update members urls

fet2020/fet2020/urls.py

@@ -37,9 +37,9 @@ urlpatterns = [
     path("ckeditor/", include("ckeditor_uploader.urls")),
     path("gallery/", include("gallery.urls"), name="gallery"),
     path("index.html", views.index, name="home"),
-    path("jobs/", include(jobs_urlpatterns), name="jobs"),
+    path("jobs/", include(jobs_urlpatterns)),
-    path("members/", include("members.urls"), name="members"),
+    path("members/", include("members.urls")),
-    path("member/", include(member_urlpatterns), name="member"),
+    path("member/", include(member_urlpatterns)),
     path("posts/", include("posts.urls")),
     path("search/", include("search.urls")),
     path("tasks/", include("tasks.urls"), name="tasks"),

fet2020/members/urls.py

@@ -1,17 +1,19 @@
 from django.urls import path
 
+from . import apps
 from . import views
 
+app_name = apps.MembersConfig.name
 
 urlpatterns = [
-    path("", views.index, name="members"),
+    path("", views.index, name="index"),
-    path("<str:filter>/", views.members_view, name="members_view"),
+    path("<str:filter>/", views.members, name="members"),
 ]
 
 member_urlpatterns = [
-    path("<str:member_id>/", views.profile_view, name="member"),
+    path("<int:member_id>/", views.profile, name="member"),
 ]
 
 jobs_urlpatterns = [
-    path("<str:slug>/", views.jobs_view, name="jobs"),
+    path("<slug:slug>/", views.jobs, name="jobs"),
 ]

fet2020/members/views.py

@@ -53,7 +53,7 @@ def index(request):
     return render(request, "members/members.html", context)
 
 
-def jobs_view(request, slug=None):
+def jobs(request, slug=None):
     pinned_job_groups, unpinned_job_groups = __get_job_groups()
 
     try:
@@ -78,7 +78,7 @@ def jobs_view(request, slug=None):
     return render(request, "members/jobs.html", context)
 
 
-def members_view(request, filter=None):
+def members(request, filter=None):
     pinned_job_groups, unpinned_job_groups = __get_job_groups()
 
     for elem in Member.MemberRole:
@@ -101,7 +101,7 @@ def members_view(request, filter=None):
     return render(request, "members/members.html", context)
 
 
-def profile_view(request, member_id=None):
+def profile(request, member_id=None):
     pinned_job_groups, unpinned_job_groups = __get_job_groups()
 
     member = Member.all_members.filter(id=member_id).first()

fet2020/templates/base.html

@@ -69,7 +69,7 @@
 				x-transition:leave-end="transform opacity-0 scale-90"
 			>
 				<li><a href="{% url 'posts:index' %}">News</a></li>
-				<li><a href="{% url 'members_view' 'active' %}">Fachschaft</a></li>
+				<li><a href="{% url 'members:members' 'active' %}">Fachschaft</a></li>
 				<li><a href="{% url 'gallery' %}">Galerie</a></li>
 				<li><a href="{% url 'blackboard' %}">Blackboard</a></li>
 				<li><a href="{% url 'contact' %}">Kontakt</a></li>

fet2020/templates/layout.html

@@ -61,7 +61,7 @@
             {% endif %}
             <li><a class="button header-btn header-link" href="{% url 'posts:index' %}">News</a></li>
             <!-- show active members first -->
-            <li><a class="button header-btn header-link" href="{% url 'members_view' 'active' %}">Fachschaft</a></li>
+            <li><a class="button header-btn header-link" href="{% url 'members:members' 'active' %}">Fachschaft</a></li>
             <li><a class="button header-btn header-link" href="{% url 'gallery' %}">Galerie</a></li>
             <li><a class="button header-btn header-link" href="{% url 'blackboard' %}">Blackboard</a></li>
             <li><a class="button header-btn header-link" href="{% url 'contact' %}">Kontakt</a></li>

fet2020/templates/members/index.html

@@ -51,15 +51,15 @@
                             <hr class="">
 
                             <li class="{% if 'active' in request.path %}active{% endif %}">
-                                <a href="{% url 'members_view' 'active' %}">Fachschaft</a>
+                                <a href="{% url 'members:members' 'active' %}">Fachschaft</a>
                             </li>
                             
                             <li class="{% if 'pension' in request.path %}active{% endif %}">
-                                <a href="{% url 'members_view' 'pension' %}">Pension</a>
+                                <a href="{% url 'members:members' 'pension' %}">Pension</a>
                             </li>
                             
                             <li class="{% if '/members/' == request.path %}active{% endif %}">
-                                <a href="{% url 'members' %}">Alle Mitglieder</a>
+                                <a href="{% url 'members:index' %}">Alle Mitglieder</a>
                             </li>
 
                             {% if request.user.is_authenticated %}