Removing Partial TemplateTag

.env

@@ -0,0 +1 @@
+DJANGO_SUPERUSER_PASSWORD=develop

.gitignore

@@ -79,7 +79,6 @@ Pipfile.lock
 __pypackages__/
 
 # Environments
-.env
 .venv
 env/
 venv/
@@ -92,3 +91,9 @@ venv.bak/
 
 # twine / pypi
 .pypirc
+
+# Django Migrations for Development branches
+django_lostplaces/lostplaces/migrations/*
+
+# Django Static files
+django_lostplaces/static/*

Pipfile

@@ -14,6 +14,7 @@ pandoc = "*"
 pylint-django = "*"
 setuptools = "*"
 django-nose = "*"
+invoke = "*"
 
 [packages]
 django = "*"
@@ -29,4 +30,9 @@ dbshell = "django_lostplaces/manage.py dbshell"
 showmigrations = "django_lostplaces/manage.py showmigrations"
 makemigrations = "django_lostplaces/manage.py makemigrations --no-input"
 migrate = "django_lostplaces/manage.py migrate"
+collectstatic = "django_lostplaces/manage.py collectstatic"
 build = "django_lostplaces/setup.py bdist_wheel --universal"
+createsuperuser = "django_lostplaces/manage.py createsuperuser --noinput --username admin --email admin@example.org"
+createsuperuser_prompt = "django_lostplaces/manage.py createsuperuser"
+quickstart = "invoke quickstart"
+security = "pipenv check"

Readme.md

@@ -65,6 +65,21 @@ Visit: [admin](http://localhost:8000/admin) for administrative backend or
 
 Happy developing ;-)
 
+# Pipenv Scripts
+This project comes with a bunch of convinient scripts, like:
+|Script|Description|
+|---|---|
+|test|Runs the tests|
+|server|Starts a **development** server|
+|dbshell|Opens a shell session in the database|
+|showmigrations|Lists all Migrations|
+|makemigrations|Creates a migration|
+|migrate|Applies unapplied migrations|
+|build|Builds this project into a wheel file|
+|createsuperuser|Creates a superuser with the username **admin** and the password **develop**. This is for development and demo instances only!
+|quickstart|Runs *migrate*, *createsuperuser* and *server*|
+
+
 # Installing a productive instance
 
 Currently there are two ways to deploy the lostplaces project:

django_lostplaces/django_lostplaces/settings.py

@@ -32,9 +32,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SECRET_KEY = 'n$(bx8(^)*wz1ygn@-ekt7rl^1km*!_c+fwwjiua8m@-x_rpl0'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
-ALLOWED_HOSTS = ['localhost']
+ALLOWED_HOSTS = ['localhost', '127.0.0.1', '[::1]']
 
 
 # Application definition
@@ -145,15 +145,16 @@ LANGUAGES = [
 # https://docs.djangoproject.com/en/3.1/howto/static-files/
 
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static_files')
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 # Upload directory
 MEDIA_URL = '/uploads/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads')
+MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads/')
 
 # Thumbnails
-THUMBNAIL_MEDIA_ROOT = os.path.join(MEDIA_ROOT, 'thumbs/')
-THUMBNAIL_MEDIA_URL = os.path.join(MEDIA_URL, 'thumbs/')
+RELATIVE_THUMBNAIL_PATH = 'images/'
+THUMBNAIL_MEDIA_ROOT = os.path.join(MEDIA_ROOT, RELATIVE_THUMBNAIL_PATH)
+THUMBNAIL_MEDIA_URL = os.path.join(MEDIA_URL, RELATIVE_THUMBNAIL_PATH)
 THUMBNAIL_QUALITY = 75
 
 # Templates to use for authentication

django_lostplaces/django_lostplaces/urls.py

@@ -19,8 +19,9 @@ Including another URLconf
 
 from django.contrib import admin
 from django.conf import settings
+from django.views.static import serve
 from django.conf.urls.static import static
-from django.urls import path, include
+from django.urls import path, include, re_path
 from django.views.generic.base import TemplateView
 
 from lostplaces.views import SignUpView
@@ -30,4 +31,6 @@ urlpatterns = [
     path('signup/', SignUpView.as_view(), name='signup'),
     path('explorer/', include('django.contrib.auth.urls')),
     path('', include('lostplaces.urls')),
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    re_path(r'^static/(?P<path>.*)$', serve,{'document_root': settings.STATIC_ROOT}),
+    re_path(r'^uploads/(?P<path>.*)$', serve,{'document_root': settings.MEDIA_ROOT})
+]

django_lostplaces/lostplaces/forms.py

@@ -7,7 +7,7 @@ from django import forms
 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 django.utils.translation import gettext as _
 
 from lostplaces import widgets
 from lostplaces.models import Place, PlaceImage, Voucher, Explorer

django_lostplaces/lostplaces/migrations/0005_release_0_1_4.py

@@ -32,7 +32,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='explorer',
             name='profile_image',
-            field=easy_thumbnails.fields.ThumbnailerImageField(blank=True, help_text='Optional profile image for display in Explorer profile', null=True, upload_to=lostplaces.models.models.generate_profile_image_filename, verbose_name='Profile image'),
+            field=easy_thumbnails.fields.ThumbnailerImageField(blank=True, help_text='Optional profile image for display in Explorer profile', null=True, upload_to=lostplaces.models.generate_profile_image_filename, verbose_name='Profile image'),
         ),
         migrations.AddField(
             model_name='explorer',

django_lostplaces/lostplaces/models/abstract_models.py

@@ -1,7 +1,7 @@
 
 from django.utils import timezone
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 from django.core.validators import MaxValueValidator, MinValueValidator
 
 from taggit.managers import TaggableManager

django_lostplaces/lostplaces/models/external_links.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 
 from lostplaces.models.place import PlaceAsset
 

django_lostplaces/lostplaces/models/models.py

@@ -13,7 +13,7 @@ from django.db import models
 from django.contrib.auth.models import User
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 
 from lostplaces.models.abstract_models import Expireable
 from lostplaces.models.place import Place

django_lostplaces/lostplaces/models/place.py

@@ -5,7 +5,8 @@ from django.db import models
 from django.urls import reverse
 from django.dispatch import receiver
 from django.db.models.signals import post_delete, pre_save
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
+from django.conf import settings
 
 from lostplaces.models.abstract_models import Submittable, Taggable, Mapable, Expireable
 
@@ -120,7 +121,7 @@ def generate_place_image_filename(instance, filename):
     Returns filename as: place_pk-placename{-number}.jpg
     """
 
-    return 'places/' + str(instance.place.pk) + '-' + str(instance.place.name) + '.' + filename.split('.')[-1]
+    return settings.RELATIVE_THUMBNAIL_PATH + str(instance.place.pk) + '-' + str(instance.place.name) + '.' + filename.split('.')[-1]
 
 def generate_image_upload_path(instance, filename):
     return generate_place_image_filename(instance, filename)

django_lostplaces/lostplaces/templates/global.html

@@ -89,7 +89,7 @@
     </div>
 
     {% block footer %}
-    {% partial 'nav/footer' %}
+        {% include 'partials/nav/footer.html' %}
     {% endblock footer %}
 
 </body>

django_lostplaces/lostplaces/templates/home.html

@@ -12,13 +12,10 @@
 
 {% block maincontent %}
 
-{% partial 'welcome' %}
+{% include 'partials/welcome.html' %}
 <article class="LP-TextSection">
 </article>
-{% partial 'osm_map' %}
-	{% set config mapping_config %}
-	{% set modifier 'wide' %}
-{% endpartial %}
+{% include 'partials/osm_map.html' with config=mapping_config modifier='wide' %}
 <div class="LP-PlaceGrid">
     <h1 class="LP-Headline LP-Headline">{% translate 'Explore the latest places' %}</h1>
     <ul class="LP-PlaceGrid__Grid">

django_lostplaces/lostplaces/templates/home_unauth.html

@@ -6,7 +6,7 @@
 
 {% block maincontent %}
 
-{% partial 'welcome' %}
+{% include 'partials/welcome.html' %}
 <article class="LP-TextSection">
     <p class="LP-Paragraph">
         {% blocktranslate %}You can create, view and share your lost places with other members of this site. You can upload photos, place links to your web galleries and contribute your knowledge by tagging other places or commenting on them. You will find detailed information on where these locations are, how to get there and what to expect from them. This might even include detailed information on the surroundings or the history of a lost place.{% endblocktranslate %}
@@ -25,9 +25,7 @@
             <a href="{% url 'place_detail' pk=place.pk %}" class="LP-Link">
                 <article class="LP-PlaceTeaser">
                     <div class="LP-PlaceTeaser__Image">
-						{% partial 'image' %}
-							{% set source_url place.placeimages.first.filename.thumbnail.url %}
-						{% endpartial %}
+                        {% include 'partials/image.html' with source_url=place.placeimages.first.filename.thumbnail.url %}
                     </div>
                     <div class="LP-PlaceTeaser__Meta">
                         <div class="LP-PlaceTeaser__Info">

django_lostplaces/lostplaces/templates/place/place_detail.html

@@ -26,12 +26,7 @@
         <h1 class="LP-Headline">{{ place.name }} {% include 'partials/icons/place_favorite.html' %} {% include 'partials/icons/place_visited.html' %}</h1>
         {% if place.get_hero_image %}
         <div class="LP-PlaceDetail__Image">
-			{% partial image %}
-				{% set source_url place.get_hero_image.filename.hero.url %}
-				{% set link_url %}
-					{{"#image"|addstr:place.get_hero_index_in_queryset}}
-				{% endset %}
-			{% endpartial %}
+			{% include '../partials/image.html' with source_url=place.get_hero_image.filename.hero.url link_url="#image"|addstr:place.get_hero_index_in_queryset %}
         </div>
         {% endif %}
     </header>
@@ -43,23 +38,18 @@
 	<div class="LP-Quickinfo">
 	    <section class="LP-Section">
 			{% url 'place_tag_submit' place_id=place.id as tag_submit_url %}
-			{% partial tagging %}
-				{% set config=tagging_config %}
-			{% endpartial %}
+			{% include '../partials/tagging.html' with config=tagging_config %}
 		</section>
 		
 		{{votingplace.vote}}
 		<section class="LP-Section">
-			{% partial voting %}
-				{% set place=place %}
-				{% set voting=placevoting %}
-			{% endpartial %}
+			{% include '../partials/voting.html' with voting=placevoting %}
 		</section>
 	</div>
 
     <section class="LP-Section">
         <h1 class="LP-Headline">{% translate 'Map links' %}</h1>
-        {% partial osm_map config=mapping_config %}
+		{% include '../partials/osm_map.html' with config=mapping_config %}
 		<ul class="LP-LinkList">
 			<li class="LP-LinkList__Item">
 				<a target="_blank" href="https://www.google.com/maps?q={{place.latitude|safe}},{{place.longitude|safe}}" class="LP-Link">
@@ -137,7 +127,7 @@
 
     <section class="LP-Section">
 		{% translate 'Images' as headline %}
-		{% partial "placeImageGrid" image_list=place.placeimages.all %}
+		{% include '../partials/placeImageGrid.html' with image_list=place.placeimages.all %}
     </section>
 
 </article>

django_lostplaces/lostplaces/tests/views/test_place_views.py

@@ -9,7 +9,7 @@ from django.urls import reverse
 from django.contrib.auth.models import User
 from django.utils import timezone
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 
 
 from lostplaces.models import Place

django_lostplaces/lostplaces/views/base_views.py

@@ -12,7 +12,7 @@ from django.contrib.messages.views import SuccessMessageMixin
 
 from django.shortcuts import redirect, get_object_or_404
 from django.urls import reverse_lazy, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 
 from lostplaces.models import Place
 from lostplaces.common import redirect_referer_or

django_lostplaces/lostplaces/views/explorer_views.py

@@ -3,7 +3,7 @@
 
 from django.views import View
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 
 from django.shortcuts import render, redirect, get_object_or_404
 from django.urls import reverse_lazy

django_lostplaces/lostplaces/views/place_image_views.py

@@ -1,6 +1,6 @@
 from django.views import View
 from django.shortcuts import get_object_or_404, redirect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 
 from lostplaces.views.base_views import PlaceAssetCreateView, PlaceAssetDeleteView
 from lostplaces.models import PlaceImage, Place

django_lostplaces/lostplaces/views/place_views.py

@@ -10,7 +10,7 @@ from django.views.generic.detail import SingleObjectMixin
 
 from django.contrib import messages
 from django.contrib.messages.views import SuccessMessageMixin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 from django.utils import timezone
 
 from django.shortcuts import render, redirect, get_object_or_404

django_lostplaces/lostplaces/views/views.py

@@ -9,7 +9,7 @@ from django.contrib import messages
 from django.urls import reverse_lazy, reverse
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseForbidden
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext as _
 
 from lostplaces.forms import SignupVoucherForm, TagSubmitForm
 from lostplaces.models import Place, PhotoAlbum

django_lostplaces/setup.py

@@ -6,13 +6,15 @@ from setuptools import setup, find_packages
 with open('Readme.md') as f:
     readme = f.read()
 
+# Keep PEP 440 for version identification in mind
+# https://www.python.org/dev/peps/pep-0440/#post-releases
 setup(
     name='django-lostplaces',
-    version='0.1.3',
+    version='0.1.4.post2',
     description='A django app to manage lost places',
-    author='Reverend',
-    author_email='reverend@reverend2048.de',
-    url='https://git.mowoe.com/reverend/lostplaces-backend',
+    author='Reverend, Commander1024',
+    author_email='reverend@reverend2048.de, commander@commander1024.de',
+    url='https://git.commander1024.de/Commander1024/lostplaces-backend',
     packages=find_packages(exclude=['django_lostplaces']),
 	long_description=readme,
 	long_description_content_type='text/markdown',
@@ -33,4 +35,4 @@ setup(
     ],
     include_package_data=True,
     license='MIT'
-)
+)

tasks.py

@@ -0,0 +1,23 @@
+from invoke import task
+
+@task
+def quickstart(c):
+    commands = [
+        'pipenv run collectstatic',
+        'pipenv run migrate',
+        'pipenv run createsuperuser',
+        'pipenv run server'
+    ]
+    c.run(' && '.join(commands))
+    
+@task
+def live(c):
+    commands = [
+        'pipenv check',
+        'pipenv run test',
+        'pipenv run collectstatic',
+        'pipenv run migrate',
+        'pipenv run createsuperuser_prompt'
+        'pipenv run server'
+    ]
+    c.run(' && '.join(commands))