Move MJML content to separate template file #955
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <mjml> | ||
| <mj-body> | ||
| <!-- header --> | ||
| <mj-section padding="0" full-width="" background-color="#c4cdd3"> | ||
| <mj-column padding="0"> | ||
| <mj-image src="https://orcasite.s3.us-west-2.amazonaws.com/email_assets/orcasound_email_header.jpg" alt="Orcasound" align="center" container-background-color="#c4cdd3"></mj-image> | ||
| </mj-column> | ||
| </mj-section> | ||
|
|
||
| <mj-section> | ||
| <mj-column background-color="#404040" padding="18px"> | ||
| <mj-text font-size="18px" color="#F2F2F2" font-family="Helvetica" line-height="150%"> | ||
| {{ meta["message"] }} | ||
| </mj-text> | ||
| </mj-column> | ||
| </mj-section> | ||
|
|
||
| <mj-section> | ||
| <mj-column> | ||
| <mj-image src="https://orcasite.s3.us-west-2.amazonaws.com/email_assets/orcasound_dont_miss.jpg"></mj-image> | ||
|
|
||
| <mj-button href="http://live.orcasound.net/listen/{{ node }}?utm_source=email&utm_medium=email&utm_campaign=notifications" background-color="#0F0F0F" border-radius="31px" font-size="18px" padding="18px" font-weight="bold">LISTEN NOW!</mj-button> | ||
dthaler marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| </mj-column> | ||
| </mj-section> | ||
|
|
||
| <mj-section> | ||
| <mj-column background-color="#404040"> | ||
| <mj-text color="#F2F2F2" font-size="16px" align="center" line-height="150%" font-family="Helvetica"> | ||
| If you miss the concert, <br /> watch the <a href="https://orcasound.net/blog?ecm&utm_source=email&utm_medium=email&utm_campaign=notifications" style="color: #007C89;">Orcasound blog</a> for recordings & bioacoustic analysis! | ||
| </mj-text> | ||
| </mj-column> | ||
| </mj-section> | ||
|
|
||
| <!-- footer --> | ||
| <mj-section background-color="#5d5b72" full-width=""> | ||
| <mj-column> | ||
| <mj-text font-weight="bold" font-family="Helvetica" color="#ffffff" align="center" line-height="150%"> | ||
| If you encounter whales at sea, <a href="https://www.bewhalewise.org/" style="font-weight: normal; color: #ffffff">Be Whale Wise</a>.<br /> | ||
| Know the laws and best practices in both the U.S. and Canada. | ||
| </mj-text> | ||
|
|
||
| <mj-divider border-color="#404040" border-width="1px"></mj-divider> | ||
|
|
||
| <mj-text color="#ffffff" font-size="12px" font-style="italic" align="center" line-height="150%"> | ||
| Copyright © 2023 Orcasound, All rights reserved. <br /> | ||
| You are receiving this email because you opted in via our website. | ||
| </mj-text> | ||
| <mj-text color="#ffffff" font-size="12px" align="center" line-height="150%"> | ||
| <strong>Our mailing address is:</strong><br /> | ||
| Orcasound<br /> | ||
| 7044 17th Ave NE<br /> | ||
| Seattle, WA 98115-5739 | ||
| </mj-text> | ||
| {{#if unsubscribe_token }} | ||
| <mj-text color="#ffffff" font-size="12px" align="center" line-height="150%"> | ||
| If you no longer wish to receive these emails,<br /> | ||
| you can <a href="{{ unsubscribe_url }}" style="color: #ffffff;">unsubscribe</a>. | ||
| </mj-text> | ||
| {{/if}} | ||
| </mj-column> | ||
| </mj-section> | ||
|
|
||
| </mj-body> | ||
| </mjml> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,68 @@ | ||||||||||||||
| <mjml> | ||||||||||||||
| <mj-body> | ||||||||||||||
| <mj-section> | ||||||||||||||
| <mj-column> | ||||||||||||||
|
|
||||||||||||||
| <mj-text font-size="20px" font-family="helvetica"> | ||||||||||||||
| A new detection has been submitted at {{ node_name }} ({{ node }})! | ||||||||||||||
| </mj-text> | ||||||||||||||
|
|
||||||||||||||
| <mj-text font-size="20px" font-family="helvetica"> | ||||||||||||||
| Description: {{#if meta["description"]}}{{ meta["description"] }}{{else}}(no description){{/if}} | ||||||||||||||
| </mj-text> | ||||||||||||||
| {{#if meta["listener_count"] }} | ||||||||||||||
| <mj-text font-size="20px" font-family="helvetica"> | ||||||||||||||
| Listeners: {{ meta["listener_count"] }} | ||||||||||||||
| </mj-text> | ||||||||||||||
| {{/if}} | ||||||||||||||
| {{#if meta["candidate_id"] }} | ||||||||||||||
| <mj-text font-size="20px" font-family="helvetica"> | ||||||||||||||
| Review here: <a href="https://live.orcasound.net/reports/{{meta["candidate_id"]}}?utm_source=email&utm_medium=email&utm_campaign=notifications">{{ meta["candidate_id"] }}</a> | ||||||||||||||
| </mj-text> | ||||||||||||||
| {{/if}} | ||||||||||||||
| {{#if node && meta["start_time"] && meta["category"] }} | ||||||||||||||
| <mj-text font-size="20px" font-family="helvetica"> | ||||||||||||||
| <a href="https://live.orcasound.net/bouts/new/{{ node }}?time={{ meta["start_time"] }}&category={{ meta["category"] }}&utm_source=email&utm_medium=email&utm_campaign=notifications">Start a new bout</a> | ||||||||||||||
| </mj-text> | ||||||||||||||
| {{/if}} | ||||||||||||||
|
|
||||||||||||||
| {{#if notifications_since_count > 0}} | ||||||||||||||
| <mj-text font-size="20px" font-family="helvetica"> | ||||||||||||||
| There have been {{ notifications_since_count }} other detections since the last notification. | ||||||||||||||
| </mj-text> | ||||||||||||||
| <mj-table> | ||||||||||||||
| <tr style="border-bottom:1px solid #ecedee;text-align:left;padding:15px 0;"> | ||||||||||||||
| <th style="padding: 0 5px 0 0;">Feed</th> | ||||||||||||||
| <th style="padding: 0 15px; text-align: right;">#</th> | ||||||||||||||
| <th style="padding: 0 0 0 15px;">Description</th> | ||||||||||||||
| <th style="padding: 0 0 0 15px;">Action</th> | ||||||||||||||
| </tr> | ||||||||||||||
| {{#each notifications_since as |notif_meta|}} | ||||||||||||||
| <tr> | ||||||||||||||
| <td style="padding: 0 5px 0 0;white-space:nowrap;">{{ notif_meta["node"] }}</td> | ||||||||||||||
| <td style="padding: 0 15px;text-align:right;">{{ notif_meta["listener_count"] }}</td> | ||||||||||||||
| <td style="padding: 0 0 0 15px;">{{ notif_meta["description"] }}</td> | ||||||||||||||
| <td style="padding: 0 0 0 15px;"> | ||||||||||||||
| {{#if notif_meta["candidate_id"] }} | ||||||||||||||
| <a href="https://live.orcasound.net/reports/{{meta["candidate_id"]}}?utm_source=email&utm_medium=email&utm_campaign=notifications">Review</a> | ||||||||||||||
|
There was a problem hiding this comment. The variable reference is incorrect. It should use
Suggested change
|
||||||||||||||
| {{/if}} | ||||||||||||||
|
Comment on lines
+46
to
+48
Contributor
There was a problem hiding this comment. Wrong variable in Review link inside the loop. Links will point to the outer - <a href="https://live.orcasound.net/reports/{{meta["candidate_id"]}}?utm_source=email&utm_medium=email&utm_campaign=notifications">Review</a>
+ <a href="https://live.orcasound.net/reports/{{notif_meta["candidate_id"]}}?utm_source=email&utm_medium=email&utm_campaign=notifications">Review</a>📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||
| </td> | ||||||||||||||
| </tr> | ||||||||||||||
| {{/each}} | ||||||||||||||
| </mj-table> | ||||||||||||||
| {{/if}} | ||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
| <mj-text font-size="20px"> | ||||||||||||||
| Listen here: <a href="https://live.orcasound.net/listen/{{node}}?utm_source=email&utm_medium=email&utm_campaign=notifications">https://live.orcasound.net/listen/{{ node }}</a> | ||||||||||||||
| </mj-text> | ||||||||||||||
|
|
||||||||||||||
| {{#if unsubscribe_token }} | ||||||||||||||
| <mj-text font-size="20px"> | ||||||||||||||
| If you no longer wish to receive these emails, you can <a href="{{unsubscribe_url}}">unsubscribe</a>. | ||||||||||||||
| </mj-text> | ||||||||||||||
| {{/if}} | ||||||||||||||
| </mj-column> | ||||||||||||||
| </mj-section> | ||||||||||||||
| </mj-body> | ||||||||||||||
| </mjml> | ||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| defmodule Orcasite.Notifications.EmailTemplateTest do | ||
| use ExUnit.Case | ||
|
|
||
| describe "email templates" do | ||
| test "new_detection template exists and is readable" do | ||
| template_path = Path.expand("lib/orcasite/notifications/templates/new_detection.mjml.eex") | ||
| assert File.exists?(template_path), "new_detection template file should exist" | ||
|
|
||
| {:ok, content} = File.read(template_path) | ||
| assert String.length(content) > 0, "template should not be empty" | ||
| assert String.contains?(content, "<mjml>"), "template should contain MJML structure" | ||
| assert String.contains?(content, "A new detection has been submitted"), "template should contain expected content" | ||
| end | ||
|
|
||
| test "confirmed_candidate template exists and is readable" do | ||
| template_path = Path.expand("lib/orcasite/notifications/templates/confirmed_candidate.mjml.eex") | ||
| assert File.exists?(template_path), "confirmed_candidate template file should exist" | ||
|
|
||
| {:ok, content} = File.read(template_path) | ||
| assert String.length(content) > 0, "template should not be empty" | ||
| assert String.contains?(content, "<mjml>"), "template should contain MJML structure" | ||
| assert String.contains?(content, "LISTEN NOW!"), "template should contain expected content" | ||
| end | ||
|
|
||
| test "templates contain required variables" do | ||
| # Test new_detection template variables | ||
| {:ok, new_detection_content} = File.read(Path.expand("lib/orcasite/notifications/templates/new_detection.mjml.eex")) | ||
| assert String.contains?(new_detection_content, "{{ node_name }}"), "should contain node_name variable" | ||
| assert String.contains?(new_detection_content, "{{ node }}"), "should contain node variable" | ||
| assert String.contains?(new_detection_content, "meta[\"description\"]"), "should contain description variable" | ||
| assert String.contains?(new_detection_content, "{{unsubscribe_url}}"), "should contain unsubscribe_url variable" | ||
|
|
||
| # Test confirmed_candidate template variables | ||
| {:ok, confirmed_candidate_content} = File.read(Path.expand("lib/orcasite/notifications/templates/confirmed_candidate.mjml.eex")) | ||
| assert String.contains?(confirmed_candidate_content, "{{ node }}"), "should contain node variable" | ||
| assert String.contains?(confirmed_candidate_content, "meta[\"message\"]"), "should contain message variable" | ||
| assert String.contains?(confirmed_candidate_content, "{{ unsubscribe_url }}"), "should contain unsubscribe_url variable" | ||
| end | ||
| end | ||
| end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make template path robust to CWD/release layout.
Hardcoding "lib/..." depends on process CWD. Resolve relative to this module instead.
📝 Committable suggestion
🤖 Prompt for AI Agents