Merge: 1.0.13 into net10

Upgrade to version 1.0.13
Rebase: net10.0 migration onto macproblemsolver
2026-01-30 10:56:40 +01:00 · 2026-01-30 09:38:06 +01:00 · 2026-01-30 09:36:57 +01:00 · 2026-01-29 22:30:01 +01:00 · 2026-01-29 21:23:51 +01:00 · 2026-01-29 21:21:09 +01:00
15 changed files with 207 additions and 138 deletions
--- a/Client/SZUAbsolventenverein.Theme.Website.Client.csproj
+++ b/Client/SZUAbsolventenverein.Theme.Website.Client.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">

  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <Version>1.0.12</Version>
+    <TargetFramework>net10.0</TargetFramework>
+    <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" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.2" />
+    <None Include="wwwroot\Themes\SZUAbsolventenverein.Theme.Website\icon.png" />
  </ItemGroup>

  <ItemGroup>
-    <Reference Include="Oqtane.Client"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Client.dll</HintPath></Reference>
-    <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll</HintPath></Reference>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
+    <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>
--- a/Client/ThemeInfo.cs
+++ b/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.13",
            PackageName = "SZUAbsolventenverein.Theme.Website",
            ThemeSettingsType = "SZUAbsolventenverein.Theme.Website.ThemeSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",
            ContainerSettingsType = "SZUAbsolventenverein.Theme.Website.ContainerSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",
--- a/Client/Themes/MenuVertical.razor
+++ b/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>
+}
--- a/Client/Themes/Theme1.razor
+++ b/Client/Themes/Theme1.razor
@@ -5,82 +5,13 @@
@implements IDisposable

 <main role="main">
-    <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">
+    <nav class="navbar navbar-dark bg-primary fixed-top">
        <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 -->
-    <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/>
+        <Menu Orientation="Horizontal" />
+        
+        <div class="controls ms-auto">
+            <div class="controls-group"><UserProfile ShowRegister="@_register" /> <Login ShowLogin="@_login" /> <ControlPanel ButtonClass="btn-outline-light" /></div>
        </div>
-    </div>
 </nav>
    <div class="content">
        <div class="container">
@@ -165,9 +96,13 @@
        </div>
        <Pane Name="Bottom Full Width" />
    </div>
-    <CookieConsent />
-</main>

+    <footer class="footer">
+        <div class="text text-center">
+            <p>Impressum | Datenschutz | AGB</p>
+        </div>
+    </footer>
+</main>

@code {
    public override string Name => "Theme1";
--- a/Client/Themes/ThemeSettings.razor
+++ b/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
--- a/Client/Themes/icon.jpg
+++ b/Client/Themes/icon.jpg
--- a/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/Theme.css
+++ b/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/Theme.css
@@ -17,14 +17,73 @@ body {}
    font-weight: 500 !important;
 }

-/* Hover-Effekt */
-.app-menu-footer .btn-login:hover,
-.app-menu-footer .login-btn:hover,
-.app-menu-footer button:hover,
-.app-menu-footer a:hover {
-    background-color: #f2f2f2 !important;
-    border-color: #bbb !important;
-    color: #333 !important;
+.navigation {
+    max-width: 80vw; /* oder max-width: 100%;*/ 
+    margin: 0 auto;
+    position: fixed; 
+    top: 0;
+    z-index: 1000;
+    background-color: #bbb;
+    padding: 1rem 0;
+    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 {
@@ -203,6 +262,49 @@ body {}
        /* optional: fixe Höhe */
    }

+.hamburger {
+    width: 40px;
+    height: 28px;
+    position: relative;
+    cursor: pointer;
+}
+
+    .hamburger span {
+        position: absolute;
+        left: 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);
+    }
+
+  
    /* Menü nur als Container für den Footer */
    .app-menu {
        display: flex !important;
@@ -316,12 +418,50 @@ body {}
        justify-content: right;
    }

+.hamburger {
+    width: 40px;
+    height: 28px;
+    position: relative;
+    cursor: pointer;
+}

-    /* Sidebar öffnen/schließen über Checkbox */
-    .nav-toggle:checked~.app-menu {
-        transform: translateX(0);
+    .hamburger span {
+        position: absolute;
+        left: 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;
--- a/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/icon.png
+++ b/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/icon.png
--- a/Package/SZUAbsolventenverein.Theme.Website.Package.csproj
+++ b/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>
--- a/Package/SZUAbsolventenverein.Theme.Website.nuspec
+++ b/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.13</version>
        <authors>SZUAbsolventenverein</authors>
        <owners>SZUAbsolventenverein</owners>
        <title>Website</title>
--- a/Package/icon.png
+++ b/Package/icon.png
--- a/Package/release.cmd
+++ b/Package/release.cmd
@@ -2,6 +2,6 @@
 set TargetFramework=%1
 set ProjectName=%2

-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 .
+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
--- a/Package/release.sh
+++ b/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
-dotnet pack "${ProjectName}.Package.csproj" -p:NuspecFile="${ProjectName}.nuspec" -p:NuspecProperties="targetframework=${TargetFramework};projectname=${ProjectName}" --no-build -o .
+
+find . -name *.nupkg -delete
+dotnet pack $ProjectName.nuspec "/p:targetframework=${TargetFramework};ProjectName=${ProjectName}"
+cp -f *.nupkg ../../oqtane.framework/Oqtane.Server/Packages/
--- a/SZUAbsolventenverein.Theme.Website.sln
+++ b/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
--- a/SZUAbsolventenverein.Theme.Website.slnx
+++ b/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>
Author	SHA1	Message	Date
KoCoder	7e5475322b	Merge: 1.0.13 into net10	2026-01-30 10:56:40 +01:00
KoCoder	3b58e43611	Upgrade to version 1.0.13	2026-01-30 09:38:06 +01:00
KoCoder	99830c6a93	Rebase: net10.0 migration onto macproblemsolver	2026-01-30 09:36:57 +01:00
KoCoder	481544069a	Update dll references to use net10.0 paths and use dotnet pack instead	2026-01-29 22:30:01 +01:00
KoCoder	b5e8a436b4	Migrate further to net10.0.1	2026-01-29 21:23:51 +01:00
KoCoder	7faf857ea1	Upgrade dependencies to net10.0	2026-01-29 21:21:09 +01:00
KoCoder	13692b8af0	MIGRATE: sln to slnx	2026-01-29 21:16:44 +01:00
Adam Gaiswinkler	5b52989230	HAT KURZ FUNKTIONIERT JETZT NICHT MEHR JETZT WILL ICH NICHT MEHR ABER MACH BALD WIEDER WEITER	2025-10-09 17:34:53 +02:00