idevelopment / RingMe

app/Http/Controllers/CallbackController.php

Indentation +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
  */
 class CallbackController extends Controller
 {
-	    public function __construct()
+        public function __construct()
     {
         $this->middleware('auth');
         $this->middleware('lang');
@@ -27,7 +27,7 @@ 
     public function index()
     {
         $data['query'] = Callback::all();
-    	return view('callbacks/list', $data);
+        return view('callbacks/list', $data);
     }
 
 
@@ -59,7 +59,7 @@ 
      */
     public function edit($id)
     {
-    	return view('callbacks/details');
+        return view('callbacks/details');
     }
 
     /**

app/Http/Controllers/SettingsController.php

Indentation +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 
 class SettingsController extends Controller
 {
-	/**
+    /**
      * SettingsController constructor.
      */
     public function __construct()
@@ -19,7 +19,7 @@ 
 
     public function index()
     {
-    	return view('settings.index');
+        return view('settings.index');
     }
 
 

app/Http/Controllers/StaffController.php

Indentation +5 added lines, -5 removed lines

@@ -81,9 +81,9 @@ 
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index()
-	{
-		$data['users'] = User::paginate(15);
-    	return view('users/index', $data);
+    {
+        $data['users'] = User::paginate(15);
+        return view('users/index', $data);
     }
 
     /**
@@ -123,7 +123,7 @@ 
     {
         $id = auth()->user()->id;
         $data['tokens'] = ApiKey::where('user_id', $id)->get();
-    	return view('users/profile', $data);
+        return view('users/profile', $data);
     }
 
     /**
@@ -149,7 +149,7 @@ 
         $data2 = [];
         foreach($items as $role)
         {
-         $data2[] = [
+            $data2[] = [
         'value' => $role["id"],
         'text'  => $role["name"]
         ];

app/Http/routes.php

Indentation -11 removed lines

@@ -67,14 +67,3 @@
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
 <<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');

app/Http/Controllers/RolesController.php

Indentation +3 added lines, -3 removed lines

@@ -16,8 +16,8 @@ 
      */
     public function index()
     {
-    	$data['roles'] = Roles::all();
-    	return view('roles.index', $data);
+        $data['roles'] = Roles::all();
+        return view('roles.index', $data);
     }
 
     /**
@@ -52,7 +52,7 @@ 
      */
     public function edit($id)
     {
-    	return view('roles.edit');
+        return view('roles.edit');
     }
 
     public function store()