darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 05:29:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update emails to use logos cdn

Browse Source
This commit is contained in:
Ken Tsang
2017-07-24 15:20:40 +01:00
parent 220d2fd9fb
commit 6e1bcb8405
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/__init__.py
View File

@@ -55,8 +55,11 @@ from app.notify_client.organisations_client import OrganisationsClient
from app.notify_client.models import AnonymousUser
from app.notify_client.letter_jobs_client import LetterJobsClient
from app.utils import get_cdn_domain
<<<<<<< HEAD
from app.utils import gmt_timezones
=======
>>>>>>> Update emails to use logos cdn
login_manager = LoginManager()
csrf = CSRFProtect()

8
app/config.py
View File

@@ -87,6 +87,8 @@ class Config(object):
r"cqc\.org\.uk",
]
LOGO_UPLOAD_BUCKET_NAME = 'local-notifications-logo-upload'
class Development(Config):
DEBUG = True
@@ -94,6 +96,7 @@ class Development(Config):
SESSION_PROTECTION = None
STATSD_ENABLED = False
CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'development-notifications-logo-upload'
class Test(Development):
@@ -102,6 +105,7 @@ class Test(Development):
STATSD_ENABLED = True
WTF_CSRF_ENABLED = False
CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'test-notifications-logo-upload'
NOTIFY_ENVIRONMENT = 'test'
TEMPLATE_PREVIEW_API_HOST = 'http://localhost:9999'
@@ -111,6 +115,7 @@ class Preview(Config):
HEADER_COLOUR = '#F499BE' # $baby-pink
STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'preview-notifications-logo-upload'
NOTIFY_ENVIRONMENT = 'preview'
@@ -120,6 +125,7 @@ class Staging(Config):
HEADER_COLOUR = '#6F72AF' # $mauve
STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'staging-notifications-logo-upload'
NOTIFY_ENVIRONMENT = 'staging'
@@ -129,6 +135,7 @@ class Live(Config):
HTTP_PROTOCOL = 'https'
STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'live-notifications-logo-upload'
NOTIFY_ENVIRONMENT = 'live'
@@ -142,6 +149,7 @@ class Sandbox(CloudFoundryConfig):
HEADER_COLOUR = '#F499BE' # $baby-pink
STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'cf-sandbox-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'cf-sandbox-notifications-logo-upload'
NOTIFY_ENVIRONMENT = 'sandbox'

10
app/utils.py
View File

@@ -1,14 +1,21 @@
import re
import csv
<<<<<<< HEAD
import pytz
=======
from datetime import datetime, timedelta, timezone
>>>>>>> Update emails to use logos cdn
from io import StringIO
from os import path
from functools import wraps
import unicodedata
from urllib.parse import urlparse
<<<<<<< HEAD
from collections import namedtuple
from datetime import datetime, timedelta, timezone
from dateutil import parser
=======
>>>>>>> Update emails to use logos cdn
import dateutil
import ago
@@ -330,6 +337,7 @@ def email_or_sms_not_enabled(template_type, permissions):
return (template_type in ['email', 'sms']) and (template_type not in permissions)
<<<<<<< HEAD
def get_letter_timings(upload_time):
LetterTimings = namedtuple(
@@ -367,6 +375,8 @@ def gmt_timezones(date):
return forced_utc.astimezone(pytz.timezone('Europe/London'))
=======
>>>>>>> Update emails to use logos cdn
def get_cdn_domain():
parsed_uri = urlparse(current_app.config['ADMIN_BASE_URL'])