Gremlinsoft
/
BuchhaltungBlazor
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
Sascha 2023-09-25 12:43:05 +07:00
parent 2492320d01 0c34fe55ab
commit 23dbf42a5c
7 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
BuchhaltungBlazor.csproj
Unescape Escape View File

@ -8,26 +8,26 @@
</PropertyGroup>
<ItemGroup>
<None Update="app.db" CopyToOutputDirectory="PreserveNewest" ExcludeFromSingleFile="true"/>
<None Update="app.db" CopyToOutputDirectory="PreserveNewest" ExcludeFromSingleFile="true" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Blazorise" Version="1.2.2"/>
<PackageReference Include="Blazorise.Bootstrap" Version="1.2.2"/>
<PackageReference Include="Blazorise.Charts" Version="1.2.2"/>
<PackageReference Include="Blazorise.Components" Version="1.2.2"/>
<PackageReference Include="Blazorise.DataGrid" Version="1.2.2"/>
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.2"/>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0-preview.3.23177.8"/>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-preview.3.23177.8"/>
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0-preview.3.23177.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.3.23174.2"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.3.23174.2"/>
<PackageReference Include="Blazorise" Version="1.2.2" />
<PackageReference Include="Blazorise.Bootstrap" Version="1.2.2" />
<PackageReference Include="Blazorise.Charts" Version="1.2.2" />
<PackageReference Include="Blazorise.Components" Version="1.2.2" />
<PackageReference Include="Blazorise.DataGrid" Version="1.2.2" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0-preview.3.23177.8" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-preview.3.23177.8" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0-preview.3.23177.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.3.23174.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.3.23174.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-preview.3.23174.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0"/>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
</ItemGroup>
</Project>

2
Data/BookingDb.cs
Unescape Escape View File

@ -10,7 +10,7 @@ public class BookingDb : DbContext {
public DbSet<SubCategory> 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();

5
Pages/Bookings.razor.cs
Unescape Escape View File

@ -9,10 +9,9 @@ public partial class Bookings {
protected override async Task OnInitializedAsync() {
bookings = await GenericController.GetAllAsync<Booking>() ?? new List<Booking>();
selectedBooking = bookings.FirstOrDefault();
await base.OnInitializedAsync();
}
private void OnSelectedBookingChanged(Booking newSelectedBooking) {
selectedBooking = newSelectedBooking;
}
private void OnSelectedBookingChanged(Booking newSelectedBooking) => selectedBooking = newSelectedBooking;
}

17
Pages/Index.razor
Unescape Escape View File

@ -1,7 +1,20 @@
@page "/"
@using BuchhaltungBlazor.Services
<PageTitle>Index</PageTitle>
<h1>Hello, world!</h1>
<h1>Hello, user.</h1>
Welcome to my bookings app.
<Paragraph>
<Button Color="Color.Primary" Clicked="@OnEnsureCreated">Ensure Created Database</Button>
<Button Color="Color.Secondary" Clicked="@OnMigrate">Migrate Database</Button>
</Paragraph>
Welcome to your new app.
@code {
private static void OnEnsureCreated() => GenericController.DeleteAndCreateDb();
private static async Task OnMigrate() {
await GenericController.Migrate();
Console.WriteLine("Migration done.");
}
}

18
Services/GenericController.cs
Unescape Escape View File

@ -4,15 +4,27 @@ using Microsoft.EntityFrameworkCore;
namespace BuchhaltungBlazor.Services;
public static class GenericController {
private static readonly BookingDb db = new();
public static async Task<IList<TResult>?> GetAllAsync<TResult>() where TResult : class {
try {
await using BookingDb db = new();
IList<TResult> resultSet = await db.Set<TResult>().ToListAsync();
return resultSet;
return await db.Set<TResult>().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();
}
}

1
Shared/MainLayout.razor
Unescape Escape View File

@ -10,7 +10,6 @@
<main>
<div class="top-row px-4 auth">
<LoginDisplay/>
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
</div>
<article class="content px-4">

5
Shared/NavMenu.razor
Unescape Escape View File

@ -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;
}