Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use default div ID for pages that are rendered completely in react

Roland Geiderbc8104f54dd2
diff --git a/wger/core/templates/base_wide.html b/wger/core/templates/base_wide.html
index 13a51312d..bd929d51f 100644
--- a/wger/core/templates/base_wide.html
+++ b/wger/core/templates/base_wide.html
@@ -23,7 +23,6 @@
<h2 id="page-title" class="page-header">
{% block title %}{% endblock %}
</h2>
- <hr>
</div>
<div class="col-sm-4">
<div class="btn-group">
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index 610c94953..43ee074ec 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -30,7 +30,7 @@
{# Content #}
{# #}
{% block content %}
- <div id="react-routine-detail"></div>
+ <div id="react-page"></div>
{% endblock %}
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 8d1fc6efb..40dc8ad57 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -37,12 +37,11 @@ from wger.manager.views import (
workout_session,
)
-
# sub patterns for workout logs
patterns_log = [
path(
'<int:pk>/view',
- ReactView.as_view(div_id='react-routine-logs', login_required=True),
+ ReactView.as_view(login_required=True),
name='log',
),
path(
@@ -85,7 +84,7 @@ patterns_templates = [
patterns_workout = [
path(
'overview',
- ReactView.as_view(div_id='react-routine-overview', login_required=True),
+ ReactView.as_view(login_required=True),
name='overview',
),
path(
@@ -115,7 +114,7 @@ patterns_workout = [
),
path(
'<int:pk>/view',
- # ReactView.as_view(div_id='react-routine-detail', login_required=True),
+ # ReactView.as_view(login_required=True),
workout.view,
name='view',
),
diff --git a/wger/measurements/urls.py b/wger/measurements/urls.py
index 154219309..cc7b3d908 100644
--- a/wger/measurements/urls.py
+++ b/wger/measurements/urls.py
@@ -19,16 +19,15 @@ from django.urls import path
# wger
from wger.core.views.react import ReactView
-
urlpatterns = [
path(
'',
- ReactView.as_view(div_id='react-measurements-overview', login_required=True),
+ ReactView.as_view(login_required=True),
name='overview',
),
path(
'category/<int:pk>',
- ReactView.as_view(div_id='react-measurements-detail', login_required=True),
+ ReactView.as_view(login_required=True),
name='detail',
),
]
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 52664fdb1..618aa62d5 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -24,6 +24,7 @@ from django.urls import (
)
# wger
+from wger.core.views.react import ReactView
from wger.nutrition.views import (
bmi,
calculator,
@@ -36,22 +37,16 @@ from wger.nutrition.views import (
unit_ingredient,
)
-
# sub patterns for nutritional plans
patterns_plan = [
path(
'overview/',
- plan.overview,
+ ReactView.as_view(login_required=True),
name='overview',
),
- path(
- 'add/',
- plan.add,
- name='add',
- ),
path(
'<int:id>/view/',
- plan.view,
+ ReactView.as_view(login_required=True),
name='view',
),
path(
@@ -59,16 +54,6 @@ patterns_plan = [
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',
- ),
re_path(
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,
@@ -253,7 +238,7 @@ patterns_calories = [
patterns_diary = [
path(
'<int:pk>',
- log.overview,
+ ReactView.as_view(login_required=True),
name='overview',
),
re_path(