Commander1024/lostplaces-backend
Commander1024/lostplaces-backend
1
0
Fork 0
Code Issues 14 Pull Requests Releases Wiki Activity

Compare commits

base: Commander1024:e601b9bf6ba14274ad43d4168a55fcc0e588e887
Branches Tags
Commander1024:master
Commander1024:develop
Commander1024:update/django-4.1.1
Commander1024:feature/50-Linktypes
Commander1024:feature/33-been-there-done-that
Commander1024:feature/30-user-profile-fields
Commander1024:27-Favorite-System
Commander1024:feature/localization
Commander1024:feature/authorized_tag
Commander1024:0.1.4
Commander1024:0.1.3
Commander1024:0.1.2
Commander1024:0.1.a2
Commander1024:0.1
..
compare: Commander1024:d04e9864194d251802ddb2cd000a98aecd8be502
Branches Tags
Commander1024:develop
Commander1024:update/django-4.1.1
Commander1024:master
Commander1024:feature/50-Linktypes
Commander1024:feature/33-been-there-done-that
Commander1024:feature/30-user-profile-fields
Commander1024:27-Favorite-System
Commander1024:feature/localization
Commander1024:feature/authorized_tag
Commander1024:0.1.4
Commander1024:0.1.3
Commander1024:0.1.2
Commander1024:0.1.a2
Commander1024:0.1

No commits in common. "e601b9bf6ba14274ad43d4168a55fcc0e588e887" and "d04e9864194d251802ddb2cd000a98aecd8be502" have entirely different histories.
e601b9bf6b ... d04e986419

14 changed files with 82 additions and 395 deletions
Show Stats Expand all files Collapse all files

68
django_lostplaces/lostplaces/locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-12-24 16:29+0100\n" "POT-Creation-Date: 2020-10-11 21:53+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Commander1024 <commander@commander1024.de>\n" "Last-Translator: Commander1024 <commander@commander1024.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -30,7 +30,7 @@ msgstr "Ungültiger Voucher"
msgid "Expired voucher" msgid "Expired voucher"
msgstr "Abgelaufener Voucher" msgstr "Abgelaufener Voucher"
#: models/abstract_models.py:29 templates/explorer/profile.html:19 #: models/abstract_models.py:29
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
@ -74,16 +74,6 @@ msgstr "Adresse (URL)"
msgid "link text" msgid "link text"
msgstr "Linktext" msgstr "Linktext"
#: models/models.py:46
#, fuzzy
#| msgid "Filename(s)"
msgid "Filename"
msgstr "Dateiname(n)"
#: models/models.py:47
msgid "Optional profile pic for display in explorer profile"
msgstr ""
#: models/place.py:21 #: models/place.py:21
msgid "Location" msgid "Location"
msgstr "Ort" msgstr "Ort"
@ -120,78 +110,38 @@ msgstr "Du wirst in 5 Sekunden weitergeleitet"
msgid "Go Back" msgid "Go Back"
msgstr "Zurück" msgstr "Zurück"
#: templates/explorer/profile.html:27
msgid "E-Mail"
msgstr ""
#: templates/explorer/profile.html:35
msgid "Joined"
msgstr ""
#: templates/explorer/profile.html:43
#, fuzzy
#| msgid "All Places"
msgid "Places"
msgstr "Alle Places"
#: templates/explorer/profile.html:51
msgid "Place Assets"
msgstr ""
#: templates/explorer/profile.html:65
#, fuzzy
#| msgid "Image(s) submitted successfully"
msgid "Places submitted by"
msgstr "Bild(er) erfolgreich hinzugefügt"
#: templates/explorer/profile.html:82
#, fuzzy
#| msgid "Image(s) submitted successfully"
msgid "Images submitted by"
msgstr "Bild(er) erfolgreich hinzugefügt"
#: templates/explorer/profile.html:104
#, fuzzy
#| msgid "Photo album link submitted"
msgid "Photo albums submitted by"
msgstr "Fotoalbum-Link hinzugefügt"
#: templates/global.html:32 #: templates/global.html:32
msgid "Logout" msgid "Logout"
msgstr "Ausloggen" msgstr "Ausloggen"
#: templates/global.html:33 #: templates/global.html:34
msgid "Profile"
msgstr ""
#: templates/global.html:35
msgid "Admin" msgid "Admin"
msgstr "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 #: templates/registration/login.html:10 templates/registration/login.html:23
msgid "Login" msgid "Login"
msgstr "Anmelden" msgstr "Anmelden"
#: templates/global.html:41 templates/registration/login.html:29 #: templates/global.html:40 templates/registration/login.html:29
#: templates/signup.html:6 templates/signup.html:12 templates/signup.html:41 #: templates/signup.html:6 templates/signup.html:12 templates/signup.html:41
msgid "Sign up" msgid "Sign up"
msgstr "Registrieren" msgstr "Registrieren"
#: templates/global.html:51 templates/home.html:10 #: templates/global.html:50 templates/home.html:10
msgid "Home" msgid "Home"
msgstr "Startseite" msgstr "Startseite"
#: templates/global.html:52 #: templates/global.html:51
msgid "UrBex Codex" msgid "UrBex Codex"
msgstr "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 #: templates/place/place_create.html:10
msgid "Create place" msgid "Create place"
msgstr "Place erstellen" msgstr "Place erstellen"
#: templates/global.html:58 #: templates/global.html:57
msgid "All places" msgid "All places"
msgstr "Alle Places" msgstr "Alle Places"

22
django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py
View File

@ -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'
)
]

2
django_lostplaces/lostplaces/migrations/0003_voucher.py
View File

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

31
django_lostplaces/lostplaces/models/models.py
View File

@ -6,28 +6,14 @@
database. database.
''' '''
import os
import uuid import uuid
from django.db import models from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db.models.signals import post_save from django.db.models.signals import post_save
from django.dispatch import receiver from django.dispatch import receiver
from django.utils.translation import ugettext_lazy as _
from lostplaces.models.abstract_models import Expireable 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.explorer.pk) + '-' + str(instance.explorer.username) + '.' + filename.split('.')[-1]
class Explorer(models.Model): class Explorer(models.Model):
""" """
@ -40,22 +26,6 @@ class Explorer(models.Model):
on_delete=models.CASCADE, on_delete=models.CASCADE,
related_name='explorer' related_name='explorer'
) )
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 pic for display in explorer profile')
)
favorite_places = models.ManyToManyField(
Place,
related_name='favorite_places',
verbose_name='Explorers favorite places',
blank=True
)
def __str__(self): def __str__(self):
return self.user.username return self.user.username
@ -88,3 +58,4 @@ class Voucher(Expireable):
def __str__(self): def __str__(self):
return "Voucher " + str(self.code) return "Voucher " + str(self.code)

8
django_lostplaces/lostplaces/models/place.py
View File

@ -49,10 +49,10 @@ class Place(Submittable, Taggable, Mapable):
return self.name 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. Callback for generating path for uploaded images.
Returns filename as: place_pk-placename{-number}.jpg Returns filename as: place_pk-placename{-rnd_string}.jpg
""" """
return 'places/' + str(instance.place.pk) + '-' + str(instance.place.name) + '.' + filename.split('.')[-1] return 'places/' + str(instance.place.pk) + '-' + str(instance.place.name) + '.' + filename.split('.')[-1]
@ -84,7 +84,7 @@ class PlaceImage (PlaceAsset):
verbose_name=_('Description'), verbose_name=_('Description'),
) )
filename = ThumbnailerImageField( filename = ThumbnailerImageField(
upload_to=generate_place_image_filename, upload_to=generate_image_upload_path,
resize_source=dict(size=(2560, 2560), resize_source=dict(size=(2560, 2560),
sharpen=True), sharpen=True),
verbose_name=_('Filename(s)'), verbose_name=_('Filename(s)'),

163
django_lostplaces/lostplaces/static/icons/favourite_filled.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 108 KiB

100
django_lostplaces/lostplaces/templates/explorer/profile.html
View File

@ -61,63 +61,65 @@
</div> </div>
<section class="LP-Section"> <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>
<section class="LP-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>
<section class=" LP-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> </section>
{% endblock maincontent %} {% endblock maincontent %}

4
django_lostplaces/lostplaces/templates/home.html
View File

@ -21,7 +21,9 @@
<ul class="LP-PlaceGrid__Grid"> <ul class="LP-PlaceGrid__Grid">
{% for place in place_list %} {% for place in place_list %}
<li class="LP-PlaceGrid__Item"> <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> </li>
{% endfor %} {% endfor %}
</ul> </ul>

14
django_lostplaces/lostplaces/templates/partials/icons/place_favorite.html
View File

@ -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 %}

18
django_lostplaces/lostplaces/templates/partials/place_teaser.html
View File

@ -1,15 +1,13 @@
{%load static %} {%load static %}
<article class="LP-PlaceTeaser {% if extended %} LP-PlaceTeaser--extended{% endif %}"> <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}}" /> <img class="LP-Image" src="{{ place.placeimages.first.filename.thumbnail.url}}" />
{% else %} {% else %}
<img class="LP-Image" src="{% static 'images/missing_image.png' %}" /> <img class="LP-Image" src="{% static 'images/missing_image.png' %}" />
{% endif %} {% endif %}
</div> </div>
</a>
<div class="LP-PlaceTeaser__Meta"> <div class="LP-PlaceTeaser__Meta">
<div class="LP-PlaceTeaser__Info"> <div class="LP-PlaceTeaser__Info">
<span class="LP-PlaceTeaser__Title"> <span class="LP-PlaceTeaser__Title">
@ -22,15 +20,15 @@
<div class="LP-PlaceTeaser__Description"> <div class="LP-PlaceTeaser__Description">
<p class="LP-Paragraph"> <p class="LP-Paragraph">
{% if place.description|length > 210 %} {% if place.description|length > 210 %}
{{place.description|truncatechars:210|truncatewords:-1}} {{place.description|truncatechars:210|truncatewords:-1}}
{% else %} {% else %}
{{place.description}} {{place.description}}
{% endif %} {% endif %}
</p> </p>
</div> </div>
<div class="LP-PlaceTeaser__Icons"> <div class="LP-PlaceTeaser__Icons">
<ul class="LP-Icon__List"> <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/location.svg' %}" /></li>
<li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li> <li class="LP-Icon__Item"><img class="LP-Icon" src="{% static '/icons/flag.svg' %}" /></li>
</ul> </ul>

2
django_lostplaces/lostplaces/templates/place/place_detail.html
View File

@ -23,7 +23,7 @@
<article class="LP-PlaceDetail"> <article class="LP-PlaceDetail">
<header class="LP-PlaceDetail__Header"> <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 %} {% if place.placeimages.first.filename.hero.url %}
<figure class="LP-PlaceDetail__Image"> <figure class="LP-PlaceDetail__Image">
<img src="{{ place.placeimages.first.filename.hero.url }}" class="LP-Image" /> <img src="{{ place.placeimages.first.filename.hero.url }}" class="LP-Image" />

4
django_lostplaces/lostplaces/templates/place/place_list.html
View File

@ -17,7 +17,9 @@
<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">
{% include 'partials/place_teaser.html' with place=place extended=True %}
</a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>

9
django_lostplaces/lostplaces/urls.py
View File

@ -11,8 +11,6 @@ from lostplaces.views import (
PlaceDeleteView, PlaceDeleteView,
PlaceTagDeleteView, PlaceTagDeleteView,
PlaceTagSubmitView, PlaceTagSubmitView,
PlaceFavoriteView,
PlaceUnfavoriteView,
PhotoAlbumCreateView, PhotoAlbumCreateView,
PhotoAlbumDeleteView, PhotoAlbumDeleteView,
PlaceImageCreateView, PlaceImageCreateView,
@ -38,10 +36,5 @@ urlpatterns = [
path('place/tag/<int:tagged_id>', PlaceTagSubmitView.as_view(), name='place_tag_submit'), 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'), 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')
] ]

32
django_lostplaces/lostplaces/views/place_views.py
View File

@ -119,35 +119,3 @@ class PlaceDeleteView(IsAuthenticatedMixin, IsPlaceSubmitterMixin, DeleteView):
def get_place(self): def get_place(self):
return self.get_object() 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})
)