alcuni aggiustamenti in base alle roles e permessi

app/Http/Controllers/Utenti.php

@@ -52,7 +52,11 @@ class Utenti extends Controller
         return $roles;
     }
     
-
+    function deleteUser($id) {
+        User::destroy($id);
+        
+        return redirect('/admin/users/new');
+    }
         
     
 }

resources/views/components/menu.blade.php

@@ -19,10 +19,9 @@
 				<li><a href="{{ route('importCR'); }}"><i
 						class="fa fa-upload  fa-fw"></i>Importa Estratto CR</a></li>
 			</ul></li>
-	
+
 	</ul> <!-- /.nav-second-level --></li>
-@endcan
+@endcan @can('consumi')
-@can('consumi')
 <li><a href="#"><i class="fa fa-industry fa-fw"></i> Consumi <span
 		class="fa arrow"></span></a>
 
@@ -33,12 +32,10 @@
 		<li><a href="{{ route('enel'); }}"><i class="fa fa-flash  fa-fw"></i>Energia
 				Elettrica</a></li>
 	</ul></li>
-@endcan
+@endcan @can('automobili')
-@can('automobili')
 <li><a href="{{ route('auto_list'); }}"><i class="fa fa-car fa-fw"></i>
 		Automobili <span class="fa arrow"></span></a></li>
-@endcan
+@endcan @can('contatti')
-@can('contatti')
 <li><a href="#"><i class="fa fa-phone-square fa-fw"></i> Contatti <span
 		class="fa arrow"></span></a>
 
@@ -49,20 +46,21 @@
 		<li><a href="{{ route('newContact'); }}"><i class="fa fa-plus  fa-fw"></i>Nuovo
 				contatto</a></li>
 	</ul></li>
-@endcan
+@endcan @can('progetti')
-@can('progetti')
 <li><a href="{{ route('progetti'); }}"><i class="fa fa-list fa-fw"></i>
 		Progetti <span class="fa arrow"></span></a></li>
-@endcan
+@endcan @can('amministrazione')
-@can('amministrazione')
 <li><a href="#"><i class="fa fa-gears fa-fw"></i>Amministrazione<span
 		class="fa arrow"></span></a>
 	<ul class="nav nav-second-level">
 		<li><a class="active" href="/admin/users/new">Nuovo Utente</a></li>
-		<li><a class="active" href="/admin/group/new">Gruppi</a></li>
+		<!--
-		<li><a class="active" href="/admin/permesso/new">Permessi</a></li>
+		<li><a class="active" href="/admin/users/newRole">Gruppi</a></li>
-		<li><a class="active" href="/admin/permesso/assign">Assegna Permessi
+		<li><a class="active" href="/admin/users/newPermission">Permessi</a></li>
-				ai gruppi</a></li>
+		-->
-		<li><a href="/login">Login Page</a></li>
+		<li><a class="active" href="/admin/users/assignRole">Assegna Ruoli</a></li>
+		<!--  
+		<li><a href="/login">Login Page</a></li> 
+		-->
 	</ul> <!-- /.nav-second-level --></li>
-	@endcan
+@endcan

resources/views/layouts/dashboard.blade.php

@@ -6,7 +6,7 @@
 	</div>
 </div>
 <div class="row">
-@role('user')
+@hasanyrole('user|admin')
 <!-- WIDGET Bilancio -->
 	<div class="col-lg-4 col-md-8">
         <div class="panel panel-primary">
@@ -53,7 +53,7 @@
            </a>
      	</div>
 	</div>	
-	@endrole
+	@endhasanyrole
 </div>
 @endsection
 

resources/views/users/create.blade.php

@@ -49,6 +49,7 @@
 					<tr>
 						<th>Nome</th>
 						<th>Email</th>
+						<th>Azioni</th>
 						
 					</tr>
 				</thead>
@@ -57,7 +58,7 @@
 					<tr>
 						<td>{{ $user->name }}</td>
 						<td>{{ $user->email }}</td>
-						
+						<td><a href="/admin/users/delete/{{ $user->id }}" class="button">Cancella</a></td>
 					</tr>
 					@endforeach
 				</tbody>

routes/admin.php

@@ -126,6 +126,7 @@ Route::group(['middleware'=>['permission:amministrazione']], function(){
     Route::get('users/new',[Utenti::class,'addUser']);
     Route::post('users/new',[Utenti::class,'createUser']);
     Route::get('users/roles',[Utenti::class,'listRoles']);
+    Route::get('users/delete/{id}',[Utenti::class,'deleteUser']);
 });
 // PROGETTI
 Route::group(['middleware'=>['permission:progetti']], function(){