From 9dd7698636a6b005418d86223054e1ebd1ddfe0d Mon Sep 17 00:00:00 2001 From: Son NK Date: Sun, 2 Feb 2020 21:49:22 +0700 Subject: [PATCH] organize emails into transactional/ and com/ --- app/email_utils.py | 40 +++++++++---------- templates/emails/{ => com}/new-app.html | 0 templates/emails/{ => com}/new-app.txt | 0 templates/emails/{ => com}/welcome.html | 0 templates/emails/{ => com}/welcome.txt | 0 .../{ => transactional}/activation.html | 0 .../emails/{ => transactional}/activation.txt | 0 .../cannot-create-alias-directory.html | 0 .../cannot-create-alias-directory.txt | 0 .../cannot-create-alias-domain.html | 0 .../cannot-create-alias-domain.txt | 0 .../{ => transactional}/change-email.html | 0 .../{ => transactional}/change-email.txt | 0 .../reply-must-use-personal-email.html | 0 .../reply-must-use-personal-email.txt | 0 .../{ => transactional}/reset-password.html | 0 .../{ => transactional}/reset-password.txt | 0 .../{ => transactional}/test-email.html | 0 .../emails/{ => transactional}/test-email.txt | 0 .../emails/{ => transactional}/trial-end.html | 0 .../emails/{ => transactional}/trial-end.txt | 0 21 files changed, 20 insertions(+), 20 deletions(-) rename templates/emails/{ => com}/new-app.html (100%) rename templates/emails/{ => com}/new-app.txt (100%) rename templates/emails/{ => com}/welcome.html (100%) rename templates/emails/{ => com}/welcome.txt (100%) rename templates/emails/{ => transactional}/activation.html (100%) rename templates/emails/{ => transactional}/activation.txt (100%) rename templates/emails/{ => transactional}/cannot-create-alias-directory.html (100%) rename templates/emails/{ => transactional}/cannot-create-alias-directory.txt (100%) rename templates/emails/{ => transactional}/cannot-create-alias-domain.html (100%) rename templates/emails/{ => transactional}/cannot-create-alias-domain.txt (100%) rename templates/emails/{ => transactional}/change-email.html (100%) rename templates/emails/{ => transactional}/change-email.txt (100%) rename templates/emails/{ => transactional}/reply-must-use-personal-email.html (100%) rename templates/emails/{ => transactional}/reply-must-use-personal-email.txt (100%) rename templates/emails/{ => transactional}/reset-password.html (100%) rename templates/emails/{ => transactional}/reset-password.txt (100%) rename templates/emails/{ => transactional}/test-email.html (100%) rename templates/emails/{ => transactional}/test-email.txt (100%) rename templates/emails/{ => transactional}/trial-end.html (100%) rename templates/emails/{ => transactional}/trial-end.txt (100%) diff --git a/app/email_utils.py b/app/email_utils.py index c6c8fcc4..0bb88150 100644 --- a/app/email_utils.py +++ b/app/email_utils.py @@ -33,8 +33,8 @@ def send_welcome_email(user): send_email( user.email, f"Welcome to SimpleLogin {user.name}", - _render("welcome.txt", name=user.name, user=user), - _render("welcome.html", name=user.name, user=user), + _render("com/welcome.txt", name=user.name, user=user), + _render("com/welcome.html", name=user.name, user=user), ) @@ -42,8 +42,8 @@ def send_trial_end_soon_email(user): send_email( user.email, f"Your trial will end soon {user.name}", - _render("trial-end.txt", name=user.name, user=user), - _render("trial-end.html", name=user.name, user=user), + _render("transactional/trial-end.txt", name=user.name, user=user), + _render("transactional/trial-end.html", name=user.name, user=user), ) @@ -52,10 +52,10 @@ def send_activation_email(email, name, activation_link): email, f"Just one more step to join SimpleLogin {name}", _render( - "activation.txt", name=name, activation_link=activation_link, email=email + "transactional/activation.txt", name=name, activation_link=activation_link, email=email ), _render( - "activation.html", name=name, activation_link=activation_link, email=email + "transactional/activation.html", name=name, activation_link=activation_link, email=email ), ) @@ -65,10 +65,10 @@ def send_reset_password_email(email, name, reset_password_link): email, f"Reset your password on SimpleLogin", _render( - "reset-password.txt", name=name, reset_password_link=reset_password_link + "transactional/reset-password.txt", name=name, reset_password_link=reset_password_link ), _render( - "reset-password.html", name=name, reset_password_link=reset_password_link + "transactional/reset-password.html", name=name, reset_password_link=reset_password_link ), ) @@ -78,14 +78,14 @@ def send_change_email(new_email, current_email, name, link): new_email, f"Confirm email update on SimpleLogin", _render( - "change-email.txt", + "transactional/change-email.txt", name=name, link=link, new_email=new_email, current_email=current_email, ), _render( - "change-email.html", + "transactional/change-email.html", name=name, link=link, new_email=new_email, @@ -98,8 +98,8 @@ def send_new_app_email(email, name): send_email( email, f"Any question/feedback for SimpleLogin {name}?", - _render("new-app.txt", name=name), - _render("new-app.html", name=name), + _render("com/new-app.txt", name=name), + _render("com/new-app.html", name=name), ) @@ -107,8 +107,8 @@ def send_test_email_alias(email, name): send_email( email, f"This email is sent to {email}", - _render("test-email.txt", name=name, alias=email), - _render("test-email.html", name=name, alias=email), + _render("transactional/test-email.txt", name=name, alias=email), + _render("transactional/test-email.html", name=name, alias=email), ) @@ -120,13 +120,13 @@ def send_cannot_create_directory_alias(user, alias, directory): user.email, f"Alias {alias} cannot be created", _render( - "cannot-create-alias-directory.txt", + "transactional/cannot-create-alias-directory.txt", name=user.name, alias=alias, directory=directory, ), _render( - "cannot-create-alias-directory.html", + "transactional/cannot-create-alias-directory.html", name=user.name, alias=alias, directory=directory, @@ -142,10 +142,10 @@ def send_cannot_create_domain_alias(user, alias, domain): user.email, f"Alias {alias} cannot be created", _render( - "cannot-create-alias-domain.txt", name=user.name, alias=alias, domain=domain + "transactional/cannot-create-alias-domain.txt", name=user.name, alias=alias, domain=domain ), _render( - "cannot-create-alias-domain.html", + "transactional/cannot-create-alias-domain.html", name=user.name, alias=alias, domain=domain, @@ -162,14 +162,14 @@ def send_reply_alias_must_use_personal_email(user, alias, sender): user.email, f"Reply from your alias {alias} only works with your personal email", _render( - "reply-must-use-personal-email.txt", + "transactional/reply-must-use-personal-email.txt", name=user.name, alias=alias, sender=sender, user_email=user.email, ), _render( - "reply-must-use-personal-email.html", + "transactional/reply-must-use-personal-email.html", name=user.name, alias=alias, sender=sender, diff --git a/templates/emails/new-app.html b/templates/emails/com/new-app.html similarity index 100% rename from templates/emails/new-app.html rename to templates/emails/com/new-app.html diff --git a/templates/emails/new-app.txt b/templates/emails/com/new-app.txt similarity index 100% rename from templates/emails/new-app.txt rename to templates/emails/com/new-app.txt diff --git a/templates/emails/welcome.html b/templates/emails/com/welcome.html similarity index 100% rename from templates/emails/welcome.html rename to templates/emails/com/welcome.html diff --git a/templates/emails/welcome.txt b/templates/emails/com/welcome.txt similarity index 100% rename from templates/emails/welcome.txt rename to templates/emails/com/welcome.txt diff --git a/templates/emails/activation.html b/templates/emails/transactional/activation.html similarity index 100% rename from templates/emails/activation.html rename to templates/emails/transactional/activation.html diff --git a/templates/emails/activation.txt b/templates/emails/transactional/activation.txt similarity index 100% rename from templates/emails/activation.txt rename to templates/emails/transactional/activation.txt diff --git a/templates/emails/cannot-create-alias-directory.html b/templates/emails/transactional/cannot-create-alias-directory.html similarity index 100% rename from templates/emails/cannot-create-alias-directory.html rename to templates/emails/transactional/cannot-create-alias-directory.html diff --git a/templates/emails/cannot-create-alias-directory.txt b/templates/emails/transactional/cannot-create-alias-directory.txt similarity index 100% rename from templates/emails/cannot-create-alias-directory.txt rename to templates/emails/transactional/cannot-create-alias-directory.txt diff --git a/templates/emails/cannot-create-alias-domain.html b/templates/emails/transactional/cannot-create-alias-domain.html similarity index 100% rename from templates/emails/cannot-create-alias-domain.html rename to templates/emails/transactional/cannot-create-alias-domain.html diff --git a/templates/emails/cannot-create-alias-domain.txt b/templates/emails/transactional/cannot-create-alias-domain.txt similarity index 100% rename from templates/emails/cannot-create-alias-domain.txt rename to templates/emails/transactional/cannot-create-alias-domain.txt diff --git a/templates/emails/change-email.html b/templates/emails/transactional/change-email.html similarity index 100% rename from templates/emails/change-email.html rename to templates/emails/transactional/change-email.html diff --git a/templates/emails/change-email.txt b/templates/emails/transactional/change-email.txt similarity index 100% rename from templates/emails/change-email.txt rename to templates/emails/transactional/change-email.txt diff --git a/templates/emails/reply-must-use-personal-email.html b/templates/emails/transactional/reply-must-use-personal-email.html similarity index 100% rename from templates/emails/reply-must-use-personal-email.html rename to templates/emails/transactional/reply-must-use-personal-email.html diff --git a/templates/emails/reply-must-use-personal-email.txt b/templates/emails/transactional/reply-must-use-personal-email.txt similarity index 100% rename from templates/emails/reply-must-use-personal-email.txt rename to templates/emails/transactional/reply-must-use-personal-email.txt diff --git a/templates/emails/reset-password.html b/templates/emails/transactional/reset-password.html similarity index 100% rename from templates/emails/reset-password.html rename to templates/emails/transactional/reset-password.html diff --git a/templates/emails/reset-password.txt b/templates/emails/transactional/reset-password.txt similarity index 100% rename from templates/emails/reset-password.txt rename to templates/emails/transactional/reset-password.txt diff --git a/templates/emails/test-email.html b/templates/emails/transactional/test-email.html similarity index 100% rename from templates/emails/test-email.html rename to templates/emails/transactional/test-email.html diff --git a/templates/emails/test-email.txt b/templates/emails/transactional/test-email.txt similarity index 100% rename from templates/emails/test-email.txt rename to templates/emails/transactional/test-email.txt diff --git a/templates/emails/trial-end.html b/templates/emails/transactional/trial-end.html similarity index 100% rename from templates/emails/trial-end.html rename to templates/emails/transactional/trial-end.html diff --git a/templates/emails/trial-end.txt b/templates/emails/transactional/trial-end.txt similarity index 100% rename from templates/emails/trial-end.txt rename to templates/emails/transactional/trial-end.txt