Release

django_lostplaces/lostplaces/admin.py

@@ -9,6 +9,8 @@ from django.contrib.auth.admin import UserAdmin
 from django.utils import timezone
 from lostplaces.models import *
 
+from lostplaces.forms import ExplorerCreationForm, ExplorerChangeForm
+
 # Register your models here.
 
 class VoucherAdmin(admin.ModelAdmin):

django_lostplaces/lostplaces/forms.py

@@ -8,12 +8,12 @@ from django.db import models
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
-from lostplaces.models import Place, PlaceImage, Voucher, Explorer
+from lostplaces.models import Place, PlaceImage, Voucher
 
-class SignupVoucherForm(UserCreationForm):
+class ExplorerCreationForm(UserCreationForm):
     class Meta:
         model = User
-        fields = ('username', 'email', 'first_name', 'last_name')
+        fields = ('username', 'email')
     voucher = forms.CharField(
         max_length=30,
         help_text=_('The Voucher you got from an administrator')
@@ -35,33 +35,10 @@ class SignupVoucherForm(UserCreationForm):
         fetched_voucher.delete()
         return True
 
-class ExplorerUserChangeForm(UserChangeForm):
+class ExplorerChangeForm(UserChangeForm):
     class Meta:
         model = User
-        fields = [ 'username', 'first_name', 'last_name', 'email' ]
-    ''' Hide password hint.'''
-    password = None
-
-    ''' Display username, but display it non-editable and not required. '''
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['username'].required = False
-        self.fields['username'].help_text = None
-        self.fields['username'].widget.attrs['disabled'] = 'disabled'
-    
-    def clean_username(self):
-        # As shown in the above answer.
-        instance = getattr(self, 'instance', None)
-        if instance:
-            return instance.username
-        else:
-            return self.cleaned_data.get('username', None)
-
-class ExplorerChangeForm(forms.ModelForm):
-    class Meta:
-        model = Explorer
-        fields = '__all__'
-        exclude = ['user', 'favorite_places']
+        fields = ('username', 'email')
 
 class PlaceForm(forms.ModelForm):
     class Meta:

django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-25 16:04+0100\n"
+"POT-Creation-Date: 2020-10-11 21:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Commander1024 <commander@commander1024.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgstr "Ungültiger Voucher"
 msgid "Expired voucher"
 msgstr "Abgelaufener Voucher"
 
-#: models/abstract_models.py:29 templates/explorer/profile.html:31
+#: models/abstract_models.py:29
 msgid "Name"
 msgstr "Name"
 
@@ -74,22 +74,6 @@ msgstr "Adresse (URL)"
 msgid "link text"
 msgstr "Linktext"
 
-#: models/models.py:47
-msgid "Biography"
-msgstr "Beschreibung"
-
-#: models/models.py:48
-msgid "Describe yourself, your preferences, etc. in a few sentences."
-msgstr "Beschreibe Dich selbst, Deine Vorlieben, usw. in ein paar Sätzen."
-
-#: models/models.py:56
-msgid "Profile image"
-msgstr "Profilbild"
-
-#: models/models.py:57
-msgid "Optional profile image for display in Explorer profile"
-msgstr "Optionales Profilbild zur Anzeige im Explorerprofil"
-
 #: models/place.py:21
 msgid "Location"
 msgstr "Ort"
@@ -126,92 +110,38 @@ msgstr "Du wirst in 5 Sekunden weitergeleitet"
 msgid "Go Back"
 msgstr "Zurück"
 
-#: templates/explorer/profile.html:41
-msgid "E-mail"
-msgstr "E-Mail"
-
-#: templates/explorer/profile.html:52
-msgid "Joined"
-msgstr "Beigetreten"
-
-#: templates/explorer/profile.html:60
-#, fuzzy
-#| msgid "All Places"
-msgid "Places"
-msgstr "Alle Places"
-
-#: templates/explorer/profile.html:68
-msgid "Place assets"
-msgstr ""
-
-#: templates/explorer/profile.html:76
-#, fuzzy
-#| msgid "Edit Explorer profile"
-msgid "Edit Profile"
-msgstr "Explorerprofil bearbeiten"
-
-#: templates/explorer/profile.html:87
-msgid "Favorite places"
-msgstr "Favoriten"
-
-#: templates/explorer/profile.html:103
-msgid "Places submitted by"
-msgstr "Places hinzugefügt von"
-
-#: templates/explorer/profile.html:118
-msgid "Images submitted by"
-msgstr "Bilder hinzugefügt von"
-
-#: templates/explorer/profile.html:140
-msgid "Photo albums submitted by"
-msgstr "Fotoalben hinzugefügt von"
-
-#: templates/explorer/profile_update.html:6
-#: templates/explorer/profile_update.html:12
-msgid "Edit Explorer profile"
-msgstr "Explorerprofil bearbeiten"
-
-#: templates/explorer/profile_update.html:48
-#: templates/place/place_update.html:42
-msgid "Update"
-msgstr "Aktualisieren"
-
 #: templates/global.html:32
 msgid "Logout"
 msgstr "Ausloggen"
 
-#: templates/global.html:33
-msgid "Profile"
-msgstr "Profil"
-
-#: templates/global.html:35
+#: templates/global.html:34
 msgid "Admin"
 msgstr "Admin"
 
-#: templates/global.html:40 templates/registration/login.html:4
+#: templates/global.html:39 templates/registration/login.html:4
 #: templates/registration/login.html:10 templates/registration/login.html:23
 msgid "Login"
 msgstr "Anmelden"
 
-#: templates/global.html:41 templates/registration/login.html:29
-#: templates/signup.html:6 templates/signup.html:12 templates/signup.html:49
+#: templates/global.html:40 templates/registration/login.html:29
+#: templates/signup.html:6 templates/signup.html:12 templates/signup.html:41
 msgid "Sign up"
 msgstr "Registrieren"
 
-#: templates/global.html:51 templates/home.html:10
+#: templates/global.html:50 templates/home.html:10
 msgid "Home"
 msgstr "Startseite"
 
-#: templates/global.html:52
+#: templates/global.html:51
 msgid "UrBex Codex"
 msgstr "UrBex Codex"
 
-#: templates/global.html:57 templates/place/place_create.html:5
+#: templates/global.html:56 templates/place/place_create.html:5
 #: templates/place/place_create.html:10
 msgid "Create place"
 msgstr "Place erstellen"
 
-#: templates/global.html:58
+#: templates/global.html:57
 msgid "All places"
 msgstr "Alle Places"
 
@@ -264,14 +194,6 @@ msgstr "Abschicken"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/partials/icons/place_favorite.html:6
-msgid "Remove from favorites"
-msgstr "Aus den Favoriten entfernen"
-
-#: templates/partials/icons/place_favorite.html:10
-msgid "Save as favorite"
-msgstr "In den Favoriten speichern"
-
 #: templates/partials/nav/footer.html:64
 msgid "Made by"
 msgstr "Erstellt von"
@@ -396,6 +318,10 @@ msgstr "Alle Places"
 msgid "Our lost places"
 msgstr "Unsere Lost Places"
 
+#: templates/place/place_update.html:42
+msgid "Update"
+msgstr "Aktualisieren"
+
 #: templates/place_image/place_image_create.html:7
 msgid "Submit images to a place"
 msgstr "Bilder zu einem Place hinzufügen"
@@ -408,16 +334,6 @@ msgstr "Noch kein Konto?"
 msgid "Please login to proceed"
 msgstr "Bitte log Dich ein um fortzufahren"
 
-#: views/explorer_views.py:78
-#, fuzzy
-#| msgid "Successfully updated place"
-msgid "Successfully updated Explorer profile"
-msgstr "Place erfolgreich aktualisiert"
-
-#: views/explorer_views.py:84 views/place_views.py:105
-msgid "Please fill in all required fields."
-msgstr "Bitte füll alle benötigten Felder aus."
-
 #: views/place_image_views.py:26
 msgid "Image(s) submitted successfully"
 msgstr "Bild(er) erfolgreich hinzugefügt"
@@ -442,6 +358,10 @@ msgstr "Du darfst diesen Place nicht bearbeiten"
 msgid "Successfully created place"
 msgstr "Place erfolgreich erstellt"
 
+#: views/place_views.py:105
+msgid "Please fill in all required fields."
+msgstr "Bitte füll alle benötigten Felder aus."
+
 #: views/place_views.py:112
 msgid "Successfully deleted place"
 msgstr "Place erfolgreich gelöscht"
@@ -465,8 +385,3 @@ msgstr "Fotoalbum-Link gelöscht"
 #: views/views.py:60
 msgid "You are not allowed to edit this photo album link"
 msgstr "Du darfst diesen Fotoalbum-Link nicht bearbeiten"
-
-#, fuzzy
-#~| msgid "Filename(s)"
-#~ msgid "Filename"
-#~ msgstr "Dateiname(n)"

django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py

@@ -1,22 +0,0 @@
-# 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

@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('lostplaces', '0002_remove_vouchers'),
+        ('lostplaces', '0002_reomve_vouchers'),
     ]
 
     operations = [

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

@@ -6,34 +6,19 @@
 database.
 '''
 
-import os
 import uuid
 
 from django.db import models
 from django.contrib.auth.models import User
-from django.db.models.signals import post_save, pre_save
+from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.models.abstract_models import Expireable
-from lostplaces.models.place import Place
-
-from easy_thumbnails.fields import ThumbnailerImageField
-from easy_thumbnails.files import get_thumbnailer
-
-def generate_profile_image_filename(instance, filename):
-    """
-    Callback for generating filename for uploaded explorer profile images.
-    Returns filename as: explorer_pk-username.jpg
-    """
-
-    return 'explorers/' + str(instance.user.pk) + '-' + str(instance.user.username) + '.' + filename.split('.')[-1]
 
 class Explorer(models.Model):
     """
-    Profile that is linked to the Django user.
+    Profile that is linked to the a User.
     Every user has a profile.
-    Provides additional attributes for user profile.
     """
     
     user = models.OneToOneField(
@@ -41,31 +26,10 @@ class Explorer(models.Model):
         on_delete=models.CASCADE,
         related_name='explorer'
     )
-    bio = models.TextField(
-        blank=True,
-        null=True,
-        verbose_name=_('Biography / Description'),
-        help_text=_('Describe yourself, your preferences, etc. in a few sentences.')
-    )
-    profile_image = ThumbnailerImageField(
-        blank=True,
-        null=True,
-        upload_to=generate_profile_image_filename, 
-        resize_source=dict(size=(400, 400), 
-        sharpen=True),
-        verbose_name=_('Profile image'),
-        help_text=_('Optional profile image for display in Explorer profile')
-    )
-    favorite_places = models.ManyToManyField(
-        Place,
-        related_name='favorite_places',
-        verbose_name='Explorers favorite places',
-        blank=True
-    )
 
     def __str__(self):
         return self.user.username
-
+        
 @receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):
     if created:
@@ -75,34 +39,13 @@ def create_user_profile(sender, instance, created, **kwargs):
 def save_user_profile(sender, instance, **kwargs):
     instance.explorer.save()
 
-@receiver(pre_save, sender=Explorer)
-def auto_delete_file_on_change(sender, instance, **kwargs):
-    """
-    Deletes old file from filesystem
-    when corresponding `Explorer` object is updated
-    with new file.
-    """
-    if not instance.pk:
-        return False
-
-    try:
-        old_file = Explorer.objects.get(pk=instance.pk).profile_image
-    except Explorer.DoesNotExist:
-        return False
-    print("Deleting:", old_file)
-    new_file = instance.profile_image
-    if not old_file == new_file:
-        old_file.delete(save=False)
-
 class Voucher(Expireable):
     """
-    Vouchers are authorization tokens to allow the registration of new users.
+    Vouchers are authorization to    created_when = models.DateTimeField(auto_now_add=True)
+    expires_when = models.DateTimeField()kens to allow the registration of new users.
     A voucher has a code, a creation and a deletion date, which are all 
     positional. Creation date is being set automatically during voucher 
     creation. 
-
-    created_when = models.DateTimeField(auto_now_add=True)
-    expires_when = models.DateTimeField()
     """
 
     code = models.CharField(unique=True, max_length=30)
@@ -113,3 +56,4 @@ class Voucher(Expireable):
 
     def __str__(self):
         return "Voucher " + str(self.code)
+

django_lostplaces/lostplaces/models/place.py

@@ -49,10 +49,10 @@ class Place(Submittable, Taggable, Mapable):
         return self.name
 
 
-def generate_place_image_filename(instance, filename):
+def generate_image_upload_path(instance, filename):
     """
-    Callback for generating filename for uploaded place images.
-    Returns filename as: place_pk-placename{-number}.jpg
+    Callback for generating path for uploaded images.
+    Returns filename as: place_pk-placename{-rnd_string}.jpg
     """
 
     return 'places/' + str(instance.place.pk) + '-' + str(instance.place.name) + '.' + filename.split('.')[-1]
@@ -72,7 +72,7 @@ class PlaceAsset(Submittable):
         null=True
     )
 
-class PlaceImage(PlaceAsset):
+class PlaceImage (PlaceAsset):
     """
     PlaceImage defines an image file object that points to a file in uploads/.
     Intermediate image sizes are generated as defined in THUMBNAIL_ALIASES.
@@ -84,7 +84,7 @@ class PlaceImage(PlaceAsset):
         verbose_name=_('Description'),
     )
     filename = ThumbnailerImageField(
-        upload_to=generate_place_image_filename, 
+        upload_to=generate_image_upload_path, 
         resize_source=dict(size=(2560, 2560), 
         sharpen=True),
         verbose_name=_('Filename(s)'),
@@ -104,6 +104,7 @@ class PlaceImage(PlaceAsset):
 
         return 'Image ' + str(self.pk)
 
+
 # These two auto-delete files from filesystem when they are unneeded:
 
 @receiver(post_delete, sender=PlaceImage)
@@ -117,6 +118,7 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
         thumbmanager = get_thumbnailer(instance.filename)
         thumbmanager.delete(save=False)
 
+
 @receiver(pre_save, sender=PlaceImage)
 def auto_delete_file_on_change(sender, instance, **kwargs):
     """
@@ -135,4 +137,5 @@ def auto_delete_file_on_change(sender, instance, **kwargs):
     # No need to delete thumbnails, as they will be overwritten on regeneration.
     new_file = instance.filename
     if not old_file == new_file:
-        old_file.delete(save=False)
+        if os.path.isfile(old_file.path):
+            os.remove(old_file.path)

django_lostplaces/lostplaces/templates/explorer/profile.html

@@ -7,46 +7,13 @@
 {% block maincontent %}
 
 <div class="LP-UserProfile">
-	<div class="LP-UserProfile__Bio">
-        <h2 class="LP-Headline">Bio</h2>
-        <p class="LP-Paragraph">{{explorer.bio}}</p>
-    </div>
     <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>
-						{% if explorer.profile_image %}
-						<figure class="LP-UserInfo__Image">
-							<img src="{{ explorer.profile_image.url }}" class="LP-Image" />
-						</figure>
-						{% endif %}
-                    <tr>
-						{% if explorer.user.first_name %}
-                        <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% trans 'Name' %}</span>
-                        </td>
-                        <td class="LP-UserInfo__Value">
-                            <span class="LP-Paragraph">{{explorer.user.first_name}} {{explorer.user.last_name}}</span>
-                        </td>
-						{% endif %}
-                    </tr>
-                    <tr>
-                        {% if explorer.user.email %}
-						<td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% trans 'E-mail' %}</span>
-                        </td>
-                        <td class="LP-UserInfo__Value">
-							<span class="LP-Paragraph">
-                            	<a href="{{explorer.user.email}}" class="LP-Link">{{explorer.user.email}}</a>
-							</span>
-                        </td>
-						{% endif %}
-                    </tr>
                     <tr>
                         <td class="LP-UserInfo__Key">
                             <span class="LP-Paragraph">{% trans 'Joined' %}</span>
@@ -65,17 +32,12 @@
                     </tr>
                     <tr>
                         <td class="LP-UserInfo__Key">
-                            <span class="LP-Paragraph">{% trans 'Place assets'%}</span>
+                            <span class="LP-Paragraph">{% trans 'Place Assets'%}</span>
                         </td>
                         <td class="LP-UserInfo__Value">
                             <span class="LP-Paragraph">{{asset_count}}</span>
                         </td>
                     </tr>
-                    <tr>
-                        <td>
-                            <a href="/explorer/update/"><button class="LP-Button LP-Button">{% trans 'Edit Profile' %}</button></a>
-                        </td>
-                    </tr>
                 </table>
             </div>
         </div>
@@ -83,79 +45,65 @@
 </div>
 
 <section class="LP-Section">
-    <div class="LP-PlaceList">
-        <h1 class="LP-Headline">{% trans 'Favorite places' %}</h1>
-        <ul class="LP-PlaceList__List">
-            {% for place in explorer.favorite_places.all %}
-            <li class="LP-PlaceList__Item">
-                {% include 'partials/place_teaser.html' with place=place extended=True %}
-            </li>
-            {% endfor %}
-        </ul>
+	<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' %}
+		{% include 'partials/nav/pagination.html' %}
 
-    </div>
+	</div>
 </section>
 
 <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">
-                {% include 'partials/place_teaser.html' with place=place extended=True %}
-            </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>
+	<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>
+	<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/explorer/profile_update.html

@@ -1,55 +0,0 @@
-{% extends 'global.html'%}
-{% load i18n %}
-{% load thumbnail %}
-{% load widget_tweaks %}
-
-# {% block title %}{% trans 'Edit Explorer profile' %}{% endblock %}
-
-{% block maincontent %}
-
-<form class="LP-Form" method="POST" enctype="multipart/form-data">
-    <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% trans 'Edit Explorer profile' %}</legend>
-        {% csrf_token %}
-        <div class="LP-Form__Composition LP-Form__Composition--breakable">
-            <div class="LP-Form__Field">
-                {% include 'partials/form/inputField.html' with field=explorer_user_change_form.username %}
-            </div>
-            <div class="LP-Form__Field">
-                {% include 'partials/form/inputField.html' with field=explorer_user_change_form.email %}
-            </div>
-        </div>
-        <div class="LP-Form__Composition LP-Form__Composition--breakable">
-            <div class="LP-Form__Field">
-                {% include 'partials/form/inputField.html' with field=explorer_user_change_form.first_name %}
-            </div>
-            <div class="LP-Form__Field">
-                {% include 'partials/form/inputField.html' with field=explorer_user_change_form.last_name %}
-            </div>
-        </div>
-
-        <div class="LP-Form__Composition">
-            <div class="LP-Form__Field">
-                {% include 'partials/form/inputField.html' with field=explorer_change_form.bio %}
-            </div>
-        </div>
-
-        <div class="LP-Form__Composition">
-            {% if explorer_image %}
-            <div class="LP-Form__Field">
-                <img src="{% thumbnail explorer_image 200x200 %}"/>
-            </div>
-            {% endif %}
-            <div class="LP-Form__Field">
-                {% include 'partials/form/inputField.html' with field=explorer_change_form.profile_image %}
-            </div>
-        </div>
-
-        {% trans 'Update' as action %}
-        <div class="LP-Form__Composition LP-Form__Composition--buttons">
-            {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER action=action %}
-        </div>
-    </fieldset>
-</form>
-
-{% 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">
-            {% 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 %}
-        </div>
-    </a>
+        {% endif %}
+    </div>
     <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/templates/signup.html

@@ -19,14 +19,6 @@
                 {% include 'partials/form/inputField.html' with field=form.email %}
             </div>
         </div>
-        <div class="LP-Form__Composition LP-Form__Composition--breakable">
-            <div class="LP-Form__Field">
-                {% include 'partials/form/inputField.html' with field=form.first_name %}
-            </div>
-            <div class="LP-Form__Field">
-                {% include 'partials/form/inputField.html' with field=form.last_name %}
-            </div>
-        </div>
 
         <div class="LP-Form__Composition">
             <div class="LP-Form__Field">

django_lostplaces/lostplaces/tests/forms/test_explorer_forms.py

@@ -4,15 +4,15 @@ from django import forms
 from django.utils import timezone
 
 from lostplaces.tests.forms import FormTestCase
-from lostplaces.forms import SignupVoucherForm
+from lostplaces.forms import ExplorerCreationForm
 from lostplaces.models.models import Voucher
 
-class SignupVoucherFormTestCase(FormTestCase):
+class ExplorerCreationFormTestCase(FormTestCase):
     """
     This test case only tests for the voucher since all other aspects don't realy matter
     to this project and are already tested by django
     """
-    form = SignupVoucherForm
+    form = ExplorerCreationForm
     
     @classmethod
     def setUpTestData(cls):
@@ -37,7 +37,7 @@ class SignupVoucherFormTestCase(FormTestCase):
         )
         
     def test_validation_valid(self):
-        form = SignupVoucherForm(self.post_data)
+        form = ExplorerCreationForm(self.post_data)
         self.assertTrue(
             form.is_valid(),
             msg='Expecting the %s to validate' % (
@@ -49,7 +49,7 @@ class SignupVoucherFormTestCase(FormTestCase):
         self.post_data = {
             'voucher': 'Imanotacode123'
         }
-        form = SignupVoucherForm(self.post_data)
+        form = ExplorerCreationForm(self.post_data)
         self.assertFalse(
             form.is_valid(),
             msg='Expecting the %s to not validate' % (

django_lostplaces/lostplaces/urls.py

@@ -11,15 +11,12 @@ from lostplaces.views import (
     PlaceDeleteView,
     PlaceTagDeleteView,
 	PlaceTagSubmitView,
-    PlaceFavoriteView,
-    PlaceUnfavoriteView,
 	PhotoAlbumCreateView,
 	PhotoAlbumDeleteView,
     PlaceImageCreateView,
     PlaceImageDeleteView,
     FlatView,
-    ExplorerProfileView,
-    ExplorerProfileUpdateView
+    ExplorerProfileView
 )
 
 urlpatterns = [
@@ -39,9 +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/update/', ExplorerProfileUpdateView.as_view(), name='explorer_profile_update'),
-    
-    path('explorer/favorite/<int:place_id>/', PlaceFavoriteView.as_view(), name='place_favorite'),
-    path('explorer/unfavorite/<int:place_id>/', PlaceUnfavoriteView.as_view(), name='place_unfavorite')
+    path('explorer/<int:explorer_id>/', ExplorerProfileView.as_view(), name='explorer_profile')
 ]

django_lostplaces/lostplaces/views/explorer_views.py

@@ -7,13 +7,11 @@ 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.contrib import messages
 
 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
-from lostplaces.forms import ExplorerChangeForm, ExplorerUserChangeForm
 
 class ExplorerProfileView(IsAuthenticatedMixin, View):
     def get(self, request, explorer_id):
@@ -35,53 +33,13 @@ class ExplorerProfileView(IsAuthenticatedMixin, View):
             asset_count += objects.count()
         
         context['asset_count'] = asset_count
-                
+        
+        print(context['assets'])
+        
         return render(
             request=request,
             template_name='explorer/profile.html',
             context=context
         )
-
-class ExplorerProfileUpdateView(IsAuthenticatedMixin, View):
-    success_message = ''
-    permission_denied_message = ''
-
-    def get(self, request, *args, **kwargs):
-        context = {
-            'explorer_user_change_form': ExplorerUserChangeForm(instance=request.user),
-            'explorer_change_form': ExplorerChangeForm(instance=request.user.explorer)
-        }
-        if request.user.explorer.profile_image:
-            context['explorer_image'] = request.user.explorer.profile_image
-        return render(request, 'explorer/profile_update.html', context)
-
-    def post(self, request, *args, **kwargs):
-        print(request.POST)
-        explorer_user_change_form = ExplorerUserChangeForm(
-            request.POST,
-            instance=request.user
-            )
-        explorer_change_form = ExplorerChangeForm(
-            request.POST,
-            request.FILES,
-            instance=request.user.explorer
-        )
-
-        if explorer_change_form.is_valid() and explorer_user_change_form.is_valid():
-            explorer_user_change_form.save()
-            explorer_change_form.save()
-
-            print(explorer_change_form.cleaned_data)
-
-            messages.success(
-                self.request,
-                _('Successfully updated Explorer profile')
-            )
-        else:
-            # Usually the browser should have checked the form before sending.
-            messages.error(
-                self.request,
-                _('Please fill in all required fields.')
-            )
-        return redirect(reverse_lazy('explorer_profile_update'))
-    
+        
+        

django_lostplaces/lostplaces/views/place_views.py

@@ -119,36 +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/lostplaces/views/views.py

@@ -11,7 +11,7 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseForbidden
 from django.utils.translation import ugettext_lazy as _
 
-from lostplaces.forms import SignupVoucherForm, TagSubmitForm
+from lostplaces.forms import ExplorerCreationForm, TagSubmitForm
 from lostplaces.models import Place, PhotoAlbum
 from lostplaces.views.base_views import IsAuthenticatedMixin
 
@@ -23,7 +23,7 @@ from lostplaces.views.base_views import (
 from taggit.models import Tag
 
 class SignUpView(SuccessMessageMixin, CreateView):
-    form_class = SignupVoucherForm
+    form_class = ExplorerCreationForm
     success_url = reverse_lazy('login')
     template_name = 'signup.html'
     success_message = _('User created')

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',