From 8f07cee5ad853c81659b548fba6f082e90aa1a52 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 29 Apr 2022 14:59:24 +0200 Subject: [PATCH] Rename to trainav --- README.md | 15 +++++------- bahnplan.web/Pages/_ViewImports.cshtml | 3 --- bahnplan.sln => trainav.sln | 2 +- .../Controllers/TestController.cs | 2 +- .../JSON/CardResponse/CardResponse.cs | 6 ++--- .../ListOrdersResponse/ListOrdersResponse.cs | 4 ++-- .../JSON/OEAPIResponse.cs | 4 ++-- .../JSON/TicketResponse.cs | 4 ++-- {bahnplan.web => trainav.web}/Migrations.cs | 6 ++--- .../Pages/Card.cshtml | 0 .../Pages/Card.cshtml.cs | 10 ++++---- .../Pages/Cards.cshtml | 0 .../Pages/Cards.cshtml.cs | 8 +++---- .../Pages/Delete.cshtml | 2 +- .../Pages/Delete.cshtml.cs | 6 ++--- .../Pages/Error.cshtml | 0 .../Pages/Error.cshtml.cs | 2 +- .../Pages/GenIcs.cshtml | 2 +- .../Pages/GenIcs.cshtml.cs | 6 ++--- .../Pages/Index.cshtml | 2 +- .../Pages/Index.cshtml.cs | 6 ++--- .../Pages/Inspection.cshtml | 2 +- .../Pages/Inspection.cshtml.cs | 6 ++--- .../Pages/Login.cshtml | 0 .../Pages/Login.cshtml.cs | 4 ++-- .../Pages/Logout.cshtml | 0 .../Pages/Logout.cshtml.cs | 2 +- .../Pages/OEAPI.cshtml | 0 .../Pages/OEAPI.cshtml.cs | 12 +++++----- .../Pages/Plain.cshtml | 2 +- .../Pages/Plain.cshtml.cs | 6 ++--- .../Pages/Privacy.cshtml | 0 .../Pages/Privacy.cshtml.cs | 2 +- .../Pages/Register.cshtml | 0 .../Pages/Register.cshtml.cs | 6 ++--- .../Pages/Shared/_Layout.cshtml | 6 ++--- .../Shared/_ValidationScriptsPartial.cshtml | 0 .../Pages/SharedTrip.cshtml | 0 .../Pages/SharedTrip.cshtml.cs | 6 ++--- .../Pages/Ticket.cshtml | 0 .../Pages/Ticket.cshtml.cs | 22 +++++++++--------- .../Pages/Trip.cshtml | 0 .../Pages/Trip.cshtml.cs | 6 ++--- trainav.web/Pages/_ViewImports.cshtml | 3 +++ .../Pages/_ViewStart.cshtml | 0 {bahnplan.web => trainav.web}/Program.cs | 4 ++-- .../Properties/launchSettings.json | 0 {bahnplan.web => trainav.web}/Startup.cs | 4 ++-- {bahnplan.web => trainav.web}/Variables.cs | 2 +- .../appsettings.Development.json | 0 .../appsettings.json | 0 .../database.db.example | Bin .../database.example.sql | 0 .../database.upgrade.txt | 0 .../database/Database.cs | 4 ++-- .../database/Tables/Card.cs | 2 +- .../database/Tables/DbInfo.cs | 2 +- .../database/Tables/Leg.cs | 4 ++-- .../database/Tables/Ticket.cs | 2 +- .../database/Tables/TicketLeg.cs | 2 +- .../database/Tables/Trip.cs | 2 +- .../database/Tables/User.cs | 2 +- {bahnplan.web => trainav.web}/ds100.csv | 0 .../trainav.web.csproj | 19 ++++++++------- .../wwwroot/css/site.css | 0 .../wwwroot/favicon.ico | Bin .../wwwroot/js/site.js | 0 .../wwwroot/lib/bootstrap/LICENSE | 0 .../lib/bootstrap/dist/css/bootstrap-grid.css | 0 .../bootstrap/dist/css/bootstrap-grid.css.map | 0 .../bootstrap/dist/css/bootstrap-grid.min.css | 0 .../dist/css/bootstrap-grid.min.css.map | 0 .../bootstrap/dist/css/bootstrap-reboot.css | 0 .../dist/css/bootstrap-reboot.css.map | 0 .../dist/css/bootstrap-reboot.min.css | 0 .../dist/css/bootstrap-reboot.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../lib/bootstrap/dist/js/bootstrap.bundle.js | 0 .../bootstrap/dist/js/bootstrap.bundle.js.map | 0 .../bootstrap/dist/js/bootstrap.bundle.min.js | 0 .../dist/js/bootstrap.bundle.min.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.js | 0 .../lib/bootstrap/dist/js/bootstrap.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.min.js | 0 .../bootstrap/dist/js/bootstrap.min.js.map | 0 .../jquery-validation-unobtrusive/LICENSE.txt | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 100 files changed, 111 insertions(+), 113 deletions(-) delete mode 100644 bahnplan.web/Pages/_ViewImports.cshtml rename bahnplan.sln => trainav.sln (81%) rename {bahnplan.web => trainav.web}/Controllers/TestController.cs (93%) rename {bahnplan.web => trainav.web}/JSON/CardResponse/CardResponse.cs (98%) rename {bahnplan.web => trainav.web}/JSON/ListOrdersResponse/ListOrdersResponse.cs (96%) rename {bahnplan.web => trainav.web}/JSON/OEAPIResponse.cs (99%) rename {bahnplan.web => trainav.web}/JSON/TicketResponse.cs (99%) rename {bahnplan.web => trainav.web}/Migrations.cs (97%) rename {bahnplan.web => trainav.web}/Pages/Card.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Card.cshtml.cs (95%) rename {bahnplan.web => trainav.web}/Pages/Cards.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Cards.cshtml.cs (94%) rename {bahnplan.web => trainav.web}/Pages/Delete.cshtml (98%) rename {bahnplan.web => trainav.web}/Pages/Delete.cshtml.cs (96%) rename {bahnplan.web => trainav.web}/Pages/Error.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Error.cshtml.cs (95%) rename {bahnplan.web => trainav.web}/Pages/GenIcs.cshtml (87%) rename {bahnplan.web => trainav.web}/Pages/GenIcs.cshtml.cs (97%) rename {bahnplan.web => trainav.web}/Pages/Index.cshtml (99%) rename {bahnplan.web => trainav.web}/Pages/Index.cshtml.cs (82%) rename {bahnplan.web => trainav.web}/Pages/Inspection.cshtml (99%) rename {bahnplan.web => trainav.web}/Pages/Inspection.cshtml.cs (89%) rename {bahnplan.web => trainav.web}/Pages/Login.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Login.cshtml.cs (96%) rename {bahnplan.web => trainav.web}/Pages/Logout.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Logout.cshtml.cs (82%) rename {bahnplan.web => trainav.web}/Pages/OEAPI.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/OEAPI.cshtml.cs (92%) rename {bahnplan.web => trainav.web}/Pages/Plain.cshtml (98%) rename {bahnplan.web => trainav.web}/Pages/Plain.cshtml.cs (82%) rename {bahnplan.web => trainav.web}/Pages/Privacy.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Privacy.cshtml.cs (90%) rename {bahnplan.web => trainav.web}/Pages/Register.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Register.cshtml.cs (90%) rename {bahnplan.web => trainav.web}/Pages/Shared/_Layout.cshtml (96%) rename {bahnplan.web => trainav.web}/Pages/Shared/_ValidationScriptsPartial.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/SharedTrip.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/SharedTrip.cshtml.cs (87%) rename {bahnplan.web => trainav.web}/Pages/Ticket.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Ticket.cshtml.cs (95%) rename {bahnplan.web => trainav.web}/Pages/Trip.cshtml (100%) rename {bahnplan.web => trainav.web}/Pages/Trip.cshtml.cs (94%) create mode 100644 trainav.web/Pages/_ViewImports.cshtml rename {bahnplan.web => trainav.web}/Pages/_ViewStart.cshtml (100%) rename {bahnplan.web => trainav.web}/Program.cs (92%) rename {bahnplan.web => trainav.web}/Properties/launchSettings.json (100%) rename {bahnplan.web => trainav.web}/Startup.cs (98%) rename {bahnplan.web => trainav.web}/Variables.cs (87%) rename {bahnplan.web => trainav.web}/appsettings.Development.json (100%) rename {bahnplan.web => trainav.web}/appsettings.json (100%) rename {bahnplan.web => trainav.web}/database.db.example (100%) rename {bahnplan.web => trainav.web}/database.example.sql (100%) rename {bahnplan.web => trainav.web}/database.upgrade.txt (100%) rename {bahnplan.web => trainav.web}/database/Database.cs (95%) rename {bahnplan.web => trainav.web}/database/Tables/Card.cs (96%) rename {bahnplan.web => trainav.web}/database/Tables/DbInfo.cs (85%) rename {bahnplan.web => trainav.web}/database/Tables/Leg.cs (96%) rename {bahnplan.web => trainav.web}/database/Tables/Ticket.cs (94%) rename {bahnplan.web => trainav.web}/database/Tables/TicketLeg.cs (95%) rename {bahnplan.web => trainav.web}/database/Tables/Trip.cs (86%) rename {bahnplan.web => trainav.web}/database/Tables/User.cs (88%) rename {bahnplan.web => trainav.web}/ds100.csv (100%) rename bahnplan.web/bahnplan.web.csproj => trainav.web/trainav.web.csproj (89%) rename {bahnplan.web => trainav.web}/wwwroot/css/site.css (100%) rename {bahnplan.web => trainav.web}/wwwroot/favicon.ico (100%) rename {bahnplan.web => trainav.web}/wwwroot/js/site.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/LICENSE (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap.css (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/js/bootstrap.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery-validation/dist/additional-methods.min.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery/LICENSE.txt (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery/dist/jquery.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery/dist/jquery.min.js (100%) rename {bahnplan.web => trainav.web}/wwwroot/lib/jquery/dist/jquery.min.map (100%) diff --git a/README.md b/README.md index ad11b58..ec6bfe8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ -# bahnplan.web or DBNav2 - -- Copy database.db.example to database.db -- Generate a random string (or use something else) and save it to regkey.txt to allow registrations +# Trainav ## DISCLAIMER - This is very early alpha @@ -10,10 +7,10 @@ - Most importantly: have fun. ## Development / testing requirements -- .NET Core SDK (version 5.0 or higher; arch package `dotnet-sdk`) -- ASP.NET Core Runtime (version 5,0 or higher; arch package `aspnet-runtime`) +- .NET Core SDK (version 6.0 or higher; arch package `dotnet-sdk`) +- ASP.NET Core Runtime (version 6.0 or higher; arch package `aspnet-runtime`) - Redis instance running on localhost -- `cd bahnplan.web` -- `cp database.db.example database.db` -- `dotnet run` \ No newline at end of file +- `cd trainav.web` +- Generate a random string (or use something else) and save it to `regkey.txt` to allow registrations +- `dotnet run` diff --git a/bahnplan.web/Pages/_ViewImports.cshtml b/bahnplan.web/Pages/_ViewImports.cshtml deleted file mode 100644 index 4f0af92..0000000 --- a/bahnplan.web/Pages/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using bahnplan.web -@namespace bahnplan.web.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/bahnplan.sln b/trainav.sln similarity index 81% rename from bahnplan.sln rename to trainav.sln index 17147da..e64b954 100644 --- a/bahnplan.sln +++ b/trainav.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bahnplan.web", "bahnplan.web\bahnplan.web.csproj", "{41B83C7E-6F7E-4EE0-A332-D87A7FE3183E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "trainav.web", "trainav.web\trainav.web.csproj", "{41B83C7E-6F7E-4EE0-A332-D87A7FE3183E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/bahnplan.web/Controllers/TestController.cs b/trainav.web/Controllers/TestController.cs similarity index 93% rename from bahnplan.web/Controllers/TestController.cs rename to trainav.web/Controllers/TestController.cs index fc7d27f..c75ccd0 100644 --- a/bahnplan.web/Controllers/TestController.cs +++ b/trainav.web/Controllers/TestController.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.AspNetCore.Mvc; -namespace bahnplan.web.Controllers { +namespace trainav.web.Controllers { [ApiController, Route("api/[controller]")] public class TestController : ControllerBase { [HttpGet] diff --git a/bahnplan.web/JSON/CardResponse/CardResponse.cs b/trainav.web/JSON/CardResponse/CardResponse.cs similarity index 98% rename from bahnplan.web/JSON/CardResponse/CardResponse.cs rename to trainav.web/JSON/CardResponse/CardResponse.cs index f643940..7447e49 100644 --- a/bahnplan.web/JSON/CardResponse/CardResponse.cs +++ b/trainav.web/JSON/CardResponse/CardResponse.cs @@ -2,7 +2,7 @@ // // To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: // -// using bahnplan.web.JSON.CardResponse; +// using trainav.web.JSON.CardResponse; // // var cardResponse = CardResponse.FromJson(jsonString); @@ -11,7 +11,7 @@ using System.Globalization; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace bahnplan.web.JSON.CardResponse { +namespace trainav.web.JSON.CardResponse { public partial class CardResponse { [JsonProperty("?xml", NullValueHandling = NullValueHandling.Ignore)] public Xml Xml { get; set; } @@ -211,4 +211,4 @@ namespace bahnplan.web.JSON.CardResponse { Converters = {new IsoDateTimeConverter {DateTimeStyles = DateTimeStyles.AssumeUniversal}} }; } -} \ No newline at end of file +} diff --git a/bahnplan.web/JSON/ListOrdersResponse/ListOrdersResponse.cs b/trainav.web/JSON/ListOrdersResponse/ListOrdersResponse.cs similarity index 96% rename from bahnplan.web/JSON/ListOrdersResponse/ListOrdersResponse.cs rename to trainav.web/JSON/ListOrdersResponse/ListOrdersResponse.cs index 6d829e7..eea184b 100644 --- a/bahnplan.web/JSON/ListOrdersResponse/ListOrdersResponse.cs +++ b/trainav.web/JSON/ListOrdersResponse/ListOrdersResponse.cs @@ -2,14 +2,14 @@ // // To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: // -// using bahnplan.web.JSON; +// using trainav.web.JSON; // // var listOrdersResponse = ListOrdersResponse.FromJson(jsonString); using System.Collections.Generic; using Newtonsoft.Json; -namespace bahnplan.web.JSON.ListOrdersResponse { +namespace trainav.web.JSON.ListOrdersResponse { public partial class ListOrdersResponse { [JsonProperty("?xml", NullValueHandling = NullValueHandling.Ignore)] public Xml Xml { get; set; } diff --git a/bahnplan.web/JSON/OEAPIResponse.cs b/trainav.web/JSON/OEAPIResponse.cs similarity index 99% rename from bahnplan.web/JSON/OEAPIResponse.cs rename to trainav.web/JSON/OEAPIResponse.cs index d74f8eb..4392194 100644 --- a/bahnplan.web/JSON/OEAPIResponse.cs +++ b/trainav.web/JSON/OEAPIResponse.cs @@ -2,14 +2,14 @@ // // To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: // -// using bahnplan.web.JSON; +// using trainav.web.JSON; // // var oeapiResponse = OeapiResponse.FromJson(jsonString); using System.Collections.Generic; using Newtonsoft.Json; -namespace bahnplan.web.JSON { +namespace trainav.web.JSON { using J = JsonPropertyAttribute; using R = Required; using N = NullValueHandling; diff --git a/bahnplan.web/JSON/TicketResponse.cs b/trainav.web/JSON/TicketResponse.cs similarity index 99% rename from bahnplan.web/JSON/TicketResponse.cs rename to trainav.web/JSON/TicketResponse.cs index feb2970..dc0ea42 100644 --- a/bahnplan.web/JSON/TicketResponse.cs +++ b/trainav.web/JSON/TicketResponse.cs @@ -2,7 +2,7 @@ // // To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: // -// using bahnplan.web.JSON; +// using trainav.web.JSON; // // var ticketResponse = TicketResponse.FromJson(jsonString); @@ -13,7 +13,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; -namespace bahnplan.web.JSON { +namespace trainav.web.JSON { using J = JsonPropertyAttribute; using R = Required; using NV = NullValueHandling; diff --git a/bahnplan.web/Migrations.cs b/trainav.web/Migrations.cs similarity index 97% rename from bahnplan.web/Migrations.cs rename to trainav.web/Migrations.cs index 0bc874e..db6773c 100644 --- a/bahnplan.web/Migrations.cs +++ b/trainav.web/Migrations.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using bahnplan.web.database; -using bahnplan.web.database.Tables; using LinqToDB; using LinqToDB.Data; +using trainav.web.database; +using trainav.web.database.Tables; -namespace bahnplan.web { +namespace trainav.web { public static class Migrations { private const int DbVer = 1; diff --git a/bahnplan.web/Pages/Card.cshtml b/trainav.web/Pages/Card.cshtml similarity index 100% rename from bahnplan.web/Pages/Card.cshtml rename to trainav.web/Pages/Card.cshtml diff --git a/bahnplan.web/Pages/Card.cshtml.cs b/trainav.web/Pages/Card.cshtml.cs similarity index 95% rename from bahnplan.web/Pages/Card.cshtml.cs rename to trainav.web/Pages/Card.cshtml.cs index 76c9af8..76254db 100644 --- a/bahnplan.web/Pages/Card.cshtml.cs +++ b/trainav.web/Pages/Card.cshtml.cs @@ -2,16 +2,16 @@ using System.Linq; using System.Net; using System.Xml; using System.Xml.Linq; -using bahnplan.web.database; -using bahnplan.web.database.Tables; -using bahnplan.web.JSON.CardResponse; -using bahnplan.web.JSON.ListOrdersResponse; using LinqToDB; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; using Newtonsoft.Json; +using trainav.web.database; +using trainav.web.database.Tables; +using trainav.web.JSON.CardResponse; +using trainav.web.JSON.ListOrdersResponse; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class CardModel : PageModel { public void OnPost() { if (HttpContext.Session.GetString("authorized") != "true") diff --git a/bahnplan.web/Pages/Cards.cshtml b/trainav.web/Pages/Cards.cshtml similarity index 100% rename from bahnplan.web/Pages/Cards.cshtml rename to trainav.web/Pages/Cards.cshtml diff --git a/bahnplan.web/Pages/Cards.cshtml.cs b/trainav.web/Pages/Cards.cshtml.cs similarity index 94% rename from bahnplan.web/Pages/Cards.cshtml.cs rename to trainav.web/Pages/Cards.cshtml.cs index 3fe8080..7127629 100644 --- a/bahnplan.web/Pages/Cards.cshtml.cs +++ b/trainav.web/Pages/Cards.cshtml.cs @@ -3,15 +3,15 @@ using System.Linq; using System.Net; using System.Xml; using System.Xml.Linq; -using bahnplan.web.database; -using bahnplan.web.database.Tables; -using bahnplan.web.JSON.CardResponse; using LinqToDB; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; using Newtonsoft.Json; +using trainav.web.database; +using trainav.web.database.Tables; +using trainav.web.JSON.CardResponse; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class CardsModel : PageModel { public List Cards; diff --git a/bahnplan.web/Pages/Delete.cshtml b/trainav.web/Pages/Delete.cshtml similarity index 98% rename from bahnplan.web/Pages/Delete.cshtml rename to trainav.web/Pages/Delete.cshtml index 6b04897..8cd0455 100644 --- a/bahnplan.web/Pages/Delete.cshtml +++ b/trainav.web/Pages/Delete.cshtml @@ -1,7 +1,7 @@ @page @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http.Extensions -@using bahnplan.web.database +@using trainav.web.database @model DeleteModel @{ ViewData["Title"] = "Home"; diff --git a/bahnplan.web/Pages/Delete.cshtml.cs b/trainav.web/Pages/Delete.cshtml.cs similarity index 96% rename from bahnplan.web/Pages/Delete.cshtml.cs rename to trainav.web/Pages/Delete.cshtml.cs index 46fd30d..c4017ca 100644 --- a/bahnplan.web/Pages/Delete.cshtml.cs +++ b/trainav.web/Pages/Delete.cshtml.cs @@ -1,11 +1,11 @@ using System.Linq; -using bahnplan.web.database; -using bahnplan.web.database.Tables; using LinqToDB; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; +using trainav.web.database; +using trainav.web.database.Tables; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class DeleteModel : PageModel { public User AuthorizedUser; diff --git a/bahnplan.web/Pages/Error.cshtml b/trainav.web/Pages/Error.cshtml similarity index 100% rename from bahnplan.web/Pages/Error.cshtml rename to trainav.web/Pages/Error.cshtml diff --git a/bahnplan.web/Pages/Error.cshtml.cs b/trainav.web/Pages/Error.cshtml.cs similarity index 95% rename from bahnplan.web/Pages/Error.cshtml.cs rename to trainav.web/Pages/Error.cshtml.cs index b4703a4..c18833c 100644 --- a/bahnplan.web/Pages/Error.cshtml.cs +++ b/trainav.web/Pages/Error.cshtml.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public class ErrorModel : PageModel { private readonly ILogger _logger; diff --git a/bahnplan.web/Pages/GenIcs.cshtml b/trainav.web/Pages/GenIcs.cshtml similarity index 87% rename from bahnplan.web/Pages/GenIcs.cshtml rename to trainav.web/Pages/GenIcs.cshtml index d6f6f91..9917c7e 100644 --- a/bahnplan.web/Pages/GenIcs.cshtml +++ b/trainav.web/Pages/GenIcs.cshtml @@ -1,5 +1,5 @@ @page -@model bahnplan.web.Pages.GenIcs +@model trainav.web.Pages.GenIcs @{ Layout = null; Response.ContentType = "text/calendar"; diff --git a/bahnplan.web/Pages/GenIcs.cshtml.cs b/trainav.web/Pages/GenIcs.cshtml.cs similarity index 97% rename from bahnplan.web/Pages/GenIcs.cshtml.cs rename to trainav.web/Pages/GenIcs.cshtml.cs index 73b2cdb..7594e8c 100644 --- a/bahnplan.web/Pages/GenIcs.cshtml.cs +++ b/trainav.web/Pages/GenIcs.cshtml.cs @@ -4,17 +4,17 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text; -using bahnplan.web.database; -using bahnplan.web.database.Tables; using CsvHelper; using CsvHelper.Configuration.Attributes; using Ical.Net.CalendarComponents; using Ical.Net.DataTypes; using Ical.Net.Serialization; using Microsoft.AspNetCore.Mvc.RazorPages; +using trainav.web.database; +using trainav.web.database.Tables; using Calendar = Ical.Net.Calendar; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class GenIcs : PageModel { public string IcsOutput; public List Legs; diff --git a/bahnplan.web/Pages/Index.cshtml b/trainav.web/Pages/Index.cshtml similarity index 99% rename from bahnplan.web/Pages/Index.cshtml rename to trainav.web/Pages/Index.cshtml index 33c9df7..35b7e33 100644 --- a/bahnplan.web/Pages/Index.cshtml +++ b/trainav.web/Pages/Index.cshtml @@ -2,7 +2,7 @@ @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http.Extensions @using LinqToDB -@using bahnplan.web.database +@using trainav.web.database @model IndexModel @{ ViewData["Title"] = "Home"; diff --git a/bahnplan.web/Pages/Index.cshtml.cs b/trainav.web/Pages/Index.cshtml.cs similarity index 82% rename from bahnplan.web/Pages/Index.cshtml.cs rename to trainav.web/Pages/Index.cshtml.cs index dbbb4ea..93c61c8 100644 --- a/bahnplan.web/Pages/Index.cshtml.cs +++ b/trainav.web/Pages/Index.cshtml.cs @@ -1,10 +1,10 @@ using System.Linq; -using bahnplan.web.database; -using bahnplan.web.database.Tables; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; +using trainav.web.database; +using trainav.web.database.Tables; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class IndexModel : PageModel { public User AuthorizedUser; diff --git a/bahnplan.web/Pages/Inspection.cshtml b/trainav.web/Pages/Inspection.cshtml similarity index 99% rename from bahnplan.web/Pages/Inspection.cshtml rename to trainav.web/Pages/Inspection.cshtml index 323de50..4be46f1 100644 --- a/bahnplan.web/Pages/Inspection.cshtml +++ b/trainav.web/Pages/Inspection.cshtml @@ -1,7 +1,7 @@ @page @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http.Extensions -@using bahnplan.web.database +@using trainav.web.database @using System.Text @model InspectionModel @{ diff --git a/bahnplan.web/Pages/Inspection.cshtml.cs b/trainav.web/Pages/Inspection.cshtml.cs similarity index 89% rename from bahnplan.web/Pages/Inspection.cshtml.cs rename to trainav.web/Pages/Inspection.cshtml.cs index 86d04f5..63f93bb 100644 --- a/bahnplan.web/Pages/Inspection.cshtml.cs +++ b/trainav.web/Pages/Inspection.cshtml.cs @@ -1,12 +1,12 @@ using System; using System.Linq; using System.Text; -using bahnplan.web.database; -using bahnplan.web.database.Tables; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; +using trainav.web.database; +using trainav.web.database.Tables; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class InspectionModel : PageModel { public Leg Leg; public Ticket Ticket; diff --git a/bahnplan.web/Pages/Login.cshtml b/trainav.web/Pages/Login.cshtml similarity index 100% rename from bahnplan.web/Pages/Login.cshtml rename to trainav.web/Pages/Login.cshtml diff --git a/bahnplan.web/Pages/Login.cshtml.cs b/trainav.web/Pages/Login.cshtml.cs similarity index 96% rename from bahnplan.web/Pages/Login.cshtml.cs rename to trainav.web/Pages/Login.cshtml.cs index 2361004..a8a3b44 100644 --- a/bahnplan.web/Pages/Login.cshtml.cs +++ b/trainav.web/Pages/Login.cshtml.cs @@ -3,11 +3,11 @@ using System.Linq; using System.Security.Cryptography; using System.Text; using System.Web; -using bahnplan.web.database; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; +using trainav.web.database; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class LoginModel : PageModel { public void OnPost() { if (!Request.HasFormContentType || string.IsNullOrWhiteSpace(Request.Form["user"]) || string.IsNullOrWhiteSpace(Request.Form["pass"])) diff --git a/bahnplan.web/Pages/Logout.cshtml b/trainav.web/Pages/Logout.cshtml similarity index 100% rename from bahnplan.web/Pages/Logout.cshtml rename to trainav.web/Pages/Logout.cshtml diff --git a/bahnplan.web/Pages/Logout.cshtml.cs b/trainav.web/Pages/Logout.cshtml.cs similarity index 82% rename from bahnplan.web/Pages/Logout.cshtml.cs rename to trainav.web/Pages/Logout.cshtml.cs index bb83235..c6685ef 100644 --- a/bahnplan.web/Pages/Logout.cshtml.cs +++ b/trainav.web/Pages/Logout.cshtml.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc.RazorPages; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class LogoutModel : PageModel { public void OnGet() { HttpContext.Session.Clear(); diff --git a/bahnplan.web/Pages/OEAPI.cshtml b/trainav.web/Pages/OEAPI.cshtml similarity index 100% rename from bahnplan.web/Pages/OEAPI.cshtml rename to trainav.web/Pages/OEAPI.cshtml diff --git a/bahnplan.web/Pages/OEAPI.cshtml.cs b/trainav.web/Pages/OEAPI.cshtml.cs similarity index 92% rename from bahnplan.web/Pages/OEAPI.cshtml.cs rename to trainav.web/Pages/OEAPI.cshtml.cs index c815660..b4384b0 100644 --- a/bahnplan.web/Pages/OEAPI.cshtml.cs +++ b/trainav.web/Pages/OEAPI.cshtml.cs @@ -2,17 +2,17 @@ using System.Linq; using System.Net; using System.Text.RegularExpressions; -using bahnplan.web.database; -using bahnplan.web.database.Tables; -using bahnplan.web.JSON; using LinqToDB; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; -using Leg = bahnplan.web.database.Tables.Leg; +using trainav.web.database; +using trainav.web.database.Tables; +using trainav.web.JSON; +using Leg = trainav.web.database.Tables.Leg; // ReSharper disable PossibleInvalidOperationException -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class OEAPIModel : PageModel { public int TripId; @@ -56,7 +56,7 @@ namespace bahnplan.web.Pages { if (extractedTrainNo.Length > 0) trainNo = int.Parse(extractedTrainNo); } - db.InsertWithInt32Identity(new Leg { + db.InsertWithInt32Identity(new database.Tables.Leg { TripId = tripId, UserId = int.Parse(HttpContext.Session.GetString("uid")), TrainType = journey.Line.ProductName, diff --git a/bahnplan.web/Pages/Plain.cshtml b/trainav.web/Pages/Plain.cshtml similarity index 98% rename from bahnplan.web/Pages/Plain.cshtml rename to trainav.web/Pages/Plain.cshtml index 9dd8b03..db46bda 100644 --- a/bahnplan.web/Pages/Plain.cshtml +++ b/trainav.web/Pages/Plain.cshtml @@ -1,7 +1,7 @@ @page @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http.Extensions -@using bahnplan.web.database +@using trainav.web.database @model PlainModel @{ ViewData["Title"] = "Plain"; diff --git a/bahnplan.web/Pages/Plain.cshtml.cs b/trainav.web/Pages/Plain.cshtml.cs similarity index 82% rename from bahnplan.web/Pages/Plain.cshtml.cs rename to trainav.web/Pages/Plain.cshtml.cs index be9863b..5d49d91 100644 --- a/bahnplan.web/Pages/Plain.cshtml.cs +++ b/trainav.web/Pages/Plain.cshtml.cs @@ -1,10 +1,10 @@ using System.Linq; -using bahnplan.web.database; -using bahnplan.web.database.Tables; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; +using trainav.web.database; +using trainav.web.database.Tables; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class PlainModel : PageModel { public User AuthorizedUser; diff --git a/bahnplan.web/Pages/Privacy.cshtml b/trainav.web/Pages/Privacy.cshtml similarity index 100% rename from bahnplan.web/Pages/Privacy.cshtml rename to trainav.web/Pages/Privacy.cshtml diff --git a/bahnplan.web/Pages/Privacy.cshtml.cs b/trainav.web/Pages/Privacy.cshtml.cs similarity index 90% rename from bahnplan.web/Pages/Privacy.cshtml.cs rename to trainav.web/Pages/Privacy.cshtml.cs index 0376f3f..c4635f0 100644 --- a/bahnplan.web/Pages/Privacy.cshtml.cs +++ b/trainav.web/Pages/Privacy.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class PrivacyModel : PageModel { private readonly ILogger _logger; diff --git a/bahnplan.web/Pages/Register.cshtml b/trainav.web/Pages/Register.cshtml similarity index 100% rename from bahnplan.web/Pages/Register.cshtml rename to trainav.web/Pages/Register.cshtml diff --git a/bahnplan.web/Pages/Register.cshtml.cs b/trainav.web/Pages/Register.cshtml.cs similarity index 90% rename from bahnplan.web/Pages/Register.cshtml.cs rename to trainav.web/Pages/Register.cshtml.cs index fc28753..f76b94f 100644 --- a/bahnplan.web/Pages/Register.cshtml.cs +++ b/trainav.web/Pages/Register.cshtml.cs @@ -1,11 +1,11 @@ using System.Linq; -using bahnplan.web.database; -using bahnplan.web.database.Tables; using LinqToDB; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.RazorPages; +using trainav.web.database; +using trainav.web.database.Tables; -namespace bahnplan.web.Pages { +namespace trainav.web.Pages { public class RegisterModel : PageModel { public void OnPost() { if (!Request.HasFormContentType diff --git a/bahnplan.web/Pages/Shared/_Layout.cshtml b/trainav.web/Pages/Shared/_Layout.cshtml similarity index 96% rename from bahnplan.web/Pages/Shared/_Layout.cshtml rename to trainav.web/Pages/Shared/_Layout.cshtml index dbe4af6..1476992 100644 --- a/bahnplan.web/Pages/Shared/_Layout.cshtml +++ b/trainav.web/Pages/Shared/_Layout.cshtml @@ -4,7 +4,7 @@ - @ViewData["Title"] - DB Navigator 2.0 + @ViewData["Title"] - Trainav @@ -12,7 +12,7 @@