From c0ce48023562a95461ac077baa559475ed11b551 Mon Sep 17 00:00:00 2001
From: FlavioBarachino <flavio.barachino@gmail.com>
Date: Thu, 5 Oct 2023 14:24:34 +0200
Subject: [PATCH] Completamento della conversione del template

---
 config/adminlte.php                           | 54 ++++++++++++++-----
 public/js/app/task.js                         |  2 +-
 .../views/anagrafica/altrocontatto.blade.php  | 15 +++---
 resources/views/anagrafica/dettagli.blade.php |  9 +++-
 resources/views/anagrafica/form.blade.php     | 15 +++---
 resources/views/anagrafica/list.blade.php     | 15 +++---
 .../views/calendario/fullcalendar.blade.php   |  3 ++
 resources/views/progetti/dettaglio.blade.php  | 18 ++++---
 resources/views/progetti/list.blade.php       | 15 +++---
 resources/views/tasks/list.blade.php          | 16 +++---
 resources/views/users/create.blade.php        | 15 +++---
 routes/admin.php                              |  2 +-
 12 files changed, 113 insertions(+), 66 deletions(-)

diff --git a/config/adminlte.php b/config/adminlte.php
index 69d07da..94fabe8 100644
--- a/config/adminlte.php
+++ b/config/adminlte.php
@@ -31,7 +31,7 @@ return [
     */
 
     'use_ico_only' => false,
-    'use_full_favicon' => true,
+    'use_full_favicon' => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -314,46 +314,51 @@ return [
         [
             'text'        => 'Gestione Economica',
             'url'         => '#',
-            'icon'        => 'far fa-fw fa-money-bill', //<i class="fa-solid fa-money-bill"></i>
+            'icon'        => 'fas fa-fw fa-money-bill', //<i class="fa-solid fa-money-bill"></i>
 
             'submenu' => [
                 [
                     'text' => 'Lista movimenti',
                     'route'  => 'movimenti',
+                    'icon' => 'fas fa-fw fa-list-check'
                 ],
                 [   'text' => 'Liste',
                     'url'  => '#',
-                    'icon' => 'fas fa-fw fa-sync',
+                    'icon' => 'fas fa-fw fa-gears',
                     'submenu' => [
                         [
                             'text' => 'Categorie',
                             'route'  => 'categorie',
+                            'icon' => 'fas fa-fw fa-wine-bottle'
                         ],
                         [
                             'text' => 'Tags',
                             'route'  => 'tags',
+                            'icon' => 'fas fa-fw fa-tags'
                         ],
                     ]
                 ],
                 [   'text' => 'Reports',
                     'url'  => '#',
-                    'icon' => 'fas fa-fw fa-sync',
+                    'icon' => 'fas fa-fw fa-file',
                     'submenu' => [
 
                         [
-                            'text' => 'Report Movimenti',
+                            'text' => 'Report movimenti',
                             'route'  => 'resoconto',
+                            'icon' => 'fas fa-fw fa-piggy-bank',
                         ],
                         [
                             'text' => 'Bilancio annuale',
                             'route'  => 'budget',
+                            'icon' => 'fas fa-fw fa-scale-balanced'
                         ],
                     ]
                 ],
                 [
                     'text' => 'Import/Export',
                     'url'  => '#',
-                    'icon' => 'fas fa-fw fa-sync',
+                    'icon' => 'fas fa-fw fa-file-arrow-down',
                     'submenu' => [
                         [
                             'text' => 'Esporta tutti i movimenti',
@@ -385,13 +390,13 @@ return [
         ],
         [
             'text' => 'Progetti',
-            'url'  => '#',
-            'icon' => 'fas fa-fw fa-todo',
+            'route'  => 'progetti',
+            'icon' => 'fas fa-fw fa-diagram-project',
         ],
         [
             'text' => 'Attività',
-            'url'  => '#',
-            'icon' => 'fas fa-fw fa-todo',
+            'route'  => 'tasks',
+            'icon' => 'fas fa-fw fa-circle-check',
         ],
         ['header' => 'GESTIONE PIM'],
         [
@@ -401,16 +406,28 @@ return [
             'submenu' => [
                 [
                     'text' => 'Nuovo Contatto',
-                    'url'  => '/admin/contatti/new',
+                    'route'  => 'newContact',
+                    'icon' => 'fas fa-fw fa-plus',
+                ],
+                [
+                    'text' => 'Rubrica',
+                    'route'  => 'contatti',
+                    'icon' => 'fas fa-fw fa-mobile',
                 ],
             ],
         ],
         [
             'text' => 'Appuntamenti',
-            'url'  => '/admin/test/calendar',
+            'route'  => 'calendario',
             'icon' => 'fas fa-fw fa-calendar',
         ],
-
+        ['header' => 'AMMINISTRAZIONE'],
+        [
+            'text' => 'Utenti',
+            'url'  => '/admin/users/new',
+            'icon' => 'fas fa-fw fa-user',
+            'can' => ['amministrazione']
+        ],
 
     ],
 
@@ -550,6 +567,17 @@ return [
 
             ],
         ],
+        'FontAwesome' =>[
+            'active' => true,
+            'files' =>[
+                [
+                    'type' => 'css',
+                    'asset' => false,
+                    'location' => '//cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css',
+                ],
+            ],
+        ],
+
     ],
 
     /*
diff --git a/public/js/app/task.js b/public/js/app/task.js
index 7efb0c7..f0ac27c 100644
--- a/public/js/app/task.js
+++ b/public/js/app/task.js
@@ -10,7 +10,7 @@ $(document).ready(function() {
 		"order": [[0, "desc"]]
 	});
 });
-$(".draggable").draggable();
+//$(".draggable").draggable();
 var d = new Date();
 
 var month = d.getMonth()+1;
diff --git a/resources/views/anagrafica/altrocontatto.blade.php b/resources/views/anagrafica/altrocontatto.blade.php
index 75c0920..7628b0c 100644
--- a/resources/views/anagrafica/altrocontatto.blade.php
+++ b/resources/views/anagrafica/altrocontatto.blade.php
@@ -1,10 +1,11 @@
-@extends('admin')
+@extends('adminlte::page')
+
+@section('content_header')
+    <h1>Inserisci Contatto</h1>
+@endsection              
+
 @section('content')
-<div class="row">
-    <div class="col-lg-12">
-        <h1 class="page-header">Inserisci Contatto</h1>
-    </div>
-</div>                          
+                    
 <div class="container">    	
 <div class="row">
  	<div class="col-lg-12">
@@ -61,6 +62,6 @@
 
 @endsection
 
-@section('script')
+@section('js')
 <script src="/js/app/altrocontatto.js"></script>
 @endsection
diff --git a/resources/views/anagrafica/dettagli.blade.php b/resources/views/anagrafica/dettagli.blade.php
index ba50291..0b6b1bf 100644
--- a/resources/views/anagrafica/dettagli.blade.php
+++ b/resources/views/anagrafica/dettagli.blade.php
@@ -1,4 +1,9 @@
-@extends('admin')
+@extends('adminlte::page')
+
+@section('content_header')
+        <h1>Dettaglio Anagrafica</h1>
+@endsection
+
 @section('content')
 <div class="row">
     <div class="col-lg-12">
@@ -97,6 +102,6 @@
 
 @endsection
 
-@section('script')
+@section('js')
 <script src="/js/app/altrocontatto.js"></script>
 @endsection
diff --git a/resources/views/anagrafica/form.blade.php b/resources/views/anagrafica/form.blade.php
index e957d1b..58b490c 100644
--- a/resources/views/anagrafica/form.blade.php
+++ b/resources/views/anagrafica/form.blade.php
@@ -1,10 +1,11 @@
-@extends('admin')
+@extends('adminlte::page')
+
+@section('content_header')
+        <h1>Inserisci Anagrafica</h1>    
+@endsection
+
 @section('content')
-<div class="row">
-    <div class="col-lg-12">
-        <h1 class="page-header">Inserisci Anagrafica</h1>
-    </div>
-</div>                          
+                  
 <div class="container">    	
 <div class="row">
  	<div class="col-lg-10">
@@ -90,6 +91,6 @@
 
 @endsection
 
-@section('script')
+@section('js')
 <script src="/js/app/altrocontatto.js"></script>
 @endsection
diff --git a/resources/views/anagrafica/list.blade.php b/resources/views/anagrafica/list.blade.php
index 6fbdc88..3d7a23e 100644
--- a/resources/views/anagrafica/list.blade.php
+++ b/resources/views/anagrafica/list.blade.php
@@ -1,10 +1,11 @@
-@extends('admin')
+@extends('adminlte::page')
+
+@section('content_header')
+    <h1>Lista Anagrafiche</h1>
+@endsection
+
 @section('content')
-<div class="row">
-    <div class="col-lg-12">
-        <h1 class="page-header">Lista Anagrafiche</h1>
-    </div>
-</div>                          
+                     
 <div class="container">
 	<!-- Content here -->
 	<div class="row">
@@ -56,6 +57,6 @@
 
 @endsection
 
-@section('script')
+@section('js')
 <script src="/js/app/altrocontatto.js"></script>
 @endsection
diff --git a/resources/views/calendario/fullcalendar.blade.php b/resources/views/calendario/fullcalendar.blade.php
index b84844e..60a5b71 100644
--- a/resources/views/calendario/fullcalendar.blade.php
+++ b/resources/views/calendario/fullcalendar.blade.php
@@ -1,5 +1,8 @@
 @extends('adminlte::page')
 @section('plugins.Fullcalendar', true)
+@section('content_header')
+<h1>Appuntamenti</h1>
+@endsection
 @section('content')
 <div id="calendar"></div>
 @endsection
diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php
index 72a737c..79786d0 100644
--- a/resources/views/progetti/dettaglio.blade.php
+++ b/resources/views/progetti/dettaglio.blade.php
@@ -1,9 +1,13 @@
-@extends('admin') @section('content')
-<div class="row">
-	<div class="col-lg-12">
-		<h1 class="page-header">Dettaglio Progetto</h1>
-	</div>
-</div>
+@extends('adminlte::page')
+
+@section('content_header')
+
+		<h1>Dettaglio Progetto</h1>
+
+@endsection
+
+@section('content')
+
 <div class="container">
 	<!-- Content here -->
 
@@ -246,6 +250,6 @@
 <!-- /MODAL RIGA -->
 
 <!-- /.col-lg-12 -->
-@endsection @section('script')
+@endsection @section('js')
 <script src="/js/app/rigaProgetti.js"></script>
 @endsection
diff --git a/resources/views/progetti/list.blade.php b/resources/views/progetti/list.blade.php
index 6647694..b8da66e 100644
--- a/resources/views/progetti/list.blade.php
+++ b/resources/views/progetti/list.blade.php
@@ -1,9 +1,10 @@
-@extends('admin') @section('content')
-<div class="row">
-	<div class="col-lg-12">
-		<h1 class="page-header">Lista Progetti</h1>
-	</div>
-</div>
+@extends('adminlte::page')
+
+@section('content_header')
+	<h1>Lista Progetti</h1>
+@endsection
+
+@section('content')
 <div class="container">
 	<!-- Content here -->
 	<div class="row">
@@ -145,6 +146,6 @@
 		</form>
 	</div>
 	<!-- /MODAL -->
-	@endsection @section('script')
+	@endsection @section('js')
 	<script src="/js/app/progetti.js"></script>
 	@endsection
diff --git a/resources/views/tasks/list.blade.php b/resources/views/tasks/list.blade.php
index 0e385c2..2d0e516 100644
--- a/resources/views/tasks/list.blade.php
+++ b/resources/views/tasks/list.blade.php
@@ -1,11 +1,11 @@
-@extends('admin') 
-@section('content')
-<div class="row">
-	<div class="col-lg-12">
-		<h1 class="page-header">Lista Attività</h1>
+@extends('adminlte::page') 
+
+@section('content_header')
+	<h1>Lista Attività</h1>
+@endsection
+
+@section('content')
 
-	</div>
-</div>
 <div class="container">
 	<!-- Content here -->
 	<div class="row">
@@ -99,6 +99,6 @@
 
 
 @endsection
-@section('script')
+@section('js')
 	<script src="/js/app/task.js"></script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 4afbbe5..cc63c43 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -1,9 +1,12 @@
-@extends('admin') @section('content')
-<div class="row">
-	<div class="col-lg-12">
-		<h1 class="page-header">Nuovo utente</h1>
-	</div>
-</div>
+@extends('adminlte::page') 
+
+@section('content_header')
+	<h1>Nuovo utente</h1>
+@endsection
+
+
+@section('content')
+
 <div class="container">
 	<!-- INIZIO CONTENUTO -->
 	<div class="row">
diff --git a/routes/admin.php b/routes/admin.php
index 65ec176..b5c17f0 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -180,7 +180,7 @@ Route::group(['middleware'=>['permission:avvisi']], function(){
     Route::get('test/err403',[CondominioController::class,'err403'])->name('errore-403');
     Route::get('test/user_role',[CondominioController::class,'user_role']);
     Route::get('test/userclass',[Utenti::class,'userClass']);
-    Route::get('test/calendar',[FullCalenderController::class,'showDemo']);
+    Route::get('test/calendar',[FullCalenderController::class,'showDemo'])->name('calendario');
 
     Route::get('testmail',function(){
         $name='Flavio';