10 Commits

13 changed files with 84 additions and 78 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

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

View File

@@ -10,7 +10,7 @@ namespace SZUAbsolventenverein.Theme.Website
public Oqtane.Models.Theme Theme => new Oqtane.Models.Theme public Oqtane.Models.Theme Theme => new Oqtane.Models.Theme
{ {
Name = "SZUAbsolventenverein Website", Name = "SZUAbsolventenverein Website",
Version = "1.0.16", Version = "1.0.15",
PackageName = "SZUAbsolventenverein.Theme.Website", PackageName = "SZUAbsolventenverein.Theme.Website",
ThemeSettingsType = "SZUAbsolventenverein.Theme.Website.ThemeSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane", ThemeSettingsType = "SZUAbsolventenverein.Theme.Website.ThemeSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",
ContainerSettingsType = "SZUAbsolventenverein.Theme.Website.ContainerSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane", ContainerSettingsType = "SZUAbsolventenverein.Theme.Website.ContainerSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",

View File

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

View File

@@ -11,16 +11,12 @@
<Logo /> <Logo />
</div> </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 --> <!-- Burger-Icon, das die Checkbox toggelt -->
<label for="nav-toggle" class="nav-toggle-label"> <label for="nav-toggle" class="nav-toggle-label">
<span></span> <span></span>
<span></span> <span></span>
<span></span> <span></span>
</label> </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">
<div class="app-menu-items"> <div class="app-menu-items">
@@ -32,7 +28,6 @@
"Login", "Register", "Reset", "Profile", "Login", "Register", "Reset", "Profile",
"Search", "Privacy", "Terms", "Not Found", "NotFound" "Search", "Privacy", "Terms", "Not Found", "NotFound"
}; };
@foreach (var page in PageState.Pages @foreach (var page in PageState.Pages
.Where(p => p.ParentId == null .Where(p => p.ParentId == null
&& p.IsNavigation && p.IsNavigation
@@ -44,13 +39,11 @@
@(@page.Name) @(@page.Name)
</a> </a>
</div> </div>
var children = PageState.Pages var children = PageState.Pages
.Where(c => c.ParentId == page.PageId .Where(c => c.ParentId == page.PageId
&& c.IsNavigation && c.IsNavigation
&& !c.IsDeleted && !c.IsDeleted
&& !hiddenNames.Contains(c.Name)); && !hiddenNames.Contains(c.Name));
if (children.Any()) if (children.Any())
{ {
<div class="app-submenu"> <div class="app-submenu">
@@ -67,21 +60,22 @@
} }
} }
</div> </div>
<!-- WICHTIG: Footer jetzt AUßERHALB von app-menu-items --> <!-- WICHTIG: Footer jetzt AUßERHALB von app-menu-items -->
<div class="app-menu-footer "> <div class="app-menu-footer ">
<UserProfile ShowRegister="@_register" /> <UserProfile ShowRegister="@_register" />
<Login ShowLogin="@_login" /> <Login ShowLogin="@_login" />
</div> </div>
</div> </div>
<!-- Rechts: ControlPanel + User + Login --> <!-- 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 app-navbar-left">
<div class="d-flex align-items-center gap-2"> <div class="d-flex align-items-center gap-2">
<ControlPanel/> <ControlPanel/>
</div> </div>
</div> </div>
</nav> </nav>
<div class="content"> <div class="content">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@@ -165,10 +159,8 @@
</div> </div>
<Pane Name="Bottom Full Width" /> <Pane Name="Bottom Full Width" />
</div> </div>
<CookieConsent />
</main> </main>
@code { @code {
public override string Name => "Theme1"; public override string Name => "Theme1";

View File

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

BIN
Client/Themes/icon.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>SZUAbsolventenverein.Theme.Website</id> <id>SZUAbsolventenverein.Theme.Website</id>
<version>1.0.16</version> <version>1.0.15</version>
<authors>SZUAbsolventenverein</authors> <authors>SZUAbsolventenverein</authors>
<owners>SZUAbsolventenverein</owners> <owners>SZUAbsolventenverein</owners>
<title>Website</title> <title>Website</title>

View File

@@ -1,10 +1,8 @@
#!/bin/bash #!/bin/bash
set -x
TargetFramework=$1 TargetFramework=$1
ProjectName=$2 ProjectName=$2
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 -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"
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/"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -2,6 +2,6 @@
set TargetFramework=%1 set TargetFramework=%1
set ProjectName=%2 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