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

4 files changed, 49 insertions, 33 deletions

diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig
index e6d4a7c..446f260 100644
--- a/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig
+++ b/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig
@@ -1,38 +1,53 @@
 {% block navigation %}
     {% if checkAccess('uri_dashboard') %}
-    <li>
-        <a href="{{site.uri.public}}/dashboard"><i class="fa fa-dashboard fa-fw"></i> <span>{{ translate("DASHBOARD") }}</span></a>
-    </li>
+        <li>
+            <a href="{{ site.uri.public }}/dashboard"><i class="fa fa-dashboard fa-fw"></i>
+                <span>{{ translate("DASHBOARD") }}</span>
+            </a>
+        </li>
     {% endif %}
     {% if checkAccess('uri_users') %}
-    <li>
-        <a href="{{site.uri.public}}/users"><i class="fa fa-user fa-fw"></i> <span>{{ translate("USER", 2) }}</span></a>
-    </li>
+        <li>
+            <a href="{{ site.uri.public }}/users"><i class="fa fa-user fa-fw"></i>
+                <span>{{ translate("USER", 2) }}</span>
+            </a>
+        </li>
     {% elseif checkAccess('uri_group', {
         'group': current_user.group
     }) %}
-    <li>
-        <a href="{{site.uri.public}}/groups/g/{{current_user.group.slug}}"><i class="{{current_user.group.icon}} fa-fw"></i> <span>{{ translate("GROUP.MANAGE") }}</span></a>
-    </li>
+        <li>
+            <a href="{{ site.uri.public }}/groups/g/{{ current_user.group.slug }}"><i
+                        class="{{ current_user.group.icon }} fa-fw"></i>
+                <span>{{ translate("GROUP.MANAGE") }}</span>
+            </a>
+        </li>
     {% endif %}
     {% if checkAccess('uri_activities') %}
-    <li>
-        <a href="{{site.uri.public}}/activities"><i class="fa fa-tasks fa-fw"></i> <span>{{ translate("ACTIVITY", 2) }}</span></a>
-    </li>
+        <li>
+            <a href="{{ site.uri.public }}/activities"><i class="fa fa-tasks fa-fw"></i>
+                <span>{{ translate("ACTIVITY", 2) }}</span>
+            </a>
+        </li>
     {% endif %}
     {% if checkAccess('uri_roles') %}
-    <li>
-        <a href="{{site.uri.public}}/roles"><i class="fa fa-drivers-license fa-fw"></i> <span>{{ translate("ROLE", 2) }}</span></a>
-    </li>
+        <li>
+            <a href="{{ site.uri.public }}/roles"><i class="fa fa-drivers-license fa-fw"></i>
+                <span>{{ translate("ROLE", 2) }}</span>
+            </a>
+        </li>
     {% endif %}
     {% if checkAccess('uri_permissions') %}
-    <li>
-        <a href="{{site.uri.public}}/permissions"><i class="fa fa-key fa-fw"></i> <span>{{ translate("PERMISSION", 2) }}</span></a>
-    </li>
+        <li>
+            <a href="{{ site.uri.public }}/permissions"><i class="fa fa-key fa-fw"></i>
+                <span>{{ translate("PERMISSION", 2) }}</span>
+            </a>
+        </li>
     {% endif %}
     {% if checkAccess('uri_groups') %}
-    <li>
-        <a href="{{site.uri.public}}/groups"><i class="fa fa-users fa-fw"></i> <span>{{ translate("GROUP", 2) }}</span></a>
-    </li>
+        <li>
+            <a href="{{ site.uri.public }}/groups"><i class="fa fa-users fa-fw"></i>
+                <span>{{ translate("GROUP", 2) }}</span>
+            </a>
+        </li>
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig
index 018e644..4b1881c 100644
--- a/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig
+++ b/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig
@@ -1,10 +1,10 @@
 <!-- Sidebar user panel -->
 <div class="user-panel">
-  <div class="pull-left image">
-    <img src="{{ current_user.avatar }}" class="img-circle" alt="User Image">
-  </div>
-  <div class="pull-left info">
-    <p>{{current_user.first_name}} {{current_user.last_name}}</p>
-    <i class="{{current_user.group.icon}}"></i> {{current_user.group.name}}
-  </div>
+    <div class="pull-left image">
+        <img src="{{ current_user.avatar }}" class="img-circle" alt="User Image">
+    </div>
+    <div class="pull-left info">
+        <p>{{ current_user.first_name }} {{ current_user.last_name }}</p>
+        <i class="{{ current_user.group.icon }}"></i> {{ current_user.group.name }}
+    </div>
 </div>
\ No newline at end of file
diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig
index 1b2939e..59f87b0 100644
--- a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig
+++ b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig
@@ -3,8 +3,8 @@
 {% endblock %}
 
 {% block sidebar_menu %}
-<ul class="sidebar-menu">
-    <li class="header" style="text-transform: uppercase">{{translate('NAVIGATION')}}</li>
-    {% include 'navigation/sidebar-menu.html.twig' %}
-</ul>
+    <ul class="sidebar-menu">
+        <li class="header" style="text-transform: uppercase">{{ translate('NAVIGATION') }}</li>
+        {% include 'navigation/sidebar-menu.html.twig' %}
+    </ul>
 {% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig
index 36fdb4b..8b40cd3 100644
--- a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig
+++ b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig
@@ -2,7 +2,8 @@
 
 {% block userCard_menu %}
     {% if checkAccess('uri_dashboard') %}
-        <a href="{{site.uri.public}}/dashboard" class="btn btn-default btn-flat btn-block">{{translate("DASHBOARD")}}</a>
+        <a href="{{ site.uri.public }}/dashboard"
+           class="btn btn-default btn-flat btn-block">{{ translate("DASHBOARD") }}</a>
     {% endif %}
     {{ parent() }}
 {% endblock %}
\ No newline at end of file