diff --git a/.idea/.idea.Fixiy/.idea/.gitignore b/.idea/.idea.Fixiy/.idea/.gitignore new file mode 100644 index 0000000..115d1f5 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/.gitignore @@ -0,0 +1,15 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/.idea.Fixiy.iml +/projectSettingsUpdater.xml +/modules.xml +/contentModel.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Ignored default folder with query files +/queries/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.Fixiy/.idea/AndroidProjectSystem.xml b/.idea/.idea.Fixiy/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..e82600c --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/encodings.xml b/.idea/.idea.Fixiy/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/indexLayout.xml b/.idea/.idea.Fixiy/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_annotation_annotation.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_annotation_annotation.xml new file mode 100644 index 0000000..ef552ef --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_annotation_annotation.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_annotation_annotation_jvm.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_annotation_annotation_jvm.xml new file mode 100644 index 0000000..05a7adc --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_annotation_annotation_jvm.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_arch_core_core_common.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_arch_core_core_common.xml new file mode 100644 index 0000000..d3fed0b --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_arch_core_core_common.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection.xml new file mode 100644 index 0000000..1fbdfc4 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection_jvm.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection_jvm.xml new file mode 100644 index 0000000..e916fc5 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection_jvm.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection_ktx.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection_ktx.xml new file mode 100644 index 0000000..d7beaa7 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_collection_collection_ktx.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_concurrent_concurrent_futures.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_concurrent_concurrent_futures.xml new file mode 100644 index 0000000..bf6ad25 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_concurrent_concurrent_futures.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_constraintlayout_constraintlayout_core.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_constraintlayout_constraintlayout_core.xml new file mode 100644 index 0000000..f4ebaee --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_constraintlayout_constraintlayout_core.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_lifecycle_lifecycle_common.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_lifecycle_lifecycle_common.xml new file mode 100644 index 0000000..1c0e22c --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_lifecycle_lifecycle_common.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_lifecycle_lifecycle_common_jvm.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_lifecycle_lifecycle_common_jvm.xml new file mode 100644 index 0000000..d50ac06 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_lifecycle_lifecycle_common_jvm.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_resourceinspection_resourceinspection_annotation.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_resourceinspection_resourceinspection_annotation.xml new file mode 100644 index 0000000..9ac54c0 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_resourceinspection_resourceinspection_annotation.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_window_window_core.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_window_window_core.xml new file mode 100644 index 0000000..0dc90ac --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_window_window_core.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/androidx_window_window_core_jvm.xml b/.idea/.idea.Fixiy/.idea/libraries/androidx_window_window_core_jvm.xml new file mode 100644 index 0000000..00524f3 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/androidx_window_window_core_jvm.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_9_0.xml b/.idea/.idea.Fixiy/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_9_0.xml new file mode 100644 index 0000000..42cc488 --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_9_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Fixiy/.idea/vcs.xml b/.idea/.idea.Fixiy/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/.idea.Fixiy/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assets/BarberApp Screenshot/screenshot-1725444549743.png b/Assets/BarberApp Screenshot/screenshot-1725444549743.png deleted file mode 100644 index b6324ec..0000000 Binary files a/Assets/BarberApp Screenshot/screenshot-1725444549743.png and /dev/null differ diff --git a/Assets/BarberApp Screenshot/screenshot-1725444612350.png b/Assets/BarberApp Screenshot/screenshot-1725444612350.png deleted file mode 100644 index 6463e06..0000000 Binary files a/Assets/BarberApp Screenshot/screenshot-1725444612350.png and /dev/null differ diff --git a/Assets/BarberApp Screenshot/screenshot-1725444624493.png b/Assets/BarberApp Screenshot/screenshot-1725444624493.png deleted file mode 100644 index d2ebf52..0000000 Binary files a/Assets/BarberApp Screenshot/screenshot-1725444624493.png and /dev/null differ diff --git a/Assets/BarberApp Screenshot/screenshot-1725444634662.png b/Assets/BarberApp Screenshot/screenshot-1725444634662.png deleted file mode 100644 index eff3141..0000000 Binary files a/Assets/BarberApp Screenshot/screenshot-1725444634662.png and /dev/null differ diff --git a/Assets/BarberApp Screenshot/screenshot-1725444668286.png b/Assets/BarberApp Screenshot/screenshot-1725444668286.png deleted file mode 100644 index d65a7da..0000000 Binary files a/Assets/BarberApp Screenshot/screenshot-1725444668286.png and /dev/null differ diff --git a/Template.Maui/App.xaml b/Fixiy.Maui/App.xaml similarity index 91% rename from Template.Maui/App.xaml rename to Fixiy.Maui/App.xaml index 500235a..61c24b5 100644 --- a/Template.Maui/App.xaml +++ b/Fixiy.Maui/App.xaml @@ -1,8 +1,8 @@ + xmlns:local="clr-namespace:Fixiy.Maui" + x:Class="Fixiy.Maui.App"> diff --git a/Template.Maui/App.xaml.cs b/Fixiy.Maui/App.xaml.cs similarity index 87% rename from Template.Maui/App.xaml.cs rename to Fixiy.Maui/App.xaml.cs index 613d687..3faa4e3 100644 --- a/Template.Maui/App.xaml.cs +++ b/Fixiy.Maui/App.xaml.cs @@ -1,4 +1,4 @@ -namespace Template.Maui +namespace Fixiy.Maui { public partial class App : Application { diff --git a/Template.Maui/Template.Maui.csproj b/Fixiy.Maui/Fixiy.Maui.csproj similarity index 64% rename from Template.Maui/Template.Maui.csproj rename to Fixiy.Maui/Fixiy.Maui.csproj index 968a0f3..ff0943c 100644 --- a/Template.Maui/Template.Maui.csproj +++ b/Fixiy.Maui/Fixiy.Maui.csproj @@ -1,22 +1,11 @@  - $(TargetFrameworks);net8.0-android - $(TargetFrameworks);net8.0-ios - $(TargetFrameworks);net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - - - - + $(TargetFrameworks);net10.0-android + $(TargetFrameworks);net10.0-ios Exe - Template.Maui + Fixiy.Maui true true enable @@ -24,22 +13,17 @@ enable - Template.Maui + Fixiy - it.integry.template.maui + it.integry.Fixiy 1.0 1 - 14.2 - - 14.0 - + 15.0 24.0 - 10.0.17763.0 - 10.0.17763.0 @@ -47,7 +31,7 @@ $(DefineConstants);PLATFORM 26.0 - 34 + 36 - + - + - + diff --git a/Template.Shared/Components/Layout/MainLayout.razor b/Fixiy.Shared/Components/Layout/MainLayout.razor similarity index 100% rename from Template.Shared/Components/Layout/MainLayout.razor rename to Fixiy.Shared/Components/Layout/MainLayout.razor diff --git a/Template.Shared/Components/Layout/MainLayout.razor.css b/Fixiy.Shared/Components/Layout/MainLayout.razor.css similarity index 100% rename from Template.Shared/Components/Layout/MainLayout.razor.css rename to Fixiy.Shared/Components/Layout/MainLayout.razor.css diff --git a/Template.Shared/Components/Layout/NavBar.razor b/Fixiy.Shared/Components/Layout/NavBar.razor similarity index 100% rename from Template.Shared/Components/Layout/NavBar.razor rename to Fixiy.Shared/Components/Layout/NavBar.razor diff --git a/Template.Shared/Components/Layout/NavBar.razor.css b/Fixiy.Shared/Components/Layout/NavBar.razor.css similarity index 100% rename from Template.Shared/Components/Layout/NavBar.razor.css rename to Fixiy.Shared/Components/Layout/NavBar.razor.css diff --git a/Template.Shared/Components/Layout/NavMenu.razor b/Fixiy.Shared/Components/Layout/NavMenu.razor similarity index 100% rename from Template.Shared/Components/Layout/NavMenu.razor rename to Fixiy.Shared/Components/Layout/NavMenu.razor diff --git a/Template.Shared/Components/Layout/NavMenu.razor.css b/Fixiy.Shared/Components/Layout/NavMenu.razor.css similarity index 100% rename from Template.Shared/Components/Layout/NavMenu.razor.css rename to Fixiy.Shared/Components/Layout/NavMenu.razor.css diff --git a/Fixiy.Shared/Components/Pages/Home.razor b/Fixiy.Shared/Components/Pages/Home.razor new file mode 100644 index 0000000..add825e --- /dev/null +++ b/Fixiy.Shared/Components/Pages/Home.razor @@ -0,0 +1,3 @@ +@page "/" + +

Hello, world!

\ No newline at end of file diff --git a/Template.Shared/Components/Routes.razor b/Fixiy.Shared/Components/Routes.razor similarity index 100% rename from Template.Shared/Components/Routes.razor rename to Fixiy.Shared/Components/Routes.razor diff --git a/Template.Shared/Components/SingleElements/NoDataAvailable.razor b/Fixiy.Shared/Components/SingleElements/NoDataAvailable.razor similarity index 100% rename from Template.Shared/Components/SingleElements/NoDataAvailable.razor rename to Fixiy.Shared/Components/SingleElements/NoDataAvailable.razor diff --git a/Template.Shared/Components/SingleElements/NoDataAvailable.razor.css b/Fixiy.Shared/Components/SingleElements/NoDataAvailable.razor.css similarity index 100% rename from Template.Shared/Components/SingleElements/NoDataAvailable.razor.css rename to Fixiy.Shared/Components/SingleElements/NoDataAvailable.razor.css diff --git a/Template.Shared/Template.Shared.csproj b/Fixiy.Shared/Fixiy.Shared.csproj similarity index 66% rename from Template.Shared/Template.Shared.csproj rename to Fixiy.Shared/Fixiy.Shared.csproj index 96bbb52..5605918 100644 --- a/Template.Shared/Template.Shared.csproj +++ b/Fixiy.Shared/Fixiy.Shared.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -11,9 +11,8 @@ - - - + + diff --git a/Template.Shared/InteractiveRenderSettings.cs b/Fixiy.Shared/InteractiveRenderSettings.cs similarity index 96% rename from Template.Shared/InteractiveRenderSettings.cs rename to Fixiy.Shared/InteractiveRenderSettings.cs index b6aadcf..830b86a 100644 --- a/Template.Shared/InteractiveRenderSettings.cs +++ b/Fixiy.Shared/InteractiveRenderSettings.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; -namespace Template.Shared; +namespace Fixiy.Shared; public static class InteractiveRenderSettings { diff --git a/Template.Shared/Interfaces/IFormFactor.cs b/Fixiy.Shared/Interfaces/IFormFactor.cs similarity index 72% rename from Template.Shared/Interfaces/IFormFactor.cs rename to Fixiy.Shared/Interfaces/IFormFactor.cs index aa7a4fa..71e9e3d 100644 --- a/Template.Shared/Interfaces/IFormFactor.cs +++ b/Fixiy.Shared/Interfaces/IFormFactor.cs @@ -1,4 +1,4 @@ -namespace Template.Shared.Interfaces; +namespace Fixiy.Shared.Interfaces; public interface IFormFactor { diff --git a/Template.Shared/_Imports.razor b/Fixiy.Shared/_Imports.razor similarity index 84% rename from Template.Shared/_Imports.razor rename to Fixiy.Shared/_Imports.razor index 62c3cc9..a805c70 100644 --- a/Template.Shared/_Imports.razor +++ b/Fixiy.Shared/_Imports.razor @@ -5,6 +5,5 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using Template.Shared.Components -@using BlazorBootstrap; +@using Fixiy.Shared.Components @using static InteractiveRenderSettings diff --git a/Template.Shared/wwwroot/css/app.css b/Fixiy.Shared/wwwroot/css/app.css similarity index 100% rename from Template.Shared/wwwroot/css/app.css rename to Fixiy.Shared/wwwroot/css/app.css diff --git a/Template.Shared/wwwroot/css/bootstrap/bootstrap-icons.min.css b/Fixiy.Shared/wwwroot/css/bootstrap/bootstrap-icons.min.css similarity index 100% rename from Template.Shared/wwwroot/css/bootstrap/bootstrap-icons.min.css rename to Fixiy.Shared/wwwroot/css/bootstrap/bootstrap-icons.min.css diff --git a/Template.Shared/wwwroot/css/bootstrap/bootstrap.min.css b/Fixiy.Shared/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from Template.Shared/wwwroot/css/bootstrap/bootstrap.min.css rename to Fixiy.Shared/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/Template.Shared/wwwroot/css/bootstrap/bootstrap.min.css.map b/Fixiy.Shared/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from Template.Shared/wwwroot/css/bootstrap/bootstrap.min.css.map rename to Fixiy.Shared/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/Template.Shared/wwwroot/css/bootstrap/fonts/bootstrap-icons.woff b/Fixiy.Shared/wwwroot/css/bootstrap/fonts/bootstrap-icons.woff similarity index 100% rename from Template.Shared/wwwroot/css/bootstrap/fonts/bootstrap-icons.woff rename to Fixiy.Shared/wwwroot/css/bootstrap/fonts/bootstrap-icons.woff diff --git a/Template.Shared/wwwroot/css/bootstrap/fonts/bootstrap-icons.woff2 b/Fixiy.Shared/wwwroot/css/bootstrap/fonts/bootstrap-icons.woff2 similarity index 100% rename from Template.Shared/wwwroot/css/bootstrap/fonts/bootstrap-icons.woff2 rename to Fixiy.Shared/wwwroot/css/bootstrap/fonts/bootstrap-icons.woff2 diff --git a/Template.Shared/wwwroot/css/default-theme.css b/Fixiy.Shared/wwwroot/css/default-theme.css similarity index 100% rename from Template.Shared/wwwroot/css/default-theme.css rename to Fixiy.Shared/wwwroot/css/default-theme.css diff --git a/Template.Shared/wwwroot/css/remixicon/remixicon.css b/Fixiy.Shared/wwwroot/css/remixicon/remixicon.css similarity index 100% rename from Template.Shared/wwwroot/css/remixicon/remixicon.css rename to Fixiy.Shared/wwwroot/css/remixicon/remixicon.css diff --git a/Template.Shared/wwwroot/css/remixicon/remixicon.eot b/Fixiy.Shared/wwwroot/css/remixicon/remixicon.eot similarity index 100% rename from Template.Shared/wwwroot/css/remixicon/remixicon.eot rename to Fixiy.Shared/wwwroot/css/remixicon/remixicon.eot diff --git a/Template.Shared/wwwroot/css/remixicon/remixicon.ttf b/Fixiy.Shared/wwwroot/css/remixicon/remixicon.ttf similarity index 100% rename from Template.Shared/wwwroot/css/remixicon/remixicon.ttf rename to Fixiy.Shared/wwwroot/css/remixicon/remixicon.ttf diff --git a/Template.Shared/wwwroot/css/remixicon/remixicon.woff b/Fixiy.Shared/wwwroot/css/remixicon/remixicon.woff similarity index 100% rename from Template.Shared/wwwroot/css/remixicon/remixicon.woff rename to Fixiy.Shared/wwwroot/css/remixicon/remixicon.woff diff --git a/Template.Shared/wwwroot/css/remixicon/remixicon.woff2 b/Fixiy.Shared/wwwroot/css/remixicon/remixicon.woff2 similarity index 100% rename from Template.Shared/wwwroot/css/remixicon/remixicon.woff2 rename to Fixiy.Shared/wwwroot/css/remixicon/remixicon.woff2 diff --git a/Template.Shared/wwwroot/images/log-book.svg b/Fixiy.Shared/wwwroot/images/log-book.svg similarity index 100% rename from Template.Shared/wwwroot/images/log-book.svg rename to Fixiy.Shared/wwwroot/images/log-book.svg diff --git a/Template.Shared/wwwroot/images/man-doing-squats.svg b/Fixiy.Shared/wwwroot/images/man-doing-squats.svg similarity index 100% rename from Template.Shared/wwwroot/images/man-doing-squats.svg rename to Fixiy.Shared/wwwroot/images/man-doing-squats.svg diff --git a/Template.Shared/wwwroot/js/bootstrap/Sortable.min.js b/Fixiy.Shared/wwwroot/js/bootstrap/Sortable.min.js similarity index 100% rename from Template.Shared/wwwroot/js/bootstrap/Sortable.min.js rename to Fixiy.Shared/wwwroot/js/bootstrap/Sortable.min.js diff --git a/Template.Shared/wwwroot/js/bootstrap/bootstrap.bundle.min.js b/Fixiy.Shared/wwwroot/js/bootstrap/bootstrap.bundle.min.js similarity index 100% rename from Template.Shared/wwwroot/js/bootstrap/bootstrap.bundle.min.js rename to Fixiy.Shared/wwwroot/js/bootstrap/bootstrap.bundle.min.js diff --git a/Template.Shared/wwwroot/js/bootstrap/chart.umd.js b/Fixiy.Shared/wwwroot/js/bootstrap/chart.umd.js similarity index 100% rename from Template.Shared/wwwroot/js/bootstrap/chart.umd.js rename to Fixiy.Shared/wwwroot/js/bootstrap/chart.umd.js diff --git a/Template.Shared/wwwroot/js/bootstrap/chartjs-plugin-datalabels.min.js b/Fixiy.Shared/wwwroot/js/bootstrap/chartjs-plugin-datalabels.min.js similarity index 100% rename from Template.Shared/wwwroot/js/bootstrap/chartjs-plugin-datalabels.min.js rename to Fixiy.Shared/wwwroot/js/bootstrap/chartjs-plugin-datalabels.min.js diff --git a/Fixiy.Web/Components/App.razor b/Fixiy.Web/Components/App.razor new file mode 100644 index 0000000..90941b7 --- /dev/null +++ b/Fixiy.Web/Components/App.razor @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Template.Web/Components/Pages/Error.razor b/Fixiy.Web/Components/Pages/Error.razor similarity index 100% rename from Template.Web/Components/Pages/Error.razor rename to Fixiy.Web/Components/Pages/Error.razor diff --git a/Template.Web/Components/_Imports.razor b/Fixiy.Web/Components/_Imports.razor similarity index 81% rename from Template.Web/Components/_Imports.razor rename to Fixiy.Web/Components/_Imports.razor index a07e26d..7643ed0 100644 --- a/Template.Web/Components/_Imports.razor +++ b/Fixiy.Web/Components/_Imports.razor @@ -6,6 +6,6 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using Template.Web -@using Template.Shared.Components -@using Template.Shared +@using Fixiy.Web +@using Fixiy.Shared.Components +@using Fixiy.Shared diff --git a/Template.Web/Template.Web.csproj b/Fixiy.Web/Fixiy.Web.csproj similarity index 68% rename from Template.Web/Template.Web.csproj rename to Fixiy.Web/Fixiy.Web.csproj index fd1e962..32b675d 100644 --- a/Template.Web/Template.Web.csproj +++ b/Fixiy.Web/Fixiy.Web.csproj @@ -1,17 +1,17 @@ - net8.0 + net10.0 enable enable - + - + diff --git a/Template.Web/Program.cs b/Fixiy.Web/Program.cs similarity index 57% rename from Template.Web/Program.cs rename to Fixiy.Web/Program.cs index 18ab6ae..5877211 100644 --- a/Template.Web/Program.cs +++ b/Fixiy.Web/Program.cs @@ -1,14 +1,9 @@ using IntegryApiClient.Blazor; -using Template.Web.Components; -using Template.Shared.Interfaces; -using Template.Web.Services; +using Fixiy.Web.Components; +using Fixiy.Shared.Interfaces; +using Fixiy.Web.Services; -#if DEBUG -const string BaseRestServicesEndpoint = "https://devservices.studioml.it/ems-api/"; -//const string BaseRestServicesEndpoint = "http://192.168.2.23:8080/ems-api/"; -#else - const string BaseRestServicesEndpoint = "https://services.studioml.it/ems-api/"; -#endif +const string appToken = "3e7e7147-1391-48e7-86bd-b70e7418d40d"; var builder = WebApplication.CreateBuilder(args); @@ -16,8 +11,7 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddRazorComponents() .AddInteractiveServerComponents(); -builder.Services.AddBlazorBootstrap(); -builder.Services.UseIntegry(BaseRestServicesEndpoint); +builder.Services.UseIntegry(appToken: appToken, useLoginAzienda: true); builder.Services.AddScoped(); @@ -38,6 +32,6 @@ app.UseAntiforgery(); app.MapRazorComponents() .AddInteractiveServerRenderMode() - .AddAdditionalAssemblies(typeof(Template.Shared._Imports).Assembly); + .AddAdditionalAssemblies(typeof(Fixiy.Shared._Imports).Assembly); -app.Run(); +app.Run(); \ No newline at end of file diff --git a/Template.Web/Properties/launchSettings.json b/Fixiy.Web/Properties/launchSettings.json similarity index 100% rename from Template.Web/Properties/launchSettings.json rename to Fixiy.Web/Properties/launchSettings.json diff --git a/Template.Web/Services/FormFactor.cs b/Fixiy.Web/Services/FormFactor.cs similarity index 75% rename from Template.Web/Services/FormFactor.cs rename to Fixiy.Web/Services/FormFactor.cs index 10c2378..6663fc1 100644 --- a/Template.Web/Services/FormFactor.cs +++ b/Fixiy.Web/Services/FormFactor.cs @@ -1,6 +1,6 @@ -using Template.Shared.Interfaces; +using Fixiy.Shared.Interfaces; -namespace Template.Web.Services; +namespace Fixiy.Web.Services; public class FormFactor : IFormFactor { diff --git a/Template.Web/appsettings.Development.json b/Fixiy.Web/appsettings.Development.json similarity index 100% rename from Template.Web/appsettings.Development.json rename to Fixiy.Web/appsettings.Development.json diff --git a/Template.Web/appsettings.json b/Fixiy.Web/appsettings.json similarity index 100% rename from Template.Web/appsettings.json rename to Fixiy.Web/appsettings.json diff --git a/Template.sln b/Fixiy.sln similarity index 80% rename from Template.sln rename to Fixiy.sln index fc29702..f94f519 100644 --- a/Template.sln +++ b/Fixiy.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.10.34607.79 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Template.Maui", "Template.Maui\Template.Maui.csproj", "{765F13F2-2E97-4912-B774-DA38B78DC032}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fixiy.Maui", "Fixiy.Maui\Fixiy.Maui.csproj", "{765F13F2-2E97-4912-B774-DA38B78DC032}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Template.Shared", "Template.Shared\Template.Shared.csproj", "{868BF270-578F-4618-9238-C41861F379DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fixiy.Shared", "Fixiy.Shared\Fixiy.Shared.csproj", "{868BF270-578F-4618-9238-C41861F379DF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Template.Web", "Template.Web\Template.Web.csproj", "{A813A640-4535-4024-8FD9-1EE6B76FB2AE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fixiy.Web", "Fixiy.Web\Fixiy.Web.csproj", "{A813A640-4535-4024-8FD9-1EE6B76FB2AE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Template.Shared/Components/Pages/Counter.razor b/Template.Shared/Components/Pages/Counter.razor deleted file mode 100644 index 1d02763..0000000 --- a/Template.Shared/Components/Pages/Counter.razor +++ /dev/null @@ -1,16 +0,0 @@ -@page "/counter" - -

Counter

- -

Current count: @currentCount

- - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } -} diff --git a/Template.Shared/Components/Pages/DeviceFormFactor.razor b/Template.Shared/Components/Pages/DeviceFormFactor.razor deleted file mode 100644 index 6f421b4..0000000 --- a/Template.Shared/Components/Pages/DeviceFormFactor.razor +++ /dev/null @@ -1,23 +0,0 @@ -@page "/device-form-factor" -@using Template.Shared.Interfaces -@inject IFormFactor FormFactor - -Form Factor - -

Device Form Factor

- -

You are running on:

- -
    -
  • Form Factor: @factor
    • -
  • Platform: @platform
    • -
- -

- This component is defined in the Template.Shared library. -

- -@code { - private string factor => FormFactor.GetFormFactor(); - private string platform => FormFactor.GetPlatform(); -} diff --git a/Template.Shared/Components/Pages/Home.razor b/Template.Shared/Components/Pages/Home.razor deleted file mode 100644 index 190c626..0000000 --- a/Template.Shared/Components/Pages/Home.razor +++ /dev/null @@ -1,15 +0,0 @@ -@page "/" - -

Hello, world!

- -Welcome to your new app. - - - ... - - - - -@code { - private Modal modal = default!; -} \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Impostazioni.razor b/Template.Shared/Components/Pages/Impostazioni.razor deleted file mode 100644 index f9a4f56..0000000 --- a/Template.Shared/Components/Pages/Impostazioni.razor +++ /dev/null @@ -1,6 +0,0 @@ -@page "/settings" -

Impostazioni

- -@code { - -} \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Log Book.razor b/Template.Shared/Components/Pages/Log Book.razor deleted file mode 100644 index ecc561d..0000000 --- a/Template.Shared/Components/Pages/Log Book.razor +++ /dev/null @@ -1,10 +0,0 @@ -@page "/logbook" -@using Template.Shared.Components.SingleElements -

Log book

- - - -@code { - -} \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Weather.razor b/Template.Shared/Components/Pages/Weather.razor deleted file mode 100644 index 472bb98..0000000 --- a/Template.Shared/Components/Pages/Weather.razor +++ /dev/null @@ -1,61 +0,0 @@ -@page "/weather" - -

Weather

- -

This component demonstrates showing data.

- -@if (forecasts == null) -{ -

Loading...

-} -else -{ - - - - - - - - - - - @foreach (var forecast in forecasts) - { - - - - - - - } - -
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
-} - -@code { - private WeatherForecast[]? forecasts; - - protected override async Task OnInitializedAsync() - { - // Simulate asynchronous loading to demonstrate a loading indicator - await Task.Delay(500); - - var startDate = DateOnly.FromDateTime(DateTime.Now); - var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" }; - forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = startDate.AddDays(index), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = summaries[Random.Shared.Next(summaries.Length)] - }).ToArray(); - } - - private class WeatherForecast - { - public DateOnly Date { get; set; } - public int TemperatureC { get; set; } - public string? Summary { get; set; } - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - } -} diff --git a/Template.Shared/Components/Pages/Workout.razor b/Template.Shared/Components/Pages/Workout.razor deleted file mode 100644 index ea09c39..0000000 --- a/Template.Shared/Components/Pages/Workout.razor +++ /dev/null @@ -1,12 +0,0 @@ -@page "/workout" -@using Template.Shared.Components.SingleElements -

Workout

- - - -@code { - - - -} \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Workout.razor.css b/Template.Shared/Components/Pages/Workout.razor.css deleted file mode 100644 index e69de29..0000000 diff --git a/Template.Web/Components/App.razor b/Template.Web/Components/App.razor deleted file mode 100644 index a568c09..0000000 --- a/Template.Web/Components/App.razor +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -