Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add endpoint for gallery images

Roland Geiderd8a1ba3e677e
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index f71bcbc2d..d59841bf4 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -36,6 +36,13 @@
{% if user.is_authenticated %}
<li><a class="dropdown-item" href="{% url 'manager:workout:calendar' user.username %}" rel="nofollow">{% translate "Calendar" %}</a></li>
{% endif %}
+
+ <li><a class="dropdown-item" href="{% url 'gallery:images:overview' %}" rel="nofollow">
+ {% if not user.is_authenticated %}
+ <span class="{% fa_class 'lock' %}"></span>
+ {% endif %}
+ {% translate "Gallery" %}
+ </a></li>
<li class="dropdown-divider"></li>
<li class="dropdown-header">{% translate "Exercises" %}</li>
diff --git a/wger/gallery/api/__init__.py b/wger/gallery/api/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wger/gallery/api/serializers.py b/wger/gallery/api/serializers.py
new file mode 100644
index 000000000..2d1686b99
--- /dev/null
+++ b/wger/gallery/api/serializers.py
@@ -0,0 +1,17 @@
+# Third Party
+from rest_framework import serializers
+
+# wger
+from wger.gallery.models import Image
+
+
+class ImageSerializer(serializers.ModelSerializer):
+ """
+ Exercise serializer
+ """
+ class Meta:
+ model = Image
+ fields = ['id',
+ 'date',
+ 'image',
+ 'description']
diff --git a/wger/gallery/api/views.py b/wger/gallery/api/views.py
new file mode 100644
index 000000000..3788cc437
--- /dev/null
+++ b/wger/gallery/api/views.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+
+# 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
+# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+
+# Standard Library
+import logging
+
+# Third Party
+from rest_framework import viewsets
+from rest_framework.parsers import (
+ FormParser,
+ MultiPartParser
+)
+from rest_framework.permissions import IsAuthenticated
+
+# wger
+from wger.gallery.api.serializers import ImageSerializer
+from wger.gallery.models import Image
+
+
+logger = logging.getLogger(__name__)
+
+
+class ImageViewSet(viewsets.ModelViewSet):
+ """
+ API endpoint for gallery image
+ """
+ parser_classes = [MultiPartParser, FormParser]
+ permission_classes = [IsAuthenticated]
+ serializer_class = ImageSerializer
+ is_private = True
+ ordering_fields = '__all__'
+ filterset_fields = ['id',
+ 'date',
+ 'description']
+
+ def get_queryset(self):
+ """
+ Only allow access to appropriate objects
+ """
+ return Image.objects.filter(user=self.request.user)
+
+ def perform_create(self, serializer):
+ """
+ Set the owner
+ """
+ serializer.save(user=self.request.user)
diff --git a/wger/gallery/forms.py b/wger/gallery/forms.py
index 7d72b07e1..b9ada6da3 100644
--- a/wger/gallery/forms.py
+++ b/wger/gallery/forms.py
@@ -1,14 +1,15 @@
-from django.forms import ModelForm, DateField
-
-from wger.gallery.models import Image
-from wger.utils.constants import DATE_FORMATS
-from wger.utils.widgets import Html5DateInput
+# Django
from django.forms import (
DateField,
ModelForm,
widgets
)
+# wger
+from wger.gallery.models import Image
+from wger.utils.constants import DATE_FORMATS
+from wger.utils.widgets import Html5DateInput
+
class ImageForm(ModelForm):
date = DateField(input_formats=DATE_FORMATS, widget=Html5DateInput())
diff --git a/wger/gallery/migrations/0001_initial.py b/wger/gallery/migrations/0001_initial.py
index dc0b3d631..9d3469ec2 100644
--- a/wger/gallery/migrations/0001_initial.py
+++ b/wger/gallery/migrations/0001_initial.py
@@ -19,11 +19,20 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Image',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name='ID')),
('date', models.DateField(default=datetime.datetime.now, verbose_name='Date')),
- ('image', models.ImageField(help_text='Only PNG and JPEG formats are supported', upload_to=wger.gallery.models.image.gallery_image_upload_dir, verbose_name='Image')),
- ('description', models.TextField(blank=True, max_length=1000, verbose_name='Description')),
- ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User')),
+ ('image', models.ImageField(help_text='Only PNG and JPEG formats are supported',
+ upload_to=wger.gallery.models.image.gallery_upload_dir,
+ verbose_name='Image')),
+ ('description', models.TextField(blank=True,
+ max_length=1000,
+ verbose_name='Description')),
+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+ to=settings.AUTH_USER_MODEL,
+ verbose_name='User')),
],
options={
'ordering': ['-date'],
diff --git a/wger/gallery/models/__init__.py b/wger/gallery/models/__init__.py
index a0c1ffb9c..2b14d2425 100644
--- a/wger/gallery/models/__init__.py
+++ b/wger/gallery/models/__init__.py
@@ -1 +1,2 @@
-from .image import Image
+# Local
+from .image import Image # noqa: F401
diff --git a/wger/gallery/models/image.py b/wger/gallery/models/image.py
index 65c371a59..419eb7a07 100644
--- a/wger/gallery/models/image.py
+++ b/wger/gallery/models/image.py
@@ -16,20 +16,22 @@
# Standard Library
import datetime
-
-# Django
+import pathlib
import uuid
+# Django
from django.contrib.auth.models import User
from django.db import models
from django.utils.translation import gettext_lazy as _
-def gallery_image_upload_dir(instance, filename):
+def gallery_upload_dir(instance, filename):
"""
Returns the upload target for exercise images
"""
- return "gallery/{0}/{1}".format(instance.user.id, uuid.uuid4())
+ return "gallery/{0}/{1}.{2}".format(instance.user.id,
+ uuid.uuid4(),
+ pathlib.Path(filename).suffix)
class Image(models.Model):
@@ -46,7 +48,7 @@ class Image(models.Model):
image = models.ImageField(verbose_name=_('Image'),
help_text=_('Only PNG and JPEG formats are supported'),
- upload_to=gallery_image_upload_dir)
+ upload_to=gallery_upload_dir)
description = models.TextField(verbose_name=_('Description'),
max_length=1000,
diff --git a/wger/gallery/templates/images/overview.html b/wger/gallery/templates/images/overview.html
index 8e82dd1cc..c77966e19 100644
--- a/wger/gallery/templates/images/overview.html
+++ b/wger/gallery/templates/images/overview.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load wger_extras %}
{% load i18n %}
{% load static %}
@@ -7,13 +8,24 @@
{% block content %}
<div class="container">
- <div class="card-columns">
+ <div class="row card-columns" >
{% for image in images %}
- <div class="card">
- <a href="{% url 'gallery:images:delete' image.pk %}">
- <img class="card-img-top" src="{{ image.image.url }}" class="img-thumbnail" alt="{{ image.description }}">
- </a>
-
+ <div class="card w-25">
+ <a href="{% url 'gallery:images:edit' image.pk %}">
+ <img class="card-img-top" src="{{ image.image.url }}" class="img-thumbnail" alt="{{ image.description }}" >
+ </a>
+ <div class="card-body">
+ <p class="card-title">{{ image.date }}</p>
+ <a href="{% url 'gallery:images:delete' image.id %}">
+ <span class="{% fa_class 'trash' %}"></span>
+ </a>
+ <!--
+ <p>
+ #{{ image.id }}
+ {{ image.description }}
+ </p>
+ -->
+ </div>
</div>
{% endfor %}
</div>
diff --git a/wger/gallery/views/images.py b/wger/gallery/views/images.py
index 13762c8fc..34dff0b8d 100644
--- a/wger/gallery/views/images.py
+++ b/wger/gallery/views/images.py
@@ -13,21 +13,22 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU Affero General Public License
#
-# Django
+# Standard Library
from datetime import datetime
+# Django
from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import (
- LoginRequiredMixin,
- PermissionRequiredMixin
-)
-from django.http import HttpResponseForbidden
+from django.contrib.auth.mixins import LoginRequiredMixin
from django.shortcuts import render
-from django.urls import reverse_lazy, reverse
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import gettext_lazy as _, gettext_lazy
from django.views.generic import (
+ CreateView,
DeleteView,
- UpdateView, CreateView
+ UpdateView
)
# wger
@@ -50,6 +51,7 @@ def overview(request):
return render(request, 'images/overview.html', context)
+
class ImageAddView(WgerFormMixin, CreateView):
"""
Generic view to add a new weight entry
@@ -77,41 +79,29 @@ class ImageAddView(WgerFormMixin, CreateView):
def get_success_url(self):
"""
- Return to overview with username
+ Return to overview
"""
return reverse('gallery:images:overview')
-class ImageUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
+class ImageUpdateView(WgerFormMixin, LoginRequiredMixin, UpdateView):
"""
- View to update an existing gym
+ Generic view to edit an existing weight entry
"""
-
model = Image
- fields = ['image', 'date', 'description']
- title = gettext_lazy('Edit')
- permission_required = 'gym.change_gym'
+ form_class = ImageForm
- def dispatch(self, request, *args, **kwargs):
- """
- Only managers for this gym and general managers can edit the gym
- """
- if not request.user.is_authenticated:
- return HttpResponseForbidden()
+ def get_context_data(self, **kwargs):
+ context = super(ImageUpdateView, self).get_context_data(**kwargs)
+ context['title'] = _('Edit')
- if request.user.has_perm('gym.manage_gym') \
- and not request.user.has_perm('gym.manage_gyms'):
- if request.user.userprofile.gym_id != int(self.kwargs['pk']):
- return HttpResponseForbidden()
- return super(ImageUpdateView, self).dispatch(request, *args, **kwargs)
+ return context
- def get_context_data(self, **kwargs):
+ def get_success_url(self):
"""
- Send some additional data to the template
+ Return to overview
"""
- context = super(ImageUpdateView, self).get_context_data(**kwargs)
- context['title'] = _('Edit {0}').format(self.object)
- return context
+ return reverse('gallery:images:overview')
class ImageDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
diff --git a/wger/urls.py b/wger/urls.py
index 5c9568bfc..21e683579 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -34,6 +34,7 @@ from rest_framework import routers
from wger.core.api import views as core_api_views
from wger.exercises.api import views as exercises_api_views
from wger.exercises.sitemap import ExercisesSitemap
+from wger.gallery.api import views as gallery_api_views
from wger.manager.api import views as manager_api_views
from wger.nutrition.api import views as nutrition_api_views
from wger.nutrition.sitemap import NutritionSitemap
@@ -94,6 +95,9 @@ router.register(r'mealitem', nutrition_api_views.MealItemViewSet, basename='meal
# Weight app
router.register(r'weightentry', weight_api_views.WeightEntryViewSet, basename='weightentry')
+# Gallery app
+router.register(r'gallery', gallery_api_views.ImageViewSet, basename='gallery')
+
#
# Sitemaps
#
diff --git a/wger/weight/api/views.py b/wger/weight/api/views.py
index 6f0e4cb24..e8332c5ce 100644
--- a/wger/weight/api/views.py
+++ b/wger/weight/api/views.py
@@ -28,6 +28,7 @@ class WeightEntryViewSet(viewsets.ModelViewSet):
API endpoint for nutrition plan objects
"""
serializer_class = WeightEntrySerializer
+
is_private = True
ordering_fields = '__all__'
filterset_fields = ('date',