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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. photo_objects/django/templatetags/photo_objects_extras.py +2 -2
  2. photo_objects/django/urls.py +1 -10
  3. photo_objects/django/views/ui/__init__.py +1 -0
  4. photo_objects/django/views/ui/photo.py +0 -1
  5. photo_objects/django/views/ui/users.py +23 -0
  6. {photo_objects-0.1.0.dist-info → photo_objects-0.2.0.dist-info}/METADATA +1 -1
  7. {photo_objects-0.1.0.dist-info → photo_objects-0.2.0.dist-info}/RECORD +10 -9
  8. {photo_objects-0.1.0.dist-info → photo_objects-0.2.0.dist-info}/WHEEL +0 -0
  9. {photo_objects-0.1.0.dist-info → photo_objects-0.2.0.dist-info}/licenses/LICENSE +0 -0
  10. {photo_objects-0.1.0.dist-info → photo_objects-0.2.0.dist-info}/top_level.txt +0 -0
photo_objects/django/templatetags/photo_objects_extras.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from django import template
2
2
 
3
- from photo_objects.django.models import Album
3
+ from photo_objects.django.api.album import get_site_album
4
4
 
5
5
 
6
6
  register = template.Library()
@@ -41,7 +41,7 @@ def meta_og(context):
41
41
  try:
42
42
  request = context.get("request")
43
43
  site = request.site
44
- album = Album.objects.get(key=f'_site_{site.id}')
44
+ album = get_site_album(site.id)
45
45
 
46
46
  return {
47
47
  'request': request,
photo_objects/django/urls.py CHANGED
@@ -68,16 +68,7 @@ urlpatterns = [
68
68
  # TODO: img/<str:album_key>/<str:photo_key>/<str:size_key> path
69
69
  path(
70
70
  "users/login",
71
- auth_views.LoginView.as_view(
72
- template_name="photo_objects/form.html",
73
- extra_context={
74
- "title": "Login",
75
- "action": "Login",
76
- "back": BackLink(
77
- f'Back to albums',
78
- reverse_lazy('photo_objects:list_albums')),
79
- },
80
- ),
71
+ ui.login,
81
72
  name="login",
82
73
  ),
83
74
  path(
photo_objects/django/views/ui/__init__.py CHANGED
@@ -1,3 +1,4 @@
1
1
  from .album import *
2
2
  from .configuration import *
3
3
  from .photo import *
4
+ from .users import *
photo_objects/django/views/ui/photo.py CHANGED
@@ -1,7 +1,6 @@
1
1
  from django.http import HttpRequest, HttpResponseRedirect
2
2
  from django.shortcuts import render
3
3
  from django.urls import reverse
4
- from django.utils.safestring import mark_safe
5
4
 
6
5
  from photo_objects.django import api
7
6
  from photo_objects.django.api.utils import AlbumNotFound, FormValidationFailed
photo_objects/django/views/ui/users.py ADDED
@@ -0,0 +1,23 @@
1
+ from django.contrib.auth import views as auth_views
2
+ from django.http import HttpRequest
3
+ from django.urls import reverse_lazy
4
+
5
+ from photo_objects.django.api.album import get_site_album
6
+ from photo_objects.django.views.utils import BackLink
7
+
8
+
9
+ def login(request: HttpRequest):
10
+ album, _ = get_site_album(request.site)
11
+
12
+ return auth_views.LoginView.as_view(
13
+ template_name="photo_objects/form.html",
14
+ extra_context={
15
+ "title": "Login",
16
+ "photo": album.cover_photo,
17
+ "action": "Login",
18
+ "back": BackLink(
19
+ f'Back to albums',
20
+ reverse_lazy('photo_objects:list_albums')),
21
+ "class": "login"
22
+ },
23
+ )(request)
{photo_objects-0.1.0.dist-info → photo_objects-0.2.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: photo-objects
3
- Version: 0.1.0
3
+ Version: 0.2.0
4
4
  Summary: Application for storing photos in S3 compatible object-storage.
5
5
  Author: Toni Kangas
6
6
  License: MIT License
{photo_objects-0.1.0.dist-info → photo_objects-0.2.0.dist-info}/RECORD RENAMED
@@ -10,7 +10,7 @@ photo_objects/django/forms.py,sha256=VoDlyZAwiTLyNxW3rRk5bzjfPJvNuKV-wpuLGCe5TCY
10
10
  photo_objects/django/models.py,sha256=tRHBqswASWMnyz8rwiKsmHDqEvQX54ly9k8tvU7qNOM,4597
11
11
  photo_objects/django/objsto.py,sha256=GZuoPZ1I5qX4rwEYZlOfZZiV4NQ19iknQBT6755421Y,2417
12
12
  photo_objects/django/signals.py,sha256=NEh_pfvsSt2f7MuHIJE0uLHUkqjKH4ipAFS7tmvm9LI,2400
13
- photo_objects/django/urls.py,sha256=safcovG-8G60F_1v31ZvCCtBE8d6sHUtma6d5ZQHymo,2356
13
+ photo_objects/django/urls.py,sha256=ZBzTTYSLkeyuGM_NdSDzz_Yt4xs6hwIFhz04j59Q1r8,2023
14
14
  photo_objects/django/api/__init__.py,sha256=BnEHlm3mwyBy-1xhk-NFasgZa4fjCDjtfkBUoH0puPY,62
15
15
  photo_objects/django/api/album.py,sha256=c5qDvy6ebIZCzggxcYgSgLBR0cco79V47nJf2OHuBj8,2486
16
16
  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
26
26
  photo_objects/django/migrations/0004_camera_setup_and_settings.py,sha256=CS5xyIHgBE2Y7-PSJ52ffRQeCzs8p899px9upomk4O8,1844
27
27
  photo_objects/django/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
28
28
  photo_objects/django/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
29
- photo_objects/django/templatetags/photo_objects_extras.py,sha256=LjqvVZpcVqdEQQ-EgC7OkEv2DqIvmfmDC-EsQNmkY7M,1205
29
+ photo_objects/django/templatetags/photo_objects_extras.py,sha256=JD6SHx3gmne5HdrwNlWOMqbGhcTfzNV9nV1bdNhlgto,1199
30
30
  photo_objects/django/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
31
31
  photo_objects/django/tests/test_album.py,sha256=qeRx_M8EvY9n_as1x8-EWtp9Ob1kOPGnUfZuUnMfDO4,13979
32
32
  photo_objects/django/tests/test_auth.py,sha256=su00EypNzGQcvxqhmOtFevZriK31pY7yD1HxpQFcUT4,3928
@@ -40,13 +40,14 @@ photo_objects/django/views/api/album.py,sha256=EZMOkxYzLSWr9wwXnd4yAO64JtXZq2k3F
40
40
  photo_objects/django/views/api/auth.py,sha256=N53csbthH0DEMFjY3fqhtLmtdL7xqzkatktywjqZ8h0,819
41
41
  photo_objects/django/views/api/photo.py,sha256=52UMP1r6TN_xfu8fHE25yOUiTa6W1F2XbgEichM8tTE,3526
42
42
  photo_objects/django/views/api/utils.py,sha256=uQzKdSKHRAux5OZzqgWQr0gsK_FeweQP0cg_67OWA_Y,264
43
- photo_objects/django/views/ui/__init__.py,sha256=vbFXPj5liue-M_CXQGP5PKhD98Z5ev53yKLPU8zWpUs,71
43
+ photo_objects/django/views/ui/__init__.py,sha256=N3ro5KggdV-JnfyHwoStX73b3SbVbpcsMuQNlxntVJs,92
44
44
  photo_objects/django/views/ui/album.py,sha256=80fkAdtXjgBqq-4e1i2slnzWD2C-m6rc02piIqYlgmI,5215
45
45
  photo_objects/django/views/ui/configuration.py,sha256=pzNRHq3FSrVCTx2R31_FW3A3aJxzEO4pDnXsOVS75uA,5576
46
- photo_objects/django/views/ui/photo.py,sha256=4NJSN5X_NcVcUEPaoGEGmXRDAgI5_KsOlHr7j-yo2QY,6040
46
+ photo_objects/django/views/ui/photo.py,sha256=fxjb47cxcT08pcYFcYIULpT4duKqK99zw5mgvKJx150,5994
47
+ photo_objects/django/views/ui/users.py,sha256=nlJyW7rhmr-ZR4LeSHMRPVmJzpiyHCEB2ry6uH2ihOc,713
47
48
  photo_objects/django/views/ui/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
48
- photo_objects-0.1.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
49
- photo_objects-0.1.0.dist-info/METADATA,sha256=o0IEDnYB7mXHUO3cT2i-yCDCkfS01DoT8OW32U4tOxU,3671
50
- photo_objects-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
51
- photo_objects-0.1.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
52
- photo_objects-0.1.0.dist-info/RECORD,,
49
+ photo_objects-0.2.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
50
+ photo_objects-0.2.0.dist-info/METADATA,sha256=qGhO3YS-Bi15OADKvnsb7QQcXfKJbbRb5sWw1SBEPsk,3671
51
+ photo_objects-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
52
+ photo_objects-0.2.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
53
+ photo_objects-0.2.0.dist-info/RECORD,,