From d7faab42132aec4ac1e913092cf879692924a1bc Mon Sep 17 00:00:00 2001
From: Patrick <patrick@fet.at>
Date: Thu, 3 Dec 2020 09:21:46 +0000
Subject: [PATCH] change urls of jobs and member

---
 fet2020/fet2020/urls.py                        | 18 +++---------------
 fet2020/members/urls.py                        | 10 ++++++++--
 fet2020/templates/members/index.html           |  4 ++--
 .../templates/members/partials/_member.html    |  2 +-
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py
index f447a461..81de07ee 100644
--- a/fet2020/fet2020/urls.py
+++ b/fet2020/fet2020/urls.py
@@ -1,18 +1,3 @@
-"""test1 URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/3.0/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  path('', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.urls import include, path
-    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
-"""
 from django.contrib import admin
 from django.urls import path, include
 from django.conf.urls.static import static
@@ -20,6 +5,7 @@ from django.conf import settings
 from django.views.generic import RedirectView
 from . import views
 from posts.views import PostViewSet
+from members.urls import member_urlpatterns, jobs_urlpatterns
 from members.views import MemberViewSet, JobViewSet, JobGroupViewSet, JobMemberViewSet
 from rest_framework import routers
 
@@ -41,6 +27,8 @@ urlpatterns = [
     path('ckeditor/', include('ckeditor_uploader.urls')),
     path('api/', include(router.urls)),
     path('members/', include('members.urls'), name='members'),
+    path('jobs/', include(jobs_urlpatterns), name='jobs'),
+    path('member/', include(member_urlpatterns), name='member'),
     path('blackboard/', include('blackboard.urls'), name='blackboard'),
     path('tasks/', include('tasks.urls'), name='tasks'),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/fet2020/members/urls.py b/fet2020/members/urls.py
index ab861c0d..16753f25 100644
--- a/fet2020/members/urls.py
+++ b/fet2020/members/urls.py
@@ -6,6 +6,12 @@ from . import views
 urlpatterns = [
     path('', views.index, name='members'),
     path('<str:filter>', views.members_view),
-    path('jobs/<str:slug>', views.jobs_view),
-    path('member/<str:member_name>', views.profile_view, name='member'),
+]
+
+member_urlpatterns = [
+    path('<str:member_name>', views.profile_view, name='member'),
+]
+
+jobs_urlpatterns = [
+    path('<str:slug>', views.jobs_view, name='jobs'),
 ]
diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html
index 2465ef3b..331fdb9f 100644
--- a/fet2020/templates/members/index.html
+++ b/fet2020/templates/members/index.html
@@ -24,7 +24,7 @@
 
         {% for job in pinned_job_groups %}
             <div class="cell large-2 medium-4 small-6">
-                <a class="button expanded {% if job.slug in request.path %} active {% endif %}" href="/members/jobs/{{job.slug}}">
+                <a class="button expanded {% if job.slug in request.path %} active {% endif %}" href="{% url 'jobs' job.slug %}">
                     {{job.name}}
                 </a>
                 </div>
@@ -32,7 +32,7 @@
 
         {% for job in unpinned_job_groups %}
             <div class="cell large-2 medium-4 small-6">
-                <a class="button expanded {% if job.slug in request.path %} active {% endif %}" href="/members/jobs/{{job.slug}}">
+                <a class="button expanded {% if job.slug in request.path %} active {% endif %}" href="{% url 'jobs' job.slug %}">
                     {{ job.name|softhyphen|safe }}
                 </a>
             </div>
diff --git a/fet2020/templates/members/partials/_member.html b/fet2020/templates/members/partials/_member.html
index 57df88c5..1ed9d65d 100644
--- a/fet2020/templates/members/partials/_member.html
+++ b/fet2020/templates/members/partials/_member.html
@@ -1,5 +1,5 @@
 {# only thumb and name of member #}
-<a class="thumbnail member-thumb" href="/members/member/{{member.nickname}}" style="width:150px;height:150px">
+<a class="thumbnail member-thumb" href="{% url 'member' member.nickname %}" style="width:150px;height:150px">
     <img src="{{member.image.thumb.url}}" alt="" />
     <div class="thumb-layer">
         <div>