Minor reordering

Readme.md

@@ -6,6 +6,9 @@ The software is currently in early development status, neither scope, datamodel(
 
 We value privacy as a whole, all resources the frontend requires will be shipped with lostplace's distribution. We also try to minimize the use of JavaScript as far as we can and try to offer JS-less alternatives where we can.
 
+## Contact
+If you run into any issues, have any questions or If you are interested in this project in general, feel free to get in touch with us via [reverend@reverend2048.de](mailto:reverend@reverend2048.de), we do speak English and German.
+
 ## Features
 - Manage lost places with lots of useful information.
 - OSM-Maps
@@ -145,8 +148,4 @@ Before making the django instance public, you should tweak the config `settings.
 4. Set a new (random) SECRET_KEY in settings.py, e. g.: `base64 /dev/urandom | head -c50`
 
 
-Run `django_lostplaces/manage.py collectstatic` you should be ready to go.
-
-
-### Contact
-If you run into any issues, have any questions or If you are interested in this project in general, feel free to get in touch with us via [reverend@reverend2048.de](mailto:reverend@reverend2048.de), we do speak English and German.
+Run `django_lostplaces/manage.py collectstatic` you should be ready to go.

django_lostplaces/lostplaces/common.py

@@ -1,3 +1,5 @@
+from django.shortcuts import redirect
+
 def get_all_subclasses(cls):
     '''
     Gets all subclasses recursively, does not contain
@@ -8,4 +10,16 @@ def get_all_subclasses(cls):
         if not subclass._meta.abstract:
             subclass_list.append(subclass)
         subclass_list += get_all_subclasses(subclass)
-    return subclass_list
+    return subclass_list
+    
+def redirect_referer_or(request, url='/'):
+    '''
+    Returns a django redirect to the requests referer,
+    if there is no referer the redirect will poin to the given url
+    Default url is /
+    '''
+    referer = request.META.get('HTTP_REFERER')  
+    if referer is not None:
+        return redirect(referer)
+    else:
+        return redirect(url)

django_lostplaces/lostplaces/forms.py

@@ -44,7 +44,15 @@ class PlaceForm(forms.ModelForm):
     class Meta:
         model = Place
         fields = '__all__'
-        exclude = ['submitted_by']
+        exclude = ['submitted_by', 'latitude', 'longitute']
+    
+    latitude = forms.IntegerField(
+        widget=forms.NumberInput(attrs={'min':-90,'max': 90,'type': 'number'})
+    )
+    
+    longitude = forms.IntegerField(
+        widget=forms.NumberInput(attrs={'min':-180,'max': 180,'type': 'number'})
+    )    
         
 class PlaceImageForm(forms.ModelForm):
     class Meta:

django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.1.1 on 2020-10-04 19:37
+# Edited by reverend
+
+import datetime
+from django.db import migrations, models
+import django.utils.timezone
+from django.utils.timezone import utc
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Voucher'
+        ),
+        migrations.DeleteModel(
+            name='Expireable'
+        )
+    ]

django_lostplaces/lostplaces/migrations/0003_voucher.py

@@ -1,25 +1,25 @@
-    # Generated by Django 3.1.1 on 2020-10-04 19:52
+# Generated by Django 3.1.1 on 2020-10-04 19:52
 
-    from django.db import migrations, models
+from django.db import migrations, models
 
 
-    class Migration(migrations.Migration):
+class Migration(migrations.Migration):
 
-        dependencies = [
-            ('lostplaces', '0002_reomve_vouchers'),
-        ]
+    dependencies = [
+        ('lostplaces', '0002_remove_vouchers'),
+    ]
 
-        operations = [
-            migrations.CreateModel(
-                name='Voucher',
-                fields=[
-                    ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                    ('created_when', models.DateTimeField(auto_now_add=True)),
-                    ('expires_when', models.DateTimeField()),
-                    ('code', models.CharField(max_length=30, unique=True)),
-                ],
-                options={
-                    'abstract': False,
-                },
-            ),
-        ]
+    operations = [
+        migrations.CreateModel(
+            name='Voucher',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_when', models.DateTimeField(auto_now_add=True)),
+                ('expires_when', models.DateTimeField()),
+                ('code', models.CharField(max_length=30, unique=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

django_lostplaces/lostplaces/models/models.py

@@ -30,7 +30,7 @@ class Explorer(models.Model):
 
     favorite_places = models.ManyToManyField(
         Place,
-        related_name='favorite_places',
+        related_name='explorer_favorites',
         verbose_name='Explorers favorite places',
         blank=True
     )

django_lostplaces/lostplaces/static/main.css

@@ -923,7 +923,8 @@ body {
       justify-content: space-between;
       align-items: flex-start;
       gap: unset; }
-      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-Headline, .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-Paragraph {
+      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-Headline,
+      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-Paragraph {
         font-size: unset; }
       .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Info .LP-Headline {
         font-size: 28px; }
@@ -941,7 +942,12 @@ body {
       overflow: hidden;
       order: unset; }
       .LP-PlaceTeaser--extended .LP-PlaceTeaser__Description .LP-Paragraph {
-        font-size: unset; }
+        font-size: unset;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+        text-overflow: ellipsis; }
     .LP-PlaceTeaser--extended .LP-PlaceTeaser__Image {
       height: 165px;
       width: 280px;

django_lostplaces/lostplaces/views/base_views.py

@@ -10,10 +10,11 @@ from django.contrib.auth.mixins import UserPassesTestMixin, LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 
 from django.shortcuts import redirect, get_object_or_404
-from django.urls import reverse_lazy
+from django.urls import reverse_lazy, reverse
 from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.models import Place
+from lostplaces.common import redirect_referer_or
 
 class IsAuthenticatedMixin(LoginRequiredMixin, View):
     '''
@@ -108,4 +109,4 @@ class PlaceAssetDeleteView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, SingleOb
         place_id = self.get_object().place.id
         self.get_object().delete()
         messages.success(self.request, self.success_message)
-        return redirect(reverse_lazy('place_detail', kwargs={'pk': place_id}))
+        return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': place_id}))

django_lostplaces/lostplaces/views/explorer_views.py

@@ -16,7 +16,7 @@ from lostplaces.models.place import Place, PlaceAsset
 class ExplorerProfileView(IsAuthenticatedMixin, View):
     def get(self, request, explorer_id):
         explorer = get_object_or_404(Explorer, pk=explorer_id)
-        place_list = Place.objects.filter(submitted_by=explorer)
+        place_list = explorer.places.all()
         place_count = place_list.count()
 
         context={

django_lostplaces/lostplaces/views/place_views.py

@@ -13,12 +13,13 @@ from django.contrib.messages.views import SuccessMessageMixin
 from django.utils.translation import ugettext_lazy as _
 
 from django.shortcuts import render, redirect, get_object_or_404
-from django.urls import reverse_lazy
+from django.urls import reverse_lazy, reverse
 
 from lostplaces.models import Place, PlaceImage
 from lostplaces.views.base_views import IsAuthenticatedMixin, IsPlaceSubmitterMixin
 from lostplaces.views.place_image_views import MultiplePlaceImageUploadMixin
 from lostplaces.forms import PlaceForm, PlaceImageForm, TagSubmitForm
+from lostplaces.common import redirect_referer_or
 
 from taggit.models import Tag
 
@@ -104,7 +105,14 @@ class PlaceCreateView(MultiplePlaceImageUploadMixin, IsAuthenticatedMixin, View)
                 self.request,
                 _('Please fill in all required fields.')
             )
-            return render(request, 'place/place_create.html', context={'form': place_form})
+            return render(
+                request=request,
+                template_name='place/place_create.html',
+                context={
+                    'place_form': place_form,
+                    'place_image_form': PlaceImageForm()
+                }
+            )
 
 class PlaceDeleteView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, DeleteView):
     template_name = 'place/place_delete.html'
@@ -127,14 +135,8 @@ class PlaceFavoriteView(IsAuthenticatedMixin, View):
         if request.user is not None:
             request.user.explorer.favorite_places.add(place)
             request.user.explorer.save()
-            
-        referer = request.META.get('HTTP_REFERER') 
-        if referer is not None:
-            return redirect(referer)
-        else:
-            return redirect(
-                reverse_lazy('place_detail', kwargs={'pk': place.pk})
-            )
+    
+        return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': place.pk}))
             
 class PlaceUnfavoriteView(IsAuthenticatedMixin, View):
     
@@ -144,10 +146,4 @@ class PlaceUnfavoriteView(IsAuthenticatedMixin, View):
             request.user.explorer.favorite_places.remove(place)
             request.user.explorer.save()
             
-        referer = request.META.get('HTTP_REFERER')  
-        if referer is not None:
-            return redirect(referer)
-        else:
-            return redirect(
-                reverse_lazy('place_detail', kwargs={'pk': place.pk})
-            )            
+        return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': place.pk}))                    

django_lostplaces/lostplaces/views/views.py

@@ -6,7 +6,7 @@ from django.views.generic.edit import CreateView
 
 from django.contrib.messages.views import SuccessMessageMixin
 from django.contrib import messages
-from django.urls import reverse_lazy
+from django.urls import reverse_lazy, reverse
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseForbidden
 from django.utils.translation import ugettext_lazy as _
@@ -14,6 +14,7 @@ from django.utils.translation import ugettext_lazy as _
 from lostplaces.forms import ExplorerCreationForm, TagSubmitForm
 from lostplaces.models import Place, PhotoAlbum
 from lostplaces.views.base_views import IsAuthenticatedMixin
+from lostplaces.common import redirect_referer_or
 
 from lostplaces.views.base_views import (
     PlaceAssetCreateView, 
@@ -79,8 +80,9 @@ class PlaceTagDeleteView(IsAuthenticatedMixin, View):
         place = get_object_or_404(Place, pk=tagged_id)
         tag = get_object_or_404(Tag, pk=tag_id)
         place.tags.remove(tag)
-        return redirect(reverse_lazy('place_detail', kwargs={'pk': tagged_id}))
-
+        
+        return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': tagged_id}))                    
+        
 def FlatView(request, slug):
     if request.LANGUAGE_CODE == 'de':
         return render(request, 'flat/' + slug + '-de' + '.html')