diff --git a/SteUp.Maui/Core/CoreModule.cs b/SteUp.Maui/Core/CoreModule.cs index 6b69bdb..0aa1b71 100644 --- a/SteUp.Maui/Core/CoreModule.cs +++ b/SteUp.Maui/Core/CoreModule.cs @@ -1,8 +1,10 @@ using Microsoft.AspNetCore.Components.Authorization; using SteUp.Maui.Core.Services; +using SteUp.Maui.Core.System; using SteUp.Maui.Core.System.Network; using SteUp.Shared.Core.Interface; using SteUp.Shared.Core.Interface.IntegryApi; +using SteUp.Shared.Core.Interface.System; using SteUp.Shared.Core.Interface.System.Network; using SteUp.Shared.Core.Services; @@ -13,6 +15,7 @@ public static class CoreModule public static void RegisterAppServices(this MauiAppBuilder builder) { builder.Services.AddSingleton(); + builder.Services.AddSingleton(); } public static void RegisterIntegryServices(this MauiAppBuilder builder) diff --git a/SteUp.Maui/Core/System/GenericSystemService.cs b/SteUp.Maui/Core/System/GenericSystemService.cs new file mode 100644 index 0000000..700b873 --- /dev/null +++ b/SteUp.Maui/Core/System/GenericSystemService.cs @@ -0,0 +1,8 @@ +using SteUp.Shared.Core.Interface.System; + +namespace SteUp.Maui.Core.System; + +public class GenericSystemService : IGenericSystemService +{ + public string GetCurrentAppVersion() => AppInfo.VersionString; +} \ No newline at end of file diff --git a/SteUp.Maui/Platforms/Android/AndroidManifest.xml b/SteUp.Maui/Platforms/Android/AndroidManifest.xml index def1282..191be83 100644 --- a/SteUp.Maui/Platforms/Android/AndroidManifest.xml +++ b/SteUp.Maui/Platforms/Android/AndroidManifest.xml @@ -1,6 +1,13 @@  - + + + + diff --git a/SteUp.Maui/Platforms/Android/MainActivity.cs b/SteUp.Maui/Platforms/Android/MainActivity.cs index f83e978..9e73182 100644 --- a/SteUp.Maui/Platforms/Android/MainActivity.cs +++ b/SteUp.Maui/Platforms/Android/MainActivity.cs @@ -1,10 +1,13 @@ using Android.App; using Android.Content.PM; -using Android.OS; namespace SteUp.Maui { - [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] + [Activity( + Theme = "@style/Maui.SplashTheme", + MainLauncher = true, + ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | + ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] public class MainActivity : MauiAppCompatActivity { } diff --git a/SteUp.Maui/Resources/AppIcon/appicon.svg b/SteUp.Maui/Resources/AppIcon/appicon.svg index 4f6f00f..f6af1ab 100644 --- a/SteUp.Maui/Resources/AppIcon/appicon.svg +++ b/SteUp.Maui/Resources/AppIcon/appicon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/SteUp.Maui/Resources/AppIcon/appiconfg.svg b/SteUp.Maui/Resources/AppIcon/appiconfg.svg index e185188..710c9d7 100644 --- a/SteUp.Maui/Resources/AppIcon/appiconfg.svg +++ b/SteUp.Maui/Resources/AppIcon/appiconfg.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/SteUp.Maui/SteUp.Maui.csproj b/SteUp.Maui/SteUp.Maui.csproj index ee60661..6068b48 100644 --- a/SteUp.Maui/SteUp.Maui.csproj +++ b/SteUp.Maui/SteUp.Maui.csproj @@ -95,10 +95,10 @@ - + - + diff --git a/SteUp.Shared/Components/Layout/NavMenu.razor b/SteUp.Shared/Components/Layout/NavMenu.razor index 5ecebcf..174c966 100644 --- a/SteUp.Shared/Components/Layout/NavMenu.razor +++ b/SteUp.Shared/Components/Layout/NavMenu.razor @@ -11,7 +11,7 @@
  • - +
    Home @@ -31,15 +31,15 @@ @if (PlusVisible) { - @* *@ - @* *@ - @* *@ - @* *@ - @* *@ - @* Nuovo contatto *@ - @* Nuova attivit� *@ - @* *@ - @* *@ + + + + + + @* Nuovo contatto *@ + @* Nuova attivit� *@ + + }
    @@ -55,10 +55,10 @@ { var location = args.Location.Remove(0, NavigationManager.BaseUri.Length); - var newIsVisible = new List { "Home" } + var newIsVisible = new List { "home" } .Contains(location); - var newPlusVisible = new List { "Home" } + var newPlusVisible = new List { } .Contains(location); if (IsVisible == newIsVisible && PlusVisible == newPlusVisible) return; diff --git a/SteUp.Shared/Components/Layout/NavMenu.razor.css b/SteUp.Shared/Components/Layout/NavMenu.razor.css index 83500fa..17d170a 100644 --- a/SteUp.Shared/Components/Layout/NavMenu.razor.css +++ b/SteUp.Shared/Components/Layout/NavMenu.razor.css @@ -1,50 +1,97 @@ -.navbar { - background-color: var(--ligther-color); - border-radius: 50px 50px 0 0; - border: #eceff2 solid 1px; +.animated-navbar { + background: transparent; position: fixed; bottom: 0; width: 100%; + z-index: 1001; + transition: all 0.3s ease-in-out; } -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} +.animated-navbar.show-nav { transform: translateY(0); } -.nav-item ::deep a { - color: var(--darker-color); +.animated-navbar.hide-nav { transform: translateY(150%); } + +.animated-navbar.with-plus { margin-left: 30px; } + +.navbar { + padding-bottom: 1rem; + padding-top: 0 !important; display: flex; - align-items: center; - line-height: 1.4; + flex-direction: row; + justify-content: space-between; + align-items: end; + transition: all 0.3s ease-in-out; +} + +.navbar.with-plus { transform: translateX(-30px); } + +.navbar.without-plus { + transform: translateX(0); justify-content: center; } -.nav-item ::deep a > div { - width: 4.3rem; - height: 4.3rem; - border-radius: 100px; - justify-content: center; - padding-bottom: 0.1rem; - -webkit-transition: all .3s ease-out; - transition: all .3s ease-out; +.container-navbar { + background: var(--mud-palette-surface); + border-radius: 50px; + padding: 0 10px; + box-shadow: var(--custom-box-shadow); + transition: all 0.3s ease-in-out; } -.nav-item ::deep a.active > div { - background-color: var(--primary-color); - color: white; +.nav-item { font-size: 0.9rem; } + +.nav-item.plus-button { + position: relative; + bottom: 15px; } -/*.nav-item a:hover :not(.active) {*/ -/* background-color: rgba(255, 255, 255, 0.1);*/ -/* color: var(--primary-color);*/ -/*}*/ - - -.nav-item ::deep a i { +.navbar ::deep .custom-plus-button .mud-icon-root { + transition: .5s; + transform: rotate(0); font-size: 2rem; } -.nav-item ::deep a span { - font-size: 0.9rem; +.navbar ::deep .custom-plus-button { + background: var(--mud-palette-surface); + box-shadow: var(--custom-box-shadow); + transition: all 0.3s ease-in-out; } + +.navbar ::deep .custom-plus-button:focus .mud-icon-root { transform: rotate(225deg); } + +.nav-item ::deep a { + display: flex; + align-items: center; + line-height: 1.2; + justify-content: center; + padding-top: .25rem !important; + padding-bottom: .25rem !important; +} + +.nav-item ::deep a > div { + -webkit-transition: all .1s ease-out; + transition: all .1s ease-out; + min-width: 75px; +} + +.nav-item ::deep a.active > div { color: var(--mud-palette-primary); } + +.nav-item ::deep a.active > div > i { + /*background-color: color-mix(in srgb, var(--mud-palette-primary) 20%, transparent);*/ + border-radius: 10px; +} + +.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 i { font-size: 1.65rem; } + +.nav-item ::deep a span { + font-size: 0.8rem; + font-weight: 500; +} + +@supports (-webkit-touch-callout: none) { .navbar { padding-bottom: env(safe-area-inset-bottom); } } \ No newline at end of file diff --git a/SteUp.Shared/Components/Layout/Spinner/SpinnerLayout.razor.css b/SteUp.Shared/Components/Layout/Spinner/SpinnerLayout.razor.css index 642f267..80fb011 100644 --- a/SteUp.Shared/Components/Layout/Spinner/SpinnerLayout.razor.css +++ b/SteUp.Shared/Components/Layout/Spinner/SpinnerLayout.razor.css @@ -16,7 +16,7 @@ aspect-ratio: 1; border-radius: 50%; border: 8px solid #0000; - border-right-color: var(--mud-palette-secondary); + border-right-color: var(--mud-palette-primary); position: relative; animation: l24 1s infinite linear; } diff --git a/SteUp.Shared/Components/Pages/Index.razor b/SteUp.Shared/Components/Pages/Index.razor index 2ab81a2..c225c0b 100644 --- a/SteUp.Shared/Components/Pages/Index.razor +++ b/SteUp.Shared/Components/Pages/Index.razor @@ -9,5 +9,4 @@ { NavigationManager.NavigateTo("/home"); } - } \ No newline at end of file diff --git a/SteUp.Shared/Components/Pages/Login.razor b/SteUp.Shared/Components/Pages/Login.razor index 024bbae..2e8c2f7 100644 --- a/SteUp.Shared/Components/Pages/Login.razor +++ b/SteUp.Shared/Components/Pages/Login.razor @@ -1,6 +1,115 @@ @page "/login" -

    Login

    +@using SteUp.Shared.Components.Layout.Spinner +@using SteUp.Shared.Core.Interface.System +@using SteUp.Shared.Core.Services +@inject IUserAccountService UserAccountService +@inject AppAuthenticationStateProvider AuthenticationStateProvider +@inject IGenericSystemService GenericSystemService + +@if (Spinner) +{ + +} +else +{ + +} + @code { - + private SignIn UserData { get; } = new(); + private bool Spinner { get; set; } + private string ErrorMessage { get; set; } = ""; + private bool _attemptFailed; + + private bool _isShow; + private InputType _passwordInput = InputType.Password; + private string _passwordInputIcon = Icons.Material.Rounded.VisibilityOff; + + private void ShowPassword() + { + if (_isShow) + { + _isShow = false; + _passwordInputIcon = Icons.Material.Rounded.VisibilityOff; + _passwordInput = InputType.Password; + } + else + { + _isShow = true; + _passwordInputIcon = Icons.Material.Rounded.Visibility; + _passwordInput = InputType.Text; + } + } + + protected override void OnInitialized() + { + UserData.CodHash = LocalStorage.GetString("codHash"); + StateHasChanged(); + } + + private async Task SignInUser() + { + _attemptFailed = false; + if (!string.IsNullOrEmpty(UserData.Username) && !string.IsNullOrEmpty(UserData.Password) && !string.IsNullOrEmpty(UserData.CodHash)) + { + Spinner = true; + StateHasChanged(); + + try + { + await UserAccountService.Login(UserData.Username, UserData.Password, UserData.CodHash); + AuthenticationStateProvider.NotifyAuthenticationState(); //Chiamato per forzare il refresh + + LocalStorage.SetString("codHash", UserData.CodHash); + NavigationManager.NavigateTo("/"); + StateHasChanged(); + } + catch (Exception e) + { + Spinner = false; + StateHasChanged(); + + ErrorMessage = e.Message; + _attemptFailed = true; + Console.WriteLine(e); + } + } + } + + public class SignIn + { + public string? Username { get; set; } + public string? Password { get; set; } + public string? CodHash { get; set; } + } + } \ No newline at end of file diff --git a/SteUp.Shared/Components/Pages/Login.razor.css b/SteUp.Shared/Components/Pages/Login.razor.css index 5f28270..4475e0e 100644 --- a/SteUp.Shared/Components/Pages/Login.razor.css +++ b/SteUp.Shared/Components/Pages/Login.razor.css @@ -1 +1,54 @@ - \ No newline at end of file +.login-page { + height: 100%; + display: flex; + flex-direction: column; + background: var(--mud-palette-surface); +} + +.container-top-logo > .logo { + width: 50%; +} + +.container-login > span { + font-size: large; + font-weight: 900; + text-align: center; +} + +.container-top-logo { + height: 35vh; + display: flex; + align-items: center; + justify-content: center; + z-index: 10; +} + +.login-form-container { + display: flex; + flex-direction: column; + gap: 1rem; +} + +.container-login { + height: 100%; + display: flex; + flex-direction: column; + padding: 4px 16px 16px; + justify-content: space-between; +} + +.login-footer { + width: 100%; + display: flex; + justify-content: center; +} + +.login-footer span { + font-size: 9px; + color: var(--mud-palette-gray-darker); +} + +.login-footer img { + height: 15px; + margin-left: 4px; +} \ No newline at end of file diff --git a/SteUp.Shared/Core/Interface/System/IGenericSystemService.cs b/SteUp.Shared/Core/Interface/System/IGenericSystemService.cs new file mode 100644 index 0000000..fecc6be --- /dev/null +++ b/SteUp.Shared/Core/Interface/System/IGenericSystemService.cs @@ -0,0 +1,6 @@ +namespace SteUp.Shared.Core.Interface.System; + +public interface IGenericSystemService +{ + string GetCurrentAppVersion(); +} \ No newline at end of file diff --git a/SteUp.Shared/wwwroot/css/default-theme.css b/SteUp.Shared/wwwroot/css/default-theme.css index bb5ba37..ade39dd 100644 --- a/SteUp.Shared/wwwroot/css/default-theme.css +++ b/SteUp.Shared/wwwroot/css/default-theme.css @@ -1,5 +1,13 @@ :root { - --primary-color: #ec4c41; - --ligther-color: #f7f7ff; - --darker-color: #d02315; + /*Color*/ + --card-border-color: hsl(from var(--mud-palette-gray-light) h s 86%); + --gray-for-shadow: hsl(from var(--mud-palette-overlay-dark)h s 40%); + /*Utility*/ + --exception-box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.3); + --custom-box-shadow: 1px 2px 5px var(--gray-for-shadow); + --mud-default-borderradius: 20px !important; + --m-page-x: 1rem; + --mh-header: 4rem; + + --light-card-background: hsl(from var(--mud-palette-background-gray) h s 97%); } \ No newline at end of file diff --git a/SteUp.Shared/wwwroot/images/log-book.svg b/SteUp.Shared/wwwroot/images/log-book.svg deleted file mode 100644 index 2803c6f..0000000 --- a/SteUp.Shared/wwwroot/images/log-book.svg +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LOG - LOG - - LOG - - - - BOOK - BOOK - - BOOK - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SteUp.Shared/wwwroot/images/logoIntegry.svg b/SteUp.Shared/wwwroot/images/logoIntegry.svg new file mode 100644 index 0000000..cf1904f --- /dev/null +++ b/SteUp.Shared/wwwroot/images/logoIntegry.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SteUp.Shared/wwwroot/images/logo_steup.svg b/SteUp.Shared/wwwroot/images/logo_steup.svg new file mode 100644 index 0000000..bbaba0d --- /dev/null +++ b/SteUp.Shared/wwwroot/images/logo_steup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/SteUp.Shared/wwwroot/images/man-doing-squats.svg b/SteUp.Shared/wwwroot/images/man-doing-squats.svg deleted file mode 100644 index c89086b..0000000 --- a/SteUp.Shared/wwwroot/images/man-doing-squats.svg +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -