django_lostplaces/lostplaces/common.py

@@ -1,11 +0,0 @@
-def get_all_subclasses(cls):
-    '''
-    Gets all subclasses recursively, does not contain
-    abstract classes
-    '''
-    subclass_list = []
-    for subclass in cls.__subclasses__():
-        if not subclass._meta.abstract:
-            subclass_list.append(subclass)
-        subclass_list += get_all_subclasses(subclass)
-    return subclass_list

django_lostplaces/lostplaces/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.1.1 on 2020-11-29 17:46
+# Generated by Django 3.1.1 on 2020-09-28 18:39
 
 from django.conf import settings
 import django.core.validators
@@ -14,11 +14,19 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('taggit', '0003_taggeditem_add_unique_index'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('taggit', '0003_taggeditem_add_unique_index'),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Expireable',
+            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()),
+            ],
+        ),
         migrations.CreateModel(
             name='Explorer',
             fields=[
@@ -30,13 +38,13 @@ class Migration(migrations.Migration):
             name='Place',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=50, verbose_name='Name')),
+                ('name', models.CharField(max_length=50)),
-                ('latitude', 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')),
+                ('latitude', models.FloatField(validators=[django.core.validators.MinValueValidator(-90), django.core.validators.MaxValueValidator(90)])),
-                ('longitude', 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')),
+                ('longitude', models.FloatField(validators=[django.core.validators.MinValueValidator(-180), django.core.validators.MaxValueValidator(180)])),
-                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')),
+                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
-                ('location', models.CharField(max_length=50, verbose_name='Location')),
+                ('location', models.CharField(max_length=50)),
-                ('description', 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')),
+                ('description', models.TextField()),
-                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer', verbose_name='Submitter')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer')),
                 ('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
             ],
             options={
@@ -46,24 +54,20 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Voucher',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('expireable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='lostplaces.expireable')),
-                ('created_when', models.DateTimeField(auto_now_add=True, verbose_name='Creation date')),
-                ('expires_when', models.DateTimeField(verbose_name='Expiration date')),
                 ('code', models.CharField(max_length=30, unique=True)),
             ],
-            options={
+            bases=('lostplaces.expireable',),
-                'abstract': False,
-            },
         ),
         migrations.CreateModel(
             name='PlaceImage',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')),
+                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
+                ('description', models.TextField(blank=True)),
-                ('filename', 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)')),
+                ('filename', easy_thumbnails.fields.ThumbnailerImageField(upload_to=lostplaces.models.place.generate_image_upload_path)),
                 ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='placeimages', to='lostplaces.place')),
-                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer', verbose_name='Submitter')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer')),
             ],
             options={
                 'abstract': False,
@@ -73,11 +77,11 @@ class Migration(migrations.Migration):
             name='PhotoAlbum',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')),
+                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)),
-                ('url', models.URLField(verbose_name='URL')),
+                ('url', models.URLField()),
-                ('label', models.CharField(max_length=100, verbose_name='link text')),
+                ('label', models.CharField(max_length=100)),
                 ('place', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photoalbums', to='lostplaces.place')),
-                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer', verbose_name='Submitter')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer')),
             ],
             options={
                 'abstract': False,

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

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.1 on 2020-10-04 19:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    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,
+            },
+        ),
+    ]

django_lostplaces/lostplaces/models/place.py

@@ -72,7 +72,7 @@ class PlaceAsset(Submittable):
         null=True
     )
 
-class PlaceImage (PlaceAsset):
+class PlaceImage (Submittable):
     """
     PlaceImage defines an image file object that points to a file in uploads/.
     Intermediate image sizes are generated as defined in THUMBNAIL_ALIASES.

django_lostplaces/lostplaces/static/main.css

@@ -862,9 +862,10 @@ body {
     margin: 0 3px; }
 
 .LP-PlaceTeaser {
-  width: 100%; }
+  width: 280px; }
   .LP-PlaceTeaser .LP-PlaceTeaser__Image {
-    width: 100%;
+    height: 165px;
+    width: 280px;
     overflow: hidden; }
     .LP-PlaceTeaser .LP-PlaceTeaser__Image .LP-Image {
       max-width: unset;
@@ -872,8 +873,6 @@ body {
       object-fit: cover; }
   .LP-PlaceTeaser .LP-PlaceTeaser__Meta {
     display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
     align-items: center;
     justify-content: space-between;
     padding: 5px;
@@ -884,30 +883,19 @@ body {
       padding: 0;
       margin: 0;
       margin-top: 5px;
-      font-size: 1.3rem; }
+      font-size: 0.9rem; }
     .LP-PlaceTeaser .LP-PlaceTeaser__Meta .LP-Headline {
       font-family: "Montserrat", Helvetica, sans-serif;
       color: #565656;
-      font-size: 2rem;
+      font-size: 1rem;
       padding: 0px;
       margin: 0px; }
-    .LP-PlaceTeaser .LP-PlaceTeaser__Meta .LP-Icon {
-      height: 2em;
-      width: 2em; }
   .LP-PlaceTeaser .LP-PlaceTeaser__Description {
     font-family: "Montserrat", Helvetica, sans-serif;
     color: #565656;
-    order: 3;
+    display: none; }
-    flex-basis: 100%; }
-    .LP-PlaceTeaser .LP-PlaceTeaser__Description .LP-Paragraph {
-      font-size: 22px; }
 
 @media (min-width: 650px) {
-  .LP-PlaceTeaser {
-    width: 280px; }
-    .LP-PlaceTeaser__Image {
-      width: 280px;
-      height: 165px; }
   .LP-PlaceTeaser--extended {
     display: flex;
     flex-direction: row;
@@ -916,15 +904,12 @@ body {
     height: 165px; }
     .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta {
       margin: 0;
+      padding: 5px;
       padding-left: 25px;
       display: flex;
-      flex-wrap: nowrap;
       flex-direction: column;
       justify-content: space-between;
-      align-items: flex-start;
+      align-items: flex-start; }
-      gap: unset; }
-      .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; }
       .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Icons {
@@ -932,16 +917,10 @@ body {
         .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Icons ul {
           padding: 0;
           margin: 0; }
-      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-Icon {
-        height: 20px;
-        width: 20px; }
     .LP-PlaceTeaser--extended .LP-PlaceTeaser__Description {
       display: block;
       max-height: 55px;
-      overflow: hidden;
+      overflow: hidden; }
-      order: unset; }
-      .LP-PlaceTeaser--extended .LP-PlaceTeaser__Description .LP-Paragraph {
-        font-size: unset; }
     .LP-PlaceTeaser--extended .LP-PlaceTeaser__Image {
       height: 165px;
       width: 280px;
@@ -1027,31 +1006,6 @@ body {
   .LP-MessageList .LP-MessageList__Item {
     margin: 5px 0; }
 
-.LP-UserInfo {
-  display: flex;
-  flex-direction: column;
-  background-color: #D7CEC7;
-  max-width: 400px;
-  width: 100%;
-  min-width: 300px; }
-  .LP-UserInfo__UserName {
-    background-color: #C09F80; }
-    .LP-UserInfo__UserName .LP-Headline {
-      color: black;
-      padding: 0;
-      margin: 0;
-      text-align: center;
-      padding: 5px;
-      font-size: 25px; }
-  .LP-UserInfo__Meta {
-    padding: 5px; }
-    .LP-UserInfo__Meta * {
-      font-family: "Montserrat", Helvetica, sans-serif;
-      font-size: 18px; }
-    .LP-UserInfo__Meta .LP-UserInfo__Key {
-      padding-right: 25px;
-      font-weight: bold; }
-
 .LP-Header {
   display: flex;
   align-items: center;
@@ -1115,9 +1069,7 @@ body {
     box-shadow: 0 0 2px #565656; }
 
 .LP-PlaceList .LP-PlaceList__List {
-  list-style-type: none;
+  list-style-type: none; }
-  padding: 0;
-  margin: 0; }
   .LP-PlaceList .LP-PlaceList__List .LP-Link .LP-Place:hover {
     color: #565656;
     background-color: #f9f9f9;
@@ -1128,10 +1080,6 @@ body {
   .LP-PlaceList .LP-PlaceList__List .LP-PlaceList__Item {
     max-width: 900px;
     margin: 18px 0; }
-    @media (max-width: 750px) {
-      .LP-PlaceList .LP-PlaceList__List .LP-PlaceList__Item {
-        width: 100%;
-        margin-bottom: 35px; } }
 
 .LP-PlaceList .LP-Pagination {
   margin-top: 50px; }
@@ -1713,18 +1661,6 @@ body {
     padding: .5em;
     border-radius: 2px; }
 
-.LP-UserProfile {
-  display: flex;
-  flex-direction: row; }
-  .LP-UserProfile__Bio {
-    flex-grow: 5;
-    flex-shrink: 10;
-    padding-right: 35px; }
-  .LP-UserProfile__Info {
-    flex-grow: 10;
-    flex-shrink: 1;
-    flex-basis: max-content; }
-
 .LP-MainContainer {
   margin: 0 auto;
   max-width: 1280px; }
@@ -1737,9 +1673,8 @@ body {
     width: 100%; } }
 
 .LP-PlaceDetail .LP-PlaceDetail__Image {
-  max-width: 700px;
+  width: 700px;
   max-height: 500px;
-  width: 50%;
   box-shadow: 0 0 10px #565656;
   box-shadow: 0 0 10px #565656;
   object-fit: cover;
@@ -1747,16 +1682,15 @@ body {
   margin: 0;
   padding: 0;
   float: right;
-  margin-left: 25px;
+  margin-left: 35px;
-  margin-bottom: 25px;
+  margin-bottom: 35px;
-  margin-right: 25px;
+  margin-right: 35px;
   overflow: hidden; }
 
-@media (max-width: 750px) {
+@media (max-width: 1000px) {
   .LP-PlaceDetail .LP-PlaceDetail__Header .LP-PlaceDetail__Image {
     float: none;
     width: 100%;
-    max-width: unset;
     height: auto;
     margin: 0;
     padding: 0;

django_lostplaces/lostplaces/templates/explorer/profile.html

@@ -1,109 +0,0 @@
-{% extends 'global.html'%}
-{% load static %}
-{% load i18n %}
-
-{% load svg_icon %}
-
-{% block maincontent %}
-
-<div class="LP-UserProfile">
-    <div class="LP-UserProfile__Info">
-        <div class="LP-UserInfo">
-            <div class="LP-UserInfo__UserName">
-                <h1 class="LP-Headline">{{explorer.user.username}}</h1>
-            </div>
-            <div class="LP-UserInfo__Meta">
-                <table>
-                    <tr>
-                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% trans 'Joined' %}</span>
-                        </td>
-                        <td class="LP-UserInfo__Value">
-                            <span class="LP-Paragraph">{{explorer.user.date_joined|date:'d.m.Y'}}</span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% trans 'Places'%}</span>
-                        </td>
-                        <td class="LP-UserInfo__Value">
-                            <span class="LP-Paragraph">{{place_count}}</span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% trans 'Place Assets'%}</span>
-                        </td>
-                        <td class="LP-UserInfo__Value">
-                            <span class="LP-Paragraph">{{asset_count}}</span>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-
-<section class="LP-Section">
-	<div class="LP-PlaceList">
-		<h1 class="LP-Headline">{% trans 'Places submitted by' %} {{explorer.user.username}}</h1>
-		<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 %}
-				</a>
-			</li>
-			{% endfor %}
-		</ul>
-
-		{% include 'partials/nav/pagination.html' %}
-
-	</div>
-</section>
-
-<section class="LP-Section">
-	<h1 class="LP-Headline">{% trans 'Images submitted by' %} {{explorer.user.username}}</h1>
-	<div class="LP-ImageGrid">
-		<ul class="LP-ImageGrid__Container">
-			{% for place_image in assets.placeimages.all %}
-			<li class="LP-ImageGrid__Item">
-				<a href="{{ place_image.filename.large.url }}" class="LP-Link">
-					<img class="LP-Image" src="{{ place_image.filename.thumbnail.url }}">
-				</a>
-				{% if user.explorer == place_image.submitted_by%}
-				<span class="LP-ImageGrid__DeleteItem" title="Bild löschen">
-					<a href="{% url 'place_image_delete' pk=place_image.id %}" class="LP-Link">
-						<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}" />
-					</a>
-				</span>
-				{% endif %}
-			</li>
-			{% endfor %}
-		</ul>
-	</div>
-</section>
-
-<section class=" LP-Section">
-	<h1 class="LP-Headline">{% trans 'Photo albums submitted by' %} {{explorer.user.username}}</h1>
-	<div class="LP-LinkList">
-		<ul class="LP-LinkList__Container">
-			{% for photo_album in assets.photoalbums.all %}
-			<li class="LP-LinkList__Item">
-				<a target="_blank" href="{{photo_album.url}}" class="LP-Link">
-					<span class="LP-Text">{{photo_album.label}}</span>
-				</a>
-				{% 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">
-					<div class="RV-Iconized__Container RV-Iconized__Container--small">
-						{% icon 'trash' className="RV-Iconized__Icon" %}
-					</div>
-				</a>
-				{% endif %}
-			</li>
-			{% endfor %}
-		</ul>
-	</div>
-</section>
-
-{% endblock maincontent %}

django_lostplaces/lostplaces/templates/global.html

@@ -29,10 +29,9 @@
                 <span class="LP-Paragraph">
                     {% if user.is_authenticated %}
                     Hi {{ user.username }}!
-                    <a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">{% trans 'Logout' %}</span></a> |
+                    <a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">{% trans 'Logout' %}</span></a>
-					<a class="LP-Link" href="{% url 'explorer_profile' explorer_id=user.pk%}"><span class="LP-Link__Text">{% trans 'Profile' %}</span></a>
                     {% if user.is_superuser %}
-                    | <a class="LP-Link" href="{% url 'admin:index' %}" target="_blank"><span class="LP-Link__Text">{% trans 'Admin' %}</span></a>
+                    <a class="LP-Link" href="{% url 'admin:index' %}" target="_blank"><span class="LP-Link__Text">{% trans 'Admin' %}</span></a>
                     {% endif %}
 
                     {% else %}

django_lostplaces/lostplaces/urls.py

@@ -15,8 +15,7 @@ from lostplaces.views import (
 	PhotoAlbumDeleteView,
     PlaceImageCreateView,
     PlaceImageDeleteView,
-    FlatView,
+    FlatView
-    ExplorerProfileView
 )
 
 urlpatterns = [
@@ -34,7 +33,5 @@ urlpatterns = [
 
     # POST-only URLs for tag submission
 	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('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')
 ]

django_lostplaces/lostplaces/views/__init__.py

@@ -4,5 +4,4 @@
 from lostplaces.views.base_views import *
 from lostplaces.views.views import * 
 from lostplaces.views.place_views import *
-from lostplaces.views.place_image_views import *
+from lostplaces.views.place_image_views import *
-from lostplaces.views.explorer_views import *

django_lostplaces/lostplaces/views/explorer_views.py

@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from django.views import View
-
-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 lostplaces.common import get_all_subclasses
-from lostplaces.views.base_views import IsAuthenticatedMixin
-from lostplaces.models.models import Explorer
-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_count = place_list.count()
-
-        context={
-            'explorer': explorer,
-            'place_count': place_count,
-            'place_list': place_list,
-            'assets': {}
-        }
-
-        asset_count = 0
-        for subclass in get_all_subclasses(PlaceAsset): # kinda ugly, but PlaceAsset cannot be abstract according to django ORM
-            objects = subclass.objects.filter(submitted_by=explorer)
-            context['assets'][subclass.__name__.lower()+'s'] = objects
-            asset_count += objects.count()
-        
-        context['asset_count'] = asset_count
-        
-        print(context['assets'])
-        
-        return render(
-            request=request,
-            template_name='explorer/profile.html',
-            context=context
-        )
-        
-