calendar - modifiche grafiche

app/Http/Livewire/Calendar.php

@@ -146,7 +146,6 @@ class Calendar extends Component
 
     public function createCalendar()
     {
-
         $calendar = new \App\Models\Calendar();
         $calendar->course_id = null;
         $calendar->court_id = $this->court_id != '' ? $this->court_id : null;

public/css/new_style.css

@@ -5,11 +5,15 @@
     --color-blu: #0618be;
     --color-viola: #7738fa;
     --color-viola-hover: #7738fa40;
+    --color-viola-hover-flat: #d6c7fe;
     --color-lilla: #f6f7ff;
     --color-outile: #8979ff;
     --color-rosso: #d6234f;
     --color-verde: #339e8e;
     --color-arancione: #ffb624;
+
+    --bs-primary: var(--color-blu);
+    --bs-primary-rgb: 6, 24, 190;
 }
 
 ::-webkit-scrollbar {
@@ -1231,4 +1235,54 @@ a.member-file-url {
 .table-actions button:hover {
     color: white;
     background-color: var(--color-blu) !important;
-}
+}
+
+/* Calendar styles */
+#calendar {
+    --fc-today-bg-color: var(--color-lilla);
+    --fc-highlight-color: var(--color-viola-hover-flat);
+}
+#calendar.fc .fc-daygrid-body {
+    --fc-event-bg-color: var(--color-blu);
+    --fc-event-border-color: var(--color-blu);
+    --fc-event-text-color: var(--color-text);
+}
+
+#calendar.fc .fc-timegrid-body {
+    --fc-event-bg-color: var(--color-viola-hover-flat);
+    --fc-event-border-color: var(--color-viola-hover-flat);
+    --fc-event-text-color: var(--color-text);
+}
+
+#calendar.fc .fc-view-harness {
+    height: calc(100dvh - 280px) !important;
+}
+
+#calendar.fc .fc-button-primary {
+    background-color: var(--color-blu);
+    border-color: var(--color-blu);
+    color: white;
+}
+
+#calendar.fc .fc-button-primary:hover {
+    background-color: var(--color-viola);
+    border-color: var(--color-viola);
+    color: white;
+}
+
+#calendar.fc .fc-button-primary:not(:disabled).fc-button-active,
+#calendar.fc .fc-button-primary:not(:disabled):active {
+    background-color: var(--color-viola-hover-flat);
+    border-color: var(--color-viola-hover-flat);
+    color: var(--color-text);
+}
+
+#calendar.fc .fc-daygrid-body .fc-daygrid-event {
+    text-align: center;
+    margin: 0;
+    border-radius: 0;
+    background: transparent;
+    border: transparent;
+    font-weight: bold;
+}
+/* END - Calendar styles */

resources/views/layouts/app.blade.php

@@ -356,8 +356,8 @@
                     </div>
                     <div class="accordion-item">
                         <h2 class="accordion-header linkMenu" id="headingThree">
-                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="{{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') || Request::is('presence_reports') || Request::is('calendar') ? 'true' : 'false'}}" aria-controls="collapseThree">
-                                <i class="fas fa-calendar"></i>
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseThree" aria-expanded="{{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') ? 'true' : 'false'}}" aria-controls="collapseThree">
+                                <i class="fas fa-book-open"></i>
                                 <span>Corsi</span>
                             </button>
                         </h2>
@@ -366,7 +366,7 @@
                         $iscritti_types[] = array('name' => 'Singoli', 'type' => 'standard');
                         $iscritti_types[] = array('name' => 'Personalizzati', 'type' => 'custom');   
                         @endphp
-                        <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') || Request::is('rates') || Request::is('presence_reports') || Request::is('calendar') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
+                        <div id="collapseThree" class="accordion-collapse collapse {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('subscription_member', 'subscription_member/*') || Request::is('course_list') || Request::is('course_member') || Request::is('rates') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
                             <div class="accordion-body">
                                 <ul class="nav nav-pills flex-column align-items-center align-items-sm-start w-100" id="menu-contabilita" style="margin-top:0px;">
                                     {{-- <li class="nav-item {{Request::is('course_member_one') || Request::is('course_member_two') || Request::is('course_member') ? "nav-item-active" : ""}}">
@@ -405,6 +405,20 @@
                                             </a>
                                         </li>
                                     @endif
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="accordion-item">
+                        <h2 class="accordion-header linkMenu" id="headingThree">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFour" aria-expanded="{{Request::is('calendar') || Request::is('presence_reports') ? 'true' : 'false'}}" aria-controls="collapseFour">
+                                <i class="fas fa-calendar"></i>
+                                <span>Presenze</span>
+                            </button>
+                        </h2>
+                        <div id="collapseFour" class="accordion-collapse collapse {{Request::is('calendar') || Request::is('presence_reports') ? 'show' : ''}}" aria-labelledby="headingThree" data-bs-parent="#accordionExample">
+                            <div class="accordion-body">
+                                <ul class="nav nav-pills flex-column align-items-center align-items-sm-start w-100" id="menu-contabilita" style="margin-top:0px;">
                                     <li class="nav-item {{Request::is('calendar') ? "nav-item-active" : ""}}">
                                         <a href="/calendar" class="nav-link d-flex align-items-center linkMenu">
                                             <span class="ms-3 d-md-inline">Calendario</span>
@@ -412,7 +426,7 @@
                                     </li>
                                     <li class="nav-item {{Request::is('presence_reports') ? "nav-item-active" : ""}}">
                                         <a href="/presence_reports" class="nav-link d-flex align-items-center linkMenu">
-                                            <span class="ms-3 d-md-inline">Presenze</span>
+                                            <span class="ms-3 d-md-inline">Report</span>
                                         </a>
                                     </li>
                                 </ul>

resources/views/livewire/calendar.blade.php

@@ -1,6 +1,6 @@
 <style>
     {!! $css_festivities !!} {
-        background: #ffff0040 !important;
+        background: var(--fc-highlight-color) !important;
     }
 </style>
 
@@ -41,8 +41,8 @@
     <div  wire:ignore.self class="modal" id="calendarModal" tabindex="-1" aria-labelledby="calendarModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title text-primary" id="calendarModalLabel">Dettaglio</h5>
+                <div class="modal-header modal-header-blu">
+                    <h5 class="modal-title" id="calendarModalLabel">Dettaglio</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
@@ -91,8 +91,8 @@
     <div  wire:ignore.self class="modal" id="calendarNewModal" tabindex="-1" aria-labelledby="calendarNewModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title text-primary" id="calendarNewModalLabel">Dettaglio</h5>
+                <div class="modal-header modal-header-blu">
+                    <h5 class="modal-title" id="calendarNewModalLabel">Dettaglio</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
@@ -226,8 +226,7 @@
         }
 
         function createCalendar()
-        {                        
-            
+        {
             console.log($("#course_type_id").val());
             @this.set('course_type_id',$("#course_type_id").val());
             console.log($("#course_duration_id").val());
@@ -242,9 +241,12 @@
             @this.set('to', $("#date").val() + " " + $("#to").val() + ":00");
             console.log($("#name").val());
             @this.set('name', $("#name").val());
-            @this.set('note', $("#note").val());
-            @this.set('court_id', $("#court_id").val());
-            @this.set('instructor_id', $("#instructor_id").val());
+            // console.log($("#note").val());
+            // @this.set('note', $("#note").val());
+            // console.log($("#court_id").val());
+            // @this.set('court_id', $("#court_id").val());
+            // console.log($("#instructor_id").val());
+            // @this.set('instructor_id', $("#instructor_id").val());
             @this.createCalendar();
         }