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.12</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.12",
+            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

@@ -11,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" @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">
+        <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">
@@ -165,10 +159,8 @@
         </div>
         <Pane Name="Bottom Full Width" />
     </div>
-    <CookieConsent />
 </main>
 
-
 @code {
     public override string Name => "Theme1";
 

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,8 +2,6 @@
    Standard Layout
    =========================== */
 
-body {}
-
 /* Login-Button (Mobile + Desktop) */
 .app-menu-footer .btn-login,
 .app-menu-footer .login-btn,
@@ -91,7 +89,6 @@ body {}
     z-index: 1000;
 }
 
-
 /* ===================================================
    NAVBAR / BURGER / SIDEBAR
    =================================================== */
@@ -316,7 +313,6 @@ body {}
         justify-content: right;
     }
 
-
     /* Sidebar öffnen/schließen über Checkbox */
     .nav-toggle:checked~.app-menu {
         transform: translateX(0);

Package/SZUAbsolventenverein.Theme.Website.Package.csproj

@@ -1,7 +1,7 @@
 <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>

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.12</version>
+        <version>1.0.14</version>
         <authors>SZUAbsolventenverein</authors>
         <owners>SZUAbsolventenverein</owners>
         <title>Website</title>

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

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

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>