diff --git a/HaWeb/Controllers/EditionController.cs b/HaWeb/Controllers/EditionController.cs index c41b609..500fa15 100644 --- a/HaWeb/Controllers/EditionController.cs +++ b/HaWeb/Controllers/EditionController.cs @@ -6,10 +6,6 @@ namespace HaWeb.Controllers; [Route("Edition/[action]")] public class EditionController : Controller { - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] - public IActionResult Error() { - return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); - } public IActionResult Kontakt() { return View("~/Views/HKB/Static/Kontakt.cshtml"); } diff --git a/HaWeb/Controllers/HKWController.cs b/HaWeb/Controllers/HKWController.cs new file mode 100644 index 0000000..552d6a0 --- /dev/null +++ b/HaWeb/Controllers/HKWController.cs @@ -0,0 +1,32 @@ +namespace HaWeb.Controllers; +using System.Diagnostics; +using Microsoft.AspNetCore.Mvc; +using HaWeb.Models; + +[Route("HKW/")] +public class HKWController : Controller { + [Route("Start")] + public IActionResult Index() { + return View("~/Views/HKW/Static/Index.cshtml"); + } + + [Route("Erschienen/FliegenderBrief")] + public IActionResult FliegenderBrief() { + return View("~/Views/HKW/Static/FliegenderBrief.cshtml"); + } + + [Route("Geplant/Kreuzzuege")] + public IActionResult Kreuzzuege() { + return View("~/Views/HKW/Static/Kreuzzuege.cshtml"); + } + + [Route("Erschienen/SokratischeDenkwuerdigkeiten")] + public IActionResult SokratischeDenkwuerdigkeiten() { + return View("~/Views/HKW/Static/SokratischeDenkwuerdigkeiten.cshtml"); + } + + [Route("Uebersicht")] + public IActionResult Uebersicht() { + return View("~/Views/HKW/Static/Uebersicht.cshtml"); + } +} \ No newline at end of file diff --git a/HaWeb/Controllers/HomeController.cs b/HaWeb/Controllers/HomeController.cs index 38ac284..283eb35 100644 --- a/HaWeb/Controllers/HomeController.cs +++ b/HaWeb/Controllers/HomeController.cs @@ -8,7 +8,7 @@ public class HomeController : Controller { [Route("")] public IActionResult Index() { - return Redirect("/Suche"); + return View("~/Views/Index.cshtml"); } [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] diff --git a/HaWeb/HaWeb.csproj b/HaWeb/HaWeb.csproj index 49a3bcc..c7fb273 100644 --- a/HaWeb/HaWeb.csproj +++ b/HaWeb/HaWeb.csproj @@ -7,12 +7,12 @@ enable - + diff --git a/HaWeb/Properties/launchSettings.json b/HaWeb/Properties/launchSettings.json.old similarity index 96% rename from HaWeb/Properties/launchSettings.json rename to HaWeb/Properties/launchSettings.json.old index 40a877e..5f4460a 100644 --- a/HaWeb/Properties/launchSettings.json +++ b/HaWeb/Properties/launchSettings.json.old @@ -1,28 +1,28 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:7668", - "sslPort": 44319 - } - }, - "profiles": { - "HaWeb": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "https://localhost:7092;http://localhost:5167", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:7668", + "sslPort": 44319 + } + }, + "profiles": { + "HaWeb": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7092;http://localhost:5167", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/HaWeb/Tailwind.csproj b/HaWeb/Tailwind.csproj.old similarity index 97% rename from HaWeb/Tailwind.csproj rename to HaWeb/Tailwind.csproj.old index 2daeb3b..aa4122b 100644 --- a/HaWeb/Tailwind.csproj +++ b/HaWeb/Tailwind.csproj.old @@ -1,30 +1,30 @@ - - - net6.0 - True - enable - enable - - - - - - - - - - - - - - - - - - - - - - - - + + + net6.0 + True + enable + enable + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HaWeb/Views/Admin/_ViewStart.cshtml b/HaWeb/Views/Admin/_ViewStart.cshtml index 19cc5f3..3ab79d0 100644 --- a/HaWeb/Views/Admin/_ViewStart.cshtml +++ b/HaWeb/Views/Admin/_ViewStart.cshtml @@ -1,3 +1,3 @@ @{ - Layout = "_LettersLayout"; + Layout = "_HKBLayout"; } diff --git a/HaWeb/Views/HKB/_ViewStart.cshtml b/HaWeb/Views/HKB/_ViewStart.cshtml index 19cc5f3..3ab79d0 100644 --- a/HaWeb/Views/HKB/_ViewStart.cshtml +++ b/HaWeb/Views/HKB/_ViewStart.cshtml @@ -1,3 +1,3 @@ @{ - Layout = "_LettersLayout"; + Layout = "_HKBLayout"; } diff --git a/HaWeb/Views/HKW/Static/FliegenderBrief.cshtml b/HaWeb/Views/HKW/Static/FliegenderBrief.cshtml new file mode 100644 index 0000000..074e8e2 --- /dev/null +++ b/HaWeb/Views/HKW/Static/FliegenderBrief.cshtml @@ -0,0 +1 @@ +Hello from FliegenderBrief! \ No newline at end of file diff --git a/HaWeb/Views/HKW/Static/Index.cshtml b/HaWeb/Views/HKW/Static/Index.cshtml new file mode 100644 index 0000000..ccdaa29 --- /dev/null +++ b/HaWeb/Views/HKW/Static/Index.cshtml @@ -0,0 +1 @@ +Hello from HKW Index! \ No newline at end of file diff --git a/HaWeb/Views/HKW/Static/Kreuzzuege.cshtml b/HaWeb/Views/HKW/Static/Kreuzzuege.cshtml new file mode 100644 index 0000000..a5ad29e --- /dev/null +++ b/HaWeb/Views/HKW/Static/Kreuzzuege.cshtml @@ -0,0 +1 @@ +Hello from Kreuzzuege! \ No newline at end of file diff --git a/HaWeb/Views/HKW/Static/SokratischeDenkwuerdigkeiten.cshtml b/HaWeb/Views/HKW/Static/SokratischeDenkwuerdigkeiten.cshtml new file mode 100644 index 0000000..da7c794 --- /dev/null +++ b/HaWeb/Views/HKW/Static/SokratischeDenkwuerdigkeiten.cshtml @@ -0,0 +1 @@ +Hello from SDW! \ No newline at end of file diff --git a/HaWeb/Views/HKW/Static/Uebersicht.cshtml b/HaWeb/Views/HKW/Static/Uebersicht.cshtml new file mode 100644 index 0000000..43361e1 --- /dev/null +++ b/HaWeb/Views/HKW/Static/Uebersicht.cshtml @@ -0,0 +1 @@ +Hello from Übersicht \ No newline at end of file diff --git a/HaWeb/Views/Index.cshtml b/HaWeb/Views/Index.cshtml new file mode 100644 index 0000000..05875c1 --- /dev/null +++ b/HaWeb/Views/Index.cshtml @@ -0,0 +1,53 @@ + + + + + + + @* TODO: Description für die Startseite *@ + + + HKB: @ViewData["Title"] + + + + + + + + + + + + + + + + + + + + + + Menu + @* Placeholder Menu *@ + + @* Placeholder Main *@ + Hallo! + + + + @await Html.PartialAsync("/Views/Shared/_Footer.cshtml") + + + + + + @await Html.PartialAsync("/Views/Shared/_Javascript.cshtml") + + + + diff --git a/HaWeb/Views/Shared/_LettersLayout.cshtml b/HaWeb/Views/Shared/_HKBLayout.cshtml similarity index 70% rename from HaWeb/Views/Shared/_LettersLayout.cshtml rename to HaWeb/Views/Shared/_HKBLayout.cshtml index 117344b..63db928 100644 --- a/HaWeb/Views/Shared/_LettersLayout.cshtml +++ b/HaWeb/Views/Shared/_HKBLayout.cshtml @@ -30,30 +30,27 @@ - - @await Html.PartialAsync("/Views/Shared/_Menu.cshtml") - - - @RenderBody() - - - - - @await Html.PartialAsync("/Views/Shared/_Footer.cshtml") + + @await Html.PartialAsync("/Views/Shared/_HKBMenu.cshtml") + + @RenderBody() + - - - - @await Html.PartialAsync("/Views/Shared/_Javascript.cshtml") - - - - - - + + @await Html.PartialAsync("/Views/Shared/_Footer.cshtml") + + + + + + + @RenderSection("Scripts", required: false) + + @await Html.PartialAsync("/Views/Shared/_Javascript.cshtml") +