Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into feature/exercise-crowdsourcing

Roland Geiderc564ef2fe119
diff --cc angular/src/locale/messages.pt.xlf
index f5d0484d4,be6929a12..0e3c9b301
--- a/angular/src/locale/messages.pt.xlf
+++ b/angular/src/locale/messages.pt.xlf
@@@ -249,85 -275,9 +275,86 @@@
<context context-type="linenumber">78,85</context>
</context-group>
</trans-unit>
+ <trans-unit id="2079820911183014447" datatype="html">
+ <source>Starting position</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>
+ <context context-type="linenumber">20</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="1534367694207535197" datatype="html">
+ <source>Steps</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>
+ <context context-type="linenumber">23</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="3807699453257291879" datatype="html">
+ <source>Comments</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>
+ <context context-type="linenumber">26</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="6683174589423846748" datatype="html">
+ <source>Muscles</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>
+ <context context-type="linenumber">32</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="7781909188300244257" datatype="html">
+ <source>Primary muscles</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>
+ <context context-type="linenumber">40</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="4300464616073530652" datatype="html">
+ <source>Secondary muscles</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>
+ <context context-type="linenumber">45</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="8760380136442491374" datatype="html">
+ <source>Variants</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>
+ <context context-type="linenumber">66</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="5815398842801469550" datatype="html">
+ <source>Exercises</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-list/exercise-list.component.html</context>
+ <context context-type="linenumber">3</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="1902100407096396858" datatype="html">
+ <source>Categories</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-list/exercise-list.component.html</context>
+ <context context-type="linenumber">17</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="3393133458004181121" datatype="html">
+ <source>All categories</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-list/exercise-list.component.html</context>
+ <context context-type="linenumber">19</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="7595930936671323978" datatype="html">
+ <source>Equipment</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/exercise/exercise-list/exercise-list.component.html</context>
+ <context context-type="linenumber">23</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="2540594807548326286" datatype="html">
<source>Add entry</source>
+ <target/>
<context-group purpose="location">
<context context-type="sourcefile">src/app/weight/weight-chart/weight-chart.component.html</context>
<context context-type="linenumber">25</context>
diff --cc requirements.txt
index abca9fb68,e15d2df03..ce5a7bd1f
--- a/requirements.txt
+++ b/requirements.txt
@@@ -6,12 -6,10 +6,12 @@@
bleach~=4.1
django-bootstrap-breadcrumbs~=0.9
django-formtools~=2.3
- django-recaptcha~=2.0.6
+ django-recaptcha~=3.0.0
Django~=3.2
- django-crispy-forms~=1.12
+ django-crispy-forms~=1.14
+django-simple-history~=3.0
+django-email-verification~=0.1.0
- django_compressor~=2.4
+ django_compressor~=3.1
django_extensions~=3.1
django-storages~=1.12
easy-thumbnails~=2.8
diff --cc requirements_dev.txt
index efc84270f,6fc776b14..4c0388ca9
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@@ -6,13 -6,13 +6,16 @@@
-r requirements.txt
# Building/installing
- wheel==0.37.0
+ wheel==0.37.1
+
+ # for ingredient import script from OFF
+ pymongo==4.0.1
+# for ingredient import script from OFF
+pymongo==3.12.1
+
# Development packages
- coverage==6.1.2
- django-debug-toolbar==3.2.2
+ coverage==6.3.1
+ django-debug-toolbar==3.2.4
tblib==1.7.0
isort==5.10.1
diff --cc wger/exercises/api/serializers.py
index cd467b8e9,097fc0fb9..295313012
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@@ -26,8 -25,8 +26,9 @@@ from wger.exercises.models import
ExerciseCategory,
ExerciseComment,
ExerciseImage,
+ ExerciseVideo,
Muscle,
+ Variation,
)
@@@ -205,8 -218,8 +252,9 @@@ class ExerciseInfoSerializer(serializer
fields = [
"id",
"name",
+ "aliases",
"uuid",
+ "exercise_base_id",
"description",
"creation_date",
"category",
diff --cc wger/exercises/api/views.py
index 5848d5793,89f71569c..9421be21e
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@@ -35,32 -34,33 +35,35 @@@ from rest_framework.response import Res
# wger
from wger.config.models import LanguageConfig
+from wger.core.api.viewsets import CreateUpdateModelViewSet
+from wger.exercises.api.permissions import CanEditExercises
from wger.exercises.api.serializers import (
EquipmentSerializer,
+ ExerciseAliasSerializer,
+ ExerciseBaseInfoSerializer,
ExerciseBaseSerializer,
ExerciseCategorySerializer,
ExerciseCommentSerializer,
ExerciseImageSerializer,
ExerciseInfoSerializer,
ExerciseSerializer,
+ ExerciseVariationSerializer,
+ ExerciseVideoSerializer,
MuscleSerializer,
)
from wger.exercises.models import (
++ Alias,
Equipment,
Exercise,
- ExerciseAlias,
ExerciseBase,
ExerciseCategory,
ExerciseComment,
ExerciseImage,
+ ExerciseVideo,
Muscle,
+ Variation,
)
-from wger.utils.language import (
- load_item_languages,
- load_language,
-)
-from wger.utils.permissions import CreateOnlyPermission
+from wger.utils.language import load_item_languages
logger = logging.getLogger(__name__)
@@@ -281,7 -309,22 +303,22 @@@ class ExerciseImageViewSet(CreateUpdate
obj.save()
+ class ExerciseVideoViewSet(viewsets.ReadOnlyModelViewSet):
+ """
+ API endpoint for exercise video objects
+ """
+ queryset = ExerciseVideo.objects.all()
+ serializer_class = ExerciseVideoSerializer
+ ordering_fields = '__all__'
+ filterset_fields = (
+ 'is_main',
+ 'exercise_base',
+ 'license',
+ 'license_author',
+ )
+
+
-class ExerciseCommentViewSet(viewsets.ReadOnlyModelViewSet):
+class ExerciseCommentViewSet(CreateUpdateModelViewSet):
"""
API endpoint for exercise comment objects
"""
@@@ -300,26 -342,6 +337,26 @@@
return qs
+class ExerciseAliasViewSet(CreateUpdateModelViewSet):
+ """
+ API endpoint for exercise aliases objects
+ """
+ serializer_class = ExerciseAliasSerializer
- queryset = ExerciseAlias.objects.all()
++ queryset = Alias.objects.all()
+ permission_classes = (CanEditExercises, )
+ ordering_fields = '__all__'
+ filterset_fields = ('alias', 'exercise')
+
+
+class ExerciseVariationViewSet(CreateUpdateModelViewSet):
+ """
+ API endpoint for exercise variation objects
+ """
+ serializer_class = ExerciseVariationSerializer
+ queryset = Variation.objects.all()
+ permission_classes = (CanEditExercises, )
+
+
class MuscleViewSet(viewsets.ReadOnlyModelViewSet):
"""
API endpoint for muscle objects
diff --cc wger/exercises/templates/exercise/view.html
index b9fe67b34,872d17f7e..930fa5572
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@@ -135,8 -138,59 +140,58 @@@ $(document).ready(function()
</a>
</p>
{% endif %}
-{% endif %}
{% endwith %}
+
+ {# Videos #}
+ {% with videos=exercise.videos.all %}
+ {% if videos or perms.exercises.change_exercisevideo %}
+ <h5 class="mt-4">{% translate "Videos" %}</h5>
+ <div class="row row-cols-1 row-cols-md-2">
+ {% for video in videos %}
+ <div class="col mb-4">
+ <div class="card h-100">
+ <video controls preload="metadata" class="card-img-top">
+ <source src='{{ MEDIA_URL }}{{ video.video }}' type='video/mp4'>
+ Your browser does not support the video tag.
+ </video>
+ <div class="card-body text-center">
+ {% if perms.exercises.change_exercisevideo %}
+ <a href="{% url 'exercise:video:delete' exercise.pk video.pk %}" class="wger-modal-dialog btn btn-link">
+ <span class="{% fa_class 'trash' %}"></span>
+ </a>
+ <a href="{% url 'exercise:video:edit' exercise.pk video.pk %}" class="btn btn-link">
+ <span class="{% fa_class 'edit' %}"></span>
+ </a>
+ {% endif %}
+
+ {% if video.is_main %}
+ <p class="card-text text-wger-green">
+ <span class="{% fa_class 'medal' %}"></span>
+ </p>
+ {% endif %}
+ </div>
+ <div class="card-footer">
+ {{video.get_license_display}}
+ {% if video.license_author %}
+ {{video.license_author}}
+ {% endif %}
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+
+ {% if allow_upload_videos and perms.exercises.change_exercisevideo %}
+ <p>
+ <a href="{% url 'exercise:video:add' exercise.id %}" >
+ {% translate "Add new video" %}
+ </a>
+ </p>
+ {% endif %}
+ {% endif %}
+ {% endwith %}
+
{% if perms.exercises.change_exerciseimage %}
{% with images=exercise.images.pending %}
{% if images %}
diff --cc wger/exercises/urls.py
index 5aafbbf72,1114bbbb2..93c807c41
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@@ -29,9 -29,9 +29,10 @@@ from wger.exercises.views import
comments,
equipment,
exercises,
+ history,
images,
muscles,
+ videos,
)
diff --cc wger/urls.py
index 5dd33a746,f060926f6..142806249
--- a/wger/urls.py
+++ b/wger/urls.py
@@@ -88,56 -87,23 +88,62 @@@ router.register
)
# Exercises app
-router.register(r'exerciseinfo', exercises_api_views.ExerciseInfoViewset, basename='exerciseinfo')
router.register(
- r'exercisebaseinfo', exercises_api_views.ExerciseBaseInfoViewset, basename='exercisebaseinfo'
+ r'exerciseinfo',
+ exercises_api_views.ExerciseInfoViewset,
+ basename='exerciseinfo',
)
-router.register(r'exercise', exercises_api_views.ExerciseViewSet, basename='exercise')
-router.register(r'equipment', exercises_api_views.EquipmentViewSet, basename='api')
+ router.register(
- r'exercisecategory', exercises_api_views.ExerciseCategoryViewSet, basename='exercisecategory'
++ r'exercisebaseinfo',
++ exercises_api_views.ExerciseBaseInfoViewset,
++ basename='exercisebaseinfo'
+ )
router.register(
- r'exerciseimage', exercises_api_views.ExerciseImageViewSet, basename='exerciseimage'
+ r'exercise',
+ exercises_api_views.ExerciseViewSet,
+ basename='exercise',
+)
+router.register(
+ r'exercise-base',
+ exercises_api_views.ExerciseBaseViewSet,
+ basename='exercise-base',
+)
+router.register(
+ r'equipment',
+ exercises_api_views.EquipmentViewSet,
+ basename='api',
+)
+router.register(
+ r'exercisecategory',
+ exercises_api_views.ExerciseCategoryViewSet,
+ basename='exercisecategory',
)
+ router.register(r'video', exercises_api_views.ExerciseVideoViewSet, basename='video')
router.register(
- r'exercisecomment', exercises_api_views.ExerciseCommentViewSet, basename='exercisecomment'
+ r'exerciseimage',
+ exercises_api_views.ExerciseImageViewSet,
+ basename='exerciseimage',
+)
+router.register(
+ r'exercisecomment',
+ exercises_api_views.ExerciseCommentViewSet,
+ basename='exercisecomment',
+)
+router.register(
+ r'exercisealias',
+ exercises_api_views.ExerciseAliasViewSet,
+ basename='exercisealias',
+)
+router.register(
+ r'muscle',
+ exercises_api_views.MuscleViewSet,
+ basename='muscle',
+)
+router.register(
+ r'variation',
+ exercises_api_views.ExerciseVariationViewSet,
+ basename='variation',
)
-router.register(r'muscle', exercises_api_views.MuscleViewSet, basename='muscle')
# Nutrition app
router.register(r'ingredient', nutrition_api_views.IngredientViewSet, basename='api-ingredient')