Merge branch 'develop' of mowoe.com:reverend/lostplaces-backend into develop

django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py

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

django_lostplaces/lostplaces/migrations/0002_reomve_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 = [
+    dependencies = [
-            ('lostplaces', '0002_reomve_vouchers'),
+        ('lostplaces', '0002_remove_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/models/models.py

@@ -14,6 +14,7 @@ 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):
     """
@@ -27,6 +28,13 @@ 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,65 +45,63 @@
 </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">
-				<a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+                {% include 'partials/place_teaser.html' with place=place extended=True %}
-					{% include 'partials/place_teaser.html' with place=place extended=True %}
+            </li>
-				</a>
+            {% endfor %}
-			</li>
+        </ul>
-			{% 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,9 +21,7 @@
     <ul class="LP-PlaceGrid__Grid">
         {% for place in place_list %}
         <li class="LP-PlaceGrid__Item">
-            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+            {% include 'partials/place_teaser.html' with place=place%}
-                {% include 'partials/place_teaser.html' with place=place%}
-            </a>
         </li>
         {% endfor %}
     </ul>

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

@@ -0,0 +1,14 @@
+{%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,13 +1,15 @@
 {%load static %}
 
 <article class="LP-PlaceTeaser {% if extended %} LP-PlaceTeaser--extended{% endif %}">
-    <div class="LP-PlaceTeaser__Image">
+    <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
-        {% if place.placeimages.all|length > 0 %}
+        <div class="LP-PlaceTeaser__Image">
+            {% 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">
@@ -20,15 +22,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"><img class="LP-Icon" src="{% static '/icons/favourite.svg' %}" /></li>
+                <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/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 }}</h1>
+        <h1 class="LP-Headline">{{ place.name }} {% include 'partials/icons/place_favorite.html' %}</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,9 +17,7 @@
     <ul class="LP-PlaceList__List">
         {% for place in place_list %}
         <li class="LP-PlaceList__Item">
-            <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
+            {% include 'partials/place_teaser.html' with place=place extended=True %}
-                {% include 'partials/place_teaser.html' with place=place extended=True %}
-            </a>
         </li>
         {% endfor %}
     </ul>

django_lostplaces/lostplaces/urls.py

@@ -11,6 +11,8 @@ from lostplaces.views import (
     PlaceDeleteView,
     PlaceTagDeleteView,
 	PlaceTagSubmitView,
+    PlaceFavoriteView,
+    PlaceUnfavoriteView,
 	PhotoAlbumCreateView,
 	PhotoAlbumDeleteView,
     PlaceImageCreateView,
@@ -36,5 +38,10 @@ 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,3 +119,35 @@ 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})
+            )