SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/Http/Controllers/PermissionsController.php

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
 
 class PermissionsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model = 'permissions';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'permissions';
 }

src/Modules/V1/Acl/Http/Controllers/GroupsController.php

Indentation +28 added lines, -28 removed lines

@@ -8,35 +8,35 @@
 
 class GroupsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'groups';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'groups';
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-    'name' => 'required|string|max:100|unique:groups,name,{id}'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+	'name' => 'required|string|max:100|unique:groups,name,{id}'
+	];
 
-    /**
-     * Handle an assign permissions to group request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postAssignpermissions(Request $request)
-    {
-        $this->validate($request, [
-            'permission_ids' => 'required|exists:permissions,id', 
-            'group_id'       => 'required|exists:groups,id'
-            ]);
+	/**
+	 * Handle an assign permissions to group request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postAssignpermissions(Request $request)
+	{
+		$this->validate($request, [
+			'permission_ids' => 'required|exists:permissions,id', 
+			'group_id'       => 'required|exists:groups,id'
+			]);
 
-        return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
-    }
+		return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -13,14 +13,14 @@
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'groups';
+    protected $model = 'groups';
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
     'name' => 'required|string|max:100|unique:groups,name,{id}'
     ];
 

src/Modules/V1/Core/Utl/ErrorHandler.php

Indentation +65 added lines, -65 removed lines

@@ -2,81 +2,81 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => 'Please login before any action'];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => 'Please login before any action'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function tokenExpired()
-    {
-        $error = ['status' => 403, 'message' => 'Login token expired'];
-        abort($error['status'], $error['message']);
-    }
+	public function tokenExpired()
+	{
+		$error = ['status' => 403, 'message' => 'Login token expired'];
+		abort($error['status'], $error['message']);
+	}
 
-     public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => 'No permissions'];
-        abort($error['status'], $error['message']);
-    }
+	 public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => 'No permissions'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => 'Wrong mail or password'];
-        abort($error['status'], $error['message']);
-    }
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => 'Wrong mail or password'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
-        abort($error['status'], $error['message']);
-    }
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => 'Please check the given inputes'];
-        abort($error['status'], $error['message']);
-    }
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => 'Please check the given inputes'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => 'Can\'t create setting'];
-        abort($error['status'], $error['message']);
-    }
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => 'Can\'t create setting'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => 'Can\'t update setting key'];
-        abort($error['status'], $error['message']);
-    }
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => 'Can\'t update setting key'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => 'You have been blocked'];
-        abort($error['status'], $error['message']);
-    }
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => 'You have been blocked'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => 'Reset password token is invalid'];
-        abort($error['status'], $error['message']);
-    }
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => 'Reset password token is invalid'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => 'Reset password is invalid'];
-        abort($error['status'], $error['message']);
-    }
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => 'Reset password is invalid'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
-        abort($error['status'], $error['message']);
-    }
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+		abort($error['status'], $error['message']);
+	}
 
-    public function generalError()
-    {
-        $error = ['status' => 404, 'message' => 'Something went wrong'];
-        abort($error['status'], $error['message']);
-    }
+	public function generalError()
+	{
+		$error = ['status' => 404, 'message' => 'Something went wrong'];
+		abort($error['status'], $error['message']);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
     public function notFound($text)
     {
-        $error = ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+        $error = ['status' => 404, 'message' => 'The requested '.$text.' not found'];
         abort($error['status'], $error['message']);
     }
 

src/Modules/V1/Acl/Http/Controllers/UsersController.php

Indentation +163 added lines, -163 removed lines

@@ -7,167 +7,167 @@
 
 class UsersController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'users';
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'block', 'unblock', 'editprofile', 'sendreset'];
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck      = ['login', 'register', 'sendreset', 'resetpassword'];
-
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules     = [
-    'email'    => 'required|email|unique:users,email,{id}',
-    'password' => 'min:6'
-    ];
-
-    /**
-     * Return the logged in user account.
-     * 
-     * @return object
-     */
-    public function getAccount()
-    {
-       $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
-       return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $user_id
-     * @return void
-     */
-    public function getBlock($user_id)
-    {
-        return \Response::json(\Core::users()->block($user_id), 200);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $user_id
-     * @return void
-     */
-    public function getUnblock($user_id)
-    {
-        return \Response::json(\Core::users()->unblock($user_id), 200);
-    }
-
-    /**
-     * Logout the user.
-     * 
-     * @return void
-     */
-    public function getLogout()
-    {
-        return \Response::json(\Core::users()->logout(), 200);
-    }
-
-    /**
-     * Handle a registration request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postRegister(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'email|unique:users,email,{id}', 
-            'password' => 'min:6'
-            ]);
-
-        return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
-    }
-
-    /**
-     * Handle a login request to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postLogin(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'required|email', 
-            'password' => 'required|min:6'
-            ]);
-
-        return \Response::json(\Core::users()->login($request->only('email', 'password')), 200);
-    }
-
-    /**
-     * Handle an assign groups to user request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postAssigngroups(Request $request)
-    {
-        $this->validate($request, [
-            'group_ids' => 'required|exists:groups,id', 
-            'user_id'   => 'required|exists:users,id'
-            ]);
-
-        return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
-    }
-
-    /**
-     * Handle the editing of the user profile.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postEditprofile(Request $request)
-    {
-        return \Response::json(\Core::users()->editProfile($request->all()), 200);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postSendreset(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email']);
-
-        return \Response::json(\Core::users()->sendReset($request->only('email')), 200);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function postResetpassword(Request $request)
-    {
-        $this->validate($request, [
-            'token'                 => 'required',
-            'email'                 => 'required|email',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
-
-        return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
-    }
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'users';
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'block', 'unblock', 'editprofile', 'sendreset'];
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck      = ['login', 'register', 'sendreset', 'resetpassword'];
+
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules     = [
+	'email'    => 'required|email|unique:users,email,{id}',
+	'password' => 'min:6'
+	];
+
+	/**
+	 * Return the logged in user account.
+	 * 
+	 * @return object
+	 */
+	public function getAccount()
+	{
+	   $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
+	   return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $user_id
+	 * @return void
+	 */
+	public function getBlock($user_id)
+	{
+		return \Response::json(\Core::users()->block($user_id), 200);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $user_id
+	 * @return void
+	 */
+	public function getUnblock($user_id)
+	{
+		return \Response::json(\Core::users()->unblock($user_id), 200);
+	}
+
+	/**
+	 * Logout the user.
+	 * 
+	 * @return void
+	 */
+	public function getLogout()
+	{
+		return \Response::json(\Core::users()->logout(), 200);
+	}
+
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postRegister(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'email|unique:users,email,{id}', 
+			'password' => 'min:6'
+			]);
+
+		return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postLogin(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'required|email', 
+			'password' => 'required|min:6'
+			]);
+
+		return \Response::json(\Core::users()->login($request->only('email', 'password')), 200);
+	}
+
+	/**
+	 * Handle an assign groups to user request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postAssigngroups(Request $request)
+	{
+		$this->validate($request, [
+			'group_ids' => 'required|exists:groups,id', 
+			'user_id'   => 'required|exists:users,id'
+			]);
+
+		return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
+	}
+
+	/**
+	 * Handle the editing of the user profile.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postEditprofile(Request $request)
+	{
+		return \Response::json(\Core::users()->editProfile($request->all()), 200);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postSendreset(Request $request)
+	{
+		$this->validate($request, ['email' => 'required|email']);
+
+		return \Response::json(\Core::users()->sendReset($request->only('email')), 200);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function postResetpassword(Request $request)
+	{
+		$this->validate($request, [
+			'token'                 => 'required',
+			'email'                 => 'required|email',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
+
+		return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'users';
+    protected $model = 'users';
 
     /**
      * List of all route actions that the base api controller
@@ -26,14 +26,14 @@ 
      * will skip login check for them.
      * @var array
      */
-    protected $skipLoginCheck      = ['login', 'register', 'sendreset', 'resetpassword'];
+    protected $skipLoginCheck = ['login', 'register', 'sendreset', 'resetpassword'];
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules     = [
+    protected $validationRules = [
     'email'    => 'required|email|unique:users,email,{id}',
     'password' => 'min:6'
     ];

src/Modules/V1/Acl/Database/Migrations/2015_12_20_124154_password_resets.php

Indentation +22 added lines, -22 removed lines

@@ -5,27 +5,27 @@
 
 class PasswordResets extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->string('email')->index();
-            $table->string('token')->index();
-            $table->timestamp('created_at');
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('password_resets', function (Blueprint $table) {
+			$table->string('email')->index();
+			$table->string('token')->index();
+			$table->timestamp('created_at');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('password_resets');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('password_resets');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create('password_resets', function (Blueprint $table) {
+        Schema::create('password_resets', function(Blueprint $table) {
             $table->string('email')->index();
             $table->string('token')->index();
             $table->timestamp('created_at');

src/Modules/V1/Acl/Database/Migrations/2015_12_20_124153_users.php

Indentation +9 added lines, -9 removed lines

@@ -13,15 +13,15 @@
 	public function up()
 	{
 		Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100)->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60);
-            $table->boolean('blocked', 0);
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('name',100)->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60);
+			$table->boolean('blocked', 0);
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 	}
 
 	/**

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 	 */
 	public function up()
 	{
-		Schema::create('users', function (Blueprint $table) {
+		Schema::create('users', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('name',100)->nullable();
+            $table->string('name', 100)->nullable();
             $table->string('email')->unique();
             $table->string('password', 60);
             $table->boolean('blocked', 0);

src/ApiSkeletonServiceProvider.php

Indentation +21 added lines, -21 removed lines

@@ -6,26 +6,26 @@
 
 class ApiSkeletonServiceProvider extends ServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->publishes([
-            __DIR__.'/Modules'               => app_path('Modules'),
-            __DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'),
-            ]);
-    }
+	/**
+	 * Perform post-registration booting of services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->publishes([
+			__DIR__.'/Modules'               => app_path('Modules'),
+			__DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'),
+			]);
+	}
 
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+	/**
+	 * Register any package services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
 }
\ No newline at end of file