From 12056096f24059d154b90a57793d3324d50b5e7d Mon Sep 17 00:00:00 2001
From: Valentin Yanakiev <valentin.yanakiev@gmail.com>
Date: Fri, 10 Dec 2021 17:40:58 +0200
Subject: [PATCH 1/5] User preferences

---
 package-lock.json                             | 14 +++----
 package.json                                  |  2 +-
 ...discussion.created.notification.builder.ts |  3 +-
 ...munication.updated.notification.builder.ts |  3 +-
 .../_layouts/email-transactional.html         | 42 ++++---------------
 src/templates/user.application.applicant.js   | 15 +++++++
 6 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fb028582..c6984282 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.4.3",
       "license": "EUPL-1.2",
       "dependencies": {
-        "@alkemio/client-lib": "^0.10.2",
+        "@alkemio/client-lib": "^0.10.4",
         "@nestjs/axios": "^0.0.1",
         "@nestjs/common": "^8.0.5",
         "@nestjs/config": "^1.0.1",
@@ -74,9 +74,9 @@
       }
     },
     "node_modules/@alkemio/client-lib": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/@alkemio/client-lib/-/client-lib-0.10.2.tgz",
-      "integrity": "sha512-JZNslgaGIIc2FlsIvET5x/JHGtq05y8MpVhUJj8U3ivjentCaHEApSGwl1i4/2yHwbvY7TbHYDga/dzDcc6hzA==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@alkemio/client-lib/-/client-lib-0.10.4.tgz",
+      "integrity": "sha512-XWVIgcBMDRtR4n955rs/trdw+kZE2Zs4yhXcaVdr2o1l78lqyccDdlKhGcf4L3OLDDdVm9aQOpUUckkeX+fiSQ==",
       "dependencies": {
         "axios": "^0.21.1",
         "dotenv": "^8.2.0",
@@ -17355,9 +17355,9 @@
   },
   "dependencies": {
     "@alkemio/client-lib": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/@alkemio/client-lib/-/client-lib-0.10.2.tgz",
-      "integrity": "sha512-JZNslgaGIIc2FlsIvET5x/JHGtq05y8MpVhUJj8U3ivjentCaHEApSGwl1i4/2yHwbvY7TbHYDga/dzDcc6hzA==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@alkemio/client-lib/-/client-lib-0.10.4.tgz",
+      "integrity": "sha512-XWVIgcBMDRtR4n955rs/trdw+kZE2Zs4yhXcaVdr2o1l78lqyccDdlKhGcf4L3OLDDdVm9aQOpUUckkeX+fiSQ==",
       "requires": {
         "axios": "^0.21.1",
         "dotenv": "^8.2.0",
diff --git a/package.json b/package.json
index 5cd04617..720fb629 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "validate-connection": "ts-node src/utils/validate-connection.ts"
   },
   "dependencies": {
-    "@alkemio/client-lib": "^0.10.2",
+    "@alkemio/client-lib": "^0.10.4",
     "@nestjs/axios": "^0.0.1",
     "@nestjs/common": "^8.0.5",
     "@nestjs/config": "^1.0.1",
diff --git a/src/services/domain/builders/communication-discussion-created/communication.discussion.created.notification.builder.ts b/src/services/domain/builders/communication-discussion-created/communication.discussion.created.notification.builder.ts
index 22007349..5e654782 100644
--- a/src/services/domain/builders/communication-discussion-created/communication.discussion.created.notification.builder.ts
+++ b/src/services/domain/builders/communication-discussion-created/communication.discussion.created.notification.builder.ts
@@ -57,7 +57,8 @@ export class CommunicationDiscussionCreatedNotificationBuilder {
       eventPayload,
       'admin',
       EmailTemplate.COMMUNICATION_DISCUSSION_CREATED_ADMIN,
-      sender
+      sender,
+      UserPreferenceType.NotificationCommunicationDiscussionCreatedAdmin
     );
 
     const memberNotificationPromises = await this.buildNotificationsForRole(
diff --git a/src/services/domain/builders/communication-updated/communication.updated.notification.builder.ts b/src/services/domain/builders/communication-updated/communication.updated.notification.builder.ts
index ddfa3a89..0d9d5c90 100644
--- a/src/services/domain/builders/communication-updated/communication.updated.notification.builder.ts
+++ b/src/services/domain/builders/communication-updated/communication.updated.notification.builder.ts
@@ -53,7 +53,8 @@ export class CommunicationUpdateNotificationBuilder {
       eventPayload,
       'admin',
       EmailTemplate.COMMUNICATION_UPDATE_ADMIN,
-      sender
+      sender,
+      UserPreferenceType.NotificationCommunicationUpdateSentAdmin
     );
 
     const memberNotificationPromises = await this.buildNotificationsForRole(
diff --git a/src/templates/_layouts/email-transactional.html b/src/templates/_layouts/email-transactional.html
index 7b6fc973..fce043d0 100644
--- a/src/templates/_layouts/email-transactional.html
+++ b/src/templates/_layouts/email-transactional.html
@@ -5,6 +5,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <!--<![endif]-->
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css?family=Source+Sans+Pro"
+    />
     <style type="text/css">
       #outlook a {
         padding: 0;
@@ -157,24 +161,7 @@
                           >
                             <tbody>
                               <tr>
-                                <td style="width: 200px">
-                                  <img
-                                    alt=""
-                                    title=""
-                                    height="auto"
-                                    src="https://www.notif.me/static/logo.png"
-                                    style="
-                                      border: none;
-                                      border-radius: 0px;
-                                      display: block;
-                                      outline: none;
-                                      text-decoration: none;
-                                      width: 100%;
-                                      height: auto;
-                                    "
-                                    width="200"
-                                  />
-                                </td>
+                                <td style="width: 200px"></td>
                               </tr>
                             </tbody>
                           </table>
@@ -252,23 +239,12 @@
                               line-height: 20px;
                               white-space: nowrap;
                             "
-                          >
-                          </div>
+                          ></div>
                         </td>
                       </tr>
-                    <tr>
-                      <td>
-                        <b>Team Alkemio</b>
-                        <br>
-                        <b>website</b>: <a href="https://alkem.io">https://alkem.io</a>
-                        <br>
-                        <a href="https://alkem.io">
-                          <img src="https://alkem.io/uploads/logos/alkemio-logo.png" width="120">
-                        </a>
-                        <br>
-                        <i>Enabling society to collaborate. Building a better future, together.</i>
-                      </td>
-                    </tr>
+                      <tr>
+                        {% block footer %}{% endblock %}
+                      </tr>
                     </tbody>
                   </table>
                 </div>
diff --git a/src/templates/user.application.applicant.js b/src/templates/user.application.applicant.js
index 563bde70..008af3f4 100644
--- a/src/templates/user.application.applicant.js
+++ b/src/templates/user.application.applicant.js
@@ -15,6 +15,21 @@ module.exports = () => ({
           Please view the status of your application on your <a href="{{applicant.profile}}">profile</a>.<br><br>
           Sincerely yours,
           Team Alkemio
+        {% endblock %}
+
+        {% block footer %}
+        <td>
+        <b>Team Alkemio</b>
+        <br>
+        <br>
+        <a href="https://alkem.io">
+          <img src="https://alkem.io/uploads/logos/alkemio-logo.png" width="175"> </a>
+
+         We have received your application for <a href="{{community.url}}">{{community.name}}</a> [{{community.type}}]!<br><br>
+         Website: <a style="color:#068293; font-weight:600; text-decoration:underline;" href="https://alkem.io">https://alkem.io</a>
+
+
+        </td>
         {% endblock %}`,
     },
   },

From c882f9117cb2ff935eabb8c2adb8b10544fcec73 Mon Sep 17 00:00:00 2001
From: Valentin Yanakiev <valentin.yanakiev@gmail.com>
Date: Fri, 10 Dec 2021 17:43:04 +0200
Subject: [PATCH 2/5] Revert template changes

---
 .../_layouts/email-transactional.html         | 42 ++++++++++++++++---
 src/templates/user.application.applicant.js   | 15 -------
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/templates/_layouts/email-transactional.html b/src/templates/_layouts/email-transactional.html
index fce043d0..40a32abc 100644
--- a/src/templates/_layouts/email-transactional.html
+++ b/src/templates/_layouts/email-transactional.html
@@ -5,10 +5,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <!--<![endif]-->
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link
-      rel="stylesheet"
-      href="https://fonts.googleapis.com/css?family=Source+Sans+Pro"
-    />
     <style type="text/css">
       #outlook a {
         padding: 0;
@@ -161,7 +157,24 @@
                           >
                             <tbody>
                               <tr>
-                                <td style="width: 200px"></td>
+                                <td style="width: 200px">
+                                  <img
+                                    alt=""
+                                    title=""
+                                    height="auto"
+                                    src="https://www.notif.me/static/logo.png"
+                                    style="
+                                      border: none;
+                                      border-radius: 0px;
+                                      display: block;
+                                      outline: none;
+                                      text-decoration: none;
+                                      width: 100%;
+                                      height: auto;
+                                    "
+                                    width="200"
+                                  />
+                                </td>
                               </tr>
                             </tbody>
                           </table>
@@ -243,7 +256,24 @@
                         </td>
                       </tr>
                       <tr>
-                        {% block footer %}{% endblock %}
+                        <td>
+                          <b>Team Alkemio</b>
+                          <br />
+                          <b>website</b>:
+                          <a href="https://alkem.io">https://alkem.io</a>
+                          <br />
+                          <a href="https://alkem.io">
+                            <img
+                              src="https://alkem.io/uploads/logos/alkemio-logo.png"
+                              width="120"
+                            />
+                          </a>
+                          <br />
+                          <i
+                            >Enabling society to collaborate. Building a better
+                            future, together.</i
+                          >
+                        </td>
                       </tr>
                     </tbody>
                   </table>
diff --git a/src/templates/user.application.applicant.js b/src/templates/user.application.applicant.js
index 008af3f4..563bde70 100644
--- a/src/templates/user.application.applicant.js
+++ b/src/templates/user.application.applicant.js
@@ -15,21 +15,6 @@ module.exports = () => ({
           Please view the status of your application on your <a href="{{applicant.profile}}">profile</a>.<br><br>
           Sincerely yours,
           Team Alkemio
-        {% endblock %}
-
-        {% block footer %}
-        <td>
-        <b>Team Alkemio</b>
-        <br>
-        <br>
-        <a href="https://alkem.io">
-          <img src="https://alkem.io/uploads/logos/alkemio-logo.png" width="175"> </a>
-
-         We have received your application for <a href="{{community.url}}">{{community.name}}</a> [{{community.type}}]!<br><br>
-         Website: <a style="color:#068293; font-weight:600; text-decoration:underline;" href="https://alkem.io">https://alkem.io</a>
-
-
-        </td>
         {% endblock %}`,
     },
   },

From ed5dc236074c96dd80750f209ba959b526737cdb Mon Sep 17 00:00:00 2001
From: Neil Smyth <neil@thesmyths.eu>
Date: Tue, 14 Dec 2021 09:43:15 +0100
Subject: [PATCH 3/5] updated url

---
 .../alkemio-url-generator/alkemio.url.generator.ts            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/services/application/alkemio-url-generator/alkemio.url.generator.ts b/src/services/application/alkemio-url-generator/alkemio.url.generator.ts
index 303e99bb..1c4b6bee 100644
--- a/src/services/application/alkemio-url-generator/alkemio.url.generator.ts
+++ b/src/services/application/alkemio-url-generator/alkemio.url.generator.ts
@@ -23,10 +23,10 @@ export class AlkemioUrlGenerator {
   ): string {
     const baseURL = `${this.webclientEndpoint}/${hubNameID}`;
     if (opportunityNameID) {
-      return `${baseURL}/${challengeNameID}/${opportunityNameID}`;
+      return `${baseURL}/challenges/${challengeNameID}/opportunities/${opportunityNameID}`;
     }
     if (challengeNameID) {
-      return `${baseURL}/${challengeNameID}`;
+      return `${baseURL}/challenges/${challengeNameID}`;
     }
     return baseURL;
   }

From 891bb0cce649bf246f21103ce11a25ff0846c695 Mon Sep 17 00:00:00 2001
From: Valentin Yanakiev <valentin.yanakiev@gmail.com>
Date: Thu, 16 Dec 2021 13:46:03 +0200
Subject: [PATCH 4/5] Email template fix

---
 package-lock.json                             |  4 +-
 package.json                                  |  2 +-
 src/app.controller.ts                         |  3 +-
 .../alkemio.client.adapter.ts                 | 14 ++++++-
 .../alkemio.url.generator.ts                  |  8 ++++
 ...pplication.created.notification.builder.ts |  9 +++++
 ...discussion.created.notification.builder.ts |  9 +++++
 ...munication.updated.notification.builder.ts |  9 +++++
 .../user.registered.notification.builder.ts   |  9 +++++
 src/templates/alkemio.template.blocks.js      | 38 +++++++++++++++++++
 .../communication.discussion.created.admin.js |  5 ++-
 ...communication.discussion.created.member.js |  5 ++-
 src/templates/communication.update.admin.js   |  6 ++-
 src/templates/communication.update.member.js  |  6 ++-
 src/templates/user.application.admin.js       |  5 ++-
 src/templates/user.application.applicant.js   |  5 ++-
 src/templates/user.registration.admin.js      |  5 ++-
 src/templates/user.registration.registrant.js |  5 ++-
 tsconfig.json                                 |  1 +
 19 files changed, 135 insertions(+), 13 deletions(-)
 create mode 100644 src/templates/alkemio.template.blocks.js

diff --git a/package-lock.json b/package-lock.json
index c6984282..adf56796 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "alkemio-notifications",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "alkemio-notifications",
-      "version": "0.4.3",
+      "version": "0.4.4",
       "license": "EUPL-1.2",
       "dependencies": {
         "@alkemio/client-lib": "^0.10.4",
diff --git a/package.json b/package.json
index 720fb629..6e11d622 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alkemio-notifications",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Alkemio notifications service",
   "author": "Cherrytwist Foundation",
   "private": false,
diff --git a/src/app.controller.ts b/src/app.controller.ts
index 4779e8a8..87d5186a 100644
--- a/src/app.controller.ts
+++ b/src/app.controller.ts
@@ -125,7 +125,8 @@ export class AppController {
             this.logger.verbose?.('All messages failed to be sent!');
             // if all messages failed to be sent, we reject the message but we make sure the message is
             // not discarded so we provide 'true' to requeue parameter
-            channel.reject(originalMsg, true);
+            channel.nack(originalMsg, false, false);
+            // channel.reject(originalMsg, true);
           } else {
             this.logger.verbose?.(
               `${nacked.length} messages out of total ${x.length} messages failed to be sent!`
diff --git a/src/services/application/alkemio-client-adapter/alkemio.client.adapter.ts b/src/services/application/alkemio-client-adapter/alkemio.client.adapter.ts
index 9d40b4b7..4ed88c9a 100644
--- a/src/services/application/alkemio-client-adapter/alkemio.client.adapter.ts
+++ b/src/services/application/alkemio-client-adapter/alkemio.client.adapter.ts
@@ -64,12 +64,24 @@ export class AlkemioClientAdapter implements IFeatureFlagProvider {
         uniqueUser => uniqueUser.id === user.id
       );
       if (!alreadyFound) {
-        uniqueUsers.push(user);
+        if (this.isEmailFormat(user.email)) uniqueUsers.push(user);
+        else {
+          this.logger.error(
+            `Unable to obtain a valid email address for "${user.displayName}": "${user.email}" is not a valid email address!
+            Please check the service account running the notifications service, it must have sufficient permissions to see the user email.`,
+            LogContext.NOTIFICATIONS
+          );
+        }
       }
     }
     return uniqueUsers;
   }
 
+  private isEmailFormat(value: string): boolean {
+    const emailRegex = /^\S+@\S+$/;
+    return emailRegex.test(value);
+  }
+
   private async tryGetUser(
     userID: string,
     retry: number
diff --git a/src/services/application/alkemio-url-generator/alkemio.url.generator.ts b/src/services/application/alkemio-url-generator/alkemio.url.generator.ts
index 1c4b6bee..3d53460b 100644
--- a/src/services/application/alkemio-url-generator/alkemio.url.generator.ts
+++ b/src/services/application/alkemio-url-generator/alkemio.url.generator.ts
@@ -16,6 +16,10 @@ export class AlkemioUrlGenerator {
     )?.webclient_endpoint;
   }
 
+  createHubURL(): string {
+    return this.webclientEndpoint;
+  }
+
   createCommunityURL(
     hubNameID: string,
     challengeNameID?: string,
@@ -38,4 +42,8 @@ export class AlkemioUrlGenerator {
   createOrganizationURL(orgNameID: string): string {
     return `${this.webclientEndpoint}/organization/${orgNameID}`;
   }
+
+  createUserNotificationPreferencesURL(userNameID: string): string {
+    return `${this.webclientEndpoint}/user/${userNameID}/settings/notifications`;
+  }
 }
diff --git a/src/services/domain/builders/application-created/application.created.notification.builder.ts b/src/services/domain/builders/application-created/application.created.notification.builder.ts
index 84ce241e..fdb958ee 100644
--- a/src/services/domain/builders/application-created/application.created.notification.builder.ts
+++ b/src/services/domain/builders/application-created/application.created.notification.builder.ts
@@ -163,6 +163,11 @@ export class ApplicationCreatedNotificationBuilder {
       eventPayload.hub.challenge?.nameID,
       eventPayload.hub.challenge?.opportunity?.nameID
     );
+    const notificationPreferenceURL =
+      this.alkemioUrlGenerator.createUserNotificationPreferencesURL(
+        recipient.nameID
+      );
+    const hubURL = this.alkemioUrlGenerator.createHubURL();
     return {
       emailFrom: 'info@alkem.io',
       applicant: {
@@ -173,12 +178,16 @@ export class ApplicationCreatedNotificationBuilder {
       recipient: {
         name: recipient.displayName,
         email: recipient.email,
+        notificationPreferences: notificationPreferenceURL,
       },
       community: {
         name: eventPayload.community.name,
         type: eventPayload.community.type,
         url: communityURL,
       },
+      hub: {
+        url: hubURL,
+      },
       event: eventPayload,
     };
   }
diff --git a/src/services/domain/builders/communication-discussion-created/communication.discussion.created.notification.builder.ts b/src/services/domain/builders/communication-discussion-created/communication.discussion.created.notification.builder.ts
index 5e654782..ea69d79c 100644
--- a/src/services/domain/builders/communication-discussion-created/communication.discussion.created.notification.builder.ts
+++ b/src/services/domain/builders/communication-discussion-created/communication.discussion.created.notification.builder.ts
@@ -179,6 +179,11 @@ export class CommunicationDiscussionCreatedNotificationBuilder {
       eventPayload.hub.challenge?.opportunity?.nameID
     );
     const senderProfile = this.alkemioUrlGenerator.createUserURL(sender.nameID);
+    const notificationPreferenceURL =
+      this.alkemioUrlGenerator.createUserNotificationPreferencesURL(
+        recipient.nameID
+      );
+    const hubURL = this.alkemioUrlGenerator.createHubURL();
     return {
       emailFrom: 'info@alkem.io',
       createdBy: {
@@ -196,12 +201,16 @@ export class CommunicationDiscussionCreatedNotificationBuilder {
         name: recipient.displayName,
         firstname: recipient.firstName,
         email: recipient.email,
+        notificationPreferences: notificationPreferenceURL,
       },
       community: {
         name: eventPayload.community.name,
         type: eventPayload.community.type,
         url: communityURL,
       },
+      hub: {
+        url: hubURL,
+      },
       event: eventPayload,
     };
   }
diff --git a/src/services/domain/builders/communication-updated/communication.updated.notification.builder.ts b/src/services/domain/builders/communication-updated/communication.updated.notification.builder.ts
index 0d9d5c90..6a8a54d6 100644
--- a/src/services/domain/builders/communication-updated/communication.updated.notification.builder.ts
+++ b/src/services/domain/builders/communication-updated/communication.updated.notification.builder.ts
@@ -177,6 +177,11 @@ export class CommunicationUpdateNotificationBuilder {
       eventPayload.hub.challenge?.opportunity?.nameID
     );
     const senderProfile = this.alkemioUrlGenerator.createUserURL(sender.nameID);
+    const notificationPreferenceURL =
+      this.alkemioUrlGenerator.createUserNotificationPreferencesURL(
+        recipient.nameID
+      );
+    const hubURL = this.alkemioUrlGenerator.createHubURL();
     return {
       emailFrom: 'info@alkem.io',
       sender: {
@@ -192,12 +197,16 @@ export class CommunicationUpdateNotificationBuilder {
         name: recipient.displayName,
         firstname: recipient.firstName,
         email: recipient.email,
+        notificationPreferences: notificationPreferenceURL,
       },
       community: {
         name: eventPayload.community.name,
         type: eventPayload.community.type,
         url: communityURL,
       },
+      hub: {
+        url: hubURL,
+      },
       event: eventPayload,
     };
   }
diff --git a/src/services/domain/builders/user-registered/user.registered.notification.builder.ts b/src/services/domain/builders/user-registered/user.registered.notification.builder.ts
index 3bc20f1a..1fa815e2 100644
--- a/src/services/domain/builders/user-registered/user.registered.notification.builder.ts
+++ b/src/services/domain/builders/user-registered/user.registered.notification.builder.ts
@@ -153,6 +153,11 @@ export class UserRegisteredNotificationBuilder {
     const registrantProfileURL = this.alkemioUrlGenerator.createUserURL(
       registrant.nameID
     );
+    const notificationPreferenceURL =
+      this.alkemioUrlGenerator.createUserNotificationPreferencesURL(
+        recipient.nameID
+      );
+    const hubURL = this.alkemioUrlGenerator.createHubURL();
     return {
       emailFrom: 'info@alkem.io',
       registrant: {
@@ -165,6 +170,10 @@ export class UserRegisteredNotificationBuilder {
         name: recipient.displayName,
         firstname: recipient.firstName,
         email: recipient.email,
+        notificationPreferences: notificationPreferenceURL,
+      },
+      hub: {
+        url: hubURL,
       },
       event: eventPayload,
     };
diff --git a/src/templates/alkemio.template.blocks.js b/src/templates/alkemio.template.blocks.js
new file mode 100644
index 00000000..6b96b6f8
--- /dev/null
+++ b/src/templates/alkemio.template.blocks.js
@@ -0,0 +1,38 @@
+module.exports = {
+  footerBlock: `{% block footer %}<a
+  stylstylee="
+    color: #068293;
+    text-decoration: underline;
+    font-family: Montserrat;
+    padding: 15px 5px;
+  "
+  href="{{hub.url}}"
+  alt="Link to our community"
+  >Join our community</a
+>
+&nbsp;
+<a
+  style="
+    color: #068293;
+    text-decoration: underline;
+    font-family: Montserrat;
+    padding: 15px 5px;
+  "
+  href="{{recipient.notificationPreferences}}"
+  alt="User notification preferences"
+  >Notification settings</a
+>
+&nbsp;
+<a
+style="
+  color: #068293;
+  text-decoration: underline;
+  font-family: Montserrat;
+  padding: 15px 5px;
+"
+href="https://alkem.io/about/"
+alt="About Alkemio"
+>About</a
+>
+{% endblock %}`,
+};
diff --git a/src/templates/communication.discussion.created.admin.js b/src/templates/communication.discussion.created.admin.js
index 6081e54d..b59fc4a8 100644
--- a/src/templates/communication.discussion.created.admin.js
+++ b/src/templates/communication.discussion.created.admin.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var templates = require('./alkemio.template.blocks');
 /* eslint-disable quotes */
 module.exports = () => ({
   name: 'communication-discussion-created-admin',
@@ -17,7 +19,8 @@ module.exports = () => ({
 
           Sincerely yours,
           Team Alkemio
-        {% endblock %}`,
+        {% endblock %}
+        ${templates.footerBlock}`,
     },
   },
 });
diff --git a/src/templates/communication.discussion.created.member.js b/src/templates/communication.discussion.created.member.js
index d128c5d4..32bcf33d 100644
--- a/src/templates/communication.discussion.created.member.js
+++ b/src/templates/communication.discussion.created.member.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var templates = require('./alkemio.template.blocks');
 /* eslint-disable quotes */
 module.exports = () => ({
   name: 'communication-discussion-created-member',
@@ -17,7 +19,8 @@ module.exports = () => ({
 
           Sincerely yours,
           Team Alkemio
-        {% endblock %}`,
+        {% endblock %}
+        ${templates.footerBlock}`,
     },
   },
 });
diff --git a/src/templates/communication.update.admin.js b/src/templates/communication.update.admin.js
index 5a3c8814..95a4eab2 100644
--- a/src/templates/communication.update.admin.js
+++ b/src/templates/communication.update.admin.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var templates = require('./alkemio.template.blocks');
 /* eslint-disable quotes */
 module.exports = () => ({
   name: 'communication-update-admin',
@@ -16,7 +18,9 @@ module.exports = () => ({
 
           Sincerely yours,
           Team Alkemio
-        {% endblock %}`,
+        {% endblock %}
+
+        ${templates.footerBlock}`,
     },
   },
 });
diff --git a/src/templates/communication.update.member.js b/src/templates/communication.update.member.js
index c86ddf80..e070808e 100644
--- a/src/templates/communication.update.member.js
+++ b/src/templates/communication.update.member.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var templates = require('./alkemio.template.blocks');
 /* eslint-disable quotes */
 module.exports = () => ({
   name: 'communication-update-member',
@@ -17,7 +19,9 @@ module.exports = () => ({
 
           Sincerely yours,
           Team Alkemio
-        {% endblock %}`,
+        {% endblock %}
+
+        ${templates.footerBlock}`,
     },
   },
 });
diff --git a/src/templates/user.application.admin.js b/src/templates/user.application.admin.js
index 0d091458..14f2bc87 100644
--- a/src/templates/user.application.admin.js
+++ b/src/templates/user.application.admin.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var templates = require('./alkemio.template.blocks');
 /* eslint-disable quotes */
 module.exports = () => ({
   name: 'user-application-admin',
@@ -17,7 +19,8 @@ module.exports = () => ({
 
           Sincerely yours,
           Team Alkemio
-        {% endblock %}`,
+        {% endblock %}
+        ${templates.footerBlock}`,
     },
   },
 });
diff --git a/src/templates/user.application.applicant.js b/src/templates/user.application.applicant.js
index 563bde70..7b537c31 100644
--- a/src/templates/user.application.applicant.js
+++ b/src/templates/user.application.applicant.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var templates = require('./alkemio.template.blocks');
 /* eslint-disable quotes */
 module.exports = () => ({
   name: 'user-application-applicant',
@@ -15,7 +17,8 @@ module.exports = () => ({
           Please view the status of your application on your <a href="{{applicant.profile}}">profile</a>.<br><br>
           Sincerely yours,
           Team Alkemio
-        {% endblock %}`,
+        {% endblock %}
+        ${templates.footerBlock}`,
     },
   },
 });
diff --git a/src/templates/user.registration.admin.js b/src/templates/user.registration.admin.js
index 993c48e0..0ca190b5 100644
--- a/src/templates/user.registration.admin.js
+++ b/src/templates/user.registration.admin.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var templates = require('./alkemio.template.blocks');
 /* eslint-disable quotes */
 module.exports = () => ({
   name: 'user-registration-admin',
@@ -16,7 +18,8 @@ module.exports = () => ({
 
           Sincerely yours,
           Team Alkemio
-        {% endblock %}`,
+        {% endblock %}
+        ${templates.footerBlock}`,
     },
   },
 });
diff --git a/src/templates/user.registration.registrant.js b/src/templates/user.registration.registrant.js
index 0c22bc82..4b54322f 100644
--- a/src/templates/user.registration.registrant.js
+++ b/src/templates/user.registration.registrant.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var templates = require('./alkemio.template.blocks');
 /* eslint-disable quotes */
 module.exports = () => ({
   name: 'user-registration-registrant',
@@ -24,7 +26,8 @@ module.exports = () => ({
 
           Sincerely yours,
           Team Alkemio
-        {% endblock %}`,
+        {% endblock %}
+        ${templates.footerBlock}`,
     },
   },
 });
diff --git a/tsconfig.json b/tsconfig.json
index d8977854..eece039e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -22,6 +22,7 @@
       "@common/*": ["src/common/*"],
       "@core/*": ["src/core/*"]
     }
+    // "types": ["alkemio-templates"]
     // "typeRoots": ["./src/types"]
   },
   "exclude": ["node_modules", "dist"]

From feaf81c52e8aa22029c4dd4b682db46e58a25a5c Mon Sep 17 00:00:00 2001
From: Valentin Yanakiev <valentin.yanakiev@gmail.com>
Date: Thu, 16 Dec 2021 14:21:31 +0200
Subject: [PATCH 5/5] Template fix

---
 .../_layouts/email-transactional.html         | 157 +++++++++++++-----
 1 file changed, 111 insertions(+), 46 deletions(-)

diff --git a/src/templates/_layouts/email-transactional.html b/src/templates/_layouts/email-transactional.html
index 40a32abc..b0a19ee8 100644
--- a/src/templates/_layouts/email-transactional.html
+++ b/src/templates/_layouts/email-transactional.html
@@ -1,10 +1,19 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title></title>
-    <!--[if !mso]><!-- -->
+    <!--[if !mso]><!== -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <!--<![endif]-->
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css?family=Source+Sans+Pro"
+    />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css?family=Montserrat"
+    />
     <style type="text/css">
       #outlook a {
         padding: 0;
@@ -43,6 +52,7 @@
       }
     </style>
     <!--[if !mso]><!-->
+
     <style type="text/css">
       @media only screen and (max-width: 480px) {
         @-ms-viewport {
@@ -69,6 +79,7 @@
         }
       </style>
     <![endif]-->
+
     <style type="text/css">
       @media (min-width: 640px) {
         body {
@@ -86,14 +97,14 @@
       }
     </style>
   </head>
-  <body>
+  <body style="padding: 0 10px">
     <div>
       <!--[if mso | IE]>
     <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="600" align="center" style="width:600px;">
       <tr>
         <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
     <![endif]-->
-      <div style="margin: 0px auto; max-width: 600px; background: #ffffff">
+      <div style="margin: 0px auto; max-width: 800px; background: #ffffff">
         <table
           role="presentation"
           cellpadding="0"
@@ -157,24 +168,7 @@
                           >
                             <tbody>
                               <tr>
-                                <td style="width: 200px">
-                                  <img
-                                    alt=""
-                                    title=""
-                                    height="auto"
-                                    src="https://www.notif.me/static/logo.png"
-                                    style="
-                                      border: none;
-                                      border-radius: 0px;
-                                      display: block;
-                                      outline: none;
-                                      text-decoration: none;
-                                      width: 100%;
-                                      height: auto;
-                                    "
-                                    width="200"
-                                  />
-                                </td>
+                                <td style="width: 200px"></td>
                               </tr>
                             </tbody>
                           </table>
@@ -188,14 +182,6 @@
                             padding: 10px 25px;
                           "
                         >
-                          <p
-                            style="
-                              font-size: 1px;
-                              margin: 0px auto;
-                              border-top: 4px solid #39bc87;
-                              width: 100%;
-                            "
-                          ></p>
                           <!--[if mso | IE
                             ]><table
                               role="presentation"
@@ -225,16 +211,15 @@
                           style="
                             word-break: break-word;
                             font-size: 0px;
-                            padding: 10px 25px;
+                            padding: 10px;
                           "
-                          align="left"
                         >
                           <div
                             class=""
                             style="
                               cursor: auto;
-                              color: #777;
-                              font-family: helvetica;
+                              color: #000;
+                              font-family: Source Sans Pro;
                               font-size: 17px;
                               line-height: 22px;
                               text-align: left;
@@ -256,23 +241,103 @@
                         </td>
                       </tr>
                       <tr>
-                        <td>
-                          <b>Team Alkemio</b>
+                        <td style="padding: 0 10px; color: black">
+                          <b>Team Alkemio</b><br />
                           <br />
-                          <b>website</b>:
-                          <a href="https://alkem.io">https://alkem.io</a>
-                          <br />
-                          <a href="https://alkem.io">
-                            <img
+                          <a href="https://alkem.io"
+                            ><img
                               src="https://alkem.io/uploads/logos/alkemio-logo.png"
-                              width="120"
+                              width="175"
+                              alt="alkemio-logo"
+                          /></a>
+                          <br />Website:
+                          <a
+                            style="
+                              color: #068293;
+                              text-decoration: underline;
+                              display: inline-block;
+                              padding-top: 5px;
+                            "
+                            href="https://alkem.io"
+                            >https://alkem.io</a
+                          >
+                        </td>
+                      </tr>
+                      <tr>
+                        <td style="padding-top: 20px">
+                          <a href="https://alkem.io"
+                            ><img
+                              src="https://i.ibb.co/X2355sx/Artboard-10.png"
+                              width="100%"
+                              alt="alkemio-logo"
+                          /></a>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td
+                          style="display:table-cell; text-align: center; width:100% height: 100%; padding: 10px 0; font-size: 14px;"
+                        >
+                          {% block footer %}{% endblock %}
+                        </td>
+                      </tr>
+                      <tr>
+                        <td style="padding-top: 3px">
+                          <svg width="max" height="15">
+                            <rect
+                              width="100%"
+                              height="3"
+                              style="fill: rgb(0, 129, 143)"
+                            ></rect>
+                          </svg>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td
+                          style="
+                            color: darkgrey;
+                            font-size: 12px;
+                            text-align: center;
+                            padding: 0 10px;
+                            line-height: 1.6;
+                          "
+                        >
+                          Don't want to recieve these notifications? Change your
+                          settings on the notifications settings to no longer
+                          recieve them anymore.
+                        </td>
+                      </tr>
+                      <tr width="100%">
+                        <td
+                          width="100%"
+                          style="text-align: center; height: 100%"
+                        >
+                          <a href="https://github.com/alkem-io/alkemio">
+                            <img
+                              style="
+                                display: inline-block;
+                                padding: 10px 5px;
+                                width: 35px;
+                                height: 35px;
+                                display: inline-block;
+                              "
+                              src="https://i.ibb.co/vcm298P/2048px-Octicons-mark-github-svg.png"
+                              alt="2048px-Octicons-mark-github-svg"
                             />
                           </a>
-                          <br />
-                          <i
-                            >Enabling society to collaborate. Building a better
-                            future, together.</i
+                          <a
+                            href="https://www.linkedin.com/company/alkemio-foundation/"
                           >
+                            <img
+                              style="
+                                display: inline-block;
+                                padding: 10px 5px;
+                                width: 35px;
+                                height: 35px;
+                              "
+                              src="https://i.ibb.co/RBYFC4Z/174857.png"
+                              alt="174857"
+                            /> </a
+                          ><br />
                         </td>
                       </tr>
                     </tbody>