SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Database/Seeds/ClearDataSeeder.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 
 class ClearDataSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $permissions = \DB::table('permissions')->whereIn('model', ['user', 'permission', 'group', 'oauthClient']);
-        \DB::table('groups_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
-        $permissions->delete();
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$permissions = \DB::table('permissions')->whereIn('model', ['user', 'permission', 'group', 'oauthClient']);
+		\DB::table('groups_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
+		$permissions->delete();
+	}
 }

src/Modules/Acl/Database/Seeds/PermissionsTableSeeder.php

Indentation +30 added lines, -30 removed lines

@@ -6,34 +6,34 @@
 
 class PermissionsTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Insert the permissions related to permissions table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Permissions model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'permission',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'find',
-                'model'      => 'permission',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-            ]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to permissions table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Permissions model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'permission',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'permission',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
+	}
 }

src/Modules/Acl/Database/Seeds/GroupsTableSeeder.php

Indentation +66 added lines, -66 removed lines

@@ -6,70 +6,70 @@
 
 class GroupsTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Insert the permissions related to groups table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Groups model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'group',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'find',
-                'model'      => 'group',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'insert',
-                'model'      => 'group',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'group',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'delete',
-                'model'      => 'group',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'group',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'group',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'assignPermissions',
-                'model'      => 'group',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-            ]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to groups table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Groups model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'group',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'group',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'insert',
+				'model'      => 'group',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'group',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'delete',
+				'model'      => 'group',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'group',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'group',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignPermissions',
+				'model'      => 'group',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
+	}
 }

src/Modules/Acl/Database/Seeds/OauthClientsTableSeeder.php

Indentation +54 added lines, -54 removed lines

@@ -6,58 +6,58 @@
 
 class OauthClientsTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Insert the permissions related to oauthClients table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * OauthClients model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'oauthClient',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'find',
-                'model'      => 'oauthClient',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'insert',
-                'model'      => 'oauthClient',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'oauthClient',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'revoke',
-                'model'      => 'oauthClient',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'unRevoke',
-                'model'      => 'oauthClient',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-            ]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to oauthClients table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * OauthClients model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'oauthClient',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'oauthClient',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'insert',
+				'model'      => 'oauthClient',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'oauthClient',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'revoke',
+				'model'      => 'oauthClient',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'unRevoke',
+				'model'      => 'oauthClient',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
+	}
 }

src/Modules/Acl/AclUser.php

Indentation +127 added lines, -127 removed lines

@@ -7,133 +7,133 @@
 class AclUser extends User
 {
 
-    use SoftDeletes, HasApiTokens;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token', 'deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
-    public $searchable  = ['name', 'email'];
+	use SoftDeletes, HasApiTokens;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token', 'deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
+	public $searchable  = ['name', 'email'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    /**
-     * Get the profile picture url.
-     * @return string
-     */
-    public function getProfilePictureAttribute($value)
-    {
-        return url(\Storage::url($value));
-    }
-
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
-
-    /**
-     * Get the entity's notifications.
-     */
-    public function notifications()
-    {
-        return $this->morphMany('App\Modules\Notifications\Notification', 'notifiable')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the entity's read notifications.
-     */
-    public function readNotifications()
-    {
-        return $this->notifications()->whereNotNull('read_at');
-    }
-
-    /**
-     * Get the entity's unread notifications.
-     */
-    public function unreadNotifications()
-    {
-        return $this->notifications()->whereNull('read_at');
-    }
-
-    public function groups()
-    {
-        return $this->belongsToMany('App\Modules\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
-
-    public function oauthClients()
-    {
-        return $this->hasMany('App\Modules\Acl\OauthClient', 'user_id');
-    }
-
-    /**
-     * Return fcm device tokens that will be used in sending fcm notifications.
-     *
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) {
-            if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) {
-                $device->forceDelete();
-                continue;
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.'.$this->id;
-    }
-
-    /**
-     * Custom password validation.
-     *
-     * @param  string $password
-     * @return boolean
-     */
-    public function validateForPassportPasswordGrant($password)
-    {
-        if ($password == config('skeleton.social_pass')) {
-            return true;
-        }
-
-        return \Hash::check($password, $this->password);
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	/**
+	 * Get the profile picture url.
+	 * @return string
+	 */
+	public function getProfilePictureAttribute($value)
+	{
+		return url(\Storage::url($value));
+	}
+
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = bcrypt($value);
+	}
+
+	/**
+	 * Get the entity's notifications.
+	 */
+	public function notifications()
+	{
+		return $this->morphMany('App\Modules\Notifications\Notification', 'notifiable')->orderBy('created_at', 'desc');
+	}
+
+	/**
+	 * Get the entity's read notifications.
+	 */
+	public function readNotifications()
+	{
+		return $this->notifications()->whereNotNull('read_at');
+	}
+
+	/**
+	 * Get the entity's unread notifications.
+	 */
+	public function unreadNotifications()
+	{
+		return $this->notifications()->whereNull('read_at');
+	}
+
+	public function groups()
+	{
+		return $this->belongsToMany('App\Modules\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
+
+	public function oauthClients()
+	{
+		return $this->hasMany('App\Modules\Acl\OauthClient', 'user_id');
+	}
+
+	/**
+	 * Return fcm device tokens that will be used in sending fcm notifications.
+	 *
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) {
+			if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) {
+				$device->forceDelete();
+				continue;
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.'.$this->id;
+	}
+
+	/**
+	 * Custom password validation.
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function validateForPassportPasswordGrant($password)
+	{
+		if ($password == config('skeleton.social_pass')) {
+			return true;
+		}
+
+		return \Hash::check($password, $this->password);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        AclUser::observe(\App::make('App\Modules\Acl\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		AclUser::observe(\App::make('App\Modules\Acl\ModelObservers\AclUserObserver'));
+	}
 }

src/Modules/Reporting/Http/Resources/Report.php

Indentation +16 added lines, -16 removed lines

@@ -6,20 +6,20 @@
 
 class Report extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'report_name' => $this->report_name,
-            'view_name' => $this->view_name,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param Request $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'report_name' => $this->report_name,
+			'view_name' => $this->view_name,
+			'created_at' => $this->created_at,
+			'updated_at' => $this->updated_at,
+		];
+	}
 }

src/Modules/Reporting/Routes/api.php

Indentation +10 added lines, -10 removed lines

@@ -13,15 +13,15 @@
 
 Route::group(['prefix' => 'reporting'], function () {
     
-    Route::group(['prefix' => 'reports'], function () {
+	Route::group(['prefix' => 'reports'], function () {
         
-        Route::get('/', 'ReportController@index');
-        Route::get('/{id}', 'ReportController@find');
-        Route::post('/', 'ReportController@insert');
-        Route::put('/', 'ReportController@update');
-        Route::delete('/{id}', 'ReportController@delete');
-        Route::get('list/deleted', 'ReportController@deleted');
-        Route::patch('restore/{id}', 'ReportController@restore');
-        Route::post('get/{reportName}', 'ReportController@getReport');
-    });
+		Route::get('/', 'ReportController@index');
+		Route::get('/{id}', 'ReportController@find');
+		Route::post('/', 'ReportController@insert');
+		Route::put('/', 'ReportController@update');
+		Route::delete('/{id}', 'ReportController@delete');
+		Route::get('list/deleted', 'ReportController@deleted');
+		Route::patch('restore/{id}', 'ReportController@restore');
+		Route::post('get/{reportName}', 'ReportController@getReport');
+	});
 });

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 |
 */
 
-Route::group(['prefix' => 'reporting'], function () {
+Route::group(['prefix' => 'reporting'], function() {
     
-    Route::group(['prefix' => 'reports'], function () {
+    Route::group(['prefix' => 'reports'], function() {
         
         Route::get('/', 'ReportController@index');
         Route::get('/{id}', 'ReportController@find');

src/Modules/Reporting/Database/Seeds/ReportsTableSeeder.php

Indentation +36 added lines, -36 removed lines

@@ -6,40 +6,40 @@
 
 class ReportsTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Insert the permissions related to settings table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Reports model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'report',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'find',
-                'model'      => 'report',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'admin_count',
-                'model'      => 'report',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to settings table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Reports model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'report',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'report',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'admin_count',
+				'model'      => 'report',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

src/Modules/Reporting/Database/Seeds/AssignRelationsSeeder.php

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class AssignRelationsSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id;
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id;
 
-        /**
-         * Assign the permissions to the admin group.
-         */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminGroupId) {
-            \DB::table('groups_permissions')->insert(
-                [
-                'permission_id' => $permission->id,
-                'group_id'      => $adminGroupId,
-                'created_at'    => \DB::raw('NOW()'),
-                'updated_at'    => \DB::raw('NOW()')
-                ]
-            );
-        });
-    }
+		/**
+		 * Assign the permissions to the admin group.
+		 */
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminGroupId) {
+			\DB::table('groups_permissions')->insert(
+				[
+				'permission_id' => $permission->id,
+				'group_id'      => $adminGroupId,
+				'created_at'    => \DB::raw('NOW()'),
+				'updated_at'    => \DB::raw('NOW()')
+				]
+			);
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
          * Assign the permissions to the admin group.
          */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminGroupId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function($permission) use ($adminGroupId) {
             \DB::table('groups_permissions')->insert(
                 [
                 'permission_id' => $permission->id,