From 0c34fe55abb57f99a202d0307836182ce78b012a Mon Sep 17 00:00:00 2001 From: Sascha Date: Mon, 25 Sep 2023 12:42:54 +0200 Subject: [PATCH] merge --- BuchhaltungBlazor.csproj | 26 +++++++++++++------------- Data/BookingDb.cs | 2 +- Pages/Bookings.razor.cs | 5 ++--- Pages/Index.razor | 17 +++++++++++++++-- Services/GenericController.cs | 18 +++++++++++++++--- Shared/MainLayout.razor | 1 - Shared/NavMenu.razor | 5 +---- 7 files changed, 47 insertions(+), 27 deletions(-) diff --git a/BuchhaltungBlazor.csproj b/BuchhaltungBlazor.csproj index 5b65950..f3c913d 100644 --- a/BuchhaltungBlazor.csproj +++ b/BuchhaltungBlazor.csproj @@ -8,26 +8,26 @@ - + - - - - - - - - - - - + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Data/BookingDb.cs b/Data/BookingDb.cs index d72ff5e..1dd5740 100644 --- a/Data/BookingDb.cs +++ b/Data/BookingDb.cs @@ -10,7 +10,7 @@ public class BookingDb : DbContext { public DbSet SubCategories { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - const string connectionString = "server=woitschetzki.de;port=3306;database=buchhaltung;user=sascha;password=mgltoJtmmDnKJ86LltsGdw;SslMode=;SslCa="; + const string connectionString = "server=woitschetzki.de;port=3308;database=buchhaltung;user=sascha;password=527646;SslMode=;SslCa="; try { optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString)).EnableSensitiveDataLogging().EnableDetailedErrors(); diff --git a/Pages/Bookings.razor.cs b/Pages/Bookings.razor.cs index e5acc8e..9270eb7 100644 --- a/Pages/Bookings.razor.cs +++ b/Pages/Bookings.razor.cs @@ -9,10 +9,9 @@ public partial class Bookings { protected override async Task OnInitializedAsync() { bookings = await GenericController.GetAllAsync() ?? new List(); + selectedBooking = bookings.FirstOrDefault(); await base.OnInitializedAsync(); } - private void OnSelectedBookingChanged(Booking newSelectedBooking) { - selectedBooking = newSelectedBooking; - } + private void OnSelectedBookingChanged(Booking newSelectedBooking) => selectedBooking = newSelectedBooking; } \ No newline at end of file diff --git a/Pages/Index.razor b/Pages/Index.razor index 2650dd5..5e79c19 100644 --- a/Pages/Index.razor +++ b/Pages/Index.razor @@ -1,7 +1,20 @@ @page "/" +@using BuchhaltungBlazor.Services Index -

Hello, world!

+

Hello, user.

+Welcome to my bookings app. + + + + -Welcome to your new app. \ No newline at end of file +@code { + private static void OnEnsureCreated() => GenericController.DeleteAndCreateDb(); + + private static async Task OnMigrate() { + await GenericController.Migrate(); + Console.WriteLine("Migration done."); + } +} \ No newline at end of file diff --git a/Services/GenericController.cs b/Services/GenericController.cs index af4bce3..f0c4b0b 100644 --- a/Services/GenericController.cs +++ b/Services/GenericController.cs @@ -4,15 +4,27 @@ using Microsoft.EntityFrameworkCore; namespace BuchhaltungBlazor.Services; public static class GenericController { + private static readonly BookingDb db = new(); public static async Task?> GetAllAsync() where TResult : class { try { - await using BookingDb db = new(); - IList resultSet = await db.Set().ToListAsync(); - return resultSet; + return await db.Set().ToListAsync(); } catch (Exception exception) { Console.WriteLine(exception); return default; } } + + public static void DeleteAndCreateDb() { + bool a = db.Database.EnsureDeleted(); + bool b = db.Database.EnsureCreated(); + Console.WriteLine($"deleted = {a}, created = {b}"); + db.SaveChanges(); + } + + public static async Task Migrate() { + await db.Database.MigrateAsync(); + await db.SaveChangesAsync(); + } + } \ No newline at end of file diff --git a/Shared/MainLayout.razor b/Shared/MainLayout.razor index c9ac5ec..7d25eb8 100644 --- a/Shared/MainLayout.razor +++ b/Shared/MainLayout.razor @@ -10,7 +10,6 @@
- About
diff --git a/Shared/NavMenu.razor b/Shared/NavMenu.razor index 58e21c0..d0e561d 100644 --- a/Shared/NavMenu.razor +++ b/Shared/NavMenu.razor @@ -34,11 +34,8 @@ @code { private bool collapseNavMenu = true; - private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; - private void ToggleNavMenu() { - collapseNavMenu = !collapseNavMenu; - } + private void ToggleNavMenu() => collapseNavMenu = !collapseNavMenu; } \ No newline at end of file