diff --git a/Template.Maui/wwwroot/index.html b/Template.Maui/wwwroot/index.html index 0da011d..dbdc694 100644 --- a/Template.Maui/wwwroot/index.html +++ b/Template.Maui/wwwroot/index.html @@ -51,7 +51,6 @@ - diff --git a/Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor b/Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor index 239bb11..600296a 100644 --- a/Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor +++ b/Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor @@ -7,7 +7,7 @@
-
+
Filtri diff --git a/Template.Shared/Components/Layout/NavMenu.razor b/Template.Shared/Components/Layout/NavMenu.razor index ac1d1b0..0756627 100644 --- a/Template.Shared/Components/Layout/NavMenu.razor +++ b/Template.Shared/Components/Layout/NavMenu.razor @@ -37,7 +37,7 @@
  • - +
    @@ -66,7 +66,7 @@ { var location = args.Location.Remove(0, NavigationManager.BaseUri.Length); - IsVisible = new List { "Calendar", "Users", "PersonalInfo" } + IsVisible = new List { "Calendar", "Users", "PersonalInfo", "Notifications" } .Contains(location); StateHasChanged(); }; diff --git a/Template.Shared/Components/Layout/NavMenu.razor.css b/Template.Shared/Components/Layout/NavMenu.razor.css index a424a10..da9476f 100644 --- a/Template.Shared/Components/Layout/NavMenu.razor.css +++ b/Template.Shared/Components/Layout/NavMenu.razor.css @@ -22,14 +22,14 @@ } .nav-item ::deep .custom-plus-button .mud-icon-root { - transition: .513s; + transition: .5s; transform: rotate(0); font-size: 2rem; } .nav-item ::deep .custom-plus-button:focus .mud-icon-root { - transform: rotate(225deg); - } + transform: rotate(225deg); +} .nav-item ::deep a { display: flex; @@ -55,9 +55,7 @@ .nav-item ::deep a.active > div > span { font-weight: 800; } - .nav-item ::deep a:not(.active) > div { - color: var(--mud-palette-text-primary); - } +.nav-item ::deep a:not(.active) > div { color: var(--mud-palette-text-primary); } .nav-item ::deep a i { font-size: 1.65rem; } @@ -66,8 +64,4 @@ font-weight: 500; } -@supports (-webkit-touch-callout: none) { - .nav-item { padding-bottom: env(safe-area-inset-bottom) !important; } - - .nav-item ::deep > .nav-link { padding-bottom: 0 !important; } -} \ No newline at end of file +@supports (-webkit-touch-callout: none) { .navbar { padding-bottom: env(safe-area-inset-bottom); } } \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Calendar.razor b/Template.Shared/Components/Pages/Calendar.razor index ac36db1..0fe71a3 100644 --- a/Template.Shared/Components/Pages/Calendar.razor +++ b/Template.Shared/Components/Pages/Calendar.razor @@ -8,97 +8,98 @@ @inject IManageDataService ManageData @inject IJSRuntime JS + + ShowFilter="true" + ShowCalendarToggle="true" + OnFilterToggle="ToggleFilter" + OnCalendarToggle="ToggleExpanded" /> -
    - @if (Expanded) - { - - @foreach (var nomeGiorno in GiorniSettimana) +
    + @if (Expanded) { -
    -
    @nomeGiorno
    -
    - } + + @foreach (var nomeGiorno in GiorniSettimana) + { +
    +
    @nomeGiorno
    +
    + } - @foreach (var unused in Enumerable.Range(0, StartOffset)) - { - - } + @foreach (var unused in Enumerable.Range(0, StartOffset)) + { + + } - @for (var d = 1; d <= DaysInMonth; d++) - { - var day = new DateTime(CurrentMonth.Year, CurrentMonth.Month, d); - var isSelected = IsSameDay(day, SelectedDate); - var isToday = IsSameDay(day, DateTime.Today); - var events = ReturnFilteredActivity(day); + @for (var d = 1; d <= DaysInMonth; d++) + { + var day = new DateTime(CurrentMonth.Year, CurrentMonth.Month, d); + var isSelected = IsSameDay(day, SelectedDate); + var isToday = IsSameDay(day, DateTime.Today); + var events = ReturnFilteredActivity(day); -
    -
    @d
    - @if (events.Any()) - { -
    - @foreach (var cat in events.Select(x => x.Category).Distinct()) - { -
    - } -
    - } -
    - } - - @foreach (var unused in Enumerable.Range(0, EndOffset)) - { - - } - } - else - { - - @foreach (var day in DaysOfWeek) - { - var isSelected = IsSameDay(day, SelectedDate); - var isToday = IsSameDay(day, DateTime.Today); - -
    -
    @day.ToString("ddd", new System.Globalization.CultureInfo("it-IT"))
    -
    @day.Day
    - @if (ReturnFilteredActivity(day).Any()) + @onclick="() => SelezionaDataDalMese(day)"> +
    @d
    + @if (events.Any()) {
    - @foreach (var cat in ReturnFilteredActivity(day).Select(x => x.Category).Distinct()) + @foreach (var cat in events.Select(x => x.Category).Distinct()) {
    }
    }
    -
    + } + + @foreach (var unused in Enumerable.Range(0, EndOffset)) + { + + } } - } -
    + else + { + + @foreach (var day in DaysOfWeek) + { + var isSelected = IsSameDay(day, SelectedDate); + var isToday = IsSameDay(day, DateTime.Today); + +
    +
    @day.ToString("ddd", new System.Globalization.CultureInfo("it-IT"))
    +
    +
    @day.Day
    + @if (ReturnFilteredActivity(day).Any()) + { +
    + @foreach (var cat in ReturnFilteredActivity(day).Select(x => x.Category).Distinct()) + { +
    + } +
    + } +
    +
    + } + } +
    @if (IsLoading) { - + } else if (FilteredActivities is { Count: > 0 }) { - + } else { - + }
    diff --git a/Template.Shared/Components/Pages/Calendar.razor.css b/Template.Shared/Components/Pages/Calendar.razor.css index 7feac36..4b2dc0a 100644 --- a/Template.Shared/Components/Pages/Calendar.razor.css +++ b/Template.Shared/Components/Pages/Calendar.razor.css @@ -119,12 +119,14 @@ gap: 1rem; overflow-y: auto; flex-direction: column; - height: 75vh; -ms-overflow-style: none; scrollbar-width: none; - padding-bottom: 45px; + padding-bottom: 60px; + height: calc(100% - 130px); } +.appointments.ah-calendar-m { height: calc(100% - 315px) !important; } + .appointments::-webkit-scrollbar { display: none; } .appointment { @@ -159,4 +161,6 @@ .event-dot.interna { background-color: var(--mud-palette-success-darken); } -.event-dot.commessa { background-color: var(--mud-palette-warning); } \ No newline at end of file +.event-dot.commessa { background-color: var(--mud-palette-warning); } + +@supports (-webkit-touch-callout: none) { .appointments { padding-bottom: calc(60px + env(safe-area-inset-bottom)) !important; } } \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Notifications.razor b/Template.Shared/Components/Pages/Notifications.razor new file mode 100644 index 0000000..8151533 --- /dev/null +++ b/Template.Shared/Components/Pages/Notifications.razor @@ -0,0 +1,9 @@ +@page "/Notifications" +@attribute [Authorize] +@using Template.Shared.Components.Layout + + + +@code { + +} \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Notifications.razor.css b/Template.Shared/Components/Pages/Notifications.razor.css new file mode 100644 index 0000000..e69de29 diff --git a/Template.Shared/wwwroot/css/app.css b/Template.Shared/wwwroot/css/app.css index 3806bc2..c443f8c 100644 --- a/Template.Shared/wwwroot/css/app.css +++ b/Template.Shared/wwwroot/css/app.css @@ -1,4 +1,10 @@ -html, body { +html { overflow: hidden; } + +.page, article, main { height: 100% !important; } + +#app { height: 100vh; } + +html, body { font-family: "Nunito", sans-serif; font-size: 14px; font-weight: 400; @@ -111,26 +117,6 @@ h1:focus { outline: none; } margin: 1rem 0; } -@supports (-webkit-touch-callout: none) { - .status-bar-safe-area { - display: flex; - position: fixed; - top: 0; - height: env(safe-area-inset-top); - background-color: #f7f7f7; - width: 100%; - z-index: 1; - } - - - #app { - padding-top: env(safe-area-inset-top); - height: 100vh; - } - - .flex-column, .navbar-brand { padding-left: env(safe-area-inset-left); } -} - /*Spinner*/ .spinner-container { @@ -167,14 +153,10 @@ h1:focus { outline: none; } animation-duration: 2s; } -.loader:after { - animation-duration: 4s; -} +.loader:after { animation-duration: 4s; } @keyframes l24 { - 100% { - transform: rotate(1turn) - } + 100% { transform: rotate(1turn) } } /*MudBlazor Personalization*/ @@ -194,9 +176,7 @@ h1:focus { outline: none; } margin: 0; } -.custom-item-select { - padding: 6px 16px; -} +.custom-item-select { padding: 6px 16px; } .custom-item-select .mud-typography-body1 { font-weight: 600; @@ -209,27 +189,24 @@ h1:focus { outline: none; } position: fixed; top: 0; height: env(safe-area-inset-top); - background-color: #f7f7f7; width: 100%; z-index: 1; - background-color: var(--primary-color); + background-color: var(--mud-palette-surface); } - .modal { - padding-top: env(safe-area-inset-top); - } + .modal { padding-top: env(safe-area-inset-top); } - article { - padding-top: 3rem !important; - padding-bottom: calc(7rem + env(safe-area-inset-bottom)) !important; - } + .safe-area-bottom { margin-bottom: env(safe-area-inset-bottom) !important; } + + .pb-safe-area { padding-bottom: env(safe-area-inset-bottom) !important; } #app { - padding-top: env(safe-area-inset-top); - height: 100vh; + margin-top: env(safe-area-inset-top); + margin-bottom: env(safe-area-inset-bottom); + height: calc(100vh - env(safe-area-inset-top) - env(safe-area-inset-bottom)); } - .flex-column, .navbar-brand { - padding-left: env(safe-area-inset-left); - } + .flex-column, .navbar-brand { padding-left: env(safe-area-inset-left); } + + .customDialog-form .mud-dialog-content { margin-top: env(safe-area-inset-top); } } \ No newline at end of file diff --git a/Template.Shared/wwwroot/js/main.js b/Template.Shared/wwwroot/js/main.js index b9e553f..a065f0e 100644 --- a/Template.Shared/wwwroot/js/main.js +++ b/Template.Shared/wwwroot/js/main.js @@ -1,3 +1,58 @@ -window.goBack = function () { +// Funzione goBack +window.goBack = function () { history.back(); }; + +// Funzione per aggiungere tabindex ai bottoni +function addTabindexToButtons() { + document.querySelectorAll('button.custom-plus-button').forEach(btn => { + if (!btn.hasAttribute('tabindex')) { + btn.setAttribute('tabindex', '0'); + } + }); +} + +// Funzione per monitorare la classe expanded e aggiungere ah-calendar-m +function monitorExpandedClass(mutations) { + mutations.forEach(function (mutation) { + if (mutation.type === 'attributes' && mutation.attributeName === 'class') { + const target = mutation.target; + + if (target.classList.contains('week-slider') && target.classList.contains('expanded')) { + const appointments = document.querySelector('.appointments'); + if (appointments) { + appointments.classList.add('ah-calendar-m'); + console.log('Classe "ah-calendar-m" aggiunta a .appointments'); + } + } + // Rimuovi la classe quando expanded viene rimossa + else if (target.classList.contains('week-slider') && !target.classList.contains('expanded')) { + const appointments = document.querySelector('.appointments'); + if (appointments) { + appointments.classList.remove('ah-calendar-m'); + console.log('Classe "ah-calendar-m" rimossa da .appointments'); + } + } + } + }); +} + +// Esegui la funzione tabindex inizialmente +addTabindexToButtons(); + +// Observer combinato per entrambe le funzionalità +const observer = new MutationObserver((mutations) => { + // Aggiungi tabindex ai nuovi bottoni + addTabindexToButtons(); + + // Monitora le classi expanded + monitorExpandedClass(mutations); +}); + +// Osserva sia i cambiamenti nel DOM che gli attributi +observer.observe(document.body, { + childList: true, + subtree: true, + attributes: true, + attributeFilter: ['class'] +}); \ No newline at end of file