From 9802a4a0e8c2e39f604450283eb314cae6426f87 Mon Sep 17 00:00:00 2001 From: Nils Pukropp Date: Tue, 22 Apr 2025 22:12:49 +0200 Subject: [PATCH] restructure --- QuickDish.sln | 110 +- src/QuickDish.Api/Program.cs | 8 +- .../Properties/launchSettings.json | 28 +- src/QuickDish.Api/QuickDish.Api.csproj | 7 +- src/QuickDish.Api/QuickDish.Api.http | 2 +- src/QuickDish.Application/Class1.cs | 6 - src/QuickDish.BLL/Class1.cs | 6 + .../QuickDish.BLL.csproj} | 4 +- src/QuickDish.Client/App.xaml.cs | 9 +- src/QuickDish.Client/AppShell.xaml | 2 +- src/QuickDish.Client/MainPage.xaml | 2 +- .../Platforms/Tizen/tizen-manifest.xml | 2 +- .../Platforms/Windows/Package.appxmanifest | 2 +- .../Properties/launchSettings.json | 2 +- src/QuickDish.Client/QuickDish.Client.csproj | 20 +- .../Resources/Fonts/FluentUI.cs | 7920 +++++++++++++++++ .../Resources/Fonts/OpenSans-Regular.ttf | Bin 107276 -> 107280 bytes .../Resources/Fonts/OpenSans-Semibold.ttf | Bin 111184 -> 111164 bytes .../Resources/Images/dotnet_bot.png | Bin 69811 -> 93437 bytes .../Resources/Styles/Styles.xaml | 26 +- .../QuickDish.Core.csproj} | 2 +- src/QuickDish.Core/Recipe.cs | 38 + src/QuickDish.Core/User.cs | 15 + src/QuickDish.DataAccess/Class1.cs | 6 + .../QuickDish.DataAccess.csproj} | 4 +- src/QuickDish.Domain/Class1.cs | 6 - src/QuickDish.Infrastructure/Class1.cs | 6 - 27 files changed, 8128 insertions(+), 105 deletions(-) delete mode 100644 src/QuickDish.Application/Class1.cs create mode 100644 src/QuickDish.BLL/Class1.cs rename src/{QuickDish.Infrastructure/QuickDish.Infrastructure.csproj => QuickDish.BLL/QuickDish.BLL.csproj} (58%) create mode 100644 src/QuickDish.Client/Resources/Fonts/FluentUI.cs rename src/{QuickDish.Domain/QuickDish.Domain.csproj => QuickDish.Core/QuickDish.Core.csproj} (77%) create mode 100644 src/QuickDish.Core/Recipe.cs create mode 100644 src/QuickDish.Core/User.cs create mode 100644 src/QuickDish.DataAccess/Class1.cs rename src/{QuickDish.Application/QuickDish.Application.csproj => QuickDish.DataAccess/QuickDish.DataAccess.csproj} (60%) delete mode 100644 src/QuickDish.Domain/Class1.cs delete mode 100644 src/QuickDish.Infrastructure/Class1.cs diff --git a/QuickDish.sln b/QuickDish.sln index 23c0569..fa1fbfd 100644 --- a/QuickDish.sln +++ b/QuickDish.sln @@ -3,53 +3,97 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BEDF4556-0366-45BC-B0F3-9FF4EB11B9CB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.Domain", "src\QuickDish.Domain\QuickDish.Domain.csproj", "{63C229FA-5E13-457A-868E-25B0C9C58AA6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.Core", "src\QuickDish.Core\QuickDish.Core.csproj", "{5172647D-5B13-42BB-A416-75C959BAFFA5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.Application", "src\QuickDish.Application\QuickDish.Application.csproj", "{A53CDB6D-8EAD-4C1D-A175-A64C90CF4B6B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.DataAccess", "src\QuickDish.DataAccess\QuickDish.DataAccess.csproj", "{946E5234-8F12-4A33-A5F3-E470E664201B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.Infrastructure", "src\QuickDish.Infrastructure\QuickDish.Infrastructure.csproj", "{86A26505-418B-49A8-99B6-52DE52C1B2F4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.BLL", "src\QuickDish.BLL\QuickDish.BLL.csproj", "{D3AD1315-4F57-495E-A866-81358666C649}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.Api", "src\QuickDish.Api\QuickDish.Api.csproj", "{21F9F0FA-71DD-42ED-AAB4-88AF11F8B6AB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.Api", "src\QuickDish.Api\QuickDish.Api.csproj", "{6A10F280-8396-444B-AD0E-EF4A20323AED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.Client", "src\QuickDish.Client\QuickDish.Client.csproj", "{AAEC702A-326A-40B8-9E02-04767A66D084}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDish.Client", "src\QuickDish.Client\QuickDish.Client.csproj", "{4F796B85-0487-4DE0-A086-EEDE32ECD3B3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Debug|x64.ActiveCfg = Debug|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Debug|x64.Build.0 = Debug|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Debug|x86.ActiveCfg = Debug|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Debug|x86.Build.0 = Debug|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Release|Any CPU.Build.0 = Release|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Release|x64.ActiveCfg = Release|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Release|x64.Build.0 = Release|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Release|x86.ActiveCfg = Release|Any CPU + {5172647D-5B13-42BB-A416-75C959BAFFA5}.Release|x86.Build.0 = Release|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Debug|x64.ActiveCfg = Debug|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Debug|x64.Build.0 = Debug|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Debug|x86.ActiveCfg = Debug|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Debug|x86.Build.0 = Debug|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Release|Any CPU.Build.0 = Release|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Release|x64.ActiveCfg = Release|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Release|x64.Build.0 = Release|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Release|x86.ActiveCfg = Release|Any CPU + {946E5234-8F12-4A33-A5F3-E470E664201B}.Release|x86.Build.0 = Release|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Debug|x64.ActiveCfg = Debug|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Debug|x64.Build.0 = Debug|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Debug|x86.ActiveCfg = Debug|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Debug|x86.Build.0 = Debug|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Release|Any CPU.Build.0 = Release|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Release|x64.ActiveCfg = Release|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Release|x64.Build.0 = Release|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Release|x86.ActiveCfg = Release|Any CPU + {D3AD1315-4F57-495E-A866-81358666C649}.Release|x86.Build.0 = Release|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Debug|x64.ActiveCfg = Debug|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Debug|x64.Build.0 = Debug|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Debug|x86.ActiveCfg = Debug|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Debug|x86.Build.0 = Debug|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Release|Any CPU.Build.0 = Release|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Release|x64.ActiveCfg = Release|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Release|x64.Build.0 = Release|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Release|x86.ActiveCfg = Release|Any CPU + {6A10F280-8396-444B-AD0E-EF4A20323AED}.Release|x86.Build.0 = Release|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Debug|x64.ActiveCfg = Debug|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Debug|x64.Build.0 = Debug|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Debug|x86.ActiveCfg = Debug|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Debug|x86.Build.0 = Debug|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Release|Any CPU.Build.0 = Release|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Release|x64.ActiveCfg = Release|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Release|x64.Build.0 = Release|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Release|x86.ActiveCfg = Release|Any CPU + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {63C229FA-5E13-457A-868E-25B0C9C58AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63C229FA-5E13-457A-868E-25B0C9C58AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63C229FA-5E13-457A-868E-25B0C9C58AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63C229FA-5E13-457A-868E-25B0C9C58AA6}.Release|Any CPU.Build.0 = Release|Any CPU - {A53CDB6D-8EAD-4C1D-A175-A64C90CF4B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A53CDB6D-8EAD-4C1D-A175-A64C90CF4B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A53CDB6D-8EAD-4C1D-A175-A64C90CF4B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A53CDB6D-8EAD-4C1D-A175-A64C90CF4B6B}.Release|Any CPU.Build.0 = Release|Any CPU - {86A26505-418B-49A8-99B6-52DE52C1B2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86A26505-418B-49A8-99B6-52DE52C1B2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86A26505-418B-49A8-99B6-52DE52C1B2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86A26505-418B-49A8-99B6-52DE52C1B2F4}.Release|Any CPU.Build.0 = Release|Any CPU - {21F9F0FA-71DD-42ED-AAB4-88AF11F8B6AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21F9F0FA-71DD-42ED-AAB4-88AF11F8B6AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21F9F0FA-71DD-42ED-AAB4-88AF11F8B6AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21F9F0FA-71DD-42ED-AAB4-88AF11F8B6AB}.Release|Any CPU.Build.0 = Release|Any CPU - {AAEC702A-326A-40B8-9E02-04767A66D084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAEC702A-326A-40B8-9E02-04767A66D084}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAEC702A-326A-40B8-9E02-04767A66D084}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAEC702A-326A-40B8-9E02-04767A66D084}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection GlobalSection(NestedProjects) = preSolution - {63C229FA-5E13-457A-868E-25B0C9C58AA6} = {BEDF4556-0366-45BC-B0F3-9FF4EB11B9CB} - {A53CDB6D-8EAD-4C1D-A175-A64C90CF4B6B} = {BEDF4556-0366-45BC-B0F3-9FF4EB11B9CB} - {86A26505-418B-49A8-99B6-52DE52C1B2F4} = {BEDF4556-0366-45BC-B0F3-9FF4EB11B9CB} - {21F9F0FA-71DD-42ED-AAB4-88AF11F8B6AB} = {BEDF4556-0366-45BC-B0F3-9FF4EB11B9CB} - {AAEC702A-326A-40B8-9E02-04767A66D084} = {BEDF4556-0366-45BC-B0F3-9FF4EB11B9CB} + {5172647D-5B13-42BB-A416-75C959BAFFA5} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {946E5234-8F12-4A33-A5F3-E470E664201B} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {D3AD1315-4F57-495E-A866-81358666C649} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {6A10F280-8396-444B-AD0E-EF4A20323AED} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {4F796B85-0487-4DE0-A086-EEDE32ECD3B3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} EndGlobalSection EndGlobal diff --git a/src/QuickDish.Api/Program.cs b/src/QuickDish.Api/Program.cs index 48863a6..666a9c5 100644 --- a/src/QuickDish.Api/Program.cs +++ b/src/QuickDish.Api/Program.cs @@ -3,17 +3,15 @@ var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddControllers(); -// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle -builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddSwaggerGen(); +// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi +builder.Services.AddOpenApi(); var app = builder.Build(); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { - app.UseSwagger(); - app.UseSwaggerUI(); + app.MapOpenApi(); } app.UseHttpsRedirection(); diff --git a/src/QuickDish.Api/Properties/launchSettings.json b/src/QuickDish.Api/Properties/launchSettings.json index fd466a9..6e50516 100644 --- a/src/QuickDish.Api/Properties/launchSettings.json +++ b/src/QuickDish.Api/Properties/launchSettings.json @@ -1,20 +1,11 @@ { - "$schema": "http://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:54692", - "sslPort": 44361 - } - }, + "$schema": "https://json.schemastore.org/launchsettings.json", "profiles": { "http": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, - "launchUrl": "swagger", - "applicationUrl": "http://localhost:5235", + "launchBrowser": false, + "applicationUrl": "http://localhost:5280", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } @@ -22,17 +13,8 @@ "https": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, - "launchUrl": "swagger", - "applicationUrl": "https://localhost:7164;http://localhost:5235", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", + "launchBrowser": false, + "applicationUrl": "https://localhost:7275;http://localhost:5280", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/QuickDish.Api/QuickDish.Api.csproj b/src/QuickDish.Api/QuickDish.Api.csproj index 75d2448..d884db2 100644 --- a/src/QuickDish.Api/QuickDish.Api.csproj +++ b/src/QuickDish.Api/QuickDish.Api.csproj @@ -1,18 +1,17 @@ - net8.0 + net9.0 enable enable - + - - + diff --git a/src/QuickDish.Api/QuickDish.Api.http b/src/QuickDish.Api/QuickDish.Api.http index 12ba3fd..423cf8a 100644 --- a/src/QuickDish.Api/QuickDish.Api.http +++ b/src/QuickDish.Api/QuickDish.Api.http @@ -1,4 +1,4 @@ -@QuickDish.Api_HostAddress = http://localhost:5235 +@QuickDish.Api_HostAddress = http://localhost:5280 GET {{QuickDish.Api_HostAddress}}/weatherforecast/ Accept: application/json diff --git a/src/QuickDish.Application/Class1.cs b/src/QuickDish.Application/Class1.cs deleted file mode 100644 index 61c2c16..0000000 --- a/src/QuickDish.Application/Class1.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace QuickDish.Application; - -public class Class1 -{ - -} diff --git a/src/QuickDish.BLL/Class1.cs b/src/QuickDish.BLL/Class1.cs new file mode 100644 index 0000000..5cfe5a8 --- /dev/null +++ b/src/QuickDish.BLL/Class1.cs @@ -0,0 +1,6 @@ +namespace QuickDish.BLL; + +public class Class1 +{ + +} diff --git a/src/QuickDish.Infrastructure/QuickDish.Infrastructure.csproj b/src/QuickDish.BLL/QuickDish.BLL.csproj similarity index 58% rename from src/QuickDish.Infrastructure/QuickDish.Infrastructure.csproj rename to src/QuickDish.BLL/QuickDish.BLL.csproj index 584a91c..5bba678 100644 --- a/src/QuickDish.Infrastructure/QuickDish.Infrastructure.csproj +++ b/src/QuickDish.BLL/QuickDish.BLL.csproj @@ -1,11 +1,11 @@  - + - net8.0 + net9.0 enable enable diff --git a/src/QuickDish.Client/App.xaml.cs b/src/QuickDish.Client/App.xaml.cs index 9f74cd9..8f9c095 100644 --- a/src/QuickDish.Client/App.xaml.cs +++ b/src/QuickDish.Client/App.xaml.cs @@ -5,7 +5,10 @@ public partial class App : Application public App() { InitializeComponent(); - - MainPage = new AppShell(); } -} + + protected override Window CreateWindow(IActivationState? activationState) + { + return new Window(new AppShell()); + } +} \ No newline at end of file diff --git a/src/QuickDish.Client/AppShell.xaml b/src/QuickDish.Client/AppShell.xaml index 7b6c791..02df97d 100644 --- a/src/QuickDish.Client/AppShell.xaml +++ b/src/QuickDish.Client/AppShell.xaml @@ -4,7 +4,7 @@ xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:QuickDish.Client" - Shell.FlyoutBehavior="Disabled" + Shell.FlyoutBehavior="Flyout" Title="QuickDish.Client"> + SemanticProperties.Description="dot net bot in a hovercraft number nine" />