Update dll references to use net10.0 paths and use dotnet pack instead

Client/Modules/SZUAbsolventenverein.Module.AdminMassMailing/ModuleInfo.cs

@@ -1,19 +0,0 @@
-using Oqtane.Models;
-using Oqtane.Modules;
-
-namespace SZUAbsolventenverein.Module.AdminMassMailing
-{
-    public class ModuleInfo : IModule
-    {
-        public ModuleDefinition ModuleDefinition => new ModuleDefinition
-        {
-            Name = "AdminMassMailing",
-            Description = "Mass Mailing Tool",
-            Version = "1.0.7",
-            ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane",
-            ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7",
-            Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane",
-            PackageName = "SZUAbsolventenverein.Module.AdminMassMailing" 
-        };
-    }
-}

Client/Modules/SZUAbsolventenverein.Module.AdminModules/Edit.razor

@@ -2,7 +2,7 @@
 @using SZUAbsolventenverein.Module.AdminModules.Services
 @using SZUAbsolventenverein.Module.AdminModules.Models
 
-@namespace SZUAbsolventenverein.Module.AdminMassMailing
+@namespace SZUAbsolventenverein.Module.AdminModules
 @inherits ModuleBase
 @inject IAdminModulesService AdminModulesService
 @inject NavigationManager NavigationManager

Client/Modules/SZUAbsolventenverein.Module.AdminModules/Index.razor

@@ -1,7 +1,7 @@
 @using SZUAbsolventenverein.Module.AdminModules.Services
 @using SZUAbsolventenverein.Module.AdminModules.Models
 
-@namespace SZUAbsolventenverein.Module.AdminMassMailing
+@namespace SZUAbsolventenverein.Module.AdminModules
 @inherits ModuleBase
 @inject IAdminModulesService AdminModulesService
 @inject NavigationManager NavigationManager

Client/Modules/SZUAbsolventenverein.Module.AdminModules/ModuleInfo.cs

@@ -1,19 +1,19 @@
 using Oqtane.Models;
 using Oqtane.Modules;
 
-namespace SZUAbsolventenverein.Module.AdminSettings
+namespace SZUAbsolventenverein.Module.AdminModules
 {
     public class ModuleInfo : IModule
     {
         public ModuleDefinition ModuleDefinition => new ModuleDefinition
         {
-            Name = "Admin - Settings",
-            Description = "Einstellungen in Oqtane",
-            Version = "1.0.0",
+            Name = "AdminModules",
+            Description = "Admin Tools",
+            Version = "1.0.2",
             ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane",
-            ReleaseVersions = "1.0.0",
+            ReleaseVersions = "1.0.0,1.0.1,1.0.2",
             Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane",
-            PackageName = "SZUAbsolventenverein.Module.AdminSettings"
+            PackageName = "SZUAbsolventenverein.Module.AdminModules" 
         };
     }
 }

Client/Modules/SZUAbsolventenverein.Module.AdminModules/Send.razor

@@ -3,7 +3,7 @@
 @using SZUAbsolventenverein.Module.AdminModules.Models
 @using Microsoft.AspNetCore.Components.Forms;
 
-@namespace SZUAbsolventenverein.Module.AdminMassMailing
+@namespace SZUAbsolventenverein.Module.AdminModules
 @inherits ModuleBase
 @inject IAdminModulesService AdminModulesService
 @inject NavigationManager NavigationManager
@@ -11,6 +11,12 @@
 
 <form @ref="form" class="@(validated ? " was-validated" : "needs-validation" )" novalidate>
     <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="Enter a name" ResourceKey="Name">Name: </Label>
+            <div class="col-sm-9">
+                <input id="name" class="form-control" @bind="@_name" required />
+            </div>
+        </div>
         <div class="row mb-1 align-items-center">
             <Label Class="col-sm-3" For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label>
             <div class="col-sm-9">
@@ -34,17 +40,10 @@
         }
     </div>
     <p></p>
-    @if(userCount != null)
-    {
-        <ActionDialog Header="@(userCount != null ? userCount + " Nachrichten versenden" : "-")"
-            Message="Are You Sure You Wish To Send this Mass Notification?"
-            Action="SendConfirm"
-            Security="SecurityAccessLevel.Edit"
-            Class="btn btn-success"
-            OnClick="@(async () => await Save())"
-            ResourceKey="SendConfirm" />
-    }
+    <button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button>
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+    <br /><br />
+    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
 </form>
 
 @code {
@@ -78,7 +77,13 @@
     private bool validated = false;
 
     private int _id;
-    
+    private string _name;
+    private string _richText;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+
     private async void RefetchUserCount()
     {
         EmailFields ef = new EmailFields();
@@ -98,6 +103,16 @@
             if (PageState.Action == "Send")
             {
                 _id = Int32.Parse(PageState.QueryString["id"]);
+                AdminModules AdminModules = await AdminModulesService.GetAdminModulesAsync(_id, ModuleState.ModuleId);
+                if (AdminModules != null)
+                {
+                    _name = AdminModules.Name;
+                    _richText = AdminModules.Content;
+                    _createdby = AdminModules.CreatedBy;
+                    _createdon = AdminModules.CreatedOn;
+                    _modifiedby = AdminModules.ModifiedBy;
+                    _modifiedon = AdminModules.ModifiedOn;
+                }
                 roles = await AdminModulesService.GetRoles(ModuleState.ModuleId);
             }
         }

Client/Modules/SZUAbsolventenverein.Module.AdminModules/Settings.razor

@@ -1,4 +1,4 @@
-@namespace SZUAbsolventenverein.Module.AdminMassMailing
+@namespace SZUAbsolventenverein.Module.AdminModules
 @inherits ModuleBase
 @inject ISettingService SettingService
 @inject IStringLocalizer<Settings> Localizer

Client/Modules/SZUAbsolventenverein.Module.AdminSettings/Index.razor

@@ -1,64 +0,0 @@
-@using SZUAbsolventenverein.Module.AdminSettings.Services
-@using SZUAbsolventenverein.Module.AdminModules.Models
-
-@namespace SZUAbsolventenverein.Module.AdminSettings
-@inherits ModuleBase
-@inject IAdminSettingsService AdminSettingsService
-@inject NavigationManager NavigationManager
-@inject IStringLocalizer<Index> Localizer
-
-@if (_AdminSetting == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <div class="container">
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="tokenLifetime" HelpText="Gib die Lebenszeit von Tokens in Tagen an" ResourceKey="TokenLifetime">TokenLifetime: </Label>
-            <div class="col-sm-9">
-                <Microsoft.AspNetCore.Components.Forms.InputNumber @bind-Value="_AdminSetting.TokenLifetime" class="form-control" id="tokenLifetime" />
-            </div>
-        </div>
-    </div>
-    <button class="btn btn-primary" type="button" @onclick="Save">Save</button>
-}
-
-@code {
-    public override List<Resource> Resources => new List<Resource>()
-    {
-        new Stylesheet("_content/SZUAbsolventenverein.Module.AdminModules/Module.css"),
-        new Script("_content/SZUAbsolventenverein.Module.AdminModules/Module.js")
-    };
-
-    private AdminSetting _AdminSetting;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _AdminSetting = await AdminSettingsService.GetAdminSettingsAsync(ModuleState.ModuleId);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading AdminSettings {Error}", ex.Message);
-            AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
-        }
-    }
-
-    private async Task Save()
-    {
-        Console.WriteLine("Saving!!!!");
-        try
-        {
-            AddModuleMessage("Saved", MessageType.Success);
-            await AdminSettingsService.SetAdminSettingsAsync(_AdminSetting);
-            AddModuleMessage("Saved", MessageType.Success);
-        } 
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Saving AdminSettings {Error}", ex.Message);
-            AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
-        }
-    }
-}

Client/Modules/SZUAbsolventenverein.Module.AdminSettings/Settings.razor

@@ -1,47 +0,0 @@
-@namespace SZUAbsolventenverein.Module.AdminSettings
-@inherits ModuleBase
-@inject ISettingService SettingService
-@inject IStringLocalizer<Settings> Localizer
-
-<div class="container">
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="value" HelpText="Enter a value" ResourceKey="SettingName" ResourceType="@resourceType">Name: </Label>
-            <div class="col-sm-9">
-                <input id="value" type="text" class="form-control" @bind="@_value" />
-            </div>
-    </div>
-</div>
-
-@code {
-    private string resourceType = "SZUAbsolventenverein.Module.AdminSettings.Settings, SZUAbsolventenverein.Module.AdminSettings.Client.Oqtane"; // for localization
-    public override string Title => "Admin - Settings Settings";
-
-    string _value;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-            _value = SettingService.GetSetting(settings, "SettingName", "");
-        }
-        catch (Exception ex)
-        {
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-
-    public async Task UpdateSettings()
-    {
-        try
-        {
-            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-            SettingService.SetSetting(settings, "SettingName", _value);
-            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-        }
-        catch (Exception ex)
-        {
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-}

Client/SZUAbsolventenverein.Module.AdminModules.Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Version>1.0.0</Version>
     <Authors>SZUAbsolventenverein</Authors>
     <Company>SZUAbsolventenverein</Company>
@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.9" />
+    <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" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
+    <PackageReference Include="System.Net.Http.Json" Version="10.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,8 +25,8 @@
   </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>
+    <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/Services/AdminSettingsService.cs

@@ -1,37 +0,0 @@
-using Oqtane.Models;
-using Oqtane.Services;
-using Oqtane.Shared;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Reflection;
-using System.Threading.Tasks;
-using SZUAbsolventenverein.Module.AdminModules.Models;
-
-namespace SZUAbsolventenverein.Module.AdminSettings.Services
-{
-    public interface IAdminSettingsService 
-    {
-        Task<AdminSetting> GetAdminSettingsAsync(int ModuleId);
-
-        Task<AdminSetting> SetAdminSettingsAsync(AdminSetting AdminSettings);
-    }
-
-    public class AdminSettingsService : ServiceBase, IAdminSettingsService
-    {
-        public AdminSettingsService(HttpClient http, SiteState siteState) : base(http, siteState) { }
-
-        private string Apiurl => CreateApiUrl("AdminSettings");
-
-        public async Task<AdminSetting> GetAdminSettingsAsync(int ModuleId)
-        {
-            return await GetJsonAsync<AdminSetting>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), null);
-        }
-
-        public async Task<AdminSetting> SetAdminSettingsAsync(AdminSetting AdminSettings)
-        {
-            return await PostJsonAsync<AdminSetting>(CreateAuthorizationPolicyUrl($"{Apiurl}", EntityNames.Module, AdminSettings.ModuleId), AdminSettings);
-        }
-    }
-}

Client/Startup/ClientStartup.cs

@@ -2,7 +2,6 @@ using Microsoft.Extensions.DependencyInjection;
 using System.Linq;
 using Oqtane.Services;
 using SZUAbsolventenverein.Module.AdminModules.Services;
-using SZUAbsolventenverein.Module.AdminSettings.Services;
 
 namespace SZUAbsolventenverein.Module.AdminModules.Startup
 {
@@ -14,10 +13,6 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
             {
                 services.AddScoped<IAdminModulesService, AdminModulesService>();
             }
-            if (!services.Any(s => s.ServiceType == typeof(IAdminSettingsService)))
-            {
-                services.AddScoped<IAdminSettingsService, AdminSettingsService>();
-            }
         }
     }
 }

Package/SZUAbsolventenverein.Module.AdminModules.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>
   </PropertyGroup>

Package/SZUAbsolventenverein.Module.AdminModules.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>$projectname$</id>
-        <version>1.0.6</version>
+        <version>1.0.2</version>
         <authors>SZUAbsolventenverein</authors>
         <owners>SZUAbsolventenverein</owners>
         <title>AdminModules</title>
@@ -27,11 +27,11 @@
         <file src="..\Server\bin\Release\$targetframework$\$ProjectName$.Server.Oqtane.pdb" target="lib\$targetframework$" />
         <file src="..\Shared\bin\Release\$targetframework$\$ProjectName$.Shared.Oqtane.dll" target="lib\$targetframework$" />
         <file src="..\Shared\bin\Release\$targetframework$\$ProjectName$.Shared.Oqtane.pdb" target="lib\$targetframework$" />
-        <file src="..\Server\obj\Release\net9.0\staticwebassets\msbuild.$ProjectName$.Microsoft.AspNetCore.StaticWebAssetEndpoints.props" target="build\Microsoft.AspNetCore.StaticWebAssetEndpoints.props" />
-        <file src="..\Server\obj\Release\net9.0\staticwebassets\msbuild.$ProjectName$.Microsoft.AspNetCore.StaticWebAssets.props" target="build\Microsoft.AspNetCore.StaticWebAssets.props" />
-        <file src="..\Server\obj\Release\net9.0\staticwebassets\msbuild.build.$ProjectName$.props" target="build\$ProjectName$.props" />
-        <file src="..\Server\obj\Release\net9.0\staticwebassets\msbuild.buildMultiTargeting.$ProjectName$.props" target="buildMultiTargeting\$ProjectName$.props" />
-        <file src="..\Server\obj\Release\net9.0\staticwebassets\msbuild.buildTransitive.$ProjectName$.props" target="buildTransitive\$ProjectName$.props" />
+        <file src="..\Server\obj\Release\net10.0\staticwebassets\msbuild.$ProjectName$.Microsoft.AspNetCore.StaticWebAssetEndpoints.props" target="build\Microsoft.AspNetCore.StaticWebAssetEndpoints.props" />
+        <file src="..\Server\obj\Release\net10.0\staticwebassets\msbuild.$ProjectName$.Microsoft.AspNetCore.StaticWebAssets.props" target="build\Microsoft.AspNetCore.StaticWebAssets.props" />
+        <file src="..\Server\obj\Release\net10.0\staticwebassets\msbuild.build.$ProjectName$.props" target="build\$ProjectName$.props" />
+        <file src="..\Server\obj\Release\net10.0\staticwebassets\msbuild.buildMultiTargeting.$ProjectName$.props" target="buildMultiTargeting\$ProjectName$.props" />
+        <file src="..\Server\obj\Release\net10.0\staticwebassets\msbuild.buildTransitive.$ProjectName$.props" target="buildTransitive\$ProjectName$.props" />
         <file src="..\Server\wwwroot\**\*.*" target="staticwebassets" />
         <file src="icon.png" target="" />
     </files>

Package/debug.sh

@@ -3,10 +3,10 @@
 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 -f "../Server/bin/Debug/$TargetFramework/$ProjectName.Server.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName.Server.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName.Shared.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName.Shared.Oqtane.pdb" "../../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.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 "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/_content/%ProjectName%/"

Package/release.sh

@@ -1,7 +1,7 @@
 TargetFramework=$1
 ProjectName=$2
 
-find . -name "*.nupkg" -delete
-"..\..\oqtane.framework\oqtane.package\FixProps.exe"
-"..\..\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 run --project ../../fixProps/FixProps/FixProps.csproj
+dotnet pack $ProjectName.nuspec "/p:targetframework=${TargetFramework};ProjectName=${ProjectName}"
+cp -f *.nupkg ../../oqtane.framework/Oqtane.Server/Packages/

SZUAbsolventenverein.Module.AdminModules.sln

@@ -1,47 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28621.142
-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.Module.AdminModules.Client", "Client\SZUAbsolventenverein.Module.AdminModules.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.AdminModules.Server", "Server\SZUAbsolventenverein.Module.AdminModules.Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.AdminModules.Shared", "Shared\SZUAbsolventenverein.Module.AdminModules.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.AdminModules.Package", "Package\SZUAbsolventenverein.Module.AdminModules.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
-		{04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.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.Module.AdminModules.slnx

@@ -0,0 +1,9 @@
+<Solution>
+  <Project Path="../oqtane.framework/Oqtane.Server/Oqtane.Server.csproj">
+    <Build Project="false" />
+  </Project>
+  <Project Path="Client/SZUAbsolventenverein.Module.AdminModules.Client.csproj" />
+  <Project Path="Package/SZUAbsolventenverein.Module.AdminModules.Package.csproj" />
+  <Project Path="Server/SZUAbsolventenverein.Module.AdminModules.Server.csproj" />
+  <Project Path="Shared/SZUAbsolventenverein.Module.AdminModules.Shared.csproj" />
+</Solution>

Server/Manager/AdminModulesManager.cs

@@ -16,13 +16,11 @@ namespace SZUAbsolventenverein.Module.AdminModules.Manager
     public class AdminModulesManager : MigratableModuleBase, IInstallable, IPortable, ISearchable
     {
         private readonly IAdminModulesRepository _AdminModulesRepository;
-        private readonly IAdminSettingsRepository _AdminSettingsRepository;
         private readonly IDBContextDependencies _DBContextDependencies;
 
-        public AdminModulesManager(IAdminModulesRepository AdminModulesRepository, IAdminSettingsRepository AdminSettingsRepository, IDBContextDependencies DBContextDependencies)
+        public AdminModulesManager(IAdminModulesRepository AdminModulesRepository, IDBContextDependencies DBContextDependencies)
         {
             _AdminModulesRepository = AdminModulesRepository;
-            _AdminSettingsRepository = AdminSettingsRepository;
             _DBContextDependencies = DBContextDependencies;
         }
 

Server/Migrations/01000000_InitializeModule.cs

@@ -17,13 +17,13 @@ namespace SZUAbsolventenverein.Module.AdminModules.Migrations
 
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            var massMailingTemplateEntityBuilder = new MassMailingTemplateEntityBuilder(migrationBuilder, ActiveDatabase);
-            massMailingTemplateEntityBuilder.Create();
+            var entityBuilder = new AdminModulesEntityBuilder(migrationBuilder, ActiveDatabase);
+            entityBuilder.Create();
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            var entityBuilder = new MassMailingTemplateEntityBuilder(migrationBuilder, ActiveDatabase);
+            var entityBuilder = new AdminModulesEntityBuilder(migrationBuilder, ActiveDatabase);
             entityBuilder.Drop();
         }
     }

Server/Migrations/EntityBuilders/AdminModulesEntityBuilder.cs

@@ -7,20 +7,20 @@ using Oqtane.Migrations.EntityBuilders;
 
 namespace SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders
 {
-    public class MassMailingTemplateEntityBuilder : AuditableBaseEntityBuilder<MassMailingTemplateEntityBuilder>
+    public class AdminModulesEntityBuilder : AuditableBaseEntityBuilder<AdminModulesEntityBuilder>
     {
         private const string _entityTableName = "SZUAbsolventenvereinAdminModules";
-        private readonly PrimaryKey<MassMailingTemplateEntityBuilder> _primaryKey = new("PK_SZUAbsolventenvereinAdminModules", x => x.AdminModulesId);
-        private readonly ForeignKey<MassMailingTemplateEntityBuilder> _moduleForeignKey = new("FK_SZUAbsolventenvereinAdminModules_Module", x => x.ModuleId, "Module", "ModuleId", ReferentialAction.Cascade);
+        private readonly PrimaryKey<AdminModulesEntityBuilder> _primaryKey = new("PK_SZUAbsolventenvereinAdminModules", x => x.AdminModulesId);
+        private readonly ForeignKey<AdminModulesEntityBuilder> _moduleForeignKey = new("FK_SZUAbsolventenvereinAdminModules_Module", x => x.ModuleId, "Module", "ModuleId", ReferentialAction.Cascade);
 
-        public MassMailingTemplateEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
+        public AdminModulesEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
         {
             EntityTableName = _entityTableName;
             PrimaryKey = _primaryKey;
             ForeignKeys.Add(_moduleForeignKey);
         }
 
-        protected override MassMailingTemplateEntityBuilder BuildTable(ColumnsBuilder table)
+        protected override AdminModulesEntityBuilder BuildTable(ColumnsBuilder table)
         {
             AdminModulesId = AddAutoIncrementColumn(table,"AdminModulesId");
             ModuleId = AddIntegerColumn(table,"ModuleId");

Server/Repository/AdminSettingsRepository.cs

@@ -1,91 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System.Linq;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using SZUAbsolventenverein.Module.AdminModules.Models;
-using Oqtane.Modules;
-
-namespace SZUAbsolventenverein.Module.AdminModules.Repository
-{
-    /// <summary>
-    /// Repository to manage admin settings in the database.
-    /// </summary>
-    public interface IAdminSettingsRepository
-    {
-        /// <summary>
-        /// Retrieves the administrative settings entry from the Database.
-        /// </summary>
-        /// <returns>An <see cref="Models.AdminSetting"/> object containing the settings for the specified module. Returns <see
-        /// langword="null"/> if the module is not found.</returns>
-        Models.AdminSetting GetAdminSetting();
-
-        /// <summary>
-        /// Updates the administrative settings with the specified values.
-        /// </summary>
-        /// <param name="adminSetting">The new administrative settings to apply. Cannot be null.</param>
-        /// <returns>The updated <see cref="Models.AdminSetting"/> object reflecting the applied changes.</returns>
-        Models.AdminSetting SetAdminSettings(Models.AdminSetting adminSetting);
-    }
-
-    /// <summary>
-    /// Implementation of the <see cref="IAdminSettingsRepository"/> interface for managing admin settings in the database.
-    /// </summary>
-    public class AdminSettingsRepository : IAdminSettingsRepository, ITransientService
-    {
-        public AdminSettingsRepository()
-        {
-        }
-
-        public AdminSetting GetAdminSetting()
-        {
-            return AdminSettingsExtensions.LoadSettings();
-        }
-
-        public AdminSetting SetAdminSettings(AdminSetting adminSetting)
-        {
-            return adminSetting.SaveChanges();
-        }
-    }
-    
-    /// <summary>
-    /// Extension methods for saving and loading admin settings to/from a JSON file.
-    /// </summary>
-    public static class AdminSettingsExtensions
-    {
-        /// <summary>
-        /// Path to the JSON file where admin settings are stored.
-        /// </summary>
-        private static string path = "AdminSettings.json";
-        
-        /// <summary>
-        /// Saves the adminSettingsObject to a JSON file.
-        /// </summary>
-        /// <param name="adminSetting">Settings to save</param>
-        /// <returns>The same AdminSettings object for chaining of Operations</returns>
-        public static AdminSetting SaveChanges(this AdminSetting adminSetting)
-        {
-            string res = JsonSerializer.Serialize(adminSetting);
-
-            File.WriteAllText(path, res);
-            
-            return adminSetting;
-        }
-        
-        /// <summary>
-        /// Loads the admin settings from the JSON file. If the file does not exist, returns a new AdminSetting object with default (0) values.
-        /// </summary>
-        /// <returns></returns>
-        public static AdminSetting LoadSettings()
-        {
-            if (File.Exists(path))
-            {
-                string json = File.ReadAllText(path);
-                return JsonSerializer.Deserialize<AdminSetting>(json);
-            }
-            
-            return new AdminSetting();
-        }
-    }
-}

Server/SZUAbsolventenverein.Module.AdminModules.Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <Version>1.0.0</Version>
     <Product>SZUAbsolventenverein.Module.AdminModules</Product>
@@ -19,10 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Oqtane.Server"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Server.dll</HintPath></Reference>
-    <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll</HintPath></Reference>
+    <Reference Include="Oqtane.Server"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Server.dll</HintPath></Reference>
+    <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll</HintPath></Reference>
   </ItemGroup>
 </Project>

Server/Services/AdminModulesService.cs

@@ -168,8 +168,8 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services
                     User user = _userRepository.GetUser(userid);
                     IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                     string body = template.Content;
-                    
-                    // Fields befüllen.
+
+                    // Fields bef<EFBFBD>llen.
                     string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
                     string url = _alias.Protocol + _alias.Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
 

Server/Services/AdminSettingsService.cs

@@ -1,77 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
-using Oqtane.Enums;
-using Oqtane.Extensions;
-using Oqtane.Infrastructure;
-using Oqtane.Models;
-using Oqtane.Repository;
-using Oqtane.Security;
-using Oqtane.Shared;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using SZUAbsolventenverein.Module.AdminModules.Models;
-using SZUAbsolventenverein.Module.AdminModules.Repository;
-using SZUAbsolventenverein.Module.AdminSettings.Services;
-
-namespace SZUAbsolventenverein.Module.AdminModules.Services
-{
-    public class ServerAdminSettingsService : IAdminSettingsService
-    {
-        private readonly IAdminSettingsRepository _AdminSettingsRepository;
-        private readonly UserManager<IdentityUser> _identityUserManager;
-        private readonly IUserPermissions _userPermissions;
-        private readonly IRoleRepository _roleRepository;
-        private readonly IUserRepository _userRepository;
-        private readonly IUserRoleRepository _userRoleRepository;
-        private readonly INotificationRepository _notifications;
-        private readonly ILogManager _logger;
-        private readonly IHttpContextAccessor _accessor;
-        private readonly Alias _alias;
-
-        public ServerAdminSettingsService(IAdminSettingsRepository AdminSettingsRepository, UserManager<IdentityUser> identityUserManager, INotificationRepository notifications, IUserPermissions userPermissions, IRoleRepository roleRepository, IUserRepository userRepository, IUserRoleRepository userRoleRepository, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
-        {
-            _AdminSettingsRepository = AdminSettingsRepository;
-            _identityUserManager = identityUserManager;
-            _userPermissions = userPermissions;
-            _roleRepository = roleRepository;
-            _userRepository = userRepository;   
-            _userRoleRepository = userRoleRepository;
-            _notifications = notifications;
-            _logger = logger;
-            _accessor = accessor;
-            _alias = tenantManager.GetAlias();
-        }
-
-        public Task<AdminSetting> GetAdminSettingsAsync(int ModuleId)
-        {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
-            {
-                return Task.FromResult(_AdminSettingsRepository.GetAdminSetting());
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized AdminModules Get Attempt {ModuleId}", ModuleId);
-                return null;
-            }
-        }
-
-        public Task<AdminSetting> SetAdminSettingsAsync(AdminSetting AdminSettings)
-        {
-            if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, 1, PermissionNames.View))
-            {
-                _logger.Log(LogLevel.Critical, this, LogFunction.Update, "Set AdminSettings");
-                return Task.FromResult(_AdminSettingsRepository.SetAdminSettings(AdminSettings));
-            }
-            else
-            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized AdminModules Get Attempt {ModuleId}", 1);
-                return null;
-            }
-        }
-    }
-}

Server/Startup/ServerStartup.cs

@@ -1,13 +1,9 @@
 using Microsoft.AspNetCore.Builder; 
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Infrastructure;
-using System;
-using SZUAbsolventenverein.Module.AdminModules.Models;
 using SZUAbsolventenverein.Module.AdminModules.Repository;
 using SZUAbsolventenverein.Module.AdminModules.Services;
-using SZUAbsolventenverein.Module.AdminSettings.Services;
 
 namespace SZUAbsolventenverein.Module.AdminModules.Startup
 {
@@ -26,28 +22,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddTransient<IAdminModulesService, ServerAdminModulesService>();
-            services.AddTransient<IAdminSettingsService, ServerAdminSettingsService>();
-            services.AddTransient<IAdminSettingsRepository, AdminSettingsRepository>();
             services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient);
-
-            services.Configure<DataProtectionTokenProviderOptions>(options =>
-            {
-                options.TokenLifespan = TimeSpan.FromDays(2);
-            });
-
-            try
-            {
-                AdminSetting settings = AdminSettingsExtensions.LoadSettings();
-                services.Configure<DataProtectionTokenProviderOptions>(options =>
-                {
-                    options.TokenLifespan = TimeSpan.FromDays(settings.TokenLifetime);
-                });
-                Console.WriteLine("Saving token lifetime: " + settings.TokenLifetime + " days");
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex);
-            }
         }
     }
 }

Shared/Models/AdminSettings.cs

@@ -1,17 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Oqtane.Models;
-
-namespace SZUAbsolventenverein.Module.AdminModules.Models
-{
-    [Table("SZUAbsolventenvereinAdminSettings")]
-    public class AdminSetting
-    {
-        [Key]
-        public int AdminSettingsId { get; set; } 
-        [NotMapped]
-        public int ModuleId { get; set; }
-        public int TokenLifetime { get; set; }
-    }
-}

Shared/SZUAbsolventenverein.Module.AdminModules.Shared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>    
+    <TargetFramework>net10.0</TargetFramework>    
     <Version>1.0.0</Version>
     <Product>SZUAbsolventenverein.Module.AdminModules</Product>
     <Authors>SZUAbsolventenverein</Authors>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll</HintPath></Reference>
+    <Reference Include="Oqtane.Shared"><HintPath>..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll</HintPath></Reference>
   </ItemGroup>
 
 </Project>