photo-objects 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

photo_objects/django/templatetags/photo_objects_extras.py

@@ -1,6 +1,6 @@
 from django import template
 
-from photo_objects.django.models import Album
+from photo_objects.django.api.album import get_site_album
 
 
 register = template.Library()
@@ -41,7 +41,7 @@ def meta_og(context):
     try:
         request = context.get("request")
         site = request.site
-        album = Album.objects.get(key=f'_site_{site.id}')
+        album = get_site_album(site.id)
 
         return {
             'request': request,

photo_objects/django/urls.py

@@ -68,16 +68,7 @@ urlpatterns = [
     # TODO: img/<str:album_key>/<str:photo_key>/<str:size_key> path
     path(
         "users/login",
-        auth_views.LoginView.as_view(
-            template_name="photo_objects/form.html",
-            extra_context={
-                "title": "Login",
-                "action": "Login",
-                "back": BackLink(
-                    f'Back to albums',
-                    reverse_lazy('photo_objects:list_albums')),
-            },
-        ),
+        ui.login,
         name="login",
     ),
     path(

photo_objects/django/views/ui/__init__.py

@@ -1,3 +1,4 @@
 from .album import *
 from .configuration import *
 from .photo import *
+from .users import *

photo_objects/django/views/ui/album.py

@@ -51,13 +51,13 @@ def new_album(request: HttpRequest):
 def get_info(request: HttpRequest, album_key: str):
     site_id = parse_site_id(album_key)
     if site_id is not None and request.site:
-        return (
+        return render_markdown(
             "This is a special album for configuring site metadata for "
-            f"{request.site.name}. Use album title to override the site name, "
-            "albums cover photo to configure the preview image, and album "
-            "description to configure the site description. The album title "
-            "is automatically updated when the related sites name is changed "
-            "and vice versa.")
+            f"**{request.site.name}**. Use album title to change the site "
+            "name, albums cover photo to configure the preview image, and "
+            "album description to configure the site description. The album "
+            "title is automatically updated when the related sites name is "
+            "changed and vice versa.")
 
 
 @json_problem_as_html

photo_objects/django/views/ui/photo.py

@@ -1,7 +1,6 @@
 from django.http import HttpRequest, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
-from django.utils.safestring import mark_safe
 
 from photo_objects.django import api
 from photo_objects.django.api.utils import AlbumNotFound, FormValidationFailed

photo_objects/django/views/ui/users.py

@@ -0,0 +1,23 @@
+from django.contrib.auth import views as auth_views
+from django.http import HttpRequest
+from django.urls import reverse_lazy
+
+from photo_objects.django.api.album import get_site_album
+from photo_objects.django.views.utils import BackLink
+
+
+def login(request: HttpRequest):
+    album, _ = get_site_album(request.site)
+
+    return auth_views.LoginView.as_view(
+        template_name="photo_objects/form.html",
+        extra_context={
+            "title": "Login",
+            "photo": album.cover_photo,
+            "action": "Login",
+            "back": BackLink(
+                f'Back to albums',
+                reverse_lazy('photo_objects:list_albums')),
+            "class": "login"
+        },
+    )(request)

{photo_objects-0.1.0.dist-info → photo_objects-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.1.0
+Version: 0.2.1
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.1.0.dist-info → photo_objects-0.2.1.dist-info}/RECORD

@@ -10,7 +10,7 @@ photo_objects/django/forms.py,sha256=VoDlyZAwiTLyNxW3rRk5bzjfPJvNuKV-wpuLGCe5TCY
 photo_objects/django/models.py,sha256=tRHBqswASWMnyz8rwiKsmHDqEvQX54ly9k8tvU7qNOM,4597
 photo_objects/django/objsto.py,sha256=GZuoPZ1I5qX4rwEYZlOfZZiV4NQ19iknQBT6755421Y,2417
 photo_objects/django/signals.py,sha256=NEh_pfvsSt2f7MuHIJE0uLHUkqjKH4ipAFS7tmvm9LI,2400
-photo_objects/django/urls.py,sha256=safcovG-8G60F_1v31ZvCCtBE8d6sHUtma6d5ZQHymo,2356
+photo_objects/django/urls.py,sha256=ZBzTTYSLkeyuGM_NdSDzz_Yt4xs6hwIFhz04j59Q1r8,2023
 photo_objects/django/api/__init__.py,sha256=BnEHlm3mwyBy-1xhk-NFasgZa4fjCDjtfkBUoH0puPY,62
 photo_objects/django/api/album.py,sha256=c5qDvy6ebIZCzggxcYgSgLBR0cco79V47nJf2OHuBj8,2486
 photo_objects/django/api/auth.py,sha256=LfMm02_TKwrP5XFie-KzBnW3FNFWQAafBlu0UE19Gd4,1370
@@ -26,7 +26,7 @@ photo_objects/django/migrations/0003_admin_visibility.py,sha256=PdxPOJzr-ViRBlOY
 photo_objects/django/migrations/0004_camera_setup_and_settings.py,sha256=CS5xyIHgBE2Y7-PSJ52ffRQeCzs8p899px9upomk4O8,1844
 photo_objects/django/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-photo_objects/django/templatetags/photo_objects_extras.py,sha256=LjqvVZpcVqdEQQ-EgC7OkEv2DqIvmfmDC-EsQNmkY7M,1205
+photo_objects/django/templatetags/photo_objects_extras.py,sha256=JD6SHx3gmne5HdrwNlWOMqbGhcTfzNV9nV1bdNhlgto,1199
 photo_objects/django/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/tests/test_album.py,sha256=qeRx_M8EvY9n_as1x8-EWtp9Ob1kOPGnUfZuUnMfDO4,13979
 photo_objects/django/tests/test_auth.py,sha256=su00EypNzGQcvxqhmOtFevZriK31pY7yD1HxpQFcUT4,3928
@@ -40,13 +40,14 @@ photo_objects/django/views/api/album.py,sha256=EZMOkxYzLSWr9wwXnd4yAO64JtXZq2k3F
 photo_objects/django/views/api/auth.py,sha256=N53csbthH0DEMFjY3fqhtLmtdL7xqzkatktywjqZ8h0,819
 photo_objects/django/views/api/photo.py,sha256=52UMP1r6TN_xfu8fHE25yOUiTa6W1F2XbgEichM8tTE,3526
 photo_objects/django/views/api/utils.py,sha256=uQzKdSKHRAux5OZzqgWQr0gsK_FeweQP0cg_67OWA_Y,264
-photo_objects/django/views/ui/__init__.py,sha256=vbFXPj5liue-M_CXQGP5PKhD98Z5ev53yKLPU8zWpUs,71
-photo_objects/django/views/ui/album.py,sha256=80fkAdtXjgBqq-4e1i2slnzWD2C-m6rc02piIqYlgmI,5215
+photo_objects/django/views/ui/__init__.py,sha256=N3ro5KggdV-JnfyHwoStX73b3SbVbpcsMuQNlxntVJs,92
+photo_objects/django/views/ui/album.py,sha256=gOVwkpNZFytTrEU0N6OfJu4U4l85AIbL6b0L6x0eA4E,5232
 photo_objects/django/views/ui/configuration.py,sha256=pzNRHq3FSrVCTx2R31_FW3A3aJxzEO4pDnXsOVS75uA,5576
-photo_objects/django/views/ui/photo.py,sha256=4NJSN5X_NcVcUEPaoGEGmXRDAgI5_KsOlHr7j-yo2QY,6040
+photo_objects/django/views/ui/photo.py,sha256=fxjb47cxcT08pcYFcYIULpT4duKqK99zw5mgvKJx150,5994
+photo_objects/django/views/ui/users.py,sha256=nlJyW7rhmr-ZR4LeSHMRPVmJzpiyHCEB2ry6uH2ihOc,713
 photo_objects/django/views/ui/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
-photo_objects-0.1.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.1.0.dist-info/METADATA,sha256=o0IEDnYB7mXHUO3cT2i-yCDCkfS01DoT8OW32U4tOxU,3671
-photo_objects-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.1.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.1.0.dist-info/RECORD,,
+photo_objects-0.2.1.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.2.1.dist-info/METADATA,sha256=lO7WJhmvO4b0VsvmN_1nQ2DXkMSmjiYLlcpLb79JYUE,3671
+photo_objects-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.2.1.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.2.1.dist-info/RECORD,,