version 1.0.10 mit bugfixes menu schliest sich aber nur auf test umgebung und login abgeschnitten weg

Client/SZUAbsolventenverein.Theme.Website.Client.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>1.0.12</Version>
+    <Version>1.0.0</Version>
     <Authors>SZUAbsolventenverein</Authors>
     <Company>SZUAbsolventenverein</Company>
     <Description>[Description]</Description>
@@ -13,7 +13,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="wwwroot\Themes\SZUAbsolventenverein.Theme.Website\icon.png" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.2" />
   </ItemGroup>
 
   <ItemGroup>

Client/ThemeInfo.cs

@@ -10,7 +10,7 @@ namespace SZUAbsolventenverein.Theme.Website
         public Oqtane.Models.Theme Theme => new Oqtane.Models.Theme
         {
             Name = "SZUAbsolventenverein Website",
-            Version = "1.0.13",
+            Version = "1.0.10",
             PackageName = "SZUAbsolventenverein.Theme.Website",
             ThemeSettingsType = "SZUAbsolventenverein.Theme.Website.ThemeSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",
             ContainerSettingsType = "SZUAbsolventenverein.Theme.Website.ContainerSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",
@@ -19,7 +19,9 @@ namespace SZUAbsolventenverein.Theme.Website
 		        // obtained from https://cdnjs.com/libraries
                 new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css", Integrity = "sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==", CrossOrigin = "anonymous" },
                 new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Theme.css" },
-                new Resource { ResourceType = ResourceType.Script, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js", Integrity = "sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==", CrossOrigin = "anonymous" }
+                new Resource { ResourceType = ResourceType.Script, Url = "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js", Integrity = "sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==", CrossOrigin = "anonymous" },
+                new Resource { ResourceType = ResourceType.Script, Url = "~/menu.js"}
+
 
             }
         };

Client/Themes/MenuVertical.razor

@@ -1,16 +0,0 @@
-@namespace Oqtane.Themes.Controls
-@inherits MenuBase
-
-@if (MenuPages.Any())
-{
-    <span class="app-menu-toggler">
-        <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-    </span>
-    <div class="app-menu">
-        <div class="collapse navbar-collapse" id="Menu">
-            <MenuItemsVertical ParentPage="null" Pages="MenuPages" />
-        </div>
-    </div>
-}

Client/Themes/Theme1.razor

@@ -1,16 +1,83 @@
 @namespace SZUAbsolventenverein.Theme.Website
 @inherits ThemeBase
-@inject NavigationManager NavigationManager
 @inject ISettingService SettingService
-@implements IDisposable
 
 <main role="main">
-    <nav class="navbar navbar-dark bg-primary fixed-top">
+    <nav class="navbar navbar-dark bg-primary fixed-top app-navbar">
+    <!-- Logo links -->
+    <div class="d-flex align-items-center gap-2 app-navbar-left">
         <Logo />
-        <Menu Orientation="Horizontal" />
+    </div>
 
-        <div class="controls ms-auto">
+    <!-- Versteckte Checkbox zum Steuern des Menüs (nur HTML, kein Blazor) -->
-            <div class="controls-group"><UserProfile ShowRegister="@_register" /> <Login ShowLogin="@_login" /> <ControlPanel ButtonClass="btn-outline-light" /></div>
+    <input type="checkbox" id="nav-toggle" class="nav-toggle" />
+
+    <!-- Burger-Icon, das die Checkbox toggelt -->
+    <label for="nav-toggle" class="nav-toggle-label">
+        <span></span>
+        <span></span>
+        <span></span>
+    </label>
+
+    <!-- Menü-Container, der per :checked ein-/ausgeblendet wird -->
+    <div class="app-menu">
+    <div class="app-menu-items">
+        @if (PageState?.Pages != null)
+        {
+            // Diese Seitennamen sollen NICHT im Menü erscheinen
+            var hiddenNames = new[]
+            {
+                "Login", "Register", "Reset", "Profile",
+                "Search", "Privacy", "Terms", "Not Found", "NotFound"
+            };
+
+            @foreach (var page in PageState.Pages
+                .Where(p => p.ParentId == null
+                            && p.IsNavigation
+                            && !p.IsDeleted
+                            && !hiddenNames.Contains(p.Name)))
+            {
+                <div class="nav-item">
+                    <a class="nav-link text-white" href="@(@page.Path)">
+                        @(@page.Name)
+                    </a>
+                </div>
+
+                var children = PageState.Pages
+                    .Where(c => c.ParentId == page.PageId
+                                && c.IsNavigation
+                                && !c.IsDeleted
+                                && !hiddenNames.Contains(c.Name));
+
+                if (children.Any())
+                {
+                    <div class="app-submenu">
+                        @foreach (var child in children)
+                        {
+                            <div class="nav-item">
+                                <a class="nav-link text-white" href="@child.Path">
+                                    @child.Name
+                                </a>
+                            </div>
+                        }
+                    </div>
+                }
+            }
+        }
+    </div>
+
+    <!-- WICHTIG: Footer jetzt AUßERHALB von app-menu-items -->
+            <div class="app-menu-footer ">
+        <UserProfile ShowRegister="@_register" />
+        <Login ShowLogin="@_login" />
+    </div>
+</div>
+
+    <!-- Rechts: ControlPanel + User + Login -->
+    <div class="d-flex align-items-center gap-2 app-navbar-left">
+        <div class="d-flex align-items-center gap-2">
+            <ControlPanel/>
+        </div>
     </div>
 </nav>
     <div class="content">
@@ -96,14 +163,10 @@
         </div>
         <Pane Name="Bottom Full Width" />
     </div>
-
+    <CookieConsent />
-    <footer class="footer">
-        <div class="text text-center">
-            <p>Impressum | Datenschutz | AGB</p>
-        </div>
-    </footer>
 </main>
 
+
 @code {
     public override string Name => "Theme1";
 
@@ -112,12 +175,6 @@
     private bool _showDropdown = false;
     private bool _login = true;
     private bool _register = true;
-    private bool _navOpen = false;
-
-    protected override void OnInitialized()
-    {
-        NavigationManager.LocationChanged += LocationChanged;
-    }
 
     protected override void OnParametersSet()
     {
@@ -133,14 +190,5 @@
         }
     }
 
-    private void LocationChanged(object sender, LocationChangedEventArgs args)
-    {
-        _navOpen = false;
-        StateHasChanged();
-    }
    
-    public void Dispose()
-    {
-        NavigationManager.LocationChanged -= LocationChanged;
-    }
 }

Client/Themes/ThemeSettings.razor

@@ -1,4 +1,4 @@
- ich pr@namespace SZUAbsolventenverein.Theme.Website
+@namespace SZUAbsolventenverein.Theme.Website
 @inherits ModuleBase
 @implements Oqtane.Interfaces.ISettingsControl
 @inject ISettingService SettingService

Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/Theme.css

@@ -2,7 +2,9 @@
    Standard Layout
    =========================== */
 
-body {}
+body {
+    
+}
 
 /* Login-Button (Mobile + Desktop) */
 .app-menu-footer .btn-login,
@@ -17,78 +19,17 @@ body {}
     font-weight: 500 !important;
 }
 
-.navigation {
+    /* Hover-Effekt */
-    max-width: 80vw; /* oder max-width: 100%;*/ 
+    .app-menu-footer .btn-login:hover,
-    margin: 0 auto;
+    .app-menu-footer .login-btn:hover,
-    position: fixed; 
+    .app-menu-footer button:hover,
-    top: 0;
+    .app-menu-footer a:hover {
-    z-index: 1000;
+        background-color: #f2f2f2 !important;
-    background-color: #bbb;
+        border-color: #bbb !important;
-    padding: 1rem 0;
+        color: #333 !important;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1); 
+    }
-    width: 80vw; /* Wichtig!*/
-    /*left: 50%; /* horizontale Zentrierung mit transform*/ 
-    /*transform: translateX(-50%);*/
-    border: 3px solid #75767B;
-    border-top: none;
-    border-bottom: none;
-}
-
-
-
-body {
-    padding-top: 100px; /* H<>he der fixierten Navigation kompensieren */
-}
-
-.app-logo .img-fluid {
-    max-height: 60px;
-}
-
-.app-menu {
-    display: flex;
-    gap: 1rem; 
-}
-
-.nav-item a {
-    color: black;
-    font-weight: normal;
-    text-decoration: none;
-}
-
-.nav-item a.active {
-    font-weight: bold;
-} 
-
-/* Footer */
-.footer {
-    background-color: #bbb;
-    padding: 1rem 0;
-    text-align: center;
-    border: 3px solid #75767B;
-    border-top: none;
-    border-bottom: none;
-    margin-top: auto;
-}
-
-
-.wrapper {
-    max-width: 80vw; /* max. 80% der Viewport-Breite */ 
-    margin: 0 auto; /* horizontal zentrieren */
-    display: flex;
-    flex-direction: column;
-    min-height: 100vh;
-}
-
-main.flex-fill {
-    flex: 1 0 auto; /* Flex-grow 1, flex-shrink 0, flex-basis auto */
-    display: flex;
-    flex-direction: column;
-    min-height: 0; /* Wichtig f<>r flexbox overflow*/
-}
-
 .content {
-    margin-top: 60px;
+    margin-top: 60px; /* ungefähr Höhe der Navbar */
-    /* ungefähr Höhe der Navbar */
 }
 
 /* App Logo */
@@ -97,7 +38,7 @@ main.flex-fill {
     padding: 0 5px 0 5px;
 }
 
-.table> :not(caption)>*>* {
+.table > :not(caption) > * > * {
     box-shadow: none;
 }
 
@@ -158,8 +99,7 @@ main.flex-fill {
 /* Navbar als durchgehende Flex-Zeile */
 .app-navbar {
     display: flex;
-    flex-wrap: nowrap;
+    flex-wrap: nowrap; /* NICHT umbrechen auf Desktop */
-    /* NICHT umbrechen auf Desktop */
     align-items: center;
     justify-content: flex-start;
     z-index: 1000;
@@ -183,20 +123,19 @@ main.flex-fill {
 
 /* Burger-Icon (wird nur auf Mobil eingeblendet) */
 .nav-toggle-label {
-    display: none;
+    display: none; /* nur auf Mobil sichtbar */
-    /* nur auf Mobil sichtbar */
     cursor: pointer;
     padding: 0.25rem 0.5rem;
     margin-left: auto;
 }
 
-.nav-toggle-label span {
+    .nav-toggle-label span {
         display: block;
         width: 22px;
         height: 2px;
         margin: 4px 0;
         background-color: #ffffff;
-}
+    }
 
 /* Menü-Container */
 .app-menu {
@@ -235,15 +174,15 @@ main.flex-fill {
     transition: background-color 0.2s ease, color 0.2s ease;
 }
 
-.app-menu .nav-link:hover {
+    .app-menu .nav-link:hover {
         background-color: #4a4a4a;
         color: #ffffff !important;
-}
+    }
 
-.app-menu .nav-link.active {
+    .app-menu .nav-link.active {
         background-color: #3b3b3b;
         color: #ffffff !important;
-}
+    }
 
 
 /* ===========================
@@ -258,8 +197,7 @@ main.flex-fill {
         align-items: center !important;
         justify-content: flex-start !important;
         position: relative !important;
-        min-height: 60px;
+        min-height: 60px; /* optional: fixe Höhe */
-        /* optional: fixe Höhe */
     }
 
     /* Menü nur als Container für den Footer */
@@ -291,8 +229,7 @@ main.flex-fill {
     .app-menu-footer {
         display: flex !important;
         gap: 0.75rem !important;
-        margin-left: auto !important;
+        margin-left: auto !important; /* schiebt Footer nach rechts */
-        /* schiebt Footer nach rechts */
         padding: 0 !important;
         border: none !important;
         background: none !important;
@@ -333,13 +270,11 @@ main.flex-fill {
     /* Sidebar-Wrapper rechts */
     .app-menu {
         position: fixed;
-        top: 80px;
+        top: 80px; /* Abstand von oben (über der Navbar + Burger) */
-        /* Abstand von oben (über der Navbar + Burger) */
         right: 0;
         bottom: 0;
         width: 70%;
         max-width: 280px;
-        /* Höhe an das neue top anpassen */
         background-color: #b1b0b0;
         flex-direction: column;
         align-items: stretch;
@@ -368,57 +303,17 @@ main.flex-fill {
         padding-top: 0.5rem;
         border-top: 1px solid rgba(255, 255, 255, 0.25);
         display: flex;
-        flex-direction: column;
+        flex-direction: column; /* untereinander statt nebeneinander */
-        /* untereinander statt nebeneinander */
+        gap: 0.5rem; /* Abstand zwischen Host und Logout */
-        gap: 0.5rem;
-        /* Abstand zwischen Host und Logout */
         justify-content: right;
     }
 
-.hamburger {
-    width: 40px;
-    height: 28px;
-    position: relative;
-    cursor: pointer;
-}
 
-    .hamburger span {
+    /* Sidebar öffnen/schließen über Checkbox */
-        position: absolute;
+    .nav-toggle:checked ~ .app-menu {
-        left: 0;
+        transform: translateX(0);
-        width: 100%;
-        height: 4px;
-        background: #e5e7eb;
-        border-radius: 2px;
-        transition: transform 0.25s ease, opacity 0.25s ease;
     }
 
-        .hamburger span:nth-child(1) {
-            top: 0;
-        }
-
-        .hamburger span:nth-child(2) {
-            top: 12px;
-        }
-
-        .hamburger span:nth-child(3) {
-            bottom: 0;
-        }
-
-    /* Animation beim Klick (wird aktiv, wenn .active hinzugef<65>gt wird) */
-    .hamburger.active span:nth-child(1) {
-        transform: translateY(12px) rotate(45deg);
-    }
-
-    .hamburger.active span:nth-child(2) {
-        opacity: 0;
-    }
-
-    .hamburger.active span:nth-child(3) {
-        transform: translateY(-12px) rotate(-45deg);
-    }
-
-  
-
     .app-menu .nav-link {
         width: 100%;
         display: block;
@@ -426,3 +321,4 @@ main.flex-fill {
     }
 
 }
+

Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/menu.js

@@ -0,0 +1,31 @@
+{
+    (function () {
+        function initMobileNavClose() {
+            var toggle = document.getElementById("nav-toggle");
+            if (!toggle) return;
+
+            var elements = document.querySelectorAll(".app-menu a, .app-menu button");
+            elements.forEach(function (el) {
+                el.addEventListener("click", function () {
+                    if (window.innerWidth <= 1000) {
+                        toggle.checked = false; // Men<65> schlie<69>en
+                    }
+                });
+            });
+        }
+
+        // Beim ersten Laden
+        document.addEventListener("DOMContentLoaded", initMobileNavClose);
+
+        // Falls Oqtane/Blazor sp<73>ter neu rendert, kannst du das bei Bedarf nochmal aufrufen
+        window.initMobileNavClose = initMobileNavClose;
+    })();
+  "exclude" [
+    "**/bin",
+    "**/bower_components",
+    "**/jspm_packages",
+    "**/node_modules",
+    "**/obj",
+    "**/platforms"
+  ]
+}

Package/SZUAbsolventenverein.Theme.Website.Package.csproj

@@ -4,8 +4,6 @@
     <TargetFramework>net9.0</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
-    <PackageId>SZUAbsolventenverein.Theme.Website</PackageId>
-    <Version>1.0.12</Version>
   </PropertyGroup>
 
   <ItemGroup>

Package/SZUAbsolventenverein.Theme.Website.nuspec

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
-        <id>SZUAbsolventenverein.Theme.Website</id>
+        <id>$projectname$</id>
-        <version>1.0.13</version>
+        <version>1.0.10</version>
         <authors>SZUAbsolventenverein</authors>
         <owners>SZUAbsolventenverein</owners>
         <title>Website</title>
@@ -20,9 +20,9 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="../Client/bin/Release/$targetframework$/SZUAbsolventenverein.Theme.Website.Client.Oqtane.dll" target="lib/$targetframework$" />
+        <file src="..\Client\bin\Release\$targetframework$\$projectname$.Client.Oqtane.dll" target="lib\$targetframework$" />
-        <file src="../Client/bin/Release/$targetframework$/SZUAbsolventenverein.Theme.Website.Client.Oqtane.pdb" target="lib/$targetframework$" />
+        <file src="..\Client\bin\Release\$targetframework$\$projectname$.Client.Oqtane.pdb" target="lib\$targetframework$" />
-        <file src="../Client/wwwroot/**/*.*" target="wwwroot" />
+        <file src="..\Client\wwwroot\**\*.*" target="wwwroot" />
         <file src="icon.png" target="" />
     </files>
 </package>

Package/release.cmd

@@ -2,6 +2,6 @@
 set TargetFramework=%1
 set ProjectName=%2
 
-if exist *.nupkg del *.nupkg
+del "*.nupkg"
-dotnet build "..\Client\SZUAbsolventenverein.Theme.Website.Client.csproj" -c Release
+"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName%
-dotnet pack "%ProjectName%.Package.csproj" -p:NuspecFile="%ProjectName%.nuspec" -p:NuspecProperties="targetframework=%TargetFramework%;projectname=%ProjectName%" --no-build -o .
+XCOPY "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\wwwroot\Packages\" /Y

Package/release.sh

@@ -1,7 +1,5 @@
 TargetFramework=$1
 ProjectName=$2
-cd "$(dirname "$0")"
 
-rm -f *.nupkg
+"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName%
-dotnet build "../Client/SZUAbsolventenverein.Theme.Website.Client.csproj" -c Release
+cp -f "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\Packages\"
-dotnet pack "${ProjectName}.Package.csproj" -p:NuspecFile="${ProjectName}.nuspec" -p:NuspecProperties="targetframework=${TargetFramework};projectname=${ProjectName}" --no-build -o .

RELEASE_GUIDE.md

@@ -1,64 +0,0 @@
-# Release Anleitung (Mac / Linux)
-
-> [!NOTE]
-> Diese Anleitung und das verwendete Skript sind für **macOS** (und Linux) optimiert.
-
-## 1. Release Skript
-Das Skript zur Erstellung des Releases befindet sich hier:
-`Theme.SZUAbsolventenverein/Package/release.sh`
-
-## 2. Version ändern
-
-Die Versionsnummer muss in den folgenden **4 Dateien** angepasst werden:
-
-1.  **Package Projektdatei**
-    *   Datei: `Theme.SZUAbsolventenverein/Package/SZUAbsolventenverein.Theme.Website.Package.csproj`
-    *   Zeile: `<Version>1.0.11</Version>`
-
-2.  **NuGet Spezifikation (Nuspec)**
-    *   Datei: `Theme.SZUAbsolventenverein/Package/SZUAbsolventenverein.Theme.Website.nuspec`
-    *   Zeile: `<version>1.0.11</version>`
-
-3.  **Client Projektdatei** (optional)
-    *   Datei: `Theme.SZUAbsolventenverein/Client/SZUAbsolventenverein.Theme.Website.Client.csproj`
-    *   Zeile: `<Version>1.0.11</Version>`
-
-4.  **Theme Info (C# Code)**
-    *   Datei: `Theme.SZUAbsolventenverein/Client/ThemeInfo.cs`
-    *   Zeile: `Version = "1.0.11",`
-
-## 3. Release Build erstellen
-
-Führe das `release.sh` Skript im Terminal aus.
-
-```bash
-# In das Verzeichnis wechseln (falls noch nicht dort)
-cd /Users/adamgaiswinkler/Theme.SZUAbsolventenverein/Package
-
-# Skript ausführen
-./release.sh net9.0 SZUAbsolventenverein.Theme.Website
-```
-
-**Was passiert dabei?**
-1.  Der Code wird im `Release` Modus kompiliert.
-2.  Ein NuGet-Paket (`.nupkg`) wird erstellt.
-3.  Das Paket (`.nupkg`) wird im Ordner **`Theme.SZUAbsolventenverein/Package/`** gespeichert.
-    
-    > [!IMPORTANT]
-    > Du musst dieses Paket nun selbst nehmen und dorthin kopieren oder hochladen, wo du es installieren möchtest.
-
-### Windows
-
-Führe die `release.cmd` in der Eingabeaufforderung (cmd) oder PowerShell aus:
-
-```cmd
-cd Theme.SZUAbsolventenverein\Package
-release.cmd net9.0 SZUAbsolventenverein.Theme.Website
-```
-
-## 4. Server neustarten
-
-Damit das neue Theme geladen wird, musst du den Oqtane Server neustarten (falls er läuft):
-
-1.  Server stoppen (`Ctrl + C` im Terminal).
-2.  Server neu starten: `dotnet run` (im Oqtane.Server Verzeichnis).