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

2 files changed, 34 insertions, 32 deletions

diff --git a/main/app/sprinkles/account/templates/navigation/main-nav.html.twig b/main/app/sprinkles/account/templates/navigation/main-nav.html.twig
index e44c9c8..dfe2fc8 100644
--- a/main/app/sprinkles/account/templates/navigation/main-nav.html.twig
+++ b/main/app/sprinkles/account/templates/navigation/main-nav.html.twig
@@ -2,10 +2,10 @@
 {% extends "@core/navigation/main-nav.html.twig" %}
 
 {% block secondary_nav %}
-    {{parent()}}
+    {{ parent() }}
     {% if not checkAuthenticated() %}
         <li>
-            <a href="{{site.uri.public}}/account/sign-in" class="nav-highlight">{{translate("SIGNIN")}}</a>
+            <a href="{{ site.uri.public }}/account/sign-in" class="nav-highlight">{{ translate("SIGNIN") }}</a>
         </li>
     {% else %}
         {% include "navigation/user-card.html.twig" %}
diff --git a/main/app/sprinkles/account/templates/navigation/user-card.html.twig b/main/app/sprinkles/account/templates/navigation/user-card.html.twig
index 47e18f1..3c1fc3c 100644
--- a/main/app/sprinkles/account/templates/navigation/user-card.html.twig
+++ b/main/app/sprinkles/account/templates/navigation/user-card.html.twig
@@ -1,33 +1,35 @@
 {% block userCard %}
-<li class="dropdown user user-menu">
-    {% block userCard_nav %}
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-      <img src="{{ current_user.avatar }}" class="user-image" alt="User Image">
-      <span class="hidden-xs">{{current_user.first_name}} {{current_user.last_name}}</span>
-      <i class="fa fa-chevron-down"></i>
-    </a>
-    {% endblock %}
-    <ul class="dropdown-menu">
-      {% block userCard_userInfo %}
-      <!-- User image -->
-      <li class="user-header">
-        <img src="{{ current_user.avatar }}" class="img-circle" alt="User Image">
-        <p>
-          {{current_user.first_name}} {{current_user.last_name}}
-          <small>({{current_user.user_name}})</small>
-        </p>
-      </li>
-      {% endblock %}
+    <li class="dropdown user user-menu">
+        {% block userCard_nav %}
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                <img src="{{ current_user.avatar }}" class="user-image" alt="User Image">
+                <span class="hidden-xs">{{ current_user.first_name }} {{ current_user.last_name }}</span>
+                <i class="fa fa-chevron-down"></i>
+            </a>
+        {% endblock %}
+        <ul class="dropdown-menu">
+            {% block userCard_userInfo %}
+                <!-- User image -->
+                <li class="user-header">
+                    <img src="{{ current_user.avatar }}" class="img-circle" alt="User Image">
+                    <p>
+                        {{ current_user.first_name }} {{ current_user.last_name }}
+                        <small>({{ current_user.user_name }})</small>
+                    </p>
+                </li>
+            {% endblock %}
 
-      <!-- Menu Footer-->
-      <li class="user-footer">
-          {% block userCard_menu %}
-              {% if checkAccess('uri_account_settings') %}
-                <a href="{{site.uri.public}}/account/settings" class="btn btn-default btn-flat btn-block">{{translate("ACCOUNT.MY")}}</a>
-              {% endif %}
-              <a href="{{site.uri.public}}/account/logout" class="btn btn-default btn-flat btn-block">{{translate("LOGOUT")}}</a>
-          {% endblock %}
-      </li>
-    </ul>
-</li>
+            <!-- Menu Footer-->
+            <li class="user-footer">
+                {% block userCard_menu %}
+                    {% if checkAccess('uri_account_settings') %}
+                        <a href="{{ site.uri.public }}/account/settings"
+                           class="btn btn-default btn-flat btn-block">{{ translate("ACCOUNT.MY") }}</a>
+                    {% endif %}
+                    <a href="{{ site.uri.public }}/account/logout"
+                       class="btn btn-default btn-flat btn-block">{{ translate("LOGOUT") }}</a>
+                {% endblock %}
+            </li>
+        </ul>
+    </li>
 {% endblock %}