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

1 files changed, 45 insertions, 24 deletions

diff --git a/main/app/sprinkles/extend-user/templates/forms/user.html.twig b/main/app/sprinkles/extend-user/templates/forms/user.html.twig
index b7c98a9..11edfd0 100644
--- a/main/app/sprinkles/extend-user/templates/forms/user.html.twig
+++ b/main/app/sprinkles/extend-user/templates/forms/user.html.twig
@@ -1,4 +1,4 @@
-<form class="js-form" method="{{form.method | default('POST')}}" action="{{site.uri.public}}/{{form.action}}">
+<form class="js-form" method="{{ form.method | default('POST') }}" action="{{ site.uri.public }}/{{ form.action }}">
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
@@ -7,10 +7,12 @@
             {% if 'user_name' not in form.fields.hidden %}
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label>{{translate('USERNAME')}}</label>
+                        <label>{{ translate('USERNAME') }}</label>
                         <div class="input-group">
                             <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
-                            <input type="text" class="form-control" name="user_name" autocomplete="off" value="{{user.user_name}}" placeholder="{{translate('USERNAME')}}" {% if 'user_name' in form.fields.disabled %}disabled{% endif %}>
+                            <input type="text" class="form-control" name="user_name" autocomplete="off"
+                                   value="{{ user.user_name }}" placeholder="{{ translate('USERNAME') }}"
+                                   {% if 'user_name' in form.fields.disabled %}disabled{% endif %}>
                         </div>
                     </div>
                 </div>
@@ -18,15 +20,17 @@
             {% if 'group' not in form.fields.hidden %}
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label for="input-group">{{translate('GROUP')}}</label>
+                        <label for="input-group">{{ translate('GROUP') }}</label>
                         <div class="input-group">
                             <span class="input-group-addon"><i class="fa fa-users fa-fw"></i></span>
                             {% if 'group' in form.fields.disabled %}
-                                <input type="text" class="form-control" name="theme" value="{{user.group.name}}" disabled>
+                                <input type="text" class="form-control" name="theme" value="{{ user.group.name }}"
+                                       disabled>
                             {% else %}
                                 <select id="input-group" class="form-control js-select2" name="group_id">
                                     {% for group in groups %}
-                                        <option value="{{group.id}}" {% if (group.id == user.group_id) %}selected{% endif %}>{{group.name}}</option>
+                                        <option value="{{ group.id }}"
+                                                {% if (group.id == user.group_id) %}selected{% endif %}>{{ group.name }}</option>
                                     {% endfor %}
                                 </select>
                             {% endif %}
@@ -37,19 +41,23 @@
             {% if 'name' not in form.fields.hidden %}
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label>{{translate('FIRST_NAME')}}</label>
+                        <label>{{ translate('FIRST_NAME') }}</label>
                         <div class="input-group">
                             <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
-                            <input type="text" class="form-control" name="first_name" autocomplete="off" value="{{user.first_name}}" placeholder="{{translate('FIRST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                            <input type="text" class="form-control" name="first_name" autocomplete="off"
+                                   value="{{ user.first_name }}" placeholder="{{ translate('FIRST_NAME') }}"
+                                   {% if 'name' in form.fields.disabled %}disabled{% endif %}>
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label>{{translate('LAST_NAME')}}</label>
+                        <label>{{ translate('LAST_NAME') }}</label>
                         <div class="input-group">
                             <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
-                            <input type="text" class="form-control" name="last_name" autocomplete="off" value="{{user.last_name}}" placeholder="{{translate('LAST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                            <input type="text" class="form-control" name="last_name" autocomplete="off"
+                                   value="{{ user.last_name }}" placeholder="{{ translate('LAST_NAME') }}"
+                                   {% if 'name' in form.fields.disabled %}disabled{% endif %}>
                         </div>
                     </div>
                 </div>
@@ -57,13 +65,16 @@
             {% if 'email' not in form.fields.hidden %}
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label>{{translate('EMAIL')}}</label>
+                        <label>{{ translate('EMAIL') }}</label>
                         <div class="input-group js-copy-container">
                             <span class="input-group-addon"><i class="fa fa-envelope fa-fw"></i></span>
-                            <input type="text" class="form-control js-copy-target" name="email" autocomplete="off" value="{{user.email}}" placeholder="{{translate('EMAIL')}}" {% if 'email' in form.fields.disabled %}disabled{% endif %}>
+                            <input type="text" class="form-control js-copy-target" name="email" autocomplete="off"
+                                   value="{{ user.email }}" placeholder="{{ translate('EMAIL') }}"
+                                   {% if 'email' in form.fields.disabled %}disabled{% endif %}>
                             {% if 'email' in form.fields.disabled %}
                                 <span class="input-group-btn">
-                                <button class="btn btn-default js-copy-trigger" type="button"><i class="fa fa-clipboard"></i></button>
+                                <button class="btn btn-default js-copy-trigger" type="button"><i
+                                            class="fa fa-clipboard"></i></button>
                             </span>
                             {% endif %}
                         </div>
@@ -73,15 +84,17 @@
             {% if 'theme' not in form.fields.hidden %}
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label for="input-theme">{{translate('THEME')}}</label>
+                        <label for="input-theme">{{ translate('THEME') }}</label>
                         <div class="input-group">
                             <span class="input-group-addon"><i class="fa fa-puzzle-piece fa-fw"></i></span>
                             {% if 'theme' in form.fields.disabled %}
-                                <input type="text" class="form-control" name="theme" value="{{themes[user.theme]}}" disabled>
+                                <input type="text" class="form-control" name="theme" value="{{ themes[user.theme] }}"
+                                       disabled>
                             {% else %}
                                 <select id="input-theme" class="form-control js-select2" name="theme">
                                     {% for option, label in theme %}
-                                        <option value="{{option}}" {% if (option == user.theme) %}selected{% endif %}>{{label}}</option>
+                                        <option value="{{ option }}"
+                                                {% if (option == user.theme) %}selected{% endif %}>{{ label }}</option>
                                     {% endfor %}
                                 </select>
                             {% endif %}
@@ -92,15 +105,17 @@
             {% if 'locale' not in form.fields.hidden %}
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label for="input-locale">{{translate('LOCALE')}}</label>
+                        <label for="input-locale">{{ translate('LOCALE') }}</label>
                         <div class="input-group">
                             <span class="input-group-addon"><i class="fa fa-language fa-fw"></i></span>
                             {% if 'locale' in form.fields.disabled %}
-                                <input type="text" class="form-control" name="theme" value="{{locales[user.locale]}}" disabled>
+                                <input type="text" class="form-control" name="theme" value="{{ locales[user.locale] }}"
+                                       disabled>
                             {% else %}
                                 <select id="input-locale" class="form-control js-select2" name="locale">
                                     {% for option, label in locales %}
-                                        <option value="{{option}}" {% if (option == user.locale) %}selected{% endif %}>{{label}}</option>
+                                        <option value="{{ option }}"
+                                                {% if (option == user.locale) %}selected{% endif %}>{{ label }}</option>
                                     {% endfor %}
                                 </select>
                             {% endif %}
@@ -114,7 +129,9 @@
                         <label>City</label>
                         <div class="input-group js-copy-container">
                             <span class="input-group-addon"><i class="fa fa-map-pin"></i></span>
-                            <input type="text" class="form-control" name="city" autocomplete="off" value="{{user.city}}" placeholder="City" {% if 'address' in form.fields.disabled %}disabled{% endif %}>
+                            <input type="text" class="form-control" name="city" autocomplete="off"
+                                   value="{{ user.city }}" placeholder="City"
+                                   {% if 'address' in form.fields.disabled %}disabled{% endif %}>
                         </div>
                     </div>
                 </div>
@@ -123,19 +140,23 @@
                         <label>Country</label>
                         <div class="input-group js-copy-container">
                             <span class="input-group-addon"><i class="fa fa-map-pin"></i></span>
-                            <input type="text" class="form-control" name="country" autocomplete="off" value="{{user.country}}" placeholder="Country" {% if 'address' in form.fields.disabled %}disabled{% endif %}>
+                            <input type="text" class="form-control" name="country" autocomplete="off"
+                                   value="{{ user.country }}" placeholder="Country"
+                                   {% if 'address' in form.fields.disabled %}disabled{% endif %}>
                         </div>
                     </div>
                 </div>
             {% endif %}
         {% endblock %}
-    </div><br>
+    </div>
+    <br>
     <div class="row">
         <div class="col-xs-8 col-sm-4">
-            <button type="submit" class="btn btn-block btn-lg btn-success">{{form.submit_text}}</button>
+            <button type="submit" class="btn btn-block btn-lg btn-success">{{ form.submit_text }}</button>
         </div>
         <div class="col-xs-4 col-sm-3 pull-right">
-            <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button>
+            <button type="button" class="btn btn-block btn-lg btn-link"
+                    data-dismiss="modal">{{ translate('CANCEL') }}</button>
         </div>
     </div>
 </form>