Merge remote-tracking branch 'origin/Development' into feature-DeviceRegistration

src/Elektrifikatsiya/Elektrifikatsiya/Program.cs

@@ -1,14 +1,20 @@
 using Blazorise;
+using Blazorise.Bootstrap;
 using Blazorise.Icons.Material;
 using Blazorise.Material;
 using Elektrifikatsiya.Database;
 using Microsoft.EntityFrameworkCore;
 
+using Elektrifikatsiya.Database;
+
+using Microsoft.EntityFrameworkCore;
+
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();
+builder.Services.AddDbContext<UserDatabaseContext>(options => options.UseSqlite("Data Source=./UserDatabase.sqlite"));
 builder.Services.AddDbContext<DeviceManagmentDatabaseContext>((options)=>options.UseSqlite("Data Source=./DeviceManagement.sqlite"));
 
 AddBlazorise(builder.Services);
@@ -28,12 +34,11 @@ app.UseHttpsRedirection();
 app.UseStaticFiles();
 
 app.UseRouting();
+app.MapBlazorHub();
+app.MapFallbackToPage("/_Host");
 
-app.UseEndpoints(endpoints =>
-{
-    _ = endpoints.MapBlazorHub();
-    _ = endpoints.MapFallbackToPage("/_Host");
-});
+IServiceScope serviceScope = app.Services.GetRequiredService<IServiceScopeFactory>().CreateScope();
+serviceScope.ServiceProvider.GetRequiredService<UserDatabaseContext>().Database.EnsureCreated();
 
 app.MapControllers();
 
@@ -49,4 +54,10 @@ void AddBlazorise(IServiceCollection services)
     _ = services
         .AddMaterialProviders()
         .AddMaterialIcons();
-}
+}
+builder.Services
+    .AddBlazorise(options =>
+    {
+        options.Immediate = true;
+    })
+    .AddBootstrapProviders();