From b66a61addb6c8e66cb26fcf74b532d68891267e4 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 23 May 2018 22:23:28 +0200
Subject: Refactored code, many fixes and improvements in chat backend+frontend

---
 main/app/sprinkles/extend-user/composer.json       | 36 +++++------
 .../src/Controller/MemberController.php            |  4 +-
 .../src/Database/Migrations/v400/MembersTable.php  |  7 +--
 .../extend-user/src/Database/Models/Member.php     | 24 +++-----
 .../extend-user/src/Database/Models/MemberAux.php  |  2 +-
 .../src/Database/Scopes/MemberAuxScope.php         |  7 +--
 .../src/ServicesProvider/ServicesProvider.php      |  3 +-
 .../extend-user/templates/forms/user.html.twig     | 69 ++++++++++++++--------
 .../extend-user/templates/pages/user.html.twig     |  2 +-
 9 files changed, 83 insertions(+), 71 deletions(-)

(limited to 'main/app/sprinkles/extend-user')

diff --git a/main/app/sprinkles/extend-user/composer.json b/main/app/sprinkles/extend-user/composer.json
index 4c8a0fa..fe94c04 100644
--- a/main/app/sprinkles/extend-user/composer.json
+++ b/main/app/sprinkles/extend-user/composer.json
@@ -1,22 +1,22 @@
 {
-    "name": "userfrosting/extend-user",
-    "type": "userfrosting-sprinkle",
-    "description": "An example Sprinkle for extending the User model and table with additional fields or relationships.",
-    "homepage": "https://github.com/userfrosting/extend-user",
-    "license" : "MIT",
-    "authors" : [
-        {
-            "name": "Alexander Weissman",
-            "homepage": "https://alexanderweissman.com"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "UserFrosting\\Sprinkle\\ExtendUser\\": "src/"
-        }
-    },
-    "extra": {
-        "installer-name": "extend-user"
+  "name": "userfrosting/extend-user",
+  "type": "userfrosting-sprinkle",
+  "description": "An example Sprinkle for extending the User model and table with additional fields or relationships.",
+  "homepage": "https://github.com/userfrosting/extend-user",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Alexander Weissman",
+      "homepage": "https://alexanderweissman.com"
     }
+  ],
+  "autoload": {
+    "psr-4": {
+      "UserFrosting\\Sprinkle\\ExtendUser\\": "src/"
+    }
+  },
+  "extra": {
+    "installer-name": "extend-user"
+  }
 }
 
diff --git a/main/app/sprinkles/extend-user/src/Controller/MemberController.php b/main/app/sprinkles/extend-user/src/Controller/MemberController.php
index c584286..0fcc481 100644
--- a/main/app/sprinkles/extend-user/src/Controller/MemberController.php
+++ b/main/app/sprinkles/extend-user/src/Controller/MemberController.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace UserFrosting\Sprinkle\ExtendUser\Controller;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
@@ -19,8 +20,7 @@ class MemberController extends UserController
      * This page requires authentication.
      * Request type: GET
      */
-    public function pageInfo($request, $response, $args)
-    {
+    public function pageInfo($request, $response, $args) {
         $user = $this->getUserFromParams($args);
 
         // If the user no longer exists, forward to main user listing page
diff --git a/main/app/sprinkles/extend-user/src/Database/Migrations/v400/MembersTable.php b/main/app/sprinkles/extend-user/src/Database/Migrations/v400/MembersTable.php
index a27d485..fe5aa93 100644
--- a/main/app/sprinkles/extend-user/src/Database/Migrations/v400/MembersTable.php
+++ b/main/app/sprinkles/extend-user/src/Database/Migrations/v400/MembersTable.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace UserFrosting\Sprinkle\ExtendUser\Database\Migrations\v400;
 
 use UserFrosting\System\Bakery\Migration;
@@ -11,8 +12,7 @@ class MembersTable extends Migration
         '\UserFrosting\Sprinkle\Account\Database\Migrations\v400\UsersTable'
     ];
 
-    public function up()
-    {
+    public function up() {
         if (!$this->schema->hasTable('members')) {
             $this->schema->create('members', function (Blueprint $table) {
                 $table->increments('id');
@@ -27,8 +27,7 @@ class MembersTable extends Migration
         }
     }
 
-    public function down()
-    {
+    public function down() {
         $this->schema->drop('members');
     }
 }
diff --git a/main/app/sprinkles/extend-user/src/Database/Models/Member.php b/main/app/sprinkles/extend-user/src/Database/Models/Member.php
index 98d9d70..094d14c 100644
--- a/main/app/sprinkles/extend-user/src/Database/Models/Member.php
+++ b/main/app/sprinkles/extend-user/src/Database/Models/Member.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace UserFrosting\Sprinkle\ExtendUser\Database\Models;
 
 use UserFrosting\Sprinkle\Account\Database\Models\User;
@@ -12,8 +13,7 @@ trait LinkMemberAux
      *
      * @return void
      */
-    protected static function bootLinkMemberAux()
-    {
+    protected static function bootLinkMemberAux() {
         /**
          * Create a new MemberAux if necessary, and save the associated member data every time.
          */
@@ -59,12 +59,11 @@ class Member extends User
      * Required to be able to access the `aux` relationship in Twig without needing to do eager loading.
      * @see http://stackoverflow.com/questions/29514081/cannot-access-eloquent-attributes-on-twig/35908957#35908957
      */
-    public function __isset($name)
-    {
+    public function __isset($name) {
         if (in_array($name, [
             'aux'
         ])) {
-            return true;
+            return TRUE;
         } else {
             return parent::__isset($name);
         }
@@ -73,8 +72,7 @@ class Member extends User
     /**
      * Globally joins the `members` table to access additional properties.
      */
-    protected static function boot()
-    {
+    protected static function boot() {
         parent::boot();
 
         static::addGlobalScope(new MemberAuxScope);
@@ -83,8 +81,7 @@ class Member extends User
     /**
      * Custom mutator for Member property
      */
-    public function setCityAttribute($value)
-    {
+    public function setCityAttribute($value) {
         $this->createAuxIfNotExists();
 
         $this->aux->city = $value;
@@ -93,8 +90,7 @@ class Member extends User
     /**
      * Custom mutator for Member property
      */
-    public function setCountryAttribute($value)
-    {
+    public function setCountryAttribute($value) {
         $this->createAuxIfNotExists();
 
         $this->aux->country = $value;
@@ -103,16 +99,14 @@ class Member extends User
     /**
      * Relationship for interacting with aux model (`members` table).
      */
-    public function aux()
-    {
+    public function aux() {
         return $this->hasOne($this->auxType, 'id');
     }
 
     /**
      * If this instance doesn't already have a related aux model (either in the db on in the current object), then create one
      */
-    protected function createAuxIfNotExists()
-    {
+    protected function createAuxIfNotExists() {
         if ($this->auxType && !count($this->aux)) {
             // Create aux model and set primary key to be the same as the main user's
             $aux = new $this->auxType;
diff --git a/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php b/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php
index c826409..6612586 100644
--- a/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php
+++ b/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php
@@ -6,7 +6,7 @@ use UserFrosting\Sprinkle\Core\Database\Models\Model;
 
 class MemberAux extends Model
 {
-    public $timestamps = false;
+    public $timestamps = FALSE;
 
     /**
      * @var string The name of the table for the current model.
diff --git a/main/app/sprinkles/extend-user/src/Database/Scopes/MemberAuxScope.php b/main/app/sprinkles/extend-user/src/Database/Scopes/MemberAuxScope.php
index c732147..624c4f6 100644
--- a/main/app/sprinkles/extend-user/src/Database/Scopes/MemberAuxScope.php
+++ b/main/app/sprinkles/extend-user/src/Database/Scopes/MemberAuxScope.php
@@ -11,12 +11,11 @@ class MemberAuxScope implements Scope
     /**
      * Apply the scope to a given Eloquent query builder.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $builder
-     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @param  \Illuminate\Database\Eloquent\Builder $builder
+     * @param  \Illuminate\Database\Eloquent\Model $model
      * @return void
      */
-    public function apply(Builder $builder, Model $model)
-    {
+    public function apply(Builder $builder, Model $model) {
         $baseTable = $model->getTable();
         // Hardcode the table name here, or you can access it using the classMapper and `getTable`
         $auxTable = 'members';
diff --git a/main/app/sprinkles/extend-user/src/ServicesProvider/ServicesProvider.php b/main/app/sprinkles/extend-user/src/ServicesProvider/ServicesProvider.php
index 8ea3860..22d8c7b 100644
--- a/main/app/sprinkles/extend-user/src/ServicesProvider/ServicesProvider.php
+++ b/main/app/sprinkles/extend-user/src/ServicesProvider/ServicesProvider.php
@@ -11,8 +11,7 @@ class ServicesProvider
      *
      * @param Container $container A DI container implementing ArrayAccess and container-interop.
      */
-    public function register($container)
-    {
+    public function register($container) {
         /**
          * Extend the 'classMapper' service to register model classes.
          *
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>
diff --git a/main/app/sprinkles/extend-user/templates/pages/user.html.twig b/main/app/sprinkles/extend-user/templates/pages/user.html.twig
index 46e79aa..13c79e6 100644
--- a/main/app/sprinkles/extend-user/templates/pages/user.html.twig
+++ b/main/app/sprinkles/extend-user/templates/pages/user.html.twig
@@ -5,7 +5,7 @@
         <hr>
         <strong><i class="fa fa-map-marker margin-r-5"></i> Location</strong>
         <p class="text-muted box-profile-property">
-            {{user.city}}, {{user.country}}
+            {{ user.city }}, {{ user.country }}
         </p>
     {% endif %}
 {% endblock %}
-- 
cgit v1.2.3