Skip to content

Commit

Permalink
Merge pull request #291 from alkem-io/develop
Browse files Browse the repository at this point in the history
Release: Email improvements
  • Loading branch information
hero101 authored Mar 1, 2024
2 parents f33d3b6 + 2837a3c commit ee703d1
Show file tree
Hide file tree
Showing 16 changed files with 51 additions and 53 deletions.
18 changes: 9 additions & 9 deletions service/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alkemio-notifications",
"version": "0.15.1",
"version": "0.15.3",
"description": "Alkemio notifications service",
"author": "Alkemio Foundation",
"private": false,
Expand Down Expand Up @@ -35,7 +35,7 @@
"validate-connection": "ts-node src/utils/validate-connection.ts"
},
"dependencies": {
"@alkemio/client-lib": "^0.25.0",
"@alkemio/client-lib": "^0.27.0",
"@alkemio/notifications-lib": "^0.6.0",
"@nestjs/common": "^8.0.5",
"@nestjs/config": "^1.0.1",
Expand Down
3 changes: 3 additions & 0 deletions service/src/templates/_layouts/email-transactional.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
text-align: center;
white-space: pre-line;
}
.content pre {
font-family: inherit;
}
.action-button {
background-color: #065f6b;
border: none;
Expand Down
3 changes: 1 addition & 2 deletions service/src/templates/comment.reply.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ module.exports = () => ({
<b><a href={{reply.createdByUrl}}>{{reply.createdBy}}</a></b> replied to your comment on "<a style="color:#065F6B; text-decoration: none;" href={{comment.commentUrl}}>{{comment.commentOrigin}}</a>":
<br><br>
<i>"{{reply.message}}"</i>
<pre><i>"{{reply.message}}"</i></pre>
<br><br>
<a class="action-button" href="{{comment.commentUrl}}">HAVE A LOOK!</a><br><br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ module.exports = () => ({
{% block content %}Hi {{recipient.firstName}},<br><br>
<b>{{commentSender.displayName}}</b> mentioned '{{mentionedOrganization.displayName}}' in a comment on <a style="color:#065F6B; text-decoration: none;" href={{commentOrigin.url}}>'{{commentOrigin.displayName}}'</a>:
<br><br>
<i>{{comment}}</i>
<br><br>
<br>
<pre><i>{{comment}}</i></pre>
<br>
<a class="action-button" href="{{commentOrigin.url}}">HAVE A LOOK!</a><br><br>
{% endblock %}
Expand Down
6 changes: 3 additions & 3 deletions service/src/templates/communication.comment.mention.user.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ module.exports = () => ({
{% block content %}Hi {{recipient.firstName}},<br><br>
<b>{{commentSender.displayName}}</b> mentioned you in a comment on <a style="color:#065F6B; text-decoration: none;" href={{commentOrigin.url}}>"{{commentOrigin.displayName}}"</a>:
<br><br>
<i>{{comment}}</i>
<br><br>
<br>
<pre><i>{{comment}}</i></pre>
<br>
<a class="action-button" href="{{commentOrigin.url}}">HAVE A LOOK!</a><br><br>
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ module.exports = () => ({
from: '{{emailFrom}}',
to: '{{recipient.email}}',
replyTo: '{{messageSender.email}}',
subject:
'{{messageSender.displayName}} sent a message to your community',
subject: '{{messageSender.displayName}} sent a message to your community',
html: `{% extends "src/templates/_layouts/email-transactional.html" %}
{% block content %}Hi {{recipient.firstName}},<br><br>
<b>{{messageSender.displayName}}</b> sent a message to you in your role as a lead of <a style="color:#065F6B; text-decoration: none;" href={{journey.url}}>'{{journey.displayName}}'</a>:
<br><br>
<i>{{message}}</i>
<br><br>
<br>
<pre><i>{{message}}</i></pre>
<br>
You can reply to this email to respond directly to {{messageSender.firstName}}.
Please keep in mind that this way, your email address will become visible.
If you prefer to communicate through Alkemio, click on the envelope icon on {{messageSender.displayName}}'s profile.<br><br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ module.exports = () => ({
{% block content %}Hi {{recipient.firstName}},<br><br>
You have sent the following message to the community lead(s) of <a style="color:#065F6B; text-decoration: none;" href={{journey.url}}>{{journey.displayName}}</a>:
<br><br>
<i>{{message}}</i>
<br><br>
<br>
<pre><i>{{message}}</i></pre>
<br>
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ module.exports = () => ({
{% block content %}Hi {{recipient.firstName}},<br><br>
<b>{{messageSender.displayName}}</b> sent a message to {{organization.displayName}}:
<br><br>
<i>{{message}}</i>
<br><br>
<br>
<pre><i>{{message}}</i></pre>
<br>
You can reply to this email to respond directly to {{messageSender.firstName}}.
Please keep in mind that this way, your email address will become visible.
If you prefer to communicate through Alkemio, click on the envelope icon on {{messageSender.displayName}}'s profile.<br><br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ module.exports = () => ({
{% block content %}Hi {{recipient.firstName}},<br><br>
You have sent the following message to <b>{{organization.displayName}}</b>:
<br><br>
<i>{{message}}</i>
<br><br>
<br>
<pre><i>{{message}}</i></pre>
<br>
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ module.exports = () => ({
subject: '{{messageSender.displayName}} sent you a message!',
html: `{% extends "src/templates/_layouts/email-transactional.html" %}
{% block content %}Hi {{recipient.firstName}},<br><br>
{{messageSender.displayName}} has sent you a message:
<br>
<br>
<i>{{message}}</i>
<br>
<pre><i>{{message}}</i></pre>
<br>
You can reply to this email to respond directly to {{messageSender.firstName}}.
Please keep in mind that this way, your email address will become visible.
Expand Down
2 changes: 1 addition & 1 deletion service/src/templates/communication.user.message.sender.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = () => ({
You have sent the following message to {{messageReceiver.displayName}}:
<br>
<i>{{message}}</i>
<pre><i>{{message}}</i></pre>
<br>
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = () => ({
{% block content %}<a href="{{inviter.profile}}">{{inviter.firstName}}</a> has invited you to join <a href="{{journey.url}}">{{journey.displayName}}</a> on Alkemio.
{% if welcomeMessage %}
<br>
<i>{{welcomeMessage}}</i>
<pre><i>{{welcomeMessage}}</i></pre>
{% endif %}
<br>
<a class="action-button" href="{{journey.url}}">click here to accept or decline</a><br><br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = () => ({
You have invited {{emails}} to join <a style="color:#065F6B; text-decoration: none;" href="{{journey.url}}">{{journey.displayName}}</a>.
{% if welcomeMessage %}
<br>
<i>{{welcomeMessage}}</i>
<pre><i>{{welcomeMessage}}</i></pre>
{% endif %}
<br>
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = () => ({
{% block content %}Hi {{recipient.firstName}},<br>
<a href="{{inviter.profile}}">{{inviter.firstName}}</a> has invited you to join <a style="color:#065F6B; text-decoration: none;" href="{{journey.url}}">{{journey.displayName}}</a>.
<br>
<i>{{welcomeMessage}}</i>
<pre><i>{{welcomeMessage}}</i></pre>
<br>
<a class="action-button" href="{{journey.url}}">click here to accept or decline</a><br><br>
{% endblock %}
Expand Down
24 changes: 12 additions & 12 deletions service/src/templates/platform.user.registration.registrant.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ module.exports = () => ({
to: '{{recipient.email}}',
subject: 'Alkemio - Registration successful!',
html: `{% extends "src/templates/_layouts/email-transactional.html" %}
{% block content %}Hi {{registrant.firstName}}, welcome to the Alkemio platform! <br>
{% block content %}
<p>Dear {{registrant.firstName}},</p>
<p>Welcome aboard the Alkemio platform! Your account creation was a success — congratulations! 🎉 Perhaps you have already explored the platform, but let’s ensure you are fully equipped to dive in with the links below.</p><br>
<p>🌐 <a style="color:#000000; text-decoration: none;" href="https://alkem.io/home"><b>Find Spaces</b>: At Alkemio, users collaborate within Spaces. If you are looking for a particular Space, use the search functionality on your Dashboard</a>.</p>
<p>🚀 <a style="color:#000000; text-decoration: none;" href="https://alkem.io/welcome-space"><b>Explore the possibilities</b>: Take a peek at our Welcome Space — it’s an open Space for you to explore the platform's structure and functionality.</a></p>
<p>📸 <a style="color:#000000; text-decoration: none;" href="{{registrant.profile}}"><b>Personalize Your Profile</b>: Add a friendly photo to your profile so fellow users can put a face to your name.</a></p>
<p>💌 <a style="color:#000000; text-decoration: none;" href="mailto:[email protected]"><b>Need Assistance?</b>: Whether you’re keen on starting your own Space or require support, our Community team is here for you. Reach out anytime at <b>[email protected]</b></a>.</p>
<p><a style="color:#000000; text-decoration: none;" href="https://welcome.alkem.io">❔ <b>Learn More</b>: For additional details about Alkemio, check out our website</a>.</p>
<br>
Your account has been successfully created. Please spend some time to further populate your <a style="color:#065F6B; text-decoration: none;" href="{{registrant.profile}}" >profile</a> so that other users and organizations can find you.
<br><br>
<a class="action-button" href="{{registrant.profile}}">YOUR PROFILE</a><br><br>
On the <a style="color:#065F6B; text-decoration: none;" href="https://alkem.io/home">Homepage</a> and <a style="color:#065F6B; text-decoration: none;" href="https://alkem.io/challenges">Challenges page</a> you'll find all available Spaces and Challenges for you to join.
<br>
Looking forward to seeing your interactions and contributions!<br><br>
Sincerely yours,<br><br>
The Alkemio team
<br><br>
<p>We are looking forward to seeing your interactions and contributions!</p>
<p>Warm regards,</p>
<p>The Alkemio Team 🌟</p>
<br><br>
{% endblock %}
${templates.footerBlock}`,
},
Expand Down

0 comments on commit ee703d1

Please sign in to comment.