From ec1a9a521640fd3769d88257174a67829fa92228 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 24 Jan 2023 18:52:32 +0100 Subject: [PATCH] Refactor, update deps --- trainav.web/Program.cs | 55 +++++++++++++++++++++++------- trainav.web/Startup.cs | 57 -------------------------------- trainav.web/Variables.cs | 8 ----- trainav.web/database/Database.cs | 8 ++--- trainav.web/trainav.web.csproj | 11 +++--- 5 files changed, 52 insertions(+), 87 deletions(-) delete mode 100644 trainav.web/Startup.cs delete mode 100644 trainav.web/Variables.cs diff --git a/trainav.web/Program.cs b/trainav.web/Program.cs index 7b823dc..f58e857 100644 --- a/trainav.web/Program.cs +++ b/trainav.web/Program.cs @@ -1,24 +1,55 @@ +using System; using System.IO; using System.Threading; using LinqToDB.Common; using LinqToDB.Data; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using trainav.web; using trainav.web.database; -namespace trainav.web; +DataConnection.DefaultSettings = new Database.Settings(); -public class Program { - public static void Main(string[] args) { - DataConnection.DefaultSettings = new Database.Settings(); - Configuration.Linq.AllowMultipleQuery = true; - Directory.CreateDirectory(Variables.TicketDir); - ThreadPool.SetMinThreads(100, 100); +Migrations.RunMigrations(); - Migrations.RunMigrations(); +var builder = WebApplication.CreateBuilder(args); - CreateHostBuilder(args).Build().Run(); - } +// Add services to the container. +builder.Services.AddRazorPages(); +builder.Services.AddSession(options => { + options.IdleTimeout = TimeSpan.MaxValue; + options.Cookie.HttpOnly = true; + options.Cookie.IsEssential = true; +}); - public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }); -} \ No newline at end of file +#if (DEBUG) +builder.Services.AddControllers().AddRazorRuntimeCompilation(); +builder.Services.AddControllers(); +#else +builder.Services.AddControllers(); +#endif + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (!app.Environment.IsDevelopment()) { + app.UseExceptionHandler("/Error"); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); +} + +app.UseHttpsRedirection(); +app.UseStaticFiles(); + +app.UseSession(); +app.UseRouting(); +app.UseAuthorization(); + +app.UseEndpoints(endpoints => { + endpoints.MapRazorPages(); + endpoints.MapControllers(); +}); + +app.Run(); diff --git a/trainav.web/Startup.cs b/trainav.web/Startup.cs deleted file mode 100644 index 892558d..0000000 --- a/trainav.web/Startup.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace trainav.web; - -public class Startup { - public Startup(IConfiguration configuration) => Configuration = configuration; - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) { - services.AddRazorPages(); - services.AddSession(options => { - options.IdleTimeout = TimeSpan.MaxValue; - options.Cookie.HttpOnly = true; - options.Cookie.IsEssential = true; - }); - #if (DEBUG) - services.AddControllers().AddRazorRuntimeCompilation(); - services.AddControllers(); - #else - services.AddControllers(); - #endif - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { - if (env.IsDevelopment()) { - app.UseDeveloperExceptionPage(); - } - else { - app.UseExceptionHandler("/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); - } - - app.UseHttpsRedirection(); - - app.UseSession(); - - app.UseStaticFiles(); - - app.UseRouting(); - - app.UseAuthorization(); - - app.UseEndpoints(endpoints => { - endpoints.MapRazorPages(); - endpoints.MapControllers(); - }); - } -} diff --git a/trainav.web/Variables.cs b/trainav.web/Variables.cs deleted file mode 100644 index 6f8cc91..0000000 --- a/trainav.web/Variables.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.IO; - -namespace trainav.web; - -public class Variables { - public const string DataDir = "data"; - public static readonly string TicketDir = Path.Combine(DataDir, "tickets"); -} \ No newline at end of file diff --git a/trainav.web/database/Database.cs b/trainav.web/database/Database.cs index 2e440c0..36326c8 100644 --- a/trainav.web/database/Database.cs +++ b/trainav.web/database/Database.cs @@ -28,10 +28,10 @@ public class Database { public class DbConn : DataConnection { public DbConn() : base("db") { } - public ITable DbInfo => GetTable(); + public ITable DbInfo => this.GetTable(); - public ITable Users => GetTable(); - public ITable Legs => GetTable(); - public ITable Trips => GetTable(); + public ITable Users => this.GetTable(); + public ITable Legs => this.GetTable(); + public ITable Trips => this.GetTable(); } } diff --git a/trainav.web/trainav.web.csproj b/trainav.web/trainav.web.csproj index e3370dd..7e34c50 100644 --- a/trainav.web/trainav.web.csproj +++ b/trainav.web/trainav.web.csproj @@ -30,14 +30,13 @@ - + - - - - + + + + -