Refactored code, many fixes and improvements in chat backend+frontend

3 files changed, 54 insertions, 44 deletions

diff --git a/main/app/sprinkles/account/templates/mail/password-reset.html.twig b/main/app/sprinkles/account/templates/mail/password-reset.html.twig
index 37096ce..087703d 100644
--- a/main/app/sprinkles/account/templates/mail/password-reset.html.twig
+++ b/main/app/sprinkles/account/templates/mail/password-reset.html.twig
@@ -1,22 +1,28 @@
 {% block subject %}
-    {{site.title}} - your password reset request
+    {{ site.title }} - your password reset request
 {% endblock %}
 
 {% block body %}
-<p>Dear {{user.first_name}},
-</p>
-<p>
-A lost password request has been submitted for your account with {{site.title}} ({{site.uri.public}}) on {{request_date | date('m/d/Y g:i A')}}.
-</p>
-<p>
-If you or someone you trust sent this request, and you wish to set a new password, please click this link: <a href="{{site.uri.public}}/account/set-password/confirm?token={{token}}">{{site.uri.public}}/account/set-password/confirm?token={{token}}</a>
-</p>
+    <p>Dear {{ user.first_name }},
+    </p>
+    <p>
+        A lost password request has been submitted for your account with {{ site.title }} ({{ site.uri.public }})
+        on {{ request_date | date('m/d/Y g:i A') }}.
+    </p>
+    <p>
+        If you or someone you trust sent this request, and you wish to set a new password, please click this link: <a
+                href="{{ site.uri.public }}/account/set-password/confirm?token={{ token }}">{{ site.uri.public }}
+            /account/set-password/confirm?token={{ token }}</a>
+    </p>
 
-<p>
-If you did <b>not</b> expect this email, you may click this link to cancel the request: <a href="{{site.uri.public}}/account/set-password/deny?token={{token}}">{{site.uri.public}}/account/set-password/deny?token={{token}}</a>, or simply do nothing and the request will expire on its own.
-</p>
-<p>
-With regards,<br>
-The {{site.title}} Team
-</p>
+    <p>
+        If you did <b>not</b> expect this email, you may click this link to cancel the request: <a
+                href="{{ site.uri.public }}/account/set-password/deny?token={{ token }}">{{ site.uri.public }}
+            /account/set-password/deny?token={{ token }}</a>, or simply do nothing and the request will expire on its
+        own.
+    </p>
+    <p>
+        With regards,<br>
+        The {{ site.title }} Team
+    </p>
 {% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/mail/resend-verification.html.twig b/main/app/sprinkles/account/templates/mail/resend-verification.html.twig
index ba1c243..56efa21 100644
--- a/main/app/sprinkles/account/templates/mail/resend-verification.html.twig
+++ b/main/app/sprinkles/account/templates/mail/resend-verification.html.twig
@@ -1,17 +1,20 @@
 {% block subject %}
-    {{site.title}} - verify your account
+    {{ site.title }} - verify your account
 {% endblock %}
 
 {% block body %}
-<p>Dear {{user.first_name}},
-</p>
-<p>
-We have received a new verification request for your account with {{site.title}} ({{site.uri.public}}).  Please follow the link below to verify your account.  If your account is already active, please disregard this message.
-</p>
-<a href="{{site.uri.public}}/account/verify?token={{token}}">{{site.uri.public}}/account/verify?token={{token}}</a>
-</p>
-<p>
-With regards,<br>
-The {{site.title}} Team
-</p>
+    <p>Dear {{ user.first_name }},
+    </p>
+    <p>
+        We have received a new verification request for your account with {{ site.title }} ({{ site.uri.public }}).
+        Please follow the link below to verify your account. If your account is already active, please disregard this
+        message.
+    </p>
+    <a href="{{ site.uri.public }}/account/verify?token={{ token }}">{{ site.uri.public }}
+        /account/verify?token={{ token }}</a>
+    </p>
+    <p>
+        With regards,<br>
+        The {{ site.title }} Team
+    </p>
 {% endblock %}
diff --git a/main/app/sprinkles/account/templates/mail/verify-account.html.twig b/main/app/sprinkles/account/templates/mail/verify-account.html.twig
index aa342c7..7a20525 100644
--- a/main/app/sprinkles/account/templates/mail/verify-account.html.twig
+++ b/main/app/sprinkles/account/templates/mail/verify-account.html.twig
@@ -1,21 +1,22 @@
 {% block subject %}
-    Welcome to {{site.title}} - please verify your account
+    Welcome to {{ site.title }} - please verify your account
 {% endblock %}
 
 {% block body %}
-<p>Dear {{user.first_name}},
-</p>
-<p>
-You are receiving this email because you registered with {{site.title}} ({{site.uri.public}}).
-</p>
-<p>
-You will need to verify your account before you can login. Please follow the link below to verify your account.
-</p>
-<p>
-<a href="{{site.uri.public}}/account/verify?token={{token}}">{{site.uri.public}}/account/verify?token={{token}}</a>
-</p>
-<p>
-With regards,<br>
-The {{site.title}} Team
-</p>
+    <p>Dear {{ user.first_name }},
+    </p>
+    <p>
+        You are receiving this email because you registered with {{ site.title }} ({{ site.uri.public }}).
+    </p>
+    <p>
+        You will need to verify your account before you can login. Please follow the link below to verify your account.
+    </p>
+    <p>
+        <a href="{{ site.uri.public }}/account/verify?token={{ token }}">{{ site.uri.public }}
+            /account/verify?token={{ token }}</a>
+    </p>
+    <p>
+        With regards,<br>
+        The {{ site.title }} Team
+    </p>
 {% endblock %}