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 --- .../account/src/Database/Migrations/v400/ActivitiesTable.php | 7 +++---- .../account/src/Database/Migrations/v400/GroupsTable.php | 11 +++++------ .../src/Database/Migrations/v400/PasswordResetsTable.php | 7 +++---- .../src/Database/Migrations/v400/PermissionRolesTable.php | 7 +++---- .../src/Database/Migrations/v400/PermissionsTable.php | 12 +++++------- .../src/Database/Migrations/v400/PersistencesTable.php | 7 +++---- .../account/src/Database/Migrations/v400/RoleUsersTable.php | 7 +++---- .../account/src/Database/Migrations/v400/RolesTable.php | 7 +++---- .../account/src/Database/Migrations/v400/UsersTable.php | 7 +++---- .../src/Database/Migrations/v400/VerificationsTable.php | 7 +++---- 10 files changed, 34 insertions(+), 45 deletions(-) (limited to 'main/app/sprinkles/account/src/Database/Migrations/v400') diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php index 4e55c7c..db02ec2 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/ActivitiesTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use UserFrosting\System\Bakery\Migration; @@ -24,8 +25,7 @@ class ActivitiesTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('activities')) { $this->schema->create('activities', function (Blueprint $table) { $table->increments('id'); @@ -47,8 +47,7 @@ class ActivitiesTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('activities'); } } \ No newline at end of file diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php index c74615f..07583af 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -26,15 +27,14 @@ class GroupsTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('groups')) { - $this->schema->create('groups', function(Blueprint $table) { + $this->schema->create('groups', function (Blueprint $table) { $table->increments('id'); $table->string('slug'); $table->string('name'); $table->text('description')->nullable(); - $table->string('icon', 100)->nullable(false)->default('fa fa-user')->comment('The icon representing users in this group.'); + $table->string('icon', 100)->nullable(FALSE)->default('fa fa-user')->comment('The icon representing users in this group.'); $table->timestamps(); $table->engine = 'InnoDB'; @@ -75,8 +75,7 @@ class GroupsTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('groups'); } } diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php index e785ccc..47eb00d 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/PasswordResetsTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -25,8 +26,7 @@ class passwordResetsTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('password_resets')) { $this->schema->create('password_resets', function (Blueprint $table) { $table->increments('id'); @@ -50,8 +50,7 @@ class passwordResetsTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('password_resets'); } } diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php index 2c2990c..8e06cd6 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionRolesTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -25,8 +26,7 @@ class PermissionRolesTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('permission_roles')) { $this->schema->create('permission_roles', function (Blueprint $table) { $table->integer('permission_id')->unsigned(); @@ -48,8 +48,7 @@ class PermissionRolesTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('permission_roles'); } } diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php index 684b01a..bef8cdd 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/PermissionsTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -36,10 +37,9 @@ class PermissionsTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('permissions')) { - $this->schema->create('permissions', function(Blueprint $table) { + $this->schema->create('permissions', function (Blueprint $table) { $table->increments('id'); $table->string('slug')->comment('A code that references a specific action or URI that an assignee of this permission has access to.'); $table->string('name'); @@ -57,16 +57,14 @@ class PermissionsTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('permissions'); } /** * {@inheritDoc} */ - public function seed() - { + public function seed() { // Skip this if table is not empty if (Permission::count() == 0) { diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php index b96e327..41378d3 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/PersistencesTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -25,8 +26,7 @@ class PersistencesTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('persistences')) { $this->schema->create('persistences', function (Blueprint $table) { $table->increments('id'); @@ -50,8 +50,7 @@ class PersistencesTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('persistences'); } } diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php index 7f3648b..4c7ca06 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/RoleUsersTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -25,8 +26,7 @@ class RoleUsersTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('role_users')) { $this->schema->create('role_users', function (Blueprint $table) { $table->integer('user_id')->unsigned(); @@ -48,8 +48,7 @@ class RoleUsersTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('role_users'); } } diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php index 9cef494..20fe699 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/RolesTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -26,8 +27,7 @@ class RolesTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('roles')) { $this->schema->create('roles', function (Blueprint $table) { $table->increments('id'); @@ -71,8 +71,7 @@ class RolesTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('roles'); } } diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php index a65eeed..9c634e8 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/UsersTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -25,8 +26,7 @@ class UsersTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('users')) { $this->schema->create('users', function (Blueprint $table) { $table->increments('id'); @@ -62,8 +62,7 @@ class UsersTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('users'); } } diff --git a/main/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php b/main/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php index fa54da6..e42114c 100644 --- a/main/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php +++ b/main/app/sprinkles/account/src/Database/Migrations/v400/VerificationsTable.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Account\Database\Migrations\v400; use Illuminate\Database\Schema\Blueprint; @@ -25,8 +26,7 @@ class VerificationsTable extends Migration /** * {@inheritDoc} */ - public function up() - { + public function up() { if (!$this->schema->hasTable('verifications')) { $this->schema->create('verifications', function (Blueprint $table) { $table->increments('id'); @@ -50,8 +50,7 @@ class VerificationsTable extends Migration /** * {@inheritDoc} */ - public function down() - { + public function down() { $this->schema->drop('verifications'); } } -- cgit v1.2.3