Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use django's path for URLs
Roland Geider05904387ef57
diff --git a/wger/config/urls.py b/wger/config/urls.pyindex 25ea19b62..6e6111c73 100644--- a/wger/config/urls.py+++ b/wger/config/urls.py@@ -16,10 +16,8 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.# Django-from django.conf.urls import (- include,- url-)+from django.conf.urls import include+from django.urls import path# wgerfrom wger.config.views import (@@ -30,17 +28,17 @@ from wger.config.views import (# sub patterns for language configspatterns_language_config = [- url(r'^(?P<pk>\d+)/edit',- language_config.LanguageConfigUpdateView.as_view(),- name='edit'),+ path('<int:pk>/edit',+ language_config.LanguageConfigUpdateView.as_view(),+ name='edit'),]# sub patterns for default gympatterns_gym_config = [- url(r'^edit$',- gym_config.GymConfigUpdateView.as_view(),- name='edit'),+ path('edit',+ gym_config.GymConfigUpdateView.as_view(),+ name='edit'),]@@ -48,6 +46,6 @@ patterns_gym_config = [# Actual patterns#urlpatterns = [- url(r'^language-config/', include((patterns_language_config, 'language_config'), namespace="language_config")),- url(r'^gym-config/', include((patterns_gym_config, 'gym_config'), namespace="gym_config")),+ path('language-config/', include((patterns_language_config, 'language_config'), namespace="language_config")),+ path('gym-config/', include((patterns_gym_config, 'gym_config'), namespace="gym_config")),]diff --git a/wger/core/urls.py b/wger/core/urls.pyindex f1c17e5af..7af2ced40 100644--- a/wger/core/urls.py+++ b/wger/core/urls.py@@ -21,6 +21,7 @@ from django.conf.urls import (url)from django.contrib.auth import views+from django.urls import pathfrom django.views.generic import TemplateView# wger@@ -37,135 +38,135 @@ from wger.core.views import (# sub patterns for languagespatterns_language = [- url(r'^list$',- languages.LanguageListView.as_view(),- name='overview'),- url(r'^(?P<pk>\d+)/view$',- languages.LanguageDetailView.as_view(),- name='view'),- url(r'^(?P<pk>\d+)/delete$',- languages.LanguageDeleteView.as_view(),- name='delete'),- url(r'^(?P<pk>\d+)/edit',- languages.LanguageEditView.as_view(),- name='edit'),- url(r'^add$',- languages.LanguageCreateView.as_view(),- name='add'),+ path('list',+ languages.LanguageListView.as_view(),+ name='overview'),+ path('<int:pk>/view',+ languages.LanguageDetailView.as_view(),+ name='view'),+ path('<int:pk>/delete',+ languages.LanguageDeleteView.as_view(),+ name='delete'),+ path('<int:pk>/edit',+ languages.LanguageEditView.as_view(),+ name='edit'),+ path('add',+ languages.LanguageCreateView.as_view(),+ name='add'),]# sub patterns for userpatterns_user = [- url(r'^login$',- views.LoginView.as_view(template_name='user/login.html',- authentication_form=UserLoginForm),- name='login'),- url(r'^logout$',- user.logout,- name='logout'),- url(r'^delete$',- user.delete,- name='delete'),- url(r'^(?P<user_pk>\d+)/delete$',- user.delete,- name='delete'),- url(r'^(?P<user_pk>\d+)/trainer-login$',- user.trainer_login,- name='trainer-login'),- url(r'^registration$',- user.registration,- name='registration'),- url(r'^preferences$',- user.preferences,- name='preferences'),- url(r'^api-key$',- user.api_key,- name='api-key'),- url(r'^demo-entries$',- misc.demo_entries,- name='demo-entries'),- url(r'^(?P<pk>\d+)/activate',- user.UserActivateView.as_view(),- name='activate'),- url(r'^(?P<pk>\d+)/deactivate',- user.UserDeactivateView.as_view(),- name='deactivate'),- url(r'^(?P<pk>\d+)/edit',- user.UserEditView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/overview',- user.UserDetailView.as_view(),- name='overview'),- url(r'^list',- user.UserListView.as_view(),- name='list'),+ path('login',+ views.LoginView.as_view(template_name='user/login.html',+ authentication_form=UserLoginForm),+ name='login'),+ path('logout',+ user.logout,+ name='logout'),+ path('delete',+ user.delete,+ name='delete'),+ path('<int:user_pk>/delete',+ user.delete,+ name='delete'),+ path('<int:user_pk>/trainer-login',+ user.trainer_login,+ name='trainer-login'),+ path('registration',+ user.registration,+ name='registration'),+ path('preferences',+ user.preferences,+ name='preferences'),+ path('api-key',+ user.api_key,+ name='api-key'),+ path('demo-entries',+ misc.demo_entries,+ name='demo-entries'),+ path('<int:pk>/activate',+ user.UserActivateView.as_view(),+ name='activate'),+ path('<int:pk>/deactivate',+ user.UserDeactivateView.as_view(),+ name='deactivate'),+ path('<int:pk>/edit',+ user.UserEditView.as_view(),+ name='edit'),+ path('<int:pk>/overview',+ user.UserDetailView.as_view(),+ name='overview'),+ path('list',+ user.UserListView.as_view(),+ name='list'),# Password reset is implemented by Django, no need to cook our own soup here# (besides the templates)- url(r'^password/change$',- user.WgerPasswordChangeView.as_view(),- name='change-password'),- url(r'^password/reset/$',- user.WgerPasswordResetView.as_view(),- name='password_reset'),- url(r'^password/reset/done/$',- views.PasswordResetDoneView.as_view(),- name='password_reset_done'),+ path('password/change',+ user.WgerPasswordChangeView.as_view(),+ name='change-password'),+ path('password/reset/',+ user.WgerPasswordResetView.as_view(),+ name='password_reset'),+ path('password/reset/done/',+ views.PasswordResetDoneView.as_view(),+ name='password_reset_done'),url(r'^password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',user.WgerPasswordResetConfirmView.as_view(),name='password_reset_confirm'),- url(r'^password/reset/complete/$',- views.PasswordResetCompleteView.as_view(),- name='password_reset_complete'),+ path('password/reset/complete/',+ views.PasswordResetCompleteView.as_view(),+ name='password_reset_complete'),]# sub patterns for licensespatterns_license = [- url(r'^license/list$',- license.LicenseListView.as_view(),- name='list'),- url(r'^license/add$',- license.LicenseAddView.as_view(),- name='add'),- url(r'^license/(?P<pk>\d+)/edit',- license.LicenseUpdateView.as_view(),- name='edit'),- url(r'^license/(?P<pk>\d+)/delete',- license.LicenseDeleteView.as_view(),- name='delete'),+ path('license/list',+ license.LicenseListView.as_view(),+ name='list'),+ path('license/add',+ license.LicenseAddView.as_view(),+ name='add'),+ path('license/<int:pk>)/edit',+ license.LicenseUpdateView.as_view(),+ name='edit'),+ path('license/<int:pk>/delete',+ license.LicenseDeleteView.as_view(),+ name='delete'),]# sub patterns for setting unitspatterns_repetition_units = [- url(r'^list$',- repetition_units.ListView.as_view(),- name='list'),- url(r'^add$',- repetition_units.AddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit',- repetition_units.UpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete',- repetition_units.DeleteView.as_view(),- name='delete'),+ path('list',+ repetition_units.ListView.as_view(),+ name='list'),+ path('add',+ repetition_units.AddView.as_view(),+ name='add'),+ path('<int:pk>/edit',+ repetition_units.UpdateView.as_view(),+ name='edit'),+ path('<int:pk>/delete',+ repetition_units.DeleteView.as_view(),+ name='delete'),]# sub patterns for setting unitspatterns_weight_units = [- url(r'^list$',- weight_units.ListView.as_view(),- name='list'),- url(r'^add$',- weight_units.AddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit',- weight_units.UpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete',- weight_units.DeleteView.as_view(),- name='delete'),+ path('list',+ weight_units.ListView.as_view(),+ name='list'),+ path('add',+ weight_units.AddView.as_view(),+ name='add'),+ path('<int:pk>)/edit',+ weight_units.UpdateView.as_view(),+ name='edit'),+ path('<int:pk>/delete',+ weight_units.DeleteView.as_view(),+ name='delete'),]@@ -175,29 +176,29 @@ patterns_weight_units = [urlpatterns = [# The landing page- url(r'^$',- misc.index,- name='index'),+ path('',+ misc.index,+ name='index'),# The dashboard- url(r'^dashboard$',- misc.dashboard,- name='dashboard'),+ path('dashboard',+ misc.dashboard,+ name='dashboard'),# Others- url(r'^about$',- TemplateView.as_view(template_name="misc/about.html"),- name='about'),- url(r'^contact$',- misc.ContactClassView.as_view(template_name="misc/contact.html"),- name='contact'),- url(r'^feedback$',- misc.FeedbackClass.as_view(),- name='feedback'),-- url(r'^language/', include((patterns_language, 'language'), namespace="language")),- url(r'^user/', include((patterns_user, 'user'), namespace="user")),- url(r'^license/', include((patterns_license, 'license'), namespace="license")),- url(r'^repetition-unit/', include((patterns_repetition_units, 'repetition-unit'), namespace="repetition-unit")),- url(r'^weight-unit/', include((patterns_weight_units, 'weight-unit'), namespace="weight-unit")),+ path('about',+ TemplateView.as_view(template_name="misc/about.html"),+ name='about'),+ path('contact',+ misc.ContactClassView.as_view(template_name="misc/contact.html"),+ name='contact'),+ path('feedback',+ misc.FeedbackClass.as_view(),+ name='feedback'),++ path('language/', include((patterns_language, 'language'), namespace="language")),+ path('user/', include((patterns_user, 'user'), namespace="user")),+ path('license/', include((patterns_license, 'license'), namespace="license")),+ path('repetition-unit/', include((patterns_repetition_units, 'repetition-unit'), namespace="repetition-unit")),+ path('weight-unit/', include((patterns_weight_units, 'weight-unit'), namespace="weight-unit")),]diff --git a/wger/exercises/urls.py b/wger/exercises/urls.pyindex 699f21072..679ccc749 100644--- a/wger/exercises/urls.py+++ b/wger/exercises/urls.py@@ -16,11 +16,9 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.# Django-from django.conf.urls import (- include,- url-)+from django.conf.urls import includefrom django.contrib.auth.decorators import login_required+from django.urls import path# wgerfrom wger.exercises.views import (@@ -35,131 +33,131 @@ from wger.exercises.views import (# sub patterns for musclespatterns_muscle = [- url(r'^overview/$',- muscles.MuscleListView.as_view(),- name='overview'),- url(r'^admin-overview/$',- muscles.MuscleAdminListView.as_view(),- name='admin-list'),- url(r'^add/$',- muscles.MuscleAddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit/$',- muscles.MuscleUpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete/$',- muscles.MuscleDeleteView.as_view(),- name='delete'),+ path('overview/',+ muscles.MuscleListView.as_view(),+ name='overview'),+ path('admin-overview/',+ muscles.MuscleAdminListView.as_view(),+ name='admin-list'),+ path('add/',+ muscles.MuscleAddView.as_view(),+ name='add'),+ path('<int:pk>/edit/',+ muscles.MuscleUpdateView.as_view(),+ name='edit'),+ path('<int:pk>/delete/',+ muscles.MuscleDeleteView.as_view(),+ name='delete'),]# sub patterns for exercise imagespatterns_images = [- url(r'^(?P<exercise_pk>\d+)/image/add$',- images.ExerciseImageAddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit$',- images.ExerciseImageEditView.as_view(),- name='edit'),- url(r'^(?P<exercise_pk>\d+)/image/(?P<pk>\d+)/delete$',- images.ExerciseImageDeleteView.as_view(),- name='delete'),- url(r'^(?P<pk>\d+)/accept/$',- images.accept,- name='accept'),- url(r'^(?P<pk>\d+)/decline/$',- images.decline,- name='decline'),+ path('<int:exercise_pk>/image/add',+ images.ExerciseImageAddView.as_view(),+ name='add'),+ path('<int:pk>/edit',+ images.ExerciseImageEditView.as_view(),+ name='edit'),+ path('<int:exercise_pk>/image/<int:pk>/delete',+ images.ExerciseImageDeleteView.as_view(),+ name='delete'),+ path('<int:pk>/accept/',+ images.accept,+ name='accept'),+ path('<int:pk>/decline/',+ images.decline,+ name='decline'),]# sub patterns for exercise commentspatterns_comment = [- url(r'^(?P<exercise_pk>\d+)/comment/add/$',- comments.ExerciseCommentAddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit/$',- comments.ExerciseCommentEditView.as_view(),- name='edit'),- url(r'^(?P<id>\d+)/delete/$',- comments.delete,- name='delete'),+ path('<int:exercise_pk>/comment/add/',+ comments.ExerciseCommentAddView.as_view(),+ name='add'),+ path('<int:pk>/edit/',+ comments.ExerciseCommentEditView.as_view(),+ name='edit'),+ path('<int:id>/delete/',+ comments.delete,+ name='delete'),]# sub patterns for categoriespatterns_category = [- url(r'^list$',- categories.ExerciseCategoryListView.as_view(),- name='list'),- url(r'^(?P<pk>\d+)/edit/$',- categories.ExerciseCategoryUpdateView.as_view(),- name='edit'),- url(r'^add/$',- categories.ExerciseCategoryAddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/delete/$',- categories.ExerciseCategoryDeleteView.as_view(),- name='delete'),+ path('list',+ categories.ExerciseCategoryListView.as_view(),+ name='list'),+ path('<int:pk>/edit/',+ categories.ExerciseCategoryUpdateView.as_view(),+ name='edit'),+ path('add/',+ categories.ExerciseCategoryAddView.as_view(),+ name='add'),+ path('<int:pk>/delete/',+ categories.ExerciseCategoryDeleteView.as_view(),+ name='delete'),]# sub patterns for equipmentpatterns_equipment = [- url(r'^list$',- equipment.EquipmentListView.as_view(),- name='list'),- url(r'^add$',- equipment.EquipmentAddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit$',- equipment.EquipmentEditView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete$',- equipment.EquipmentDeleteView.as_view(),- name='delete'),- url(r'^overview$',- equipment.EquipmentOverviewView.as_view(),- name='overview'),+ path('list',+ equipment.EquipmentListView.as_view(),+ name='list'),+ path('add',+ equipment.EquipmentAddView.as_view(),+ name='add'),+ path('<int:pk>/edit',+ equipment.EquipmentEditView.as_view(),+ name='edit'),+ path('<int:pk>/delete',+ equipment.EquipmentDeleteView.as_view(),+ name='delete'),+ path('overview',+ equipment.EquipmentOverviewView.as_view(),+ name='overview'),]# sub patterns for exercisespatterns_exercise = [- url(r'^overview/$',- exercises.ExerciseListView.as_view(),- name='overview'),- url(r'^(?P<id>\d+)/view/$',- exercises.view,- name='view'),- url(r'^(?P<id>\d+)/view/(?P<slug>[-\w]*)/?$',- exercises.view,- name='view'),- url(r'^add/$',- login_required(exercises.ExerciseAddView.as_view()),- name='add'),- url(r'^(?P<pk>\d+)/edit/$',- exercises.ExerciseUpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/correct$',- exercises.ExerciseCorrectView.as_view(),- name='correct'),- url(r'^(?P<pk>\d+)/delete/$',- exercises.ExerciseDeleteView.as_view(),- name='delete'),- url(r'^pending/$',- exercises.PendingExerciseListView.as_view(),- name='pending'),- url(r'^(?P<pk>\d+)/accept/$',- exercises.accept,- name='accept'),- url(r'^(?P<pk>\d+)/decline/$',- exercises.decline,- name='decline'),+ path('overview/',+ exercises.ExerciseListView.as_view(),+ name='overview'),+ path('<int:id>/view/',+ exercises.view,+ name='view'),+ path('<int:id>/view/<slug:slug>/',+ exercises.view,+ name='view'),+ path('add/',+ login_required(exercises.ExerciseAddView.as_view()),+ name='add'),+ path('<int:pk>/edit/',+ exercises.ExerciseUpdateView.as_view(),+ name='edit'),+ path('<int:pk>/correct',+ exercises.ExerciseCorrectView.as_view(),+ name='correct'),+ path('<int:pk>/delete/',+ exercises.ExerciseDeleteView.as_view(),+ name='delete'),+ path('pending/',+ exercises.PendingExerciseListView.as_view(),+ name='pending'),+ path('<int:pk>/accept/',+ exercises.accept,+ name='accept'),+ path('<int:pk>/decline/',+ exercises.decline,+ name='decline'),]urlpatterns = [- url(r'^muscle/', include((patterns_muscle, 'muscle'), namespace="muscle")),- url(r'^image/', include((patterns_images, 'image'), namespace="image")),- url(r'^comment/', include((patterns_comment, 'comment'), namespace="comment")),- url(r'^category/', include((patterns_category, 'category'), namespace="category")),- url(r'^equipment/', include((patterns_equipment, 'equipment'), namespace="equipment")),- url(r'^', include((patterns_exercise, 'exercise'), namespace="exercise")),+ path('muscle/', include((patterns_muscle, 'muscle'), namespace="muscle")),+ path('image/', include((patterns_images, 'image'), namespace="image")),+ path('comment/', include((patterns_comment, 'comment'), namespace="comment")),+ path('category/', include((patterns_category, 'category'), namespace="category")),+ path('equipment/', include((patterns_equipment, 'equipment'), namespace="equipment")),+ path('', include((patterns_exercise, 'exercise'), namespace="exercise")),]diff --git a/wger/gym/urls.py b/wger/gym/urls.pyindex 2c5d315fb..6988aa57f 100644--- a/wger/gym/urls.py+++ b/wger/gym/urls.py@@ -16,10 +16,8 @@# Django-from django.conf.urls import (- include,- url-)+from django.conf.urls import include+from django.urls import path# wgerfrom wger.gym.views import (@@ -38,159 +36,159 @@ from wger.gym.views import (# 'sub patterns' for gymspatterns_gym = [- url(r'^list$',- gym.GymListView.as_view(),- name='list'),- url(r'^new-user-data/view$',- gym.gym_new_user_info,- name='new-user-data'),- url(r'^new-user-data/export$',- gym.gym_new_user_info_export,- name='new-user-data-export'),- url(r'^(?P<pk>\d+)/members$',- gym.GymUserListView.as_view(),- name='user-list'),- url(r'^(?P<gym_pk>\d+)/add-member$',- gym.GymAddUserView.as_view(),- name='add-user'),- url(r'^add$',- gym.GymAddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit$',- gym.GymUpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete$',- gym.GymDeleteView.as_view(),- name='delete'),- url(r'^user/(?P<user_pk>\d+)/permission-edit$',- gym.gym_permissions_user_edit,- name='edit-user-permission'),- url(r'^user/(?P<user_pk>\d+)/reset-user-password$',- gym.reset_user_password,- name='reset-user-password'),+ path('list',+ gym.GymListView.as_view(),+ name='list'),+ path('new-user-data/view',+ gym.gym_new_user_info,+ name='new-user-data'),+ path('new-user-data/export',+ gym.gym_new_user_info_export,+ name='new-user-data-export'),+ path('<int:pk>/members',+ gym.GymUserListView.as_view(),+ name='user-list'),+ path('<int:gym_pk>/add-member',+ gym.GymAddUserView.as_view(),+ name='add-user'),+ path('add',+ gym.GymAddView.as_view(),+ name='add'),+ path('<int:pk>/edit',+ gym.GymUpdateView.as_view(),+ name='edit'),+ path('<int:pk>/delete',+ gym.GymDeleteView.as_view(),+ name='delete'),+ path('user/<int:user_pk>/permission-edit',+ gym.gym_permissions_user_edit,+ name='edit-user-permission'),+ path('user/<int:user_pk>/reset-user-password',+ gym.reset_user_password,+ name='reset-user-password'),]# 'sub patterns' for gym configpatterns_gymconfig = [- url(r'^(?P<pk>\d+)/edit$',- config.GymConfigUpdateView.as_view(),- name='edit'),+ path('<int:pk>/edit',+ config.GymConfigUpdateView.as_view(),+ name='edit'),]# 'sub patterns' for gym admin configpatterns_adminconfig = [- url(r'^(?P<pk>\d+)/edit$',- admin_config.ConfigUpdateView.as_view(),- name='edit'),+ path('<int:pk>/edit',+ admin_config.ConfigUpdateView.as_view(),+ name='edit'),]# 'sub patterns' for gym user configpatterns_userconfig = [- url(r'^(?P<pk>\d+)/edit$',- user_config.ConfigUpdateView.as_view(),- name='edit'),+ path('<int:pk>/edit',+ user_config.ConfigUpdateView.as_view(),+ name='edit'),]# 'sub patterns' for admin notespatterns_admin_notes = [- url(r'^list/user/(?P<user_pk>\d+)$',- admin_notes.ListView.as_view(),- name='list'),- url(r'^add/user/(?P<user_pk>\d+)$',- admin_notes.AddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit$',- admin_notes.UpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete$',- admin_notes.DeleteView.as_view(),- name='delete'),+ path('list/user/<int:user_pk>',+ admin_notes.ListView.as_view(),+ name='list'),+ path('add/user/<int:user_pk>',+ admin_notes.AddView.as_view(),+ name='add'),+ path('<int:pk>/edit',+ admin_notes.UpdateView.as_view(),+ name='edit'),+ path('<int:pk>/delete',+ admin_notes.DeleteView.as_view(),+ name='delete'),]# 'sub patterns' for user documentspatterns_documents = [- url(r'^list/user/(?P<user_pk>\d+)$',- document.ListView.as_view(),- name='list'),- url(r'^add/user/(?P<user_pk>\d+)$',- document.AddView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit$',- document.UpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete$',- document.DeleteView.as_view(),- name='delete'),+ path('list/user/<int:user_pk>',+ document.ListView.as_view(),+ name='list'),+ path('add/user/<int:user_pk>',+ document.AddView.as_view(),+ name='add'),+ path('<int:pk>/edit',+ document.UpdateView.as_view(),+ name='edit'),+ path('<int:pk>/delete',+ document.DeleteView.as_view(),+ name='delete'),]# sub patterns for contractspatterns_contracts = [- url(r'^add/(?P<user_pk>\d+)$',- contract.AddView.as_view(),- name='add'),- url(r'^view/(?P<pk>\d+)$',- contract.DetailView.as_view(),- name='view'),- url(r'^edit/(?P<pk>\d+)$',- contract.UpdateView.as_view(),- name='edit'),- url(r'^list/(?P<user_pk>\d+)$',- contract.ListView.as_view(),- name='list'),+ path('add/<int:user_pk>',+ contract.AddView.as_view(),+ name='add'),+ path('view/<int:pk>',+ contract.DetailView.as_view(),+ name='view'),+ path('edit/<int:pk>',+ contract.UpdateView.as_view(),+ name='edit'),+ path('list/<int:user_pk>',+ contract.ListView.as_view(),+ name='list'),]# sub patterns for contract typespatterns_contract_types = [- url(r'^add/(?P<gym_pk>\d+)$',- contract_type.AddView.as_view(),- name='add'),- url(r'^edit/(?P<pk>\d+)$',- contract_type.UpdateView.as_view(),- name='edit'),- url(r'^delete/(?P<pk>\d+)$',- contract_type.DeleteView.as_view(),- name='delete'),- url(r'^list/(?P<gym_pk>\d+)$',- contract_type.ListView.as_view(),- name='list'),+ path('add/<int:gym_pk>',+ contract_type.AddView.as_view(),+ name='add'),+ path('edit/<int:pk>',+ contract_type.UpdateView.as_view(),+ name='edit'),+ path('delete/<int:pk>',+ contract_type.DeleteView.as_view(),+ name='delete'),+ path('list/<int:gym_pk>',+ contract_type.ListView.as_view(),+ name='list'),]# sub patterns for contract optionspatterns_contract_options = [- url(r'^add/(?P<gym_pk>\d+)$',- contract_option.AddView.as_view(),- name='add'),- url(r'^edit/(?P<pk>\d+)$',- contract_option.UpdateView.as_view(),- name='edit'),- url(r'^delete/(?P<pk>\d+)$',- contract_option.DeleteView.as_view(),- name='delete'),- url(r'^list/(?P<gym_pk>\d+)$',- contract_option.ListView.as_view(),- name='list'),+ path('add/<int:gym_pk>',+ contract_option.AddView.as_view(),+ name='add'),+ path('edit/<int:pk>',+ contract_option.UpdateView.as_view(),+ name='edit'),+ path('delete/<int:pk>',+ contract_option.DeleteView.as_view(),+ name='delete'),+ path('list/<int:gym_pk>',+ contract_option.ListView.as_view(),+ name='list'),]# sub patterns for exportspatterns_export = [- url(r'^users/(?P<gym_pk>\d+)$',- export.users,- name='users'),+ path('users/<int:gym_pk>)',+ export.users,+ name='users'),]## All patterns for this app#urlpatterns = [- url(r'^', include((patterns_gym, 'gym'), namespace="gym")),- url(r'^config/', include((patterns_gymconfig, 'config'), namespace="config")),- url(r'^admin-config/', include((patterns_adminconfig, 'admin_config'), namespace="admin_config")),- url(r'^user-config/', include((patterns_userconfig, 'user_config'), namespace="user_config")),- url(r'^notes/', include((patterns_admin_notes, 'admin_note'), namespace="admin_note")),- url(r'^document/', include((patterns_documents, 'document'), namespace="document")),- url(r'^contract/', include((patterns_contracts, 'contract'), namespace="contract")),- url(r'^contract-type/', include((patterns_contract_types, 'contract_type'), namespace="contract_type")),- url(r'^contract-option/', include((patterns_contract_options, 'contract-option'), namespace="contract-option")),- url(r'^export/', include((patterns_export, 'export'), namespace="export")),+ path('', include((patterns_gym, 'gym'), namespace="gym")),+ path('config/', include((patterns_gymconfig, 'config'), namespace="config")),+ path('admin-config/', include((patterns_adminconfig, 'admin_config'), namespace="admin_config")),+ path('user-config/', include((patterns_userconfig, 'user_config'), namespace="user_config")),+ path('notes/', include((patterns_admin_notes, 'admin_note'), namespace="admin_note")),+ path('document/', include((patterns_documents, 'document'), namespace="document")),+ path('contract/', include((patterns_contracts, 'contract'), namespace="contract")),+ path('contract-type/', include((patterns_contract_types, 'contract_type'), namespace="contract_type")),+ path('contract-option/', include((patterns_contract_options, 'contract-option'), namespace="contract-option")),+ path('export/', include((patterns_export, 'export'), namespace="export")),]diff --git a/wger/mailer/urls.py b/wger/mailer/urls.pyindex e4e4e978a..ae7b6a855 100644--- a/wger/mailer/urls.py+++ b/wger/mailer/urls.py@@ -15,10 +15,8 @@# You should have received a copy of the GNU Affero General Public License# Django-from django.conf.urls import (- include,- url-)+from django.conf.urls import include+from django.urls import path# wgerfrom wger.mailer.forms import EmailListForm@@ -27,15 +25,15 @@ from wger.mailer.views import gym# sub patterns for email listspatterns_email = [- url(r'^overview/gym/(?P<gym_pk>\d+)$',- gym.EmailLogListView.as_view(),- name='overview'),- url(r'^add/gym/(?P<gym_pk>\d+)$',- gym.EmailListFormPreview(EmailListForm),- name='add-gym'),+ path('overview/gym/<int:gym_pk>',+ gym.EmailLogListView.as_view(),+ name='overview'),+ path('add/gym/<int:gym_pk>',+ gym.EmailListFormPreview(EmailListForm),+ name='add-gym'),]urlpatterns = [- url(r'^email/', include((patterns_email, 'email'), namespace="email")),+ path('email', include((patterns_email, 'email'), namespace="email")),]diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 105047b40..121c37d13 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -21,6 +21,7 @@ from django.conf.urls import (url)from django.contrib.auth.decorators import login_required+from django.urls import path# wgerfrom wger.manager.views import (@@ -38,44 +39,43 @@ from wger.manager.views import (# sub patterns for workout logspatterns_log = [- url(r'^(?P<pk>\d+)/view$',- log.WorkoutLogDetailView.as_view(),- name='log'),- url(r'^(?P<pk>\d+)/edit$', # JS- log.WorkoutLogUpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete$',- log.WorkoutLogDeleteView.as_view(),- name='delete')+ path('<int:pk>/view',+ log.WorkoutLogDetailView.as_view(),+ name='log'),+ path('<int:pk>/edit', # JS+ log.WorkoutLogUpdateView.as_view(),+ name='edit'),+ path('<int:pk>/delete',+ log.WorkoutLogDeleteView.as_view(),+ name='delete')]-# sub patterns for workoutspatterns_workout = [- url(r'^overview$',- workout.overview,- name='overview'),- url(r'^add$',- workout.add,- name='add'),- url(r'^(?P<pk>\d+)/copy/$',- workout.copy_workout,- name='copy'),- url(r'^(?P<pk>\d+)/edit/$',- workout.WorkoutEditView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete/$',- workout.WorkoutDeleteView.as_view(),- name='delete'),- url(r'^(?P<pk>\d+)/view/$',- workout.view,- name='view'),+ path('overview',+ workout.overview,+ name='overview'),+ path('add',+ workout.add,+ name='add'),+ path('<int:pk>/copy/',+ workout.copy_workout,+ name='copy'),+ path('<int:pk>/edit/',+ workout.WorkoutEditView.as_view(),+ name='edit'),+ path('<int:pk>/delete/',+ workout.WorkoutDeleteView.as_view(),+ name='delete'),+ path('<int:pk>/view/',+ workout.view,+ name='view'),url(r'^calendar/(?P<username>[\w.@+-]+)$',log.calendar,name='calendar'),- url(r'^calendar$',- log.calendar,- name='calendar'),+ path('calendar',+ log.calendar,+ name='calendar'),url(r'^calendar/(?P<username>[\w.@+-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})$',log.calendar,name='calendar'),@@ -88,9 +88,9 @@ patterns_workout = [url(r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',ical.export,name='ical'),- url(r'^(?P<pk>\d+)/ical$',- ical.export,- name='ical'),+ path('<int:pk>/ical',+ ical.export,+ name='ical'),url(r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',pdf.workout_log,name='pdf-log'), # JS!@@ -100,9 +100,9 @@ patterns_workout = [url(r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',pdf.workout_log,name='pdf-log'),- url(r'^(?P<id>\d+)/pdf/log$',- pdf.workout_log,- name='pdf-log'),+ path('<int:id>/pdf/log',+ pdf.workout_log,+ name='pdf-log'),url(r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',pdf.workout_view,name='pdf-table'), # JS!@@ -112,91 +112,88 @@ patterns_workout = [url(r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)$',pdf.workout_view,name='pdf-table'),- url(r'^(?P<id>\d+)/pdf/table$',- pdf.workout_view,- name='pdf-table'),- url(r'^(?P<day_pk>\d+)/timer$',- workout.timer,- name='timer'),+ path('<int:id>/pdf/table',+ pdf.workout_view,+ name='pdf-table'),+ path('<int:day_pk>/timer',+ workout.timer,+ name='timer'),]-# sub patterns for workout sessionspatterns_session = [url(r'^(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',workout_session.WorkoutSessionAddView.as_view(),name='add'),- url(r'^(?P<pk>\d+)/edit$',- workout_session.WorkoutSessionUpdateView.as_view(),- name='edit'),+ path('<int:pk>/edit',+ workout_session.WorkoutSessionUpdateView.as_view(),+ name='edit'),url(r'^(?P<pk>\d+)/delete/(?P<logs>session|logs)?$',workout_session.WorkoutSessionDeleteView.as_view(),name='delete'),]-# sub patterns for workout dayspatterns_day = [- url(r'^(?P<pk>\d+)/edit/$',- login_required(day.DayEditView.as_view()),- name='edit'),- url(r'(?P<workout_pk>\d+)/day/add/$',- login_required(day.DayCreateView.as_view()),- name='add'),- url(r'(?P<pk>\d+)/delete/$',- day.delete,- name='delete'),- url(r'^(?P<id>\d+)/view/$',- day.view,- name='view'),- url(r'^(?P<pk>\d+)/log/add/$',- log.add,- name='log'),+ path('<int:pk>/edit/',+ login_required(day.DayEditView.as_view()),+ name='edit'),+ path('<int:workout_pk>/day/add/',+ login_required(day.DayCreateView.as_view()),+ name='add'),+ path('<int:pk>/delete/',+ day.delete,+ name='delete'),+ path('<int:id>/view/',+ day.view,+ name='view'),+ path('<int:pk>/log/add/',+ log.add,+ name='log'),]# sub patterns for workout setspatterns_set = [- url(r'^day/(?P<day_pk>\d+)/set/add/$',- set.create,- name='add'),- url(r'^get-formset/(?P<exercise_pk>\d+)/(?P<reps>\d+)/',- set.get_formset,- name='get-formset'), # Used by JS- url(r'^(?P<pk>\d+)/delete$',- set.delete,- name='delete'),- url(r'^(?P<pk>\d+)/edit/$',- set.edit,- name='edit'),+ path('day/<int:day_pk>/set/add/',+ set.create,+ name='add'),+ path('get-formset/<int:exercise_pk>/<int:reps>/',+ set.get_formset,+ name='get-formset'), # Used by JS+ path('<int:pk>/delete',+ set.delete,+ name='delete'),+ path('<int:pk>/edit/',+ set.edit,+ name='edit'),]-# sub patterns for schedulespatterns_schedule = [- url(r'^overview$',- schedule.overview,- name='overview'),- url(r'^add$',- schedule.ScheduleCreateView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/view/$',- schedule.view,- name='view'),- url(r'^(?P<pk>\d+)/start$',- schedule.start,- name='start'),- url(r'^(?P<pk>\d+)/edit/$',- schedule.ScheduleEditView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete/$',- schedule.ScheduleDeleteView.as_view(),- name='delete'),+ path('overview',+ schedule.overview,+ name='overview'),+ path('add',+ schedule.ScheduleCreateView.as_view(),+ name='add'),+ path('<int:pk>/view/',+ schedule.view,+ name='view'),+ path('<int:pk>/start',+ schedule.start,+ name='start'),+ path('<int:pk>/edit/',+ schedule.ScheduleEditView.as_view(),+ name='edit'),+ path('<int:pk>/delete/',+ schedule.ScheduleDeleteView.as_view(),+ name='delete'),url(r'^(?P<pk>\d+)/ical/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',ical.export_schedule,name='ical'),- url(r'^(?P<pk>\d+)/ical$',- ical.export_schedule,- name='ical'),+ path('<int:pk>/ical',+ ical.export_schedule,+ name='ical'),url(r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',schedule.export_pdf_log,name='pdf-log'), # JS!@@ -206,11 +203,10 @@ patterns_schedule = [url(r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',schedule.export_pdf_log,name='pdf-log'),- url(r'^(?P<pk>\d+)/pdf/log$',- schedule.export_pdf_log,- name='pdf-log'),- url(- r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',+ path('<int:pk>/pdf/log',+ schedule.export_pdf_log,+ name='pdf-log'),+ url(r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',schedule.export_pdf_table,name='pdf-table'), # JS!url(r'^(?P<pk>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',@@ -219,32 +215,30 @@ patterns_schedule = [url(r'^(?P<pk>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)$',schedule.export_pdf_table,name='pdf-table'),- url(r'^(?P<pk>\d+)/pdf/table$',- schedule.export_pdf_table,- name='pdf-table'),+ path('<int:pk>/pdf/table',+ schedule.export_pdf_table,+ name='pdf-table'),]-# sub patterns for schedule stepspatterns_step = [- url(r'^(?P<schedule_pk>\d+)/step/add$',- schedule_step.StepCreateView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit$',- schedule_step.StepEditView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete$',- schedule_step.StepDeleteView.as_view(),- name='delete'),+ path('<int:schedule_pk>/step/add',+ schedule_step.StepCreateView.as_view(),+ name='add'),+ path('<int:pk>/edit',+ schedule_step.StepEditView.as_view(),+ name='edit'),+ path('<int:pk>/delete',+ schedule_step.StepDeleteView.as_view(),+ name='delete'),]-urlpatterns = [- url(r'^', include((patterns_workout, 'workout'), namespace="workout")),- url(r'^log/', include((patterns_log, 'log'), namespace="log")),- url(r'^day/', include((patterns_day, 'day'), namespace="day")),- url(r'^set/', include((patterns_set, 'set'), namespace="set")),- url(r'^session/', include((patterns_session, 'session'), namespace="session")),- url(r'^schedule/', include((patterns_schedule, 'schedule'), namespace="schedule")),- url(r'^schedule/step/', include((patterns_step, 'step'), namespace="step")),+ path('', include((patterns_workout, 'workout'), namespace="workout")),+ path('log/', include((patterns_log, 'log'), namespace="log")),+ path('day/', include((patterns_day, 'day'), namespace="day")),+ path('set/', include((patterns_set, 'set'), namespace="set")),+ path('session/', include((patterns_session, 'session'), namespace="session")),+ path('schedule/', include((patterns_schedule, 'schedule'), namespace="schedule")),+ path('schedule/step/', include((patterns_step, 'step'), namespace="step")),]diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.pyindex f198722c2..ba7b8aa93 100644--- a/wger/nutrition/urls.py+++ b/wger/nutrition/urls.py@@ -21,6 +21,7 @@ from django.conf.urls import (url)from django.contrib.auth.decorators import login_required+from django.urls import path# wgerfrom wger.nutrition.views import (@@ -38,182 +39,182 @@ from wger.nutrition.views import (# sub patterns for nutritional planspatterns_plan = [- url(r'^overview/$',- plan.overview,- name='overview'),- url(r'^add/$',- plan.add,- name='add'),- url(r'^(?P<id>\d+)/view/$',- plan.view,- name='view'),- url(r'^(?P<pk>\d+)/copy/$',- plan.copy,- name='copy'),- url(r'^(?P<pk>\d+)/delete/$',- login_required(plan.PlanDeleteView.as_view()),- name='delete'),- url(r'^(?P<pk>\d+)/edit/$',- login_required(plan.PlanEditView.as_view()),- name='edit'),- url(r'^(?P<id>\d+)/pdf/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',- plan.export_pdf,- name='export-pdf'),- url(r'^(?P<id>\d+)/pdf/$',+ path('overview/',+ plan.overview,+ name='overview'),+ path('add/',+ plan.add,+ name='add'),+ path('<int:id>/view/',+ plan.view,+ name='view'),+ path('<int:pk>/copy/',+ plan.copy,+ name='copy'),+ path('<int:pk>/delete/',+ login_required(plan.PlanDeleteView.as_view()),+ name='delete'),+ path('<int:pk>/edit/',+ login_required(plan.PlanEditView.as_view()),+ name='edit'),+ url(r'^(?P<id>\d+)/pdf/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})',plan.export_pdf,name='export-pdf'),+ path('<int:id>/pdf/',+ plan.export_pdf,+ name='export-pdf'),]# sub patterns for mealspatterns_meal = [- url(r'^(?P<plan_pk>\d+)/meal/add/$',- login_required(meal.MealCreateView.as_view()),- name='add'),- url(r'^(?P<pk>\d+)/edit/$',- login_required(meal.MealEditView.as_view()),- name='edit'),- url(r'^(?P<id>\d+)/delete/$',- meal.delete_meal,- name='delete'),+ path('<int:plan_pk>/meal/add/',+ login_required(meal.MealCreateView.as_view()),+ name='add'),+ path('<int:pk>/edit/',+ login_required(meal.MealEditView.as_view()),+ name='edit'),+ path('<int:id>/delete/',+ meal.delete_meal,+ name='delete'),]# sub patterns for meal itemspatterns_meal_item = [- url(r'^(?P<meal_id>\d+)/item/add/$',- login_required(meal_item.MealItemCreateView.as_view()),- name='add'),- url(r'^(?P<pk>\d+)/edit/$',- login_required(meal_item.MealItemEditView.as_view()),- name='edit'),- url(r'^(?P<item_id>\d+)/delete/$',- meal_item.delete_meal_item,- name='delete'),+ path('<int:meal_id>/item/add/',+ login_required(meal_item.MealItemCreateView.as_view()),+ name='add'),+ path('<int:pk>/edit/',+ login_required(meal_item.MealItemEditView.as_view()),+ name='edit'),+ path('<int:item_id>/delete/',+ meal_item.delete_meal_item,+ name='delete'),]# sub patterns for ingredientpatterns_ingredient = [- url(r'^(?P<pk>\d+)/delete/$',- ingredient.IngredientDeleteView.as_view(),- name='delete'),- url(r'^(?P<pk>\d+)/edit/$',- ingredient.IngredientEditView.as_view(),- name='edit'),- url(r'^add/$',- login_required(ingredient.IngredientCreateView.as_view()),- name='add'),- url(r'^overview/$',- ingredient.IngredientListView.as_view(),- name='list'),- url(r'^pending/$',- ingredient.PendingIngredientListView.as_view(),- name='pending'),- url(r'^(?P<pk>\d+)/accept/$',- ingredient.accept,- name='accept'),- url(r'^(?P<pk>\d+)/decline/$',- ingredient.decline,- name='decline'),- url(r'^(?P<id>\d+)/view/$',- ingredient.view,- name='view'),- url(r'^(?P<id>\d+)/view/(?P<slug>[-\w]+)/$',- ingredient.view,- name='view'),+ path('<int:pk>/delete/',+ ingredient.IngredientDeleteView.as_view(),+ name='delete'),+ path('<int:pk>/edit/',+ ingredient.IngredientEditView.as_view(),+ name='edit'),+ path('add/',+ login_required(ingredient.IngredientCreateView.as_view()),+ name='add'),+ path('overview/',+ ingredient.IngredientListView.as_view(),+ name='list'),+ path('pending/',+ ingredient.PendingIngredientListView.as_view(),+ name='pending'),+ path('<int:pk>/accept/',+ ingredient.accept,+ name='accept'),+ path('<int:pk>/decline/',+ ingredient.decline,+ name='decline'),+ path('<int:id>/view/',+ ingredient.view,+ name='view'),+ path('<int:id>/view/<slug:slug>/',+ ingredient.view,+ name='view'),]# sub patterns for weight unitspatterns_weight_unit = [- url(r'^list/$',- unit.WeightUnitListView.as_view(),- name='list'),- url(r'^add/$',- unit.WeightUnitCreateView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/delete/$',- unit.WeightUnitDeleteView.as_view(),- name='delete'),- url(r'^(?P<pk>\d+)/edit/$',- unit.WeightUnitUpdateView.as_view(),- name='edit'),+ path('list/',+ unit.WeightUnitListView.as_view(),+ name='list'),+ path('add/',+ unit.WeightUnitCreateView.as_view(),+ name='add'),+ path('<int:pk>/delete/',+ unit.WeightUnitDeleteView.as_view(),+ name='delete'),+ path('<int:pk>/edit/',+ unit.WeightUnitUpdateView.as_view(),+ name='edit'),]# sub patterns for weight units / ingredient cross tablepatterns_unit_ingredient = [- url(r'^add/(?P<ingredient_pk>\d+)/$',- unit_ingredient.WeightUnitIngredientCreateView.as_view(),- name='add'),- url(r'^(?P<pk>\d+)/edit/$',- unit_ingredient.WeightUnitIngredientUpdateView.as_view(),- name='edit'),- url(r'^(?P<pk>\d+)/delete/$',- unit_ingredient.WeightUnitIngredientDeleteView.as_view(),- name='delete'),+ path('add/<int:ingredient_pk>/',+ unit_ingredient.WeightUnitIngredientCreateView.as_view(),+ name='add'),+ path('<int:pk>/edit/',+ unit_ingredient.WeightUnitIngredientUpdateView.as_view(),+ name='edit'),+ path('<int:pk>/delete/',+ unit_ingredient.WeightUnitIngredientDeleteView.as_view(),+ name='delete'),]# sub patterns for BMI calculatorpatterns_bmi = [- url(r'^$',- bmi.view,- name='view'),- url(r'^calculate$',- bmi.calculate,- name='calculate'),- url(r'^chart-data$',- bmi.chart_data,- name='chart-data'), # JS+ path('',+ bmi.view,+ name='view'),+ path('calculate',+ bmi.calculate,+ name='calculate'),+ path('chart-data',+ bmi.chart_data,+ name='chart-data'), # JS]# sub patterns for calories calculatorpatterns_calories = [- url(r'^$',- calculator.view,- name='view'),- url(r'^bmr$',- calculator.calculate_bmr,- name='bmr'),- url(r'^activities$',- calculator.calculate_activities,- name='activities'), # JS+ path('',+ calculator.view,+ name='view'),+ path('bmr',+ calculator.calculate_bmr,+ name='bmr'),+ path('activities',+ calculator.calculate_activities,+ name='activities'), # JS]# sub patterns for calories dairypatterns_diary = [- url(r'^(?P<pk>\d+)$',- log.overview,- name='overview'),+ path('<int:pk>',+ log.overview,+ name='overview'),url(r'^(?P<pk>\d+)/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',log.detail,name='detail'),- url(r'^entry/(?P<pk>\d+)/delete$',- log.LogDeleteView.as_view(),- name='delete'),- url(r'^plan/(?P<plan_pk>\d+)/add',- log.LogCreateView.as_view(),- name='add'),- url(r'^log-meal/(?P<meal_pk>\d+)$',- log.log_meal,- name='log_meal'),- url(r'^log-plan/(?P<plan_pk>\d+)$',- log.log_plan,- name='log_plan')+ path('entry/<int:pk>/delete',+ log.LogDeleteView.as_view(),+ name='delete'),+ path('plan/<int:plan_pk>/add',+ log.LogCreateView.as_view(),+ name='add'),+ path('log-meal/<int:meal_pk>',+ log.log_meal,+ name='log_meal'),+ path('log-plan/<int:plan_pk>',+ log.log_plan,+ name='log_plan')]urlpatterns = [- url(r'^', include((patterns_plan, "plan"), namespace="plan")),- url(r'^meal/', include((patterns_meal, "meal"), namespace="meal")),- url(r'^meal/item/', include((patterns_meal_item, "meal_item"), namespace="meal_item")),- url(r'^ingredient/', include((patterns_ingredient, "ingredient"), namespace="ingredient")),- url(r'^unit/', include((patterns_weight_unit, "weight_unit"), namespace="weight_unit")),- url(r'^unit-to-ingredient/', include((patterns_unit_ingredient, "unit_ingredient"), namespace="unit_ingredient")),- url(r'^calculator/bmi/', include((patterns_bmi, "bmi"), namespace="bmi")),- url(r'^calculator/calories/', include((patterns_calories, "calories"), namespace="calories")),- url(r'^diary/', include((patterns_diary, "log"), namespace="log")),+ path('', include((patterns_plan, "plan"), namespace="plan")),+ path('meal/', include((patterns_meal, "meal"), namespace="meal")),+ path('meal/item/', include((patterns_meal_item, "meal_item"), namespace="meal_item")),+ path('ingredient/', include((patterns_ingredient, "ingredient"), namespace="ingredient")),+ path('unit/', include((patterns_weight_unit, "weight_unit"), namespace="weight_unit")),+ path('unit-to-ingredient/', include((patterns_unit_ingredient, "unit_ingredient"), namespace="unit_ingredient")),+ path('calculator/bmi/', include((patterns_bmi, "bmi"), namespace="bmi")),+ path('calculator/calories/', include((patterns_calories, "calories"), namespace="calories")),+ path('diary/', include((patterns_diary, "log"), namespace="log")),]diff --git a/wger/software/urls.py b/wger/software/urls.pyindex b2511478a..eb2fd1b28 100644--- a/wger/software/urls.py+++ b/wger/software/urls.py@@ -15,7 +15,7 @@# You should have received a copy of the GNU Affero General Public License# Django-from django.conf.urls import url+from django.urls import pathfrom django.views.generic import (RedirectView,TemplateView@@ -27,30 +27,30 @@ from wger.software import viewsurlpatterns = [- url(r'^issues$',- TemplateView.as_view(template_name="issues.html"),- name='issues'),- url(r'^terms-of-service$',- TemplateView.as_view(template_name="tos.html"),- name='tos'),+ path('issues',+ TemplateView.as_view(template_name="issues.html"),+ name='issues'),+ path('terms-of-service',+ TemplateView.as_view(template_name="tos.html"),+ name='tos'),- url(r'^features$',- views.features,- name='features'),+ path('features',+ views.features,+ name='features'),- url(r'^license$',- TemplateView.as_view(template_name="license.html"),- name='license'),+ path('license',+ TemplateView.as_view(template_name="license.html"),+ name='license'),- url(r'^code$',- RedirectView.as_view(permanent=True, url='https://github.com/wger-project/wger'),- name='code'),+ path('code',+ RedirectView.as_view(permanent=True, url='https://github.com/wger-project/wger'),+ name='code'),- url(r'^contribute$',- TemplateView.as_view(template_name="contribute.html"),- name='contribute'),+ path('contribute',+ TemplateView.as_view(template_name="contribute.html"),+ name='contribute'),- url(r'^api$',- TemplateView.as_view(template_name="api.html"),- name='api'),+ path('api',+ TemplateView.as_view(template_name="api.html"),+ name='api'),]diff --git a/wger/urls.py b/wger/urls.pyindex 93d24ea75..94b95dd13 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -17,14 +17,12 @@# Djangofrom django.conf import settings-from django.conf.urls import (- include,- url-)+from django.conf.urls import includefrom django.conf.urls.i18n import i18n_patternsfrom django.conf.urls.static import staticfrom django.contrib import adminfrom django.contrib.sitemaps.views import sitemap+from django.urls import path# Third Partyfrom rest_framework import routers@@ -102,44 +100,44 @@ sitemaps = {'exercises': ExercisesSitemap,#urlpatterns = i18n_patterns(#url(r'^admin/', admin.site.urls),- url(r'^', include(('wger.core.urls', 'core'), namespace='core')),- url(r'workout/', include(('wger.manager.urls', 'manager'), namespace='manager')),- url(r'exercise/', include(('wger.exercises.urls', 'exercise'), namespace='exercise')),- url(r'weight/', include(('wger.weight.urls', 'weight'), namespace='weight')),- url(r'nutrition/', include(('wger.nutrition.urls', 'nutrition'), namespace='nutrition')),- url(r'software/', include(('wger.software.urls', 'software'), namespace='software')),- url(r'config/', include(('wger.config.urls', 'config'), namespace='config')),- url(r'gym/', include(('wger.gym.urls', 'gym'), namespace='gym')),- url(r'email/', include(('wger.mailer.urls', 'email'), namespace='email')),- url(r'^sitemap\.xml$',- sitemap,- {'sitemaps': sitemaps},- name='sitemap')+ path('', include(('wger.core.urls', 'core'), namespace='core')),+ path('workout/', include(('wger.manager.urls', 'manager'), namespace='manager')),+ path('exercise/', include(('wger.exercises.urls', 'exercise'), namespace='exercise')),+ path('weight/', include(('wger.weight.urls', 'weight'), namespace='weight')),+ path('nutrition/', include(('wger.nutrition.urls', 'nutrition'), namespace='nutrition')),+ path('software/', include(('wger.software.urls', 'software'), namespace='software')),+ path('config/', include(('wger.config.urls', 'config'), namespace='config')),+ path('gym/', include(('wger.gym.urls', 'gym'), namespace='gym')),+ path('email', include(('wger.mailer.urls', 'email'), namespace='email')),+ path('sitemap.xml',+ sitemap,+ {'sitemaps': sitemaps},+ name='sitemap'))## URLs without language prefix#urlpatterns += [- url(r'^robots\.txt$',- TextTemplateView.as_view(template_name="robots.txt"),- name='robots'),+ path('robots.txt',+ TextTemplateView.as_view(template_name="robots.txt"),+ name='robots'),# API- url(r'^api/v2/exercise/search/$',- exercises_api_views.search,- name='exercise-search'),- url(r'^api/v2/exerciseinfo/search/$',- exercises_api_views.search,- name='exercise-info'),- url(r'^api/v2/ingredient/search/$',- nutrition_api_views.search,- name='ingredient-search'),- url(r'^api/v2/', include(router.urls)),+ path('api/v2/exercise/search/',+ exercises_api_views.search,+ name='exercise-search'),+ path('api/v2/exerciseinfo/search/',+ exercises_api_views.search,+ name='exercise-info'),+ path('api/v2/ingredient/search/',+ nutrition_api_views.search,+ name='ingredient-search'),+ path('api/v2/', include(router.urls)),# The api user login- url(r'^api/v2/login/$', core_api_views.UserAPILoginView.as_view({- 'post': 'post'}), name='api_user'),+ path('api/v2/login/', core_api_views.UserAPILoginView.as_view({+ 'post': 'post'}), name='api_user'),]#diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.pyindex ec087f8a5..711935a9b 100644--- a/wger/weight/tests/test_entry.py+++ b/wger/weight/tests/test_entry.py@@ -23,9 +23,9 @@ from django.urls import reversefrom wger.core.tests import api_base_testfrom wger.core.tests.base_testcase import (WgerAddTestCase,+ WgerDeleteTestCase,WgerEditTestCase,- WgerTestCase,- WgerDeleteTestCase+ WgerTestCase)from wger.utils.constants import TWOPLACESfrom wger.weight.models import WeightEntrydiff --git a/wger/weight/urls.py b/wger/weight/urls.pyindex 2e9b99075..edf1280d9 100644--- a/wger/weight/urls.py+++ b/wger/weight/urls.py@@ -18,6 +18,7 @@# Djangofrom django.conf.urls import urlfrom django.contrib.auth.decorators import login_required+from django.urls import path# wgerfrom wger.weight import views@@ -25,24 +26,24 @@ from wger.weight.forms import WeightCsvImportFormurlpatterns = [- url(r'^add/$',- login_required(views.WeightAddView.as_view()),- name='add'),+ path('add/',+ login_required(views.WeightAddView.as_view()),+ name='add'),- url(r'^(?P<pk>\d+)/edit/$',- login_required(views.WeightUpdateView.as_view()),- name='edit'),+ path('<int:pk>/edit/',+ login_required(views.WeightUpdateView.as_view()),+ name='edit'),- url(r'^(?P<pk>\d+)/delete/$',- views.WeightDeleteView.as_view(),- name='delete'),+ path('<int:pk>/delete/',+ views.WeightDeleteView.as_view(),+ name='delete'),- url(r'^export-csv/$',- views.export_csv,- name='export-csv'),- url(r'^import-csv/$',- login_required(views.WeightCsvImportFormPreview(WeightCsvImportForm)),- name='import-csv'),+ path('export-csv/',+ views.export_csv,+ name='export-csv'),+ path('import-csv/',+ login_required(views.WeightCsvImportFormPreview(WeightCsvImportForm)),+ name='import-csv'),url(r'^overview/(?P<username>[\w.@+-]+)$',views.overview,@@ -53,7 +54,7 @@ urlpatterns = [url(r'^api/get_weight_data/(?P<username>[\w.@+-]+)$', # JSviews.get_weight_data,name='weight-data'),- url(r'^api/get_weight_data/$', # JS- views.get_weight_data,- name='weight-data'),+ path('api/get_weight_data/', # JS+ views.get_weight_data,+ name='weight-data'),]diff --git a/wger/weight/views.py b/wger/weight/views.pyindex 94d095ef6..a136f04b5 100644--- a/wger/weight/views.py+++ b/wger/weight/views.py@@ -38,8 +38,8 @@ from django.utils.translation import ()from django.views.generic import (CreateView,- UpdateView,- DeleteView+ DeleteView,+ UpdateView)# Third Party@@ -49,8 +49,8 @@ from rest_framework.response import Response# wgerfrom wger.utils.generic_views import (- WgerFormMixin,- WgerDeleteMixin+ WgerDeleteMixin,+ WgerFormMixin)from wger.utils.helpers import check_accessfrom wger.weight import helpers