Fix: Theme

Client/SZUAbsolventenverein.Theme.Website.Client.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
-    <Version>1.0.0</Version>
+    <Version>1.0.13</Version>
     <Authors>SZUAbsolventenverein</Authors>
     <Company>SZUAbsolventenverein</Company>
     <Description>[Description]</Description>
@@ -13,14 +13,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2" />
+    <None Include="wwwroot\Themes\SZUAbsolventenverein.Theme.Website\icon.png" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Oqtane.Client"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Client.dll</HintPath></Reference>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
-    <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll</HintPath></Reference>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Oqtane.Client"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Client.dll</HintPath></Reference>
+    <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll</HintPath></Reference>
   </ItemGroup>
 
   <PropertyGroup>

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.7",
+            Version = "1.0.14",
             PackageName = "SZUAbsolventenverein.Theme.Website",
             ThemeSettingsType = "SZUAbsolventenverein.Theme.Website.ThemeSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",
             ContainerSettingsType = "SZUAbsolventenverein.Theme.Website.ContainerSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",

Client/Themes/MenuVertical.razor

@@ -0,0 +1,16 @@
+@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,6 +1,8 @@
 @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 app-navbar">
@@ -9,77 +11,71 @@
         <Logo />
     </div>
 
-    <!-- Versteckte Checkbox zum Steuern des Menüs (nur HTML, kein Blazor) -->
-    <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 -->
-    <!-- Menü-Container, der per :checked ein-/ausgeblendet wird -->
     <div class="app-menu">
-    <div class="app-menu-items">
+        <div class="app-menu-items">
-        @if (PageState?.Pages != null)
+            @if (PageState?.Pages != null)
-        {
-            // Diese Seitennamen sollen NICHT im Menü erscheinen
-            var hiddenNames = new[]
             {
-                "Login", "Register", "Reset", "Profile",
+                // Diese Seitennamen sollen NICHT im Menü erscheinen
-                "Search", "Privacy", "Terms", "Not Found", "NotFound"
+                var hiddenNames = new[]
-            };
-
-            @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">
+                    "Login", "Register", "Reset", "Profile",
-                        @foreach (var child in children)
+                    "Search", "Privacy", "Terms", "Not Found", "NotFound"
-                        {
+                };
-                            <div class="nav-item">
+                @foreach (var page in PageState.Pages
-                                <a class="nav-link text-white" href="@child.Path">
+                    .Where(p => p.ParentId == null
-                                    @child.Name
+                                && p.IsNavigation
-                                </a>
+                                && !p.IsDeleted
-                            </div>
+                                && !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>
-    </div>
+        <!-- WICHTIG: Footer jetzt AUßERHALB von app-menu-items -->
-
+                <div class="app-menu-footer ">
-    <!-- WICHTIG: Footer jetzt AUßERHALB von app-menu-items -->
+            <UserProfile ShowRegister="@_register" />
-            <div class="app-menu-footer ">
+            <Login ShowLogin="@_login" />
-        <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>
+        <!-- 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">
         <div class="container">
             <div class="row">
@@ -163,10 +159,8 @@
         </div>
         <Pane Name="Bottom Full Width" />
     </div>
-    <CookieConsent />
 </main>
 
-
 @code {
     public override string Name => "Theme1";
 
@@ -175,6 +169,12 @@
     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()
     {
@@ -190,5 +190,14 @@
         }
     }
 
+    private void LocationChanged(object sender, LocationChangedEventArgs args)
+    {
+        _navOpen = false;
+        StateHasChanged();
+    }
 
+    public void Dispose()
+    {
+        NavigationManager.LocationChanged -= LocationChanged;
+    }
 }

Client/Themes/ThemeSettings.razor

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

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

@@ -2,10 +2,6 @@
    Standard Layout
    =========================== */
 
-body {
-    
-}
-
 /* Login-Button (Mobile + Desktop) */
 .app-menu-footer .btn-login,
 .app-menu-footer .login-btn,
@@ -19,17 +15,19 @@ body {
     font-weight: 500 !important;
 }
 
-    /* Hover-Effekt */
+/* Hover-Effekt */
-    .app-menu-footer .btn-login:hover,
+.app-menu-footer .btn-login:hover,
-    .app-menu-footer .login-btn:hover,
+.app-menu-footer .login-btn:hover,
-    .app-menu-footer button:hover,
+.app-menu-footer button:hover,
-    .app-menu-footer a:hover {
+.app-menu-footer a:hover {
-        background-color: #f2f2f2 !important;
+    background-color: #f2f2f2 !important;
-        border-color: #bbb !important;
+    border-color: #bbb !important;
-        color: #333 !important;
+    color: #333 !important;
-    }
+}
+
 .content {
-    margin-top: 60px; /* ungefähr Höhe der Navbar */
+    margin-top: 60px;
+    /* ungefähr Höhe der Navbar */
 }
 
 /* App Logo */
@@ -38,7 +36,7 @@ body {
     padding: 0 5px 0 5px;
 }
 
-.table > :not(caption) > * > * {
+.table> :not(caption)>*>* {
     box-shadow: none;
 }
 
@@ -91,7 +89,6 @@ body {
     z-index: 1000;
 }
 
-
 /* ===================================================
    NAVBAR / BURGER / SIDEBAR
    =================================================== */
@@ -99,7 +96,8 @@ body {
 /* Navbar als durchgehende Flex-Zeile */
 .app-navbar {
     display: flex;
-    flex-wrap: nowrap; /* NICHT umbrechen auf Desktop */
+    flex-wrap: nowrap;
+    /* NICHT umbrechen auf Desktop */
     align-items: center;
     justify-content: flex-start;
     z-index: 1000;
@@ -123,19 +121,20 @@ body {
 
 /* Burger-Icon (wird nur auf Mobil eingeblendet) */
 .nav-toggle-label {
-    display: none; /* nur auf Mobil sichtbar */
+    display: none;
+    /* nur auf Mobil sichtbar */
     cursor: pointer;
     padding: 0.25rem 0.5rem;
     margin-left: auto;
 }
 
-    .nav-toggle-label span {
+.nav-toggle-label span {
-        display: block;
+    display: block;
-        width: 22px;
+    width: 22px;
-        height: 2px;
+    height: 2px;
-        margin: 4px 0;
+    margin: 4px 0;
-        background-color: #ffffff;
+    background-color: #ffffff;
-    }
+}
 
 /* Menü-Container */
 .app-menu {
@@ -174,15 +173,15 @@ body {
     transition: background-color 0.2s ease, color 0.2s ease;
 }
 
-    .app-menu .nav-link:hover {
+.app-menu .nav-link:hover {
-        background-color: #4a4a4a;
+    background-color: #4a4a4a;
-        color: #ffffff !important;
+    color: #ffffff !important;
-    }
+}
 
-    .app-menu .nav-link.active {
+.app-menu .nav-link.active {
-        background-color: #3b3b3b;
+    background-color: #3b3b3b;
-        color: #ffffff !important;
+    color: #ffffff !important;
-    }
+}
 
 
 /* ===========================
@@ -197,7 +196,8 @@ body {
         align-items: center !important;
         justify-content: flex-start !important;
         position: relative !important;
-        min-height: 60px; /* optional: fixe Höhe */
+        min-height: 60px;
+        /* optional: fixe Höhe */
     }
   
     /* Menü nur als Container für den Footer */
@@ -229,7 +229,8 @@ body {
     .app-menu-footer {
         display: flex !important;
         gap: 0.75rem !important;
-        margin-left: auto !important; /* schiebt Footer nach rechts */
+        margin-left: auto !important;
+        /* schiebt Footer nach rechts */
         padding: 0 !important;
         border: none !important;
         background: none !important;
@@ -270,11 +271,13 @@ body {
     /* Sidebar-Wrapper rechts */
     .app-menu {
         position: fixed;
-        top: 80px; /* Abstand von oben (über der Navbar + Burger) */
+        top: 80px;
+        /* Abstand von oben (über der Navbar + Burger) */
         right: 0;
+        bottom: 0;
         width: 70%;
         max-width: 280px;
-        height: calc(100vh - 80px); /* Höhe an das neue top anpassen */
+        /* Höhe an das neue top anpassen */
         background-color: #b1b0b0;
         flex-direction: column;
         align-items: stretch;
@@ -303,14 +306,15 @@ body {
         padding-top: 0.5rem;
         border-top: 1px solid rgba(255, 255, 255, 0.25);
         display: flex;
-        flex-direction: column; /* untereinander statt nebeneinander */
+        flex-direction: column;
-        gap: 0.5rem; /* Abstand zwischen Host und Logout */
+        /* untereinander statt nebeneinander */
+        gap: 0.5rem;
+        /* Abstand zwischen Host und Logout */
         justify-content: right;
     }
 
-
     /* Sidebar öffnen/schließen über Checkbox */
-    .nav-toggle:checked ~ .app-menu {
+    .nav-toggle:checked~.app-menu {
         transform: translateX(0);
     }
 
@@ -321,4 +325,3 @@ body {
     }
 
 }
-

Package/SZUAbsolventenverein.Theme.Website.Package.csproj

@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.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>$projectname$</id>
+        <id>SZUAbsolventenverein.Theme.Website</id>
-        <version>1.0.7</version>
+        <version>1.0.14</version>
         <authors>SZUAbsolventenverein</authors>
         <owners>SZUAbsolventenverein</owners>
         <title>Website</title>
@@ -20,9 +20,9 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="..\Client\bin\Release\$targetframework$\$projectname$.Client.Oqtane.dll" target="lib\$targetframework$" />
+        <file src="../Client/bin/Release/$targetframework$/SZUAbsolventenverein.Theme.Website.Client.Oqtane.dll" target="lib/$targetframework$" />
-        <file src="..\Client\bin\Release\$targetframework$\$projectname$.Client.Oqtane.pdb" target="lib\$targetframework$" />
+        <file src="../Client/bin/Release/$targetframework$/SZUAbsolventenverein.Theme.Website.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.sh

@@ -1,5 +1,8 @@
 TargetFramework=$1
 ProjectName=$2
+cd "$(dirname "$0")"
 
-"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName%
+
-cp -f "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\Packages\"
+find . -name *.nupkg -delete
+dotnet pack $ProjectName.nuspec "/p:targetframework=${TargetFramework};ProjectName=${ProjectName}"
+cp -f *.nupkg ../../oqtane.framework/Oqtane.Server/Packages/

RELEASE_GUIDE.md

@@ -0,0 +1,64 @@
+# 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).

SZUAbsolventenverein.Theme.Website.sln

@@ -1,34 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.13.35825.156 d17.13
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\oqtane.framework\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Theme.Website.Client", "Client\SZUAbsolventenverein.Theme.Website.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Theme.Website.Package", "Package\SZUAbsolventenverein.Theme.Website.Package.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1D016F15-46FE-4726-8DFD-2E4FD4DC7668}
-	EndGlobalSection
-EndGlobal

SZUAbsolventenverein.Theme.Website.slnx

@@ -0,0 +1,7 @@
+<Solution>
+  <Project Path="../oqtane.framework/Oqtane.Server/Oqtane.Server.csproj">
+    <Build Project="false" />
+  </Project>
+  <Project Path="Client/SZUAbsolventenverein.Theme.Website.Client.csproj" />
+  <Project Path="Package/SZUAbsolventenverein.Theme.Website.Package.csproj" />
+</Solution>