From b534695ba970d8b7fee81956ae504b8aafc2deaa Mon Sep 17 00:00:00 2001 From: gzbender Date: Tue, 9 Jul 2019 15:35:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=D0=B8=D1=81=D1=8C=20=D0=B3=D1=80=D0=B0=D0=BC?= =?UTF-8?q?=D0=BE=D1=82=D1=8B=20=D0=B7=D0=B0=20=D1=80=D0=B8=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BB=D0=B0=D0=B3?= =?UTF-8?q?=D0=B5=D1=80=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/notification/tasks.py | 10 +++++----- project/settings.py | 2 ++ {web/src/img => resources}/camp-certificates/1.jpg | Bin {web/src/img => resources}/camp-certificates/2.jpg | Bin {web/src/img => resources}/camp-certificates/3.jpg | Bin .../signed-camp-certificates/1.jpg | Bin .../signed-camp-certificates/2.jpg | Bin .../signed-camp-certificates/3.jpg | Bin web/src/sass/_common.sass | 1 + 9 files changed, 8 insertions(+), 5 deletions(-) rename {web/src/img => resources}/camp-certificates/1.jpg (100%) rename {web/src/img => resources}/camp-certificates/2.jpg (100%) rename {web/src/img => resources}/camp-certificates/3.jpg (100%) rename {web/src/img => resources}/signed-camp-certificates/1.jpg (100%) rename {web/src/img => resources}/signed-camp-certificates/2.jpg (100%) rename {web/src/img => resources}/signed-camp-certificates/3.jpg (100%) diff --git a/apps/notification/tasks.py b/apps/notification/tasks.py index 3c0c6774..72a02db1 100644 --- a/apps/notification/tasks.py +++ b/apps/notification/tasks.py @@ -179,8 +179,8 @@ def send_child_birthday_email_and_bonuses(): @app.task def send_camp_certificates(email=None, dry_run=False, certificate_number=None): - path_pattern = 'img/camp-certificates/%d.jpg' - signed_path_pattern = 'img/signed-camp-certificates/%d.jpg' + path_pattern = 'camp-certificates/%d.jpg' + signed_path_pattern = 'signed-camp-certificates/%d.jpg' color = (0, 27, 94) if certificate_number is None: certificate_number = 1 @@ -189,7 +189,7 @@ def send_camp_certificates(email=None, dry_run=False, certificate_number=None): if certificate_number == 3: color = (24, 57, 220) if email: - fn = draw_cert(staticfiles_storage.path(signed_path_pattern % certificate_number), email, 'Имя', 'Фамилия', + fn = draw_cert(os.path.join(settings.RESOURCES_ROOT, signed_path_pattern % certificate_number), email, 'Имя', 'Фамилия', font_size=120, y=1000, color=color) file = open(fn, 'rb') try: @@ -221,12 +221,12 @@ def send_camp_certificates(email=None, dry_run=False, certificate_number=None): file_names = [] if un.user.child_filled: - fn = staticfiles_storage.path(signed_path_pattern % certificate_number) + fn = os.path.join(settings.RESOURCES_ROOT, signed_path_pattern % certificate_number) for child in un.user.childs.all(): file_names.append(draw_cert(fn, un.user.email, child.first_name, child.last_name, font_size=120, y=1000, color=color)) else: - file_names.append(staticfiles_storage.path(path_pattern % certificate_number)) + file_names.append(os.path.join(settings.RESOURCES_ROOT, path_pattern % certificate_number)) files = [open(fn, 'rb') for fn in file_names] try: send_email('Грамота от Lil School', un.user.email, 'notification/email/camp_certificate.html', diff --git a/project/settings.py b/project/settings.py index 7cb935b1..0cfc970e 100644 --- a/project/settings.py +++ b/project/settings.py @@ -182,6 +182,8 @@ STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesSto MEDIA_URL = '/media/' MEDIA_ROOT = os.path.join(BASE_DIR, 'media') +RESOURCES_ROOT = os.path.join(BASE_DIR, 'resources') + LOGIN_URL = '/' # Email # https://github.com/anymail/django-anymail diff --git a/web/src/img/camp-certificates/1.jpg b/resources/camp-certificates/1.jpg similarity index 100% rename from web/src/img/camp-certificates/1.jpg rename to resources/camp-certificates/1.jpg diff --git a/web/src/img/camp-certificates/2.jpg b/resources/camp-certificates/2.jpg similarity index 100% rename from web/src/img/camp-certificates/2.jpg rename to resources/camp-certificates/2.jpg diff --git a/web/src/img/camp-certificates/3.jpg b/resources/camp-certificates/3.jpg similarity index 100% rename from web/src/img/camp-certificates/3.jpg rename to resources/camp-certificates/3.jpg diff --git a/web/src/img/signed-camp-certificates/1.jpg b/resources/signed-camp-certificates/1.jpg similarity index 100% rename from web/src/img/signed-camp-certificates/1.jpg rename to resources/signed-camp-certificates/1.jpg diff --git a/web/src/img/signed-camp-certificates/2.jpg b/resources/signed-camp-certificates/2.jpg similarity index 100% rename from web/src/img/signed-camp-certificates/2.jpg rename to resources/signed-camp-certificates/2.jpg diff --git a/web/src/img/signed-camp-certificates/3.jpg b/resources/signed-camp-certificates/3.jpg similarity index 100% rename from web/src/img/signed-camp-certificates/3.jpg rename to resources/signed-camp-certificates/3.jpg diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 94f49c79..f5433351 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -2975,6 +2975,7 @@ a.grey-link fill: #000000 &__toggle margin-top: 10px + margin-left: 10px display: inline-block &--heart &__content