Release

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 = [
+    dependencies = [
-            ('lostplaces', '0002_reomve_vouchers'),
+        ('lostplaces', '0002_reomve_vouchers'),
-        ]
+    ]
 
-        operations = [
+    operations = [
-            migrations.CreateModel(
+        migrations.CreateModel(
-                name='Voucher',
+            name='Voucher',
-                fields=[
+            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')),
-                    ('created_when', models.DateTimeField(auto_now_add=True)),
+                ('created_when', models.DateTimeField(auto_now_add=True)),
-                    ('expires_when', models.DateTimeField()),
+                ('expires_when', models.DateTimeField()),
-                    ('code', models.CharField(max_length=30, unique=True)),
+                ('code', models.CharField(max_length=30, unique=True)),
-                ],
+            ],
-                options={
+            options={
-                    'abstract': False,
+                'abstract': False,
-                },
+            },
-            ),
+        ),
-        ]
+    ]

django_lostplaces/lostplaces/migrations/0004_release_0_1_3.py

@@ -0,0 +1,102 @@
+# Generated by Django 3.1.1 on 2020-12-19 13:53
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import easy_thumbnails.fields
+import lostplaces.models.place
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0003_voucher'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='photoalbum',
+            name='label',
+            field=models.CharField(max_length=100, verbose_name='link text'),
+        ),
+        migrations.AlterField(
+            model_name='photoalbum',
+            name='submitted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer', verbose_name='Submitter'),
+        ),
+        migrations.AlterField(
+            model_name='photoalbum',
+            name='submitted_when',
+            field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
+        ),
+        migrations.AlterField(
+            model_name='photoalbum',
+            name='url',
+            field=models.URLField(verbose_name='URL'),
+        ),
+        migrations.AlterField(
+            model_name='place',
+            name='description',
+            field=models.TextField(help_text="Description of the place: e.g. how to get there, where to be careful, the place's history...", verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='place',
+            name='latitude',
+            field=models.FloatField(help_text='Latitude in decimal format: e. g. 41.40338', validators=[django.core.validators.MinValueValidator(-90), django.core.validators.MaxValueValidator(90)], verbose_name='Latitude'),
+        ),
+        migrations.AlterField(
+            model_name='place',
+            name='location',
+            field=models.CharField(max_length=50, verbose_name='Location'),
+        ),
+        migrations.AlterField(
+            model_name='place',
+            name='longitude',
+            field=models.FloatField(help_text='Longitude in decimal format: e. g. 2.17403', validators=[django.core.validators.MinValueValidator(-180), django.core.validators.MaxValueValidator(180)], verbose_name='Longitude'),
+        ),
+        migrations.AlterField(
+            model_name='place',
+            name='name',
+            field=models.CharField(max_length=50, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='place',
+            name='submitted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer', verbose_name='Submitter'),
+        ),
+        migrations.AlterField(
+            model_name='place',
+            name='submitted_when',
+            field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
+        ),
+        migrations.AlterField(
+            model_name='placeimage',
+            name='description',
+            field=models.TextField(blank=True, verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='placeimage',
+            name='filename',
+            field=easy_thumbnails.fields.ThumbnailerImageField(help_text='Optional: One or more images to upload', upload_to=lostplaces.models.place.generate_image_upload_path, verbose_name='Filename(s)'),
+        ),
+        migrations.AlterField(
+            model_name='placeimage',
+            name='submitted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer', verbose_name='Submitter'),
+        ),
+        migrations.AlterField(
+            model_name='placeimage',
+            name='submitted_when',
+            field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date'),
+        ),
+        migrations.AlterField(
+            model_name='voucher',
+            name='created_when',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Creation date'),
+        ),
+        migrations.AlterField(
+            model_name='voucher',
+            name='expires_when',
+            field=models.DateTimeField(verbose_name='Expiration date'),
+        ),
+    ]

django_lostplaces/lostplaces/models/models.py

@@ -14,7 +14,6 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 
 from lostplaces.models.abstract_models import Expireable
-from lostplaces.models.place import Place
 
 class Explorer(models.Model):
     """
@@ -28,13 +27,6 @@ class Explorer(models.Model):
         related_name='explorer'
     )
 
-    favorite_places = models.ManyToManyField(
-        Place,
-        related_name='favorite_places',
-        verbose_name='Explorers favorite places',
-        blank=True
-    )
-
     def __str__(self):
         return self.user.username
         

django_lostplaces/lostplaces/templates/explorer/profile.html

@@ -45,63 +45,65 @@
 </div>
 
 <section class="LP-Section">
-    <div class="LP-PlaceList">
+	<div class="LP-PlaceList">
-        <h1 class="LP-Headline">{% trans 'Places submitted by' %} {{explorer.user.username}}</h1>
+		<h1 class="LP-Headline">{% trans 'Places submitted by' %} {{explorer.user.username}}</h1>
-        <ul class="LP-PlaceList__List">
+		<ul class="LP-PlaceList__List">
-            {% for place in place_list %}
+			{% for place in place_list %}
-            <li class="LP-PlaceList__Item">
+			<li class="LP-PlaceList__Item">
-                {% include 'partials/place_teaser.html' with place=place extended=True %}
+				<a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-            </li>
+					{% include 'partials/place_teaser.html' with place=place extended=True %}
-            {% endfor %}
+				</a>
-        </ul>
+			</li>
+			{% endfor %}
+		</ul>
 
-        {% include 'partials/nav/pagination.html' %}
+		{% include 'partials/nav/pagination.html' %}
 
-    </div>
+	</div>
 </section>
 
 <section class="LP-Section">
-    <h1 class="LP-Headline">{% trans 'Images submitted by' %} {{explorer.user.username}}</h1>
+	<h1 class="LP-Headline">{% trans 'Images submitted by' %} {{explorer.user.username}}</h1>
-    <div class="LP-ImageGrid">
+	<div class="LP-ImageGrid">
-        <ul class="LP-ImageGrid__Container">
+		<ul class="LP-ImageGrid__Container">
-            {% for place_image in assets.placeimages.all %}
+			{% for place_image in assets.placeimages.all %}
-            <li class="LP-ImageGrid__Item">
+			<li class="LP-ImageGrid__Item">
-                <a href="{{ place_image.filename.large.url }}" class="LP-Link">
+				<a href="{{ place_image.filename.large.url }}" class="LP-Link">
-                    <img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
+					<img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
-                </a>
+				</a>
-                {% if user.explorer == place_image.submitted_by%}
+				{% if user.explorer == place_image.submitted_by%}
-                <span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
+				<span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
-                    <a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
+					<a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
-                        <img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
+						<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
-                    </a>
+					</a>
-                </span>
+				</span>
-                {% endif %}
+				{% endif %}
-            </li>
+			</li>
-            {% endfor %}
+			{% endfor %}
-        </ul>
+		</ul>
-    </div>
+	</div>
 </section>
 
 <section class=" LP-Section">
-    <h1 class="LP-Headline">{% trans 'Photo albums submitted by' %} {{explorer.user.username}}</h1>
+	<h1 class="LP-Headline">{% trans 'Photo albums submitted by' %} {{explorer.user.username}}</h1>
-    <div class="LP-LinkList">
+	<div class="LP-LinkList">
-        <ul class="LP-LinkList__Container">
+		<ul class="LP-LinkList__Container">
-            {% for photo_album in assets.photoalbums.all %}
+			{% for photo_album in assets.photoalbums.all %}
-            <li class="LP-LinkList__Item">
+			<li class="LP-LinkList__Item">
-                <a target="_blank" href="{{photo_album.url}}" class="LP-Link">
+				<a target="_blank" href="{{photo_album.url}}" class="LP-Link">
-                    <span class="LP-Text">{{photo_album.label}}</span>
+					<span class="LP-Text">{{photo_album.label}}</span>
-                </a>
+				</a>
-                {% if user.explorer == photo_album.submitted_by%}
+				{% if user.explorer == photo_album.submitted_by%}
-                <a href="{% url 'photo_album_delete' pk=photo_album.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete Photo Album">
+				<a href="{% url 'photo_album_delete' pk=photo_album.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete Photo Album">
-                    <div class="RV-Iconized__Container RV-Iconized__Container--small">
+					<div class="RV-Iconized__Container RV-Iconized__Container--small">
-                        {% icon 'trash' className="RV-Iconized__Icon" %}
+						{% icon 'trash' className="RV-Iconized__Icon" %}
-                    </div>
+					</div>
-                </a>
+				</a>
-                {% endif %}
+				{% endif %}
-            </li>
+			</li>
-            {% endfor %}
+			{% endfor %}
-        </ul>
+		</ul>
-    </div>
+	</div>
 </section>
 
 {% endblock maincontent %}

django_lostplaces/lostplaces/templates/home.html

@@ -21,7 +21,9 @@
     <ul class="LP-PlaceGrid__Grid">
         {% for place in place_list %}
         <li class="LP-PlaceGrid__Item">
-            {% include 'partials/place_teaser.html' with place=place%}
+            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+                {% include 'partials/place_teaser.html' with place=place%}
+            </a>
         </li>
         {% endfor %}
     </ul>

django_lostplaces/lostplaces/templates/partials/icons/place_favorite.html

@@ -1,14 +0,0 @@
-{%load static %}
-{% load i18n %}
-
-{% if request.user %}
-{% if place in request.user.explorer.favorite_places.all %}
-<a href="{% url 'place_unfavorite' place_id=place.id %}" class="LP-Link" title="{% trans 'Remove from favorites' %}">
-    <img class="LP-Icon" src="{% static '/icons/favourite_filled.svg' %}" />
-</a>
-{%else%}
-<a href="{% url 'place_favorite' place_id=place.id %}" class="LP-Link" title="{% trans 'Save as favorite' %}">
-    <img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" />
-</a>
-{% endif %}
-{% endif %}

django_lostplaces/lostplaces/templates/partials/place_teaser.html

@@ -1,15 +1,13 @@
 {%load static %}
 
 <article class="LP-PlaceTeaser {% if extended %} LP-PlaceTeaser--extended{% endif %}">
-    <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+    <div class="LP-PlaceTeaser__Image">
-        <div class="LP-PlaceTeaser__Image">
+        {% if place.placeimages.all|length > 0 %}
-            {% if place.placeimages.all|length > 0 %}
             <img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url}}" />
-            {% else %}
+        {% else %}
             <img class="LP-Image" src="{% static 'images/missing_image.png' %}" />
-            {% endif %}
+        {% endif %}
-        </div>
+    </div>
-    </a>
     <div class="LP-PlaceTeaser__Meta">
         <div class="LP-PlaceTeaser__Info">
             <span class="LP-PlaceTeaser__Title">
@@ -22,15 +20,15 @@
         <div class="LP-PlaceTeaser__Description">
             <p class="LP-Paragraph">
                 {% if place.description|length > 210 %}
-                {{place.description|truncatechars:210|truncatewords:-1}}
+                    {{place.description|truncatechars:210|truncatewords:-1}}
                 {% else %}
-                {{place.description}}
+                    {{place.description}}
                 {% endif %}
             </p>
         </div>
         <div class="LP-PlaceTeaser__Icons">
             <ul class="LP-Icon__List">
-                <li class="LP-Icon__Item">{% include 'partials/icons/place_favorite.html' with place=place%}</li>
+                <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
                 <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/location.svg' %}" /></li>
                 <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li>
             </ul>

django_lostplaces/lostplaces/templates/place/place_detail.html

@@ -23,7 +23,7 @@
 <article class="LP-PlaceDetail">
 
     <header class="LP-PlaceDetail__Header">
-        <h1 class="LP-Headline">{{ place.name }} {% include 'partials/icons/place_favorite.html' %}</h1>
+        <h1 class="LP-Headline">{{ place.name }}</h1>
         {% if place.placeimages.first.filename.hero.url %}
         <figure class="LP-PlaceDetail__Image">
             <img src="{{ place.placeimages.first.filename.hero.url }}" class="LP-Image" />

django_lostplaces/lostplaces/templates/place/place_list.html

@@ -17,7 +17,9 @@
     <ul class="LP-PlaceList__List">
         {% for place in place_list %}
         <li class="LP-PlaceList__Item">
-            {% include 'partials/place_teaser.html' with place=place extended=True %}
+            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+                {% include 'partials/place_teaser.html' with place=place extended=True %}
+            </a>
         </li>
         {% endfor %}
     </ul>

django_lostplaces/lostplaces/urls.py

@@ -11,8 +11,6 @@ from lostplaces.views import (
     PlaceDeleteView,
     PlaceTagDeleteView,
 	PlaceTagSubmitView,
-    PlaceFavoriteView,
-    PlaceUnfavoriteView,
 	PhotoAlbumCreateView,
 	PhotoAlbumDeleteView,
     PlaceImageCreateView,
@@ -38,10 +36,5 @@ urlpatterns = [
 	path('place/tag/<int:tagged_id>', PlaceTagSubmitView.as_view(), name='place_tag_submit'),
     path('place/tag/delete/<int:tagged_id>/<int:tag_id>', PlaceTagDeleteView.as_view(), name='place_tag_delete'),
     
-    path('explorer/<int:explorer_id>/', ExplorerProfileView.as_view(), name='explorer_profile'),
+    path('explorer/<int:explorer_id>/', ExplorerProfileView.as_view(), name='explorer_profile')
-    
-    path('explorer/favorite/<int:place_id>/', PlaceFavoriteView.as_view(), name='place_favorite'),
-    path('explorer/unfavorite/<int:place_id>/', PlaceUnfavoriteView.as_view(), name='place_unfavorite')
-    
-    
 ]

django_lostplaces/lostplaces/views/place_views.py

@@ -119,35 +119,3 @@ class PlaceDeleteView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, DeleteView):
 
     def get_place(self):
         return self.get_object()
-
-class PlaceFavoriteView(IsAuthenticatedMixin, View):
-    
-    def get(self, request, place_id):
-        place = get_object_or_404(Place, id=place_id)
-        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})
-            )
-            
-class PlaceUnfavoriteView(IsAuthenticatedMixin, View):
-    
-    def get(self, request, place_id):
-        place = get_object_or_404(Place, id=place_id)
-        if request.user is not None:
-            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})
-            )            

django_lostplaces/setup.py

@@ -8,7 +8,7 @@ with open('../Readme.md') as f:
 
 setup(
     name='django-lostplaces',
-    version='0.1.2 HotFix',
+    version='0.1.3',
     description='A django app to manage lost places',
     author='Reverend',
     author_email='reverend@reverend2048.de',