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 Geidere37be09681cd
diff --cc requirements.txt
index 3984627e7,5eaa0f732..2826301c2
--- a/requirements.txt
+++ b/requirements.txt
@@@ -8,20 -8,19 +8,22 @@@ django-bootstrap-breadcrumbs~=0.
django-formtools~=2.3
django-recaptcha~=3.0.0
Django~=3.2
+django-activity-stream~=1.4
django-crispy-forms~=1.14
+django-simple-history~=3.0
+django-email-verification~=0.1.0
- django_compressor~=3.1
+ django_compressor~=4.0
django_extensions~=3.1
django-storages~=1.12
- easy-thumbnails~=2.8
+ django-environ==0.8.1
+ easy-thumbnails==2.8.1
icalendar==4.0.9
- invoke~=1.6
- pillow~=9.0
- reportlab==3.6.8
+ invoke~=1.7
+ pillow~=9.1
+ reportlab==3.6.9
requests==2.27.1
+
# AWS
#boto3
diff --cc requirements_dev.txt
index 3bf44735c,154bf1c9a..241893312
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@@ -9,13 -9,10 +9,13 @@@
wheel==0.37.1
# for ingredient import script from OFF
- pymongo==4.0.2
+ pymongo==4.1.1
+# for ingredient import script from OFF
+pymongo==3.12.1
+
# Development packages
coverage==6.3.2
- django-debug-toolbar==3.2.4
+ django-debug-toolbar==3.4.0
tblib==1.7.0
isort==5.10.1
diff --cc wger/exercises/api/views.py
index 320698e19,ca6bc27ae..7d8f02a44
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@@ -19,11 -19,12 +19,14 @@@
import logging
# Django
+ from django.conf import settings
+ from django.utils.decorators import method_decorator
+from django.db.models import Q
from django.utils.translation import gettext as _
+ from django.views.decorators.cache import cache_page
# Third Party
+from actstream import action as actstream_action
from easy_thumbnails.alias import aliases
from easy_thumbnails.files import get_thumbnailer
from rest_framework import viewsets
@@@ -156,9 -101,24 +159,12 @@@ class ExerciseViewSet(viewsets.ReadOnly
'exercise_base',
'description',
'language',
- 'status',
'name',
)
-
+ @method_decorator(cache_page(settings.WGER_SETTINGS['EXERCISE_CACHE_TTL']))
+ def dispatch(self, request, *args, **kwargs):
+ return super().dispatch(request, *args, **kwargs)
- def perform_create(self, serializer):
- """
- Set author and status
- """
- language = load_language()
- obj = serializer.save(language=language)
- # Todo is it right to call set author after save?
- obj.set_author(self.request)
- obj.save()
-
def get_queryset(self):
"""Add additional filters for fields from exercise base"""
diff --cc wger/settings_global.py
index 7807bff21,71a33bf42..30f110565
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@@ -436,36 -424,11 +436,36 @@@ USER_AGENTS_CACHE = 'default
# Consult docs/settings.rst for more information
#
WGER_SETTINGS = {
- 'USE_RECAPTCHA': False,
- 'REMOVE_WHITESPACE': False,
- 'ALLOW_REGISTRATION': True,
'ALLOW_GUEST_USERS': True,
+ 'ALLOW_REGISTRATION': True,
'ALLOW_UPLOAD_VIDEOS': False,
'EMAIL_FROM': 'wger Workout Manager <[email protected]>',
- 'TWITTER': False
+ 'EXERCISE_CACHE_TTL': 3600,
+ 'TWITTER': False,
+ 'USE_RECAPTCHA': False
}
+
+
+#
+# Django email verification
+#
+def email_verified_callback(user):
+ user.userprofile.email_verified = True
+ user.userprofile.save()
+
+
+EMAIL_VERIFIED_CALLBACK = email_verified_callback
+EMAIL_FROM_ADDRESS = WGER_SETTINGS['EMAIL_FROM']
+EMAIL_MAIL_SUBJECT = 'Confirm your email'
+EMAIL_MAIL_HTML = 'email_verification/email_body.html'
+EMAIL_MAIL_PLAIN = 'email_verification/email_body.txt'
+EMAIL_TOKEN_LIFE = 60 * 60
+EMAIL_PAGE_TEMPLATE = 'email_verification/confirm_template.html'
+EMAIL_PAGE_DOMAIN = 'https://wger.de/'
+
+#
+# Django activity stream
+#
+ACTSTREAM_SETTINGS = {
+ 'USE_JSONFIELD': True,
+}