idevelopment / RingMe

app/Departments.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 class Departments extends Model
 {
-    protected $fillable = ['name', 'manager'];
+    protected $fillable = [ 'name', 'manager' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany

app/Http/Controllers/StaffController.php

Spacing +11 added lines, -11 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function create()
     {
-        $data['departments'] = Departments::all();
+        $data[ 'departments' ] = Departments::all();
         return view('staff.create', $data);
     }
 
@@ -50,7 +50,7 @@ 
      */
     public function store(Requests\NewStaffValidator $input)
     {
-        $newUser = User::create($input->except(['_token', 'department']))->id;
+        $newUser = User::create($input->except([ '_token', 'department' ]))->id;
         User::find($newUser)->departments()->attach($input->department);
 
         session()->flash('message', 'New staff member created');
@@ -78,7 +78,7 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = User::find($id);
+        $data[ 'query' ] = User::find($id);
         return view('staff.edit', $data);
     }
 
@@ -89,7 +89,7 @@ 
      */
     public function index()
 	{
-		$data['users'] = User::paginate(15);
+		$data[ 'users' ] = User::paginate(15);
     	return view('users/index', $data);
     }
 
@@ -129,7 +129,7 @@ 
     public function profile()
     {
         $id = auth()->user()->id;
-        $data['tokens'] = ApiKey::where('user_id', $id)->get();
+        $data[ 'tokens' ] = ApiKey::where('user_id', $id)->get();
     	return view('users/profile', $data);
     }
 
@@ -142,7 +142,7 @@ 
     public function destroy($id)
     {
         $user = User::find($id);
-        $user->roles()->sync([]);
+        $user->roles()->sync([ ]);
 
         User::destroy($id);
         session()->flash('message', 'User deleted');
@@ -153,12 +153,12 @@ 
     public function get_roles()
     {
         $items = Roles::all();
-        $data2 = [];
-        foreach($items as $role)
+        $data2 = [ ];
+        foreach ($items as $role)
         {
-         $data2[] = [
-        'value' => $role["id"],
-        'text'  => $role["name"]
+         $data2[ ] = [
+        'value' => $role[ "id" ],
+        'text'  => $role[ "name" ]
         ];
 
         }

app/Roles.php

Spacing +1 added lines, -1 removed lines

@@ -19,5 +19,5 @@
      *
      * @var array
      */
-    protected $fillable = ['name'];
+    protected $fillable = [ 'name' ];
 }

app/Http/Controllers/RolesController.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function index()
     {
-    	$data['roles'] = Roles::all();
+    	$data[ 'roles' ] = Roles::all();
     	return view('roles.index', $data);
     }
 
@@ -28,7 +28,7 @@ 
     public function search(Request $request)
     {
         $term = $request->get('term');
-        $data['roles'] = Roles::where('name', 'LIKE', "$term")->get();
+        $data[ 'roles' ] = Roles::where('name', 'LIKE', "$term")->get();
         return view('roles.index', $data);
     }
 
@@ -40,7 +40,7 @@ 
      */
     public function show($id)
     {
-        $data['query'] = Roles::find($id);
+        $data[ 'query' ] = Roles::find($id);
         return view('', $data);
     }
 
@@ -71,7 +71,7 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = Roles::find($id);
+        $data[ 'query' ] = Roles::find($id);
         return view('', $data)
     }
 

app/Http/routes.php

Spacing +2 added lines, -13 removed lines

@@ -11,7 +11,7 @@ 
 |
 */
 
-Route::get('/', function () {
+Route::get('/', function() {
     return view('welcome');
 });
 
@@ -66,15 +66,4 @@ 
 
 // 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');
+<< << <<< HEAD