Simplify templated e-mails folder structure

lysomuch · Feb 6, 2018 · 6f268e6 · 6f268e6
1 parent 1d652a0
commit 6f268e6
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,4 @@ dist/
 /static/
 /saleor/static/assets/
 webpack-bundle.json
-/templates/templated_email/html/compiled/
+/templates/templated_email/compiled/
diff --git a/package.json b/package.json
@@ -90,6 +90,6 @@
     "build-assets": "node ./node_modules/webpack/bin/webpack.js -p --progress",
     "heroku-postbuild": "npm run build-assets",
     "start": "UV_THREADPOOL_SIZE=8 node ./node_modules/webpack/bin/webpack.js -d --watch --progress",
-    "build-emails": "mkdir -p templates/templated_email/html/compiled/ && find templates -name \"*.mjml\" -not -path \"templates/templated_email/html/source/*partials/*\" -not -path \"templates/templated_email/html/source/*shared/*\" -exec ./node_modules/.bin/mjml -l skip {} -o templates/templated_email/html/compiled/ \\;"
+    "build-emails": "mkdir -p templates/templated_email/compiled/ && find templates -name \"*.mjml\" -not -path \"templates/templated_email/source/*partials/*\" -not -path \"templates/templated_email/source/*shared/*\" -exec ./node_modules/.bin/mjml -l skip {} -o templates/templated_email/compiled/ \\;"
   }
 }
diff --git a/saleor/dashboard/emails.py b/saleor/dashboard/emails.py
@@ -20,7 +20,7 @@ def send_set_password_email(staff):
         'uid': urlsafe_base64_encode(force_bytes(staff.pk)).decode(),
         'token': default_token_generator.make_token(staff)}
     send_templated_mail(
-        template_name='dashboard/staff/set_password',
+        template_name='source/dashboard/staff/set_password',
         from_email=settings.DEFAULT_FROM_EMAIL,
         recipient_list=[staff.email],
         context=ctx)
@@ -35,7 +35,7 @@ def send_promote_customer_to_staff_email(staff):
         'url': build_absolute_uri(reverse('dashboard:index')),
         'site_name': site.name}
     send_templated_mail(
-        template_name='dashboard/staff/promote_customer',
+        template_name='source/dashboard/staff/promote_customer',
         from_email=settings.DEFAULT_FROM_EMAIL,
         recipient_list=[staff.email],
         context=ctx)
diff --git a/saleor/order/emails.py b/saleor/order/emails.py
@@ -3,9 +3,9 @@
 from django.contrib.sites.models import Site
 from templated_email import send_templated_mail
 
-CONFIRM_ORDER_TEMPLATE = 'order/confirm_order'
-CONFIRM_PAYMENT_TEMPLATE = 'order/payment/confirm_payment'
-CONFIRM_NOTE_TEMPLATE = 'order/note/confirm_note'
+CONFIRM_ORDER_TEMPLATE = 'source/order/confirm_order'
+CONFIRM_PAYMENT_TEMPLATE = 'source/order/payment/confirm_payment'
+CONFIRM_NOTE_TEMPLATE = 'source/order/note/confirm_note'
 
 
 def _send_confirmation(email, url, template, context=None):

diff --git a/saleor/registration/emails.py b/saleor/registration/emails.py
@@ -14,7 +14,7 @@ def send_password_reset_email(context, recipient):
             kwargs={'uidb64': context['uid'], 'token': context['token']}))
     context['reset_url'] = reset_url
     send_templated_mail(
-        template_name='account/password_reset',
+        template_name='source/account/password_reset',
         from_email=settings.DEFAULT_FROM_EMAIL,
         recipient_list=[recipient],
         context=context)
diff --git a/...plated_email/account/password_reset.email → ...email/source/account/password_reset.email b/...plated_email/account/password_reset.email → ...email/source/account/password_reset.email
@@ -23,5 +23,5 @@ Sincerely,
 {% endblock %}
 
 {% block html %}
-{% include 'templated_email/html/compiled/password_reset.html' %}
+{% include 'templated_email/compiled/password_reset.html' %}
 {% endblock %}
diff --git a/...l/html/source/account/password_reset.mjml → ..._email/source/account/password_reset.mjml b/...l/html/source/account/password_reset.mjml → ..._email/source/account/password_reset.mjml
diff --git a/...il/dashboard/staff/promote_customer.email → ...ce/dashboard/staff/promote_customer.email b/...il/dashboard/staff/promote_customer.email → ...ce/dashboard/staff/promote_customer.email
@@ -13,5 +13,5 @@ This is an automatically generated email, please do not reply.
 {% endblock %}
 
 {% block html %}
-{% include 'templated_email/html/compiled/promote_customer.html' %}
+{% include 'templated_email/compiled/promote_customer.html' %}
 {% endblock %}
diff --git a/...rce/dashboard/staff/promote_customer.mjml → ...rce/dashboard/staff/promote_customer.mjml b/...rce/dashboard/staff/promote_customer.mjml → ...rce/dashboard/staff/promote_customer.mjml
diff --git a/..._email/dashboard/staff/set_password.email → ...source/dashboard/staff/set_password.email b/..._email/dashboard/staff/set_password.email → ...source/dashboard/staff/set_password.email
@@ -17,5 +17,5 @@ This is an automatically generated email, please do not reply.
 {% endblock %}
 
 {% block html %}
-{% include 'templated_email/html/compiled/set_password.html' %}
+{% include 'templated_email/compiled/set_password.html' %}
 {% endblock %}
diff --git a/.../source/dashboard/staff/set_password.mjml → .../source/dashboard/staff/set_password.mjml b/.../source/dashboard/staff/set_password.mjml → .../source/dashboard/staff/set_password.mjml
diff --git a/...templated_email/order/confirm_order.email → ...ed_email/source/order/confirm_order.email b/...templated_email/order/confirm_order.email → ...ed_email/source/order/confirm_order.email
@@ -34,5 +34,5 @@ Sincerely,
 {% endblock %}
 
 {% block html %}
-{% include 'templated_email/html/compiled/confirm_order.html' %}
+{% include 'templated_email/compiled/confirm_order.html' %}
 {% endblock %}
diff --git a/...mail/html/source/order/confirm_order.mjml → ...ted_email/source/order/confirm_order.mjml b/...mail/html/source/order/confirm_order.mjml → ...ted_email/source/order/confirm_order.mjml
diff --git a/...lated_email/order/note/confirm_note.email → ...mail/source/order/note/confirm_note.email b/...lated_email/order/note/confirm_note.email → ...mail/source/order/note/confirm_note.email
@@ -19,5 +19,5 @@ Sincerely,
 {% endblock %}
 
 {% block html %}
-{% include 'templated_email/html/compiled/confirm_note.html' %}
+{% include 'templated_email/compiled/confirm_note.html' %}
 {% endblock %}
diff --git a/.../html/source/order/note/confirm_note.mjml → ...email/source/order/note/confirm_note.mjml b/.../html/source/order/note/confirm_note.mjml → ...email/source/order/note/confirm_note.mjml
diff --git a/...l/source/order/partials/_order_lines.mjml → ...l/source/order/partials/_order_lines.mjml b/...l/source/order/partials/_order_lines.mjml → ...l/source/order/partials/_order_lines.mjml
diff --git a/...email/order/payment/confirm_payment.email → ...ource/order/payment/confirm_payment.email b/...email/order/payment/confirm_payment.email → ...ource/order/payment/confirm_payment.email
@@ -19,5 +19,5 @@ Sincerely,
 {% endblock %}
 
 {% block html %}
-{% include 'templated_email/html/compiled/confirm_payment.html' %}
+{% include 'templated_email/compiled/confirm_payment.html' %}
 {% endblock %}
diff --git a/...source/order/payment/confirm_payment.mjml → ...source/order/payment/confirm_payment.mjml b/...source/order/payment/confirm_payment.mjml → ...source/order/payment/confirm_payment.mjml
diff --git a/...ated_email/html/source/shared/footer.mjml → ...templated_email/source/shared/footer.mjml b/...ated_email/html/source/shared/footer.mjml → ...templated_email/source/shared/footer.mjml
diff --git a/...ated_email/html/source/shared/header.mjml → ...templated_email/source/shared/header.mjml b/...ated_email/html/source/shared/header.mjml → ...templated_email/source/shared/header.mjml
diff --git a/...ated_email/html/source/shared/styles.mjml → ...templated_email/source/shared/styles.mjml b/...ated_email/html/source/shared/styles.mjml → ...templated_email/source/shared/styles.mjml
diff --git a/tests/dashboard/test_staff.py b/tests/dashboard/test_staff.py
@@ -97,7 +97,7 @@ def test_send_set_password_email(staff_user):
         'uid': urlsafe_base64_encode(force_bytes(staff_user.pk)).decode(),
         'token': default_token_generator.make_token(staff_user)}
     send_templated_mail(
-        template_name='dashboard/staff/set_password',
+        template_name='source/dashboard/staff/set_password',
         from_email=DEFAULT_FROM_EMAIL,
         recipient_list=[staff_user.email],
         context=ctx)