New: 1.0.16

Client/SZUAbsolventenverein.Theme.Website.Client.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
-    <Version>1.0.13</Version>
+    <Version>1.0.0</Version>
     <Authors>SZUAbsolventenverein</Authors>
     <Company>SZUAbsolventenverein</Company>
     <Description>[Description]</Description>
@@ -12,10 +12,6 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="wwwroot\Themes\SZUAbsolventenverein.Theme.Website\icon.png" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.1" />

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.14",
+            Version = "1.0.16",
             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

@@ -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

@@ -2,7 +2,7 @@
 @inherits ThemeBase
 @inject NavigationManager NavigationManager
 @inject ISettingService SettingService
-@implements IDisposable  
+@implements IDisposable
 
 <main role="main">
     <nav class="navbar navbar-dark bg-primary fixed-top app-navbar">
@@ -11,71 +11,77 @@
         <Logo />
     </div>
 
+    <!-- Versteckte Checkbox zum Steuern des Menüs (nur HTML, kein Blazor) -->
+    <input type="checkbox" id="nav-toggle" class="nav-toggle" @bind="_navOpen" />
+
     <!-- 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">
-            @if (PageState?.Pages != null)
+    <div class="app-menu-items">
+        @if (PageState?.Pages != null)
+        {
+            // Diese Seitennamen sollen NICHT im Menü erscheinen
+            var hiddenNames = new[]
             {
-                // 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())
                 {
-                    "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 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>
-                    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>
+
+    <!-- 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>
-        <!-- 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>
-
-
-
+</nav>
     <div class="content">
         <div class="container">
             <div class="row">
@@ -159,8 +165,10 @@
         </div>
         <Pane Name="Bottom Full Width" />
     </div>
+    <CookieConsent />
 </main>
 
+
 @code {
     public override string Name => "Theme1";
 

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,6 +2,8 @@
    Standard Layout
    =========================== */
 
+body {}
+
 /* Login-Button (Mobile + Desktop) */
 .app-menu-footer .btn-login,
 .app-menu-footer .login-btn,
@@ -89,6 +91,7 @@
     z-index: 1000;
 }
 
+
 /* ===================================================
    NAVBAR / BURGER / SIDEBAR
    =================================================== */
@@ -199,7 +202,7 @@
         min-height: 60px;
         /* optional: fixe Höhe */
     }
-  
+
     /* Menü nur als Container für den Footer */
     .app-menu {
         display: flex !important;
@@ -313,6 +316,7 @@
         justify-content: right;
     }
 
+
     /* Sidebar öffnen/schließen über Checkbox */
     .nav-toggle:checked~.app-menu {
         transform: translateX(0);

Package/SZUAbsolventenverein.Theme.Website.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>SZUAbsolventenverein.Theme.Website</id>
-        <version>1.0.14</version>
+        <version>1.0.16</version>
         <authors>SZUAbsolventenverein</authors>
         <owners>SZUAbsolventenverein</owners>
         <title>Website</title>
@@ -16,7 +16,7 @@
         <releaseNotes></releaseNotes>
         <summary></summary>
         <dependencies>
-            <dependency id="Oqtane.Framework" version="6.1.1" />
+            <dependency id="Oqtane.Framework" version="10.0.3" />
         </dependencies>
     </metadata>
     <files>

Package/debug.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
-
+set -x
 TargetFramework=$1
 ProjectName=$2
 
-cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"
+whoami
+
+cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -rf "../Client/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"

Package/release.cmd

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