Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Cleanup react templates plus other changes needed for implementing routines in react

Roland Geider2df617514433
diff --git a/extras/dummy_generator/generator.py b/extras/dummy_generator/generator.py
index 38fcbe856..2a071aa13 100644
--- a/extras/dummy_generator/generator.py
+++ b/extras/dummy_generator/generator.py
@@ -410,6 +410,7 @@ if hasattr(args, 'number_logs'):
weight_log = []
print(' - generating for {0}'.format(user.username))
+ # Create a log for each workout day, set, setting, reps, weight, date
for workout in Workout.objects.filter(user=user):
for day in workout.day_set.all():
for set in day.set_set.all():
@@ -419,7 +420,7 @@ if hasattr(args, 'number_logs'):
date = datetime.date.today() - datetime.timedelta(weeks=i)
log = WorkoutLog(
user=user,
- exercise_base=setting.exercise.exercise_base,
+ exercise_base=setting.exercise_base,
workout=workout,
reps=reps,
weight=50 - reps + random.randint(1, 10),
diff --git a/wger/core/templates/react/react-page.html b/wger/core/templates/react/react-page.html
index bf829ef48..10bb915fb 100644
--- a/wger/core/templates/react/react-page.html
+++ b/wger/core/templates/react/react-page.html
@@ -7,15 +7,8 @@
{# #}
{% block opengraph %}
{{ block.super }}
- <meta property="og:title" content="{{ exercise.name }}">
- <meta property="og:description" content="{{ exercise.description_clean }}">
{% endblock %}
{% block opengraphimages %}
- {% for image in exercise.images.accepted %}
- <meta property="og:image" content="{{ image.image.url }}">
- {% empty %}
- <meta property="og:image" content="{{ image_absolute_path }}">
- {% endfor %}
{% endblock %}
@@ -37,7 +30,7 @@
{# Content #}
{# #}
{% block content %}
- <div id="react-routine-overview"></div>
+ <div id="{{ div_id }}"></div>
{% endblock %}
diff --git a/wger/core/views/react.py b/wger/core/views/react.py
index e69de29bb..f44bb8589 100644
--- a/wger/core/views/react.py
+++ b/wger/core/views/react.py
@@ -0,0 +1,39 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+from django.http import HttpResponseForbidden
+from django.views.generic import TemplateView
+
+
+class ReactView(TemplateView):
+ """
+ ReactView is a TemplateView that renders a React page.
+ """
+
+ template_name = 'react/react-page.html'
+ div_id = 'react-page'
+ login_required = False
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context['div_id'] = self.div_id
+ return context
+
+ def dispatch(self, request, *args, **kwargs):
+ """
+ Can only add contract types in own gym
+ """
+ if self.login_required and not request.user.is_authenticated:
+ return HttpResponseForbidden('You are not allowed to access this object')
+
+ return super().dispatch(request, *args, **kwargs)
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index c6be132ce..dbe619a3e 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -23,6 +23,7 @@ from django.urls import (
)
from django.views.generic import TemplateView
+from wger.core.views.react import ReactView
# wger
from wger.exercises.views import (
categories,
@@ -119,7 +120,7 @@ patterns_equipment = [
patterns_exercise = [
path(
'overview/',
- exercises.ExerciseListView.as_view(),
+ ReactView.as_view(div_id='react-exercise-overview'),
name='overview',
),
path(
@@ -134,17 +135,17 @@ patterns_exercise = [
),
path(
'<int:pk>/view-base',
- TemplateView.as_view(template_name='exercise/view-base.html'),
+ ReactView.as_view(div_id='react-exercise-overview'),
name='view-base',
),
path(
'<int:pk>/view-base/<slug:slug>',
- TemplateView.as_view(template_name='exercise/view-base.html'),
+ ReactView.as_view(div_id='react-exercise-detail'),
name='view-base',
),
path(
'contribute',
- TemplateView.as_view(template_name='exercise/contribute.html'),
+ ReactView.as_view(div_id='react-exercise-contribute'),
name='contribute',
),
]
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 1fdfd5934..c55a5a78a 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -44,13 +44,6 @@ from wger.utils.generic_views import WgerDeleteMixin
logger = logging.getLogger(__name__)
-class ExerciseListView(TemplateView):
- """
- Generic view to list all exercises
- """
- template_name = 'exercise/overview.html'
-
-
def view(request, id, slug=None):
"""
Detail view for an exercise translation
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index 5ba3d91c1..749949624 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -391,6 +391,8 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):
'reps',
'weight',
'workout',
+ 'repetition_unit',
+ 'weight_unit'
)
def get_queryset(self):
diff --git a/wger/manager/templates/workout/log.html b/wger/manager/templates/workout/log.html
index 57d8145a5..d227f77d6 100644
--- a/wger/manager/templates/workout/log.html
+++ b/wger/manager/templates/workout/log.html
@@ -62,12 +62,6 @@
{# TODO: perhaps move the draw_weight_chart function to render_weight_log #}
{% with list=exercise_list.log_by_date %}
{% render_weight_log list exercise_list.div_uuid owner_user %}
- <script>
- $(document).ready(function() {
- wgerDrawWeightLogChart({{exercise_list.chart_data|safe}},
- "{{exercise_list.div_uuid}}");
- });
- </script>
{% endwith %}
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index 7b7718227..e67a5b59d 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -23,26 +23,7 @@
{# Header #}
{# #}
{% block header %}
- <script>
- function wgerCustomModalInit() {
- // Set up the edit set functions on modal dialogs
- wgerInitEditSet();
- }
-
- $(document).ready(function () {
- var $exercisecomments = $(".exercise-comments");
- // Allow the sets to be sortable
- wgerSetupSortable();
-
- // Show/Hide the comments to the exercises
- {% if user.userprofile.show_comments %}
- $exercisecomments.show();
- {% else %}
- $exercisecomments.hide();
- {% endif %}
- wgerToggleComments();
- });
- </script>
+ {% react_static %}
{% endblock %}
@@ -50,34 +31,7 @@
{# Content #}
{# #}
{% block content %}
-
-
- {% if workout.name %}
- <h4>{{ workout.name }}</h4>
- {% endif %}
-
- {% if workout.description %}
- <p>{{ workout.description }}</p>
- {% endif %}
-
- {% for day in workout.day_set.all %}
- <div id="div-day-{{ day.id }}">
- {% render_day day is_owner %}
- </div>
- {% endfor %}
-
-
- {% if is_owner %}
- <p>
- <a href="{% url 'manager:day:add' workout.id %}"
- class="wger-modal-dialog btn btn-link btn-block">{% translate "Add training day" %}</a>
-
- <!--
- |
- <a id="exercise-comments-toggle" href="{% url 'core:user:preferences' %}">{% translate "Show/Hide exercise comments" %}</a>
- -->
- </p>
- {% endif %}
+ <div id="react-routine-detail"></div>
{% endblock %}
diff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.py
index 2e40d4f85..1ce9a28b3 100644
--- a/wger/manager/tests/test_schedule.py
+++ b/wger/manager/tests/test_schedule.py
@@ -40,26 +40,6 @@ from wger.utils.helpers import make_token
logger = logging.getLogger(__name__)
-class ScheduleShareButtonTestCase(WgerTestCase):
- """
- Test that the share button is correctly displayed and hidden
- """
-
- def test_share_button(self):
- workout = Workout.objects.get(pk=2)
-
- response = self.client.get(workout.get_absolute_url())
- self.assertFalse(response.context['show_shariff'])
-
- self.user_login('admin')
- response = self.client.get(workout.get_absolute_url())
- self.assertTrue(response.context['show_shariff'])
-
- self.user_login('test')
- response = self.client.get(workout.get_absolute_url())
- self.assertFalse(response.context['show_shariff'])
-
-
class ScheduleAccessTestCase(WgerTestCase):
"""
Test accessing the workout page
diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.py
index ca5a1d957..82ab02c82 100644
--- a/wger/manager/tests/test_workout.py
+++ b/wger/manager/tests/test_workout.py
@@ -28,68 +28,6 @@ from wger.core.tests.base_testcase import (
from wger.manager.models import Workout
-class WorkoutShareButtonTestCase(WgerTestCase):
- """
- Test that the share button is correctly displayed and hidden
- """
-
- def test_share_button(self):
- workout = Workout.objects.get(pk=1)
-
- response = self.client.get(workout.get_absolute_url())
- self.assertFalse(response.context['show_shariff'])
-
- self.user_login('admin')
- response = self.client.get(workout.get_absolute_url())
- self.assertTrue(response.context['show_shariff'])
-
- self.user_login('test')
- response = self.client.get(workout.get_absolute_url())
- self.assertFalse(response.context['show_shariff'])
-
-
-class WorkoutAccessTestCase(WgerTestCase):
- """
- Test accessing the workout page
- """
-
- def test_access_shared(self):
- """
- Test accessing the URL of a shared workout
- """
- workout = Workout.objects.get(pk=1)
-
- self.user_login('admin')
- response = self.client.get(workout.get_absolute_url())
- self.assertEqual(response.status_code, 200)
-
- self.user_login('test')
- response = self.client.get(workout.get_absolute_url())
- self.assertEqual(response.status_code, 200)
-
- self.user_logout()
- response = self.client.get(workout.get_absolute_url())
- self.assertEqual(response.status_code, 200)
-
- def test_access_not_shared(self):
- """
- Test accessing the URL of a private workout
- """
- workout = Workout.objects.get(pk=3)
-
- self.user_login('admin')
- response = self.client.get(workout.get_absolute_url())
- self.assertEqual(response.status_code, 403)
-
- self.user_login('test')
- response = self.client.get(workout.get_absolute_url())
- self.assertEqual(response.status_code, 200)
-
- self.user_logout()
- response = self.client.get(workout.get_absolute_url())
- self.assertEqual(response.status_code, 403)
-
-
class AddWorkoutTestCase(WgerTestCase):
"""
Tests adding a Workout
@@ -113,9 +51,6 @@ class AddWorkoutTestCase(WgerTestCase):
# Test accessing workout
response = self.client.get(reverse('manager:workout:view', kwargs={'pk': 1}))
-
- workout = Workout.objects.get(pk=1)
- self.assertEqual(response.context['workout'], workout)
self.assertEqual(response.status_code, 200)
def test_create_workout_logged_in(self):
@@ -167,14 +102,6 @@ class WorkoutOverviewTestCase(WgerTestCase):
# Page exists
self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 2)
-
- def test_dashboard_logged_in(self):
- """
- Test creating a workout a logged in user
- """
- self.user_login()
- self.get_workout_overview()
class WorkoutModelTestCase(WgerTestCase):
diff --git a/wger/manager/tests/test_workout_template.py b/wger/manager/tests/test_workout_template.py
index 6d2975bde..f58c98663 100644
--- a/wger/manager/tests/test_workout_template.py
+++ b/wger/manager/tests/test_workout_template.py
@@ -47,136 +47,6 @@ class WorkoutTemplateManagerTestCase(WgerTestCase):
self.assertEqual(Workout.both.all().count(), 3)
-class WorkoutTemplateOverviewTestCase(WgerTestCase):
- """
- Test accessing the workout template overview page
- """
-
- def test_access_overviews(self):
- """
- Test accessing the different workout and template overviews
- """
- self.user_login('test')
- response = self.client.get(reverse('manager:workout:overview'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 1)
-
- response = self.client.get(reverse('manager:template:overview'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 0)
-
- response = self.client.get(reverse('manager:template:public'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 0)
-
- def test_access_overviews_no_public_templates(self):
- """
- Test accessing the different workout and template overviews - no public workouts
- """
-
- # Workout #1 belongs to another user
- workout = Workout.objects.get(pk=1)
- workout.is_template = True
- workout.save()
-
- self.user_login('test')
- response = self.client.get(reverse('manager:workout:overview'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 1)
-
- response = self.client.get(reverse('manager:template:overview'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 0)
-
- response = self.client.get(reverse('manager:template:public'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 0)
-
- def test_access_overviews_public_templates(self):
- """
- Test accessing the different workout and template overviews - no public workouts
- """
- workout = Workout.objects.get(pk=1)
- workout.is_template = True
- workout.is_public = True
- workout.save()
-
- self.user_login('test')
- response = self.client.get(reverse('manager:workout:overview'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 1)
-
- response = self.client.get(reverse('manager:template:overview'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 0)
-
- response = self.client.get(reverse('manager:template:public'))
- self.assertEqual(response.status_code, 200)
- self.assertEqual(len(response.context['workouts']), 1)
-
-
-class WorkoutTemplateDetailPageTestCase(WgerTestCase):
- """
- Test accessing the workout template detail page
- """
-
- def test_access_detail_for_workout(self):
- """
- Test accessing the template view for a regular workout
- """
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 302)
-
- self.user_login('test')
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 404)
-
- self.user_login('admin')
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 404)
-
- def test_access_detail_for_template(self):
- """
- Test accessing the template view for a template
- """
- workout = Workout.objects.get(pk=3)
- workout.is_template = True
- workout.save()
-
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 302)
-
- self.user_login('test')
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 200)
- self.user_logout()
-
- self.user_login('admin')
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 403)
-
- def test_access_detail_for_public_template(self):
- """
- Test accessing the template view for a template
- """
- workout = Workout.objects.get(pk=3)
- workout.is_template = True
- workout.is_public = True
- workout.save()
-
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 302)
-
- self.user_login('test')
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 200)
- self.user_logout()
-
- self.user_login('admin')
- response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
- self.assertEqual(response.status_code, 200)
-
-
class SwitchViewsTestCase(WgerTestCase):
"""
Test the views that convert a workout to a template and viceversa
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 0c9aa8678..6dd7757bc 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -23,6 +23,7 @@ from django.urls import (
re_path,
)
+from wger.core.views.react import ReactView
# wger
from wger.manager.views import (
day,
@@ -41,7 +42,7 @@ from wger.manager.views import (
patterns_log = [
path(
'<int:pk>/view',
- log.WorkoutLogDetailView.as_view(),
+ ReactView.as_view(div_id='react-routine-logs', login_required=True),
name='log',
),
path(
@@ -84,7 +85,7 @@ patterns_templates = [
patterns_workout = [
path(
'overview',
- workout.overview,
+ ReactView.as_view(div_id='react-routine-overview', login_required=True),
name='overview',
),
path(
@@ -114,6 +115,7 @@ patterns_workout = [
),
path(
'<int:pk>/view',
+ # ReactView.as_view(div_id='react-routine-detail', login_required=True),
workout.view,
name='view',
),
@@ -221,7 +223,7 @@ patterns_day = [
name='edit',
),
path(
- '<int:workout_pk>/day/add',
+ '<int:workout_pk>/add',
login_required(day.DayCreateView.as_view()),
name='add',
),
@@ -245,7 +247,7 @@ patterns_day = [
# sub patterns for workout sets
patterns_set = [
path(
- 'day/<int:day_pk>/set/add',
+ '<int:day_pk>/add',
set.create,
name='add',
),
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index af10fd60b..6b74ae5bb 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -72,23 +72,6 @@ logger = logging.getLogger(__name__)
# ************************
# Workout functions
# ************************
-@login_required
-def overview(request):
- """
- An overview of all the user's workouts
- """
-
- context = {}
-
- workouts = Workout.objects.filter(user=request.user)
- (current_workout, schedule) = Schedule.objects.get_current_workout(request.user)
- context['workouts'] = workouts
- context['current_workout'] = current_workout
- context['title'] = _('Your workouts')
- context['template_overview'] = False
-
- return render(request, 'workout/overview.html', context)
-
@login_required
def template_overview(request):
diff --git a/wger/urls.py b/wger/urls.py
index 48c383c19..9ba6b261f 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -217,7 +217,7 @@ sitemaps = {'exercises': ExercisesSitemap, 'nutrition': NutritionSitemap}
urlpatterns = i18n_patterns(
# url(r'^admin/', admin.site.urls),
path('', include(('wger.core.urls', 'core'), namespace='core')),
- path('workout/', include(('wger.manager.urls', 'manager'), namespace='manager')),
+ path('routine/', 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')),
diff --git a/wger/utils/requests.py b/wger/utils/requests.py
index cbb55c4de..abcf11834 100644
--- a/wger/utils/requests.py
+++ b/wger/utils/requests.py
@@ -41,10 +41,10 @@ def get_paginated(url: str, headers=None):
results = []
while True:
response = requests.get(url, headers=headers).json()
+ url = response['next']
results.extend(response['results'])
- url = response['next']
- if not response['next']:
+ if not url:
break
return results
@@ -65,5 +65,5 @@ def get_paginated_generator(url: str, headers=None):
yield response['results']
url = response['next']
- if not response['next']:
+ if not url:
break