5 Commits

26 changed files with 164 additions and 1031 deletions

View File

@@ -1,305 +0,0 @@
@using SZUAbsolventenverein.Module.HallOfFame.Services
@using SZUAbsolventenverein.Module.HallOfFame.Models
@using Oqtane.Security
@using Oqtane.Shared
@namespace SZUAbsolventenverein.Module.HallOfFame
@inherits ModuleBase
@inject IHallOfFameService HallOfFameService
@inject NavigationManager NavigationManager
@if (_item == null)
{
<p><em>Loading...</em></p>
}
else
{
<div class="hall-of-fame-details container mt-4">
<div class="card shadow-lg border-0 overflow-hidden" style="border-radius: 20px;">
<div class="row g-0">
<div class="col-lg-5 position-relative bg-light d-flex align-items-center justify-content-center p-4" style="min-height: 400px; background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);">
@if (!string.IsNullOrEmpty(_item.Image))
{
<div class="detail-image-bg" style="background-image: url('@_item.Image');"></div>
<img src="@_item.Image" class="img-fluid rounded-3 shadow position-relative" style="max-height: 450px; z-index: 1; border: 8px solid white; object-fit: cover;" alt="@_item.Name">
}
else
{
<div class="text-muted position-relative" style="z-index: 1;"><i class="oi oi-person" style="font-size: 8rem; opacity: 0.2;"></i></div>
}
</div>
<div class="col-lg-7">
<div class="card-body p-4 p-md-5">
<div class="mb-4">
<nav aria-label="breadcrumb">
<ol class="breadcrumb mb-2">
<li class="breadcrumb-item"><a href="@NavigateUrl()">Hall of Fame</a></li>
<li class="breadcrumb-item active" aria-current="page">Details</li>
</ol>
</nav>
<h1 class="display-4 fw-bold text-dark mb-0">@_item.Name</h1>
<h3 class="text-primary fw-light">Absolvent des Jahrgangs @_item.Year</h3>
</div>
<hr class="my-4" style="width: 100px; height: 3px; background-color: var(--primary); opacity: 1;">
<div class="description-section mb-5">
<h5 class="text-uppercase fw-bold text-muted mb-3" style="letter-spacing: 1px; font-size: 0.9rem;">Werdegang & Erfolge</h5>
@if (_item.IsReported && UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin + ";" + RoleNames.Host))
{
<div class="alert alert-danger mb-3 p-3">
<h6 class="mb-2"><i class="oi oi-warning me-2"></i><strong>Meldungen:</strong></h6>
@if (_reports != null && _reports.Any())
{
<ul class="list-group list-group-flush bg-transparent">
@foreach (var report in _reports)
{
<li class="list-group-item bg-transparent d-flex justify-content-between align-items-center border-0 border-bottom">
<div>
<strong>@report.CreatedBy (@report.CreatedOn.ToShortDateString()):</strong><br />
<span>@report.Reason</span>
</div>
<button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteReport(report.HallOfFameReportId)" title="Meldung löschen">
<i class="oi oi-trash"></i>
</button>
</li>
}
</ul>
}
else
{
<p class="mb-0">Keine detaillierten Meldungen gefunden.</p>
}
</div>
}
<div class="lead text-dark mb-4" style="line-height: 1.7; font-size: 1.1rem;">
@foreach (var line in (_item.Description?.Replace("\t", " ").Split('\n') ?? Array.Empty<string>()))
{
<div class="hof-description-line">@line</div>
}
</div>
</div>
<div class="d-flex flex-wrap gap-3 mt-5 no-print">
<button type="button" class="btn btn-primary btn-lg px-4 shadow-sm" @onclick="PrintPage">
<i class="oi oi-print me-2"></i> Als PDF speichern
</button>
@if (!string.IsNullOrEmpty(_item.Link))
{
<a href="@_item.Link" target="_blank" class="btn btn-secondary btn-lg px-4 shadow-sm">
<i class="oi oi-external-link me-2"></i> Webseite besuchen
</a>
}
<NavLink class="btn btn-outline-secondary btn-lg px-4" href="@NavigateUrl()">
<i class="oi oi-arrow-left me-2"></i> Zurück
</NavLink>
<div class="ms-auto d-flex gap-2">
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin + ";" + RoleNames.Host))
{
<button class="btn btn-danger btn-lg px-4" @onclick="DeleteEntry">
<i class="oi oi-trash me-2"></i> Löschen
</button>
}
<button class="btn btn-warning btn-lg px-4" @onclick="ShowReportModal">
<i class="oi oi-warning me-2"></i> Melden
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@if (_showReportModal)
{
<div class="modal fade show" style="display: block; background: rgba(0,0,0,0.5); z-index: 1050;" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Eintrag melden</h5>
<button type="button" class="btn-close" @onclick="CloseReportModal"></button>
</div>
<div class="modal-body">
<p>Warum möchtest du diesen Eintrag von <strong>@_item?.Name</strong> melden?</p>
<textarea class="form-control" @bind="_reportReason" rows="3" placeholder="Grund für die Meldung..."></textarea>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" @onclick="CloseReportModal">Abbrechen</button>
<button type="button" class="btn btn-danger" @onclick="ReportEntry">Melden</button>
</div>
</div>
</div>
</div>
}
}
<style>
.detail-image-bg {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-size: cover;
background-position: center;
filter: blur(30px) brightness(1.1);
opacity: 0.15;
z-index: 0;
}
.hall-of-fame-details .card {
background: #ffffff;
}
.hall-of-fame-details .breadcrumb-item a {
text-decoration: none;
color: var(--primary);
}
@@media print {
.no-print, header, footer, nav, .app-sidebar, .breadcrumb, .btn-link, .app-navbar {
display: none !important;
}
/* Reset containers for printing */
html, body, .app-viewport, .app-main, .app-container, main, .hall-of-fame-details, .container {
height: auto !important;
min-height: auto !important;
overflow: visible !important;
position: static !important;
margin: 0 !important;
padding: 0 !important;
width: 100% !important;
}
body {
background-color: white !important;
}
.card {
box-shadow: none !important;
border: none !important;
position: relative !important;
display: block !important; /* Force block instead of flex for better printing */
}
.row {
display: block !important; /* Stack columns vertically for print if needed, or keeping it but ensuring it doesn't clip */
}
.col-lg-5, .col-lg-7 {
width: 100% !important;
display: block !important;
float: none !important;
}
.hall-of-fame-details {
margin-top: 0 !important;
}
img {
max-width: 100% !important;
page-break-inside: avoid;
}
}
</style>
@code {
public override string Actions => "Details";
private HallOfFame _item;
private int _id;
private List<HallOfFameReport> _reports;
private bool _showReportModal = false;
private string _reportReason = "";
protected override async Task OnInitializedAsync()
{
await LoadData();
}
private async Task LoadData()
{
try
{
_id = Int32.Parse(PageState.QueryString["id"]);
_item = await HallOfFameService.GetHallOfFameAsync(_id, ModuleState.ModuleId);
if (_item != null && _item.IsReported && UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin + ";" + RoleNames.Host))
{
_reports = await HallOfFameService.GetHallOfFameReportsAsync(_id, ModuleState.ModuleId);
}
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Loading HallOfFame {HallOfFameId} {Error}", _id, ex.Message);
AddModuleMessage("Fehler beim Laden der Details.", MessageType.Error);
}
}
private async Task PrintPage()
{
await JSRuntime.InvokeVoidAsync("window.print");
}
private void ShowReportModal()
{
_reportReason = "";
_showReportModal = true;
}
private void CloseReportModal()
{
_showReportModal = false;
}
private async Task ReportEntry()
{
if (!string.IsNullOrEmpty(_reportReason))
{
try
{
await HallOfFameService.ReportAsync(_item.HallOfFameId, ModuleState.ModuleId, _reportReason);
AddModuleMessage("Eintrag wurde erfolgreich gemeldet.", MessageType.Success);
_showReportModal = false;
await LoadData();
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Reporting HallOfFame {Error}", ex.Message);
AddModuleMessage("Fehler beim Melden des Eintrags.", MessageType.Error);
}
}
}
private async Task DeleteEntry()
{
try
{
await HallOfFameService.DeleteHallOfFameAsync(_item.HallOfFameId, ModuleState.ModuleId);
NavigationManager.NavigateTo(NavigateUrl());
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Deleting HallOfFame {Error}", ex.Message);
AddModuleMessage("Fehler beim Löschen des Eintrags.", MessageType.Error);
}
}
private async Task DeleteReport(int reportId)
{
try
{
await HallOfFameService.DeleteHallOfFameReportAsync(reportId, ModuleState.ModuleId);
AddModuleMessage("Meldung gelöscht.", MessageType.Success);
await LoadData();
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Deleting Report {Error}", ex.Message);
AddModuleMessage("Fehler beim Löschen der Meldung.", MessageType.Error);
}
}
}

View File

@@ -1,7 +1,6 @@
@using Oqtane.Modules.Controls
@using SZUAbsolventenverein.Module.HallOfFame.Services
@using SZUAbsolventenverein.Module.HallOfFame.Models
@using Microsoft.AspNetCore.Components.Forms
@namespace SZUAbsolventenverein.Module.HallOfFame
@inherits ModuleBase
@@ -21,47 +20,21 @@
<div class="row mb-3 align-items-center">
<Label Class="col-sm-3 col-form-label" For="year" HelpText="Jahrgang (z.B. 2020)" ResourceKey="Year">Jahrgang: </Label>
<div class="col-sm-9">
<input id="year" type="number" class="form-control" @bind="@_year" required min="1900" max="@Int32.MaxValue" />
<input id="year" type="number" class="form-control" @bind="@_year" required min="1990" max="2100" />
<div class="invalid-feedback">Bitte gib einen gültigen Jahrgang ein.</div>
</div>
</div>
<div class="row mb-3 align-items-center">
<Label Class="col-sm-3 col-form-label" For="description" HelpText="Kurzbeschreibung / Werdegang" ResourceKey="Description">Beschreibung: </Label>
<div class="col-sm-9">
<textarea id="description" class="form-control" @bind="@_description" required rows="5" maxlength="500"></textarea>
<div class="text-muted small">@(_description?.Length ?? 0) / 500 Zeichen</div>
<textarea id="description" class="form-control" @bind="@_description" required rows="5" maxlength="1500"></textarea>
<div class="invalid-feedback">Bitte gib eine Beschreibung ein.</div>
</div>
</div>
<div class="row mb-3">
<Label Class="col-sm-3 col-form-label" For="image" HelpText="Porträtfoto hochladen (JPG/PNG)" ResourceKey="Image">Foto: </Label>
<div class="row mb-3 align-items-center">
<Label Class="col-sm-3 col-form-label" For="image" HelpText="Bild URL (optional)" ResourceKey="Image">Bild URL: </Label>
<div class="col-sm-9">
<div class="mb-2">
@if (!string.IsNullOrEmpty(_image))
{
<div class="position-relative d-inline-block">
<img src="@_image" style="max-height: 150px; border-radius: 8px; margin-bottom: 10px; border: 1px solid #ddd;" alt="Vorschau" />
<button type="button" class="btn btn-sm btn-danger" style="position: absolute; top: 5px; right: 5px;" @onclick="RemoveImage" title="Bild entfernen">
<i class="oi oi-x"></i>
</button>
</div>
}
else
{
<div class="bg-light d-flex align-items-center justify-content-center text-muted" style="height: 150px; width: 150px; border: 2px dashed #ddd; border-radius: 8px;">
Kein Bild
</div>
}
</div>
<InputFile OnChange="HandleFileSelected" class="form-control" accept=".jpg,.jpeg,.png" />
<div class="text-muted small mt-1">Nur JPG oder PNG, max. 5 MB.</div>
@if (_uploading)
{
<div class="spinner-border spinner-border-sm text-primary mt-2" role="status">
<span class="visually-hidden">Wird hochgeladen...</span>
</div>
<span class="small text-primary ms-1">Wird hochgeladen...</span>
}
<input id="image" class="form-control" @bind="@_image" />
</div>
</div>
<div class="row mb-3 align-items-center">
@@ -80,8 +53,8 @@
</div>
<div class="mt-4">
<button type="button" class="btn btn-secondary me-2" @onclick="@(() => Save("Draft"))" disabled="@_uploading">Als Entwurf speichern</button>
<button type="button" class="btn btn-primary" @onclick="@(() => Save("Published"))" disabled="@_uploading">Veröffentlichen</button>
<button type="button" class="btn btn-secondary me-2" @onclick="@(() => Save("Draft"))">Als Entwurf speichern</button>
<button type="button" class="btn btn-primary" @onclick="@(() => Save("Published"))">Veröffentlichen</button>
<NavLink class="btn btn-link ms-2" href="@NavigateUrl()">Abbrechen</NavLink>
</div>
@@ -106,7 +79,6 @@
private ElementReference form;
private bool validated = false;
private bool _uploading = false;
private int _id;
private string _name;
@@ -130,6 +102,7 @@
_id = Int32.Parse(PageState.QueryString["id"]);
HallOfFame HallOfFame = await HallOfFameService.GetHallOfFameAsync(_id, ModuleState.ModuleId);
// Security check: only allow editing own entry
if (HallOfFame != null)
{
if (HallOfFame.UserId != PageState.User.UserId)
@@ -153,9 +126,11 @@
}
else // Add Mode
{
// Check if user already has an entry to prevent duplicates
var existing = await HallOfFameService.GetHallOfFameByUserIdAsync(PageState.User.UserId, ModuleState.ModuleId);
if (existing != null)
{
// Use NavigateUrl with parameters properly (simplified here)
NavigationManager.NavigateTo(EditUrl(existing.HallOfFameId.ToString()));
}
}
@@ -167,50 +142,6 @@
}
}
private async Task HandleFileSelected(InputFileChangeEventArgs e)
{
var file = e.File;
if (file == null) return;
if (file.Size > 5 * 1024 * 1024)
{
AddModuleMessage("Die Datei ist zu groß (max. 5 MB allowed).", MessageType.Warning);
return;
}
try
{
_uploading = true;
using var stream = file.OpenReadStream(5 * 1024 * 1024);
var url = await HallOfFameService.UploadFileAsync(stream, file.Name, ModuleState.ModuleId);
if (!string.IsNullOrEmpty(url))
{
_image = url;
AddModuleMessage("Foto erfolgreich hochgeladen.", MessageType.Success);
}
else
{
AddModuleMessage("Fehler beim Hochladen des Fotos.", MessageType.Error);
}
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Uploading File {Error}", ex.Message);
AddModuleMessage("Ein technischer Fehler ist beim Upload aufgetreten.", MessageType.Error);
}
finally
{
_uploading = false;
StateHasChanged();
}
}
private void RemoveImage()
{
_image = string.Empty;
StateHasChanged();
}
private async Task Save(string status)
{
try
@@ -225,7 +156,7 @@
{
HallOfFame HallOfFame = new HallOfFame();
HallOfFame.ModuleId = ModuleState.ModuleId;
HallOfFame.UserId = PageState.User.UserId;
HallOfFame.UserId = PageState.User.UserId; // Set Owner
HallOfFame.Name = _name;
HallOfFame.Year = _year;
HallOfFame.Description = _description;
@@ -239,6 +170,7 @@
else
{
HallOfFame HallOfFame = await HallOfFameService.GetHallOfFameAsync(_id, ModuleState.ModuleId);
// Ensure we don't overwrite with invalid user logic, though server checks too
if (HallOfFame.UserId == PageState.User.UserId)
{
HallOfFame.Name = _name;

View File

@@ -1,7 +1,5 @@
@using SZUAbsolventenverein.Module.HallOfFame.Services
@using SZUAbsolventenverein.Module.HallOfFame.Models
@using Oqtane.Security
@using Oqtane.Shared
@namespace SZUAbsolventenverein.Module.HallOfFame
@inherits ModuleBase
@@ -15,44 +13,30 @@
}
else
{
<div class="row mb-4 align-items-center">
<div class="col-md-6">
<div class="input-group">
<span class="input-group-text"><i class="oi oi-magnifying-glass"></i></span>
<input type="text" class="form-control" placeholder="Suchen nach Namen oder Begriffen..." @bind="_searchText" @bind:event="oninput" />
</div>
</div>
<div class="col-md-3">
<div class="input-group">
<select class="form-select" @bind="_sortOption">
<option value="CreatedOn">Datum</option>
<option value="Name">Name</option>
<option value="Year">Jahrgang</option>
</select>
<button class="btn btn-outline-secondary" type="button" @onclick="ToggleSortDirection" title="@(_sortAscending ? "Aufsteigend" : "Absteigend")">
<i class="oi @(_sortAscending ? "oi-arrow-top" : "oi-arrow-bottom")"></i>
</button>
</div>
</div>
<div class="col-md-3 text-end">
<div class="row mb-4">
<div class="col text-end">
@if (PageState.User != null)
{
if (_myEntry != null)
{
<ActionLink Action="Edit" Parameters="@($"id=" + _myEntry.HallOfFameId.ToString())" Text="Mein Eintrag" />
<ActionLink Action="Edit" Parameters="@($"id=" + _myEntry.HallOfFameId.ToString())" Text="Hall-of-Fame-Eintrag bearbeiten" />
}
else
{
<ActionLink Action="Add" Text="Eintragen" />
<ActionLink Action="Add" Text="Neuen Hall-of-Fame-Eintrag erstellen" />
}
}
else
{
<p class="text-muted">Einloggen, um einen Eintrag zu erstellen.</p>
}
</div>
</div>
@if (@_HallOfFames.Count != 0)
{
<div class="row">
@foreach (var item in FilteredHallOfFames)
@foreach (var item in _HallOfFames)
{
<div class="col-md-4 mb-3">
<div class="card h-100">
@@ -60,35 +44,13 @@ else
{
<img src="@item.Image" class="card-img-top" alt="@item.Name" style="max-height: 200px; object-fit: cover;">
}
<div class="card-body d-flex flex-column">
<div class="card-body">
<h5 class="card-title">@item.Name (@item.Year)</h5>
@if (item.IsReported && UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin + ";" + RoleNames.Host))
<p class="card-text">@item.Description</p>
@if (!string.IsNullOrEmpty(item.Link))
{
<div class="alert alert-danger p-1 mb-2" style="font-size: 0.8rem;">
<i class="oi oi-warning me-1"></i> <strong>Dieser Eintrag wurde gemeldet!</strong>
</div>
<a href="@item.Link" target="_blank" class="btn btn-sm btn-outline-primary">Mehr Infos</a>
}
<div class="hof-description-container" style="
max-height: 150px;
overflow: hidden;
position: relative;
flex-grow: 1;
margin-bottom: 0.5rem;
">
@foreach (var line in (item.Description?.Replace("\t", " ").Split('\n') ?? Array.Empty<string>()))
{
<div class="hof-description-line">@line</div>
}
</div>
<div class="d-flex justify-content-between align-items-center">
<ActionLink Action="Details" Parameters="@($"id=" + item.HallOfFameId.ToString())" Class="btn btn-sm btn-outline-primary" Text="Details ansehen" />
<div>
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin + ";" + RoleNames.Host))
{
<button class="btn btn-sm btn-outline-danger me-1" @onclick="@(() => Delete(item.HallOfFameId))" title="Löschen"><i class="oi oi-trash"></i></button>
}
</div>
</div>
</div>
</div>
</div>
@@ -104,6 +66,7 @@ else
}
@code {
public override string RenderMode => RenderModes.Static;
public override List<Resource> Resources => new List<Resource>()
{
@@ -113,53 +76,8 @@ else
List<HallOfFame> _HallOfFames;
HallOfFame _myEntry;
string _searchText = "";
string _sortOption = "CreatedOn";
bool _sortAscending = false;
IEnumerable<HallOfFame> FilteredHallOfFames
{
get
{
var items = _HallOfFames.AsEnumerable();
if (!string.IsNullOrEmpty(_searchText))
{
items = items.Where(i =>
(i.Name?.Contains(_searchText, StringComparison.OrdinalIgnoreCase) ?? false) ||
(i.Description?.Contains(_searchText, StringComparison.OrdinalIgnoreCase) ?? false)
);
}
items = _sortOption switch
{
"Name" => _sortAscending ? items.OrderBy(i => i.Name) : items.OrderByDescending(i => i.Name),
"Year" => _sortAscending ? items.OrderBy(i => i.Year) : items.OrderByDescending(i => i.Year),
"CreatedOn" or _ => _sortAscending ? items.OrderBy(i => i.CreatedOn) : items.OrderByDescending(i => i.CreatedOn)
};
return items;
}
}
private string TruncateDescription(string description)
{
if (string.IsNullOrEmpty(description)) return "";
const int maxLength = 150;
if (description.Length <= maxLength) return description;
return description.Substring(0, maxLength).TrimEnd() + "...";
}
private void ToggleSortDirection()
{
_sortAscending = !_sortAscending;
}
protected override async Task OnInitializedAsync()
{
await LoadData();
}
private async Task LoadData()
{
try
{
@@ -176,19 +94,4 @@ else
AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
}
}
private async Task Delete(int hallOfFameId)
{
try
{
await HallOfFameService.DeleteHallOfFameAsync(hallOfFameId, ModuleState.ModuleId);
AddModuleMessage("Eintrag wurde gelöscht.", MessageType.Success);
await LoadData();
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Deleting HallOfFame {Error}", ex.Message);
AddModuleMessage("Fehler beim Löschen des Eintrags.", MessageType.Error);
}
}
}

View File

@@ -9,9 +9,9 @@ namespace SZUAbsolventenverein.Module.HallOfFame
{
Name = "HallOfFame",
Description = "The Hall of Fame module displays selected individuals or achievements within the CMS. Entries are shown online, can be exported as a PDF, and are only published with user consen.",
Version = "1.0.3",
Version = "1.0.0",
ServerManagerType = "SZUAbsolventenverein.Module.HallOfFame.Manager.HallOfFameManager, SZUAbsolventenverein.Module.HallOfFame.Server.Oqtane",
ReleaseVersions = "1.0.0,1.0.2,1.0.3",
ReleaseVersions = "1.0.0",
Dependencies = "SZUAbsolventenverein.Module.HallOfFame.Shared.Oqtane",
PackageName = "SZUAbsolventenverein.Module.HallOfFame"
};

View File

@@ -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.8" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
<PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
<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>

View File

@@ -1,11 +1,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Net;
using System.Threading.Tasks;
using Oqtane.Services;
using Oqtane.Shared;
using System.Text.Json;
namespace SZUAbsolventenverein.Module.HallOfFame.Services
{
@@ -20,11 +18,8 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Services
Task<Models.HallOfFame> AddHallOfFameAsync(Models.HallOfFame HallOfFame);
Task<Models.HallOfFame> UpdateHallOfFameAsync(Models.HallOfFame HallOfFame);
Task DeleteHallOfFameAsync(int HallOfFameId, int ModuleId);
Task ReportAsync(int HallOfFameId, int ModuleId, string reason);
Task<List<Models.HallOfFameReport>> GetHallOfFameReportsAsync(int HallOfFameId, int ModuleId);
Task DeleteHallOfFameReportAsync(int HallOfFameReportId, int ModuleId);
Task<string> UploadFileAsync(System.IO.Stream stream, string fileName, int ModuleId);
}
public class HallOfFameService : ServiceBase, IHallOfFameService
@@ -35,7 +30,8 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Services
public async Task<List<Models.HallOfFame>> GetHallOfFamesAsync(int ModuleId)
{
return await GetJsonAsync<List<Models.HallOfFame>>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty<Models.HallOfFame>().ToList());
List<Models.HallOfFame> HallOfFames = await GetJsonAsync<List<Models.HallOfFame>>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty<Models.HallOfFame>().ToList());
return HallOfFames.OrderBy(item => item.Name).ToList();
}
public async Task<Models.HallOfFame> GetHallOfFameAsync(int HallOfFameId, int ModuleId)
@@ -62,38 +58,5 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Services
{
await DeleteAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/{HallOfFameId}/{ModuleId}", EntityNames.Module, ModuleId));
}
public async Task ReportAsync(int HallOfFameId, int ModuleId, string reason)
{
await PutAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/report/{HallOfFameId}?reason={WebUtility.UrlEncode(reason)}", EntityNames.Module, ModuleId));
}
public async Task<List<Models.HallOfFameReport>> GetHallOfFameReportsAsync(int HallOfFameId, int ModuleId)
{
return await GetJsonAsync<List<Models.HallOfFameReport>>(CreateAuthorizationPolicyUrl($"{Apiurl}/reports/{HallOfFameId}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty<Models.HallOfFameReport>().ToList());
}
public async Task DeleteHallOfFameReportAsync(int HallOfFameReportId, int ModuleId)
{
await DeleteAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/report/{HallOfFameReportId}/{ModuleId}", EntityNames.Module, ModuleId));
}
public async Task<string> UploadFileAsync(System.IO.Stream stream, string fileName, int ModuleId)
{
var uri = CreateAuthorizationPolicyUrl($"{Apiurl}/upload", EntityNames.Module, ModuleId);
using var content = new MultipartFormDataContent();
var fileContent = new StreamContent(stream);
fileContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream");
content.Add(fileContent, "file", fileName);
var response = await GetHttpClient().PostAsync(uri, content);
if (response.IsSuccessStatusCode)
{
var json = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize<Dictionary<string, string>>(json, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
return result["url"];
}
return null;
}
}
}

View File

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

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>$projectname$</id>
<version>1.0.1</version>
<version>1.0.0</version>
<authors>SZUAbsolventenverein</authors>
<owners>SZUAbsolventenverein</owners>
<title>HallOfFame</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>

View File

@@ -9,5 +9,5 @@ cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName.Server.Oqtane.dll" "../
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/"
mkdir -p "../../oqtane.framework/Oqtane.Server/wwwroot/_content/$ProjectName/"
cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/_content/$ProjectName/"

View File

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

View File

@@ -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.HallOfFame.Client", "Client\SZUAbsolventenverein.Module.HallOfFame.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.HallOfFame.Server", "Server\SZUAbsolventenverein.Module.HallOfFame.Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.HallOfFame.Shared", "Shared\SZUAbsolventenverein.Module.HallOfFame.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Module.HallOfFame.Package", "Package\SZUAbsolventenverein.Module.HallOfFame.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

View File

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

View File

@@ -1,4 +1,3 @@
using System;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using System.Collections.Generic;
@@ -11,8 +10,6 @@ using SZUAbsolventenverein.Module.HallOfFame.Services;
using Oqtane.Controllers;
using System.Net;
using System.Threading.Tasks;
using System.IO;
using Microsoft.AspNetCore.Hosting;
namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
{
@@ -20,12 +17,10 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
public class HallOfFameController : ModuleControllerBase
{
private readonly IHallOfFameService _HallOfFameService;
private readonly IWebHostEnvironment _environment;
public HallOfFameController(IHallOfFameService HallOfFameService, ILogManager logger, IHttpContextAccessor accessor, IWebHostEnvironment environment) : base(logger, accessor)
public HallOfFameController(IHallOfFameService HallOfFameService, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
{
_HallOfFameService = HallOfFameService;
_environment = environment;
}
// GET: api/<controller>?moduleid=x
@@ -38,10 +33,9 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
{
var list = await _HallOfFameService.GetHallOfFamesAsync(ModuleId);
if (User.IsInRole(RoleNames.Admin) || User.IsInRole(RoleNames.Host))
{
return list;
}
// Filter: Show only Published unless user has Edit permissions (simplified check for now, can be expanded)
// For now, let's filter in memory or service. The requirement says: "Hauptseite zeigt nur Published".
// We will filter here.
return list.Where(item => item.Status == "Published");
}
else
@@ -144,47 +138,7 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
return HallOfFame;
}
// PUT api/<controller>/report/5
[HttpPut("report/{id}")]
[Authorize(Policy = PolicyNames.ViewModule)]
public async Task Report(int id, [FromQuery] string reason)
{
Models.HallOfFame HallOfFame = await _HallOfFameService.GetHallOfFameAsync(id, -1);
if (HallOfFame != null && IsAuthorizedEntityId(EntityNames.Module, HallOfFame.ModuleId))
{
await _HallOfFameService.ReportAsync(id, HallOfFame.ModuleId, reason);
}
}
// GET api/<controller>/reports/5?moduleid=x
[HttpGet("reports/{id}")]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task<IEnumerable<Models.HallOfFameReport>> GetReports(int id, string moduleid)
{
int ModuleId;
if (int.TryParse(moduleid, out ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
{
return await _HallOfFameService.GetHallOfFameReportsAsync(id, ModuleId);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame GetReports Attempt {HallOfFameId} {ModuleId}", id, moduleid);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
return null;
}
}
// DELETE api/<controller>/report/5/x
[HttpDelete("report/{id}/{moduleid}")]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task DeleteReport(int id, int moduleid)
{
if (IsAuthorizedEntityId(EntityNames.Module, moduleid))
{
await _HallOfFameService.DeleteHallOfFameReportAsync(id, moduleid);
}
}
// DELETE api/<controller>/5
[HttpDelete("{id}/{moduleid}")]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task Delete(int id, int moduleid)
@@ -200,33 +154,5 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Controllers
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
}
}
[HttpPost("upload")]
[Authorize(Policy = PolicyNames.EditModule)]
public async Task<IActionResult> Upload(IFormFile file)
{
if (file == null || file.Length == 0) return BadRequest("Keine Datei ausgewählt.");
var extension = Path.GetExtension(file.FileName).ToLower();
if (extension != ".jpg" && extension != ".jpeg" && extension != ".png")
{
return BadRequest("Nur JPG und PNG Dateien sind erlaubt.");
}
var folder = Path.Combine(_environment.WebRootPath, "Content", "HallOfFame");
if (!Directory.Exists(folder))
{
Directory.CreateDirectory(folder);
}
var fileName = Guid.NewGuid().ToString() + extension;
var path = Path.Combine(folder, fileName);
using (var stream = new FileStream(path, FileMode.Create))
{
await file.CopyToAsync(stream);
}
return Ok(new { url = "/Content/HallOfFame/" + fileName });
}
}
}

View File

@@ -0,0 +1,83 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.HallOfFame.Repository;
namespace SZUAbsolventenverein.Module.HallOfFame.Migrations
{
[DbContext(typeof(HallOfFameContext))]
[Migration("SZUAbsolventenverein.Module.HallOfFame.01.00.00.01")]
public class AddHallOfFameColumns : MultiDatabaseMigration
{
public AddHallOfFameColumns(IDatabase database) : base(database)
{
}
protected override void Up(MigrationBuilder migrationBuilder)
{
var entityBuilder = new HallOfFameEntityBuilder(migrationBuilder, ActiveDatabase);
migrationBuilder.AddColumn<int>(
name: "Year",
table: "SZUAbsolventenvereinHallOfFame",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<string>(
name: "Description",
table: "SZUAbsolventenvereinHallOfFame",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Image",
table: "SZUAbsolventenvereinHallOfFame",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Link",
table: "SZUAbsolventenvereinHallOfFame",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Status",
table: "SZUAbsolventenvereinHallOfFame",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<int>(
name: "UserId",
table: "SZUAbsolventenvereinHallOfFame",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Year",
table: "SZUAbsolventenvereinHallOfFame");
migrationBuilder.DropColumn(
name: "Description",
table: "SZUAbsolventenvereinHallOfFame");
migrationBuilder.DropColumn(
name: "Image",
table: "SZUAbsolventenvereinHallOfFame");
migrationBuilder.DropColumn(
name: "Link",
table: "SZUAbsolventenvereinHallOfFame");
migrationBuilder.DropColumn(
name: "Status",
table: "SZUAbsolventenvereinHallOfFame");
migrationBuilder.DropColumn(
name: "UserId",
table: "SZUAbsolventenvereinHallOfFame");
}
}
}

View File

@@ -1,43 +0,0 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.HallOfFame.Repository;
namespace SZUAbsolventenverein.Module.HallOfFame.Migrations
{
[DbContext(typeof(HallOfFameContext))]
[Migration("SZUAbsolventenverein.Module.HallOfFame.01.00.00.02")]
public class AddReportingColumns : MultiDatabaseMigration
{
public AddReportingColumns(IDatabase database) : base(database)
{
}
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsReported",
table: "SZUAbsolventenvereinHallOfFame",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<string>(
name: "ReportReason",
table: "SZUAbsolventenvereinHallOfFame",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsReported",
table: "SZUAbsolventenvereinHallOfFame");
migrationBuilder.DropColumn(
name: "ReportReason",
table: "SZUAbsolventenvereinHallOfFame");
}
}
}

View File

@@ -1,30 +0,0 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.HallOfFame.Repository;
namespace SZUAbsolventenverein.Module.HallOfFame.Migrations
{
[DbContext(typeof(HallOfFameContext))]
[Migration("SZUAbsolventenverein.Module.HallOfFame.01.00.00.03")]
public class AddReportTable : MultiDatabaseMigration
{
public AddReportTable(IDatabase database) : base(database)
{
}
protected override void Up(MigrationBuilder migrationBuilder)
{
var entityBuilder = new HallOfFameReportEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.Create();
}
protected override void Down(MigrationBuilder migrationBuilder)
{
var entityBuilder = new HallOfFameReportEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.Drop();
}
}
}

View File

@@ -44,8 +44,6 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders
public OperationBuilder<AddColumnOperation> Link { get; set; }
public OperationBuilder<AddColumnOperation> Status { get; set; }
public OperationBuilder<AddColumnOperation> UserId { get; set; }
public OperationBuilder<AddColumnOperation> IsReported { get; set; }
public OperationBuilder<AddColumnOperation> ReportReason { get; set; }
}
}

View File

@@ -1,36 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using Oqtane.Migrations.EntityBuilders;
namespace SZUAbsolventenverein.Module.HallOfFame.Migrations.EntityBuilders
{
public class HallOfFameReportEntityBuilder : AuditableBaseEntityBuilder<HallOfFameReportEntityBuilder>
{
private const string _entityTableName = "SZUAbsolventenvereinHallOfFameReport";
private readonly PrimaryKey<HallOfFameReportEntityBuilder> _primaryKey = new("PK_SZUAbsolventenvereinHallOfFameReport", x => x.HallOfFameReportId);
private readonly ForeignKey<HallOfFameReportEntityBuilder> _hallOfFameForeignKey = new("FK_SZUAbsolventenvereinHallOfFameReport_HallOfFame", x => x.HallOfFameId, "SZUAbsolventenvereinHallOfFame", "HallOfFameId", ReferentialAction.Cascade);
public HallOfFameReportEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
{
EntityTableName = _entityTableName;
PrimaryKey = _primaryKey;
ForeignKeys.Add(_hallOfFameForeignKey);
}
protected override HallOfFameReportEntityBuilder BuildTable(ColumnsBuilder table)
{
HallOfFameReportId = AddAutoIncrementColumn(table, "HallOfFameReportId");
HallOfFameId = AddIntegerColumn(table, "HallOfFameId");
Reason = AddMaxStringColumn(table, "Reason");
AddAuditableColumns(table);
return this;
}
public OperationBuilder<AddColumnOperation> HallOfFameReportId { get; set; }
public OperationBuilder<AddColumnOperation> HallOfFameId { get; set; }
public OperationBuilder<AddColumnOperation> Reason { get; set; }
}
}

View File

@@ -10,7 +10,6 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
public class HallOfFameContext : DBContextBase, ITransientService, IMultiDatabase
{
public virtual DbSet<Models.HallOfFame> HallOfFame { get; set; }
public virtual DbSet<Models.HallOfFameReport> HallOfFameReport { get; set; }
public HallOfFameContext(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies)
{
@@ -22,7 +21,6 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
base.OnModelCreating(builder);
builder.Entity<Models.HallOfFame>().ToTable(ActiveDatabase.RewriteName("SZUAbsolventenvereinHallOfFame"));
builder.Entity<Models.HallOfFameReport>().ToTable(ActiveDatabase.RewriteName("SZUAbsolventenvereinHallOfFameReport"));
}
}
}

View File

@@ -13,11 +13,6 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
Models.HallOfFame AddHallOfFame(Models.HallOfFame HallOfFame);
Models.HallOfFame UpdateHallOfFame(Models.HallOfFame HallOfFame);
void DeleteHallOfFame(int HallOfFameId);
IEnumerable<Models.HallOfFameReport> GetHallOfFameReports(int HallOfFameId);
Models.HallOfFameReport GetHallOfFameReport(int HallOfFameReportId);
Models.HallOfFameReport AddHallOfFameReport(Models.HallOfFameReport HallOfFameReport);
void DeleteHallOfFameReport(int HallOfFameReportId);
}
public class HallOfFameRepository : IHallOfFameRepository, ITransientService
@@ -32,14 +27,7 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
public IEnumerable<Models.HallOfFame> GetHallOfFames(int ModuleId)
{
using var db = _factory.CreateDbContext();
var items = db.HallOfFame.Where(item => item.ModuleId == ModuleId)
.OrderByDescending(item => item.CreatedOn)
.ToList();
foreach (var item in items)
{
item.Description = item.Description?.Replace("\t", " ");
}
return items;
return db.HallOfFame.Where(item => item.ModuleId == ModuleId).ToList();
}
public Models.HallOfFame GetHallOfFame(int HallOfFameId)
@@ -50,26 +38,19 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
public Models.HallOfFame GetHallOfFame(int HallOfFameId, bool tracking)
{
using var db = _factory.CreateDbContext();
Models.HallOfFame item;
if (tracking)
{
item = db.HallOfFame.Find(HallOfFameId);
return db.HallOfFame.Find(HallOfFameId);
}
else
{
item = db.HallOfFame.AsNoTracking().FirstOrDefault(i => i.HallOfFameId == HallOfFameId);
return db.HallOfFame.AsNoTracking().FirstOrDefault(item => item.HallOfFameId == HallOfFameId);
}
if (item != null)
{
item.Description = item.Description?.Replace("\t", " ");
}
return item;
}
public Models.HallOfFame AddHallOfFame(Models.HallOfFame HallOfFame)
{
using var db = _factory.CreateDbContext();
HallOfFame.Description = HallOfFame.Description?.Replace("\t", " ");
db.HallOfFame.Add(HallOfFame);
db.SaveChanges();
return HallOfFame;
@@ -78,72 +59,17 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Repository
public Models.HallOfFame UpdateHallOfFame(Models.HallOfFame HallOfFame)
{
using var db = _factory.CreateDbContext();
HallOfFame.Description = HallOfFame.Description?.Replace("\t", " ");
db.Entry(HallOfFame).State = EntityState.Modified;
db.SaveChanges();
return HallOfFame;
}
public void DeleteHallOfFame(int HallOfFameId)
{
// First transaction: Delete all associated reports
using (var db = _factory.CreateDbContext())
{
var reports = db.HallOfFameReport.Where(item => item.HallOfFameId == HallOfFameId).ToList();
if (reports.Any())
{
db.HallOfFameReport.RemoveRange(reports);
db.SaveChanges();
}
}
// Second transaction: Delete the HallOfFame entry itself
using (var db = _factory.CreateDbContext())
{
var hallOfFame = db.HallOfFame.Find(HallOfFameId);
if (hallOfFame != null)
{
db.HallOfFame.Remove(hallOfFame);
db.SaveChanges();
}
}
}
public IEnumerable<Models.HallOfFameReport> GetHallOfFameReports(int HallOfFameId)
{
using var db = _factory.CreateDbContext();
return db.HallOfFameReport.Where(item => item.HallOfFameId == HallOfFameId)
.OrderByDescending(item => item.CreatedOn)
.ToList();
}
public Models.HallOfFameReport GetHallOfFameReport(int HallOfFameReportId)
{
using var db = _factory.CreateDbContext();
return db.HallOfFameReport.Find(HallOfFameReportId);
}
public Models.HallOfFameReport AddHallOfFameReport(Models.HallOfFameReport HallOfFameReport)
{
using var db = _factory.CreateDbContext();
db.HallOfFameReport.Add(HallOfFameReport);
Models.HallOfFame HallOfFame = db.HallOfFame.Find(HallOfFameId);
db.HallOfFame.Remove(HallOfFame);
db.SaveChanges();
return HallOfFameReport;
}
public void DeleteHallOfFameReport(int HallOfFameReportId)
{
using var db = _factory.CreateDbContext();
// Clear any tracked entities to avoid conflicts
db.ChangeTracker.Clear();
Models.HallOfFameReport HallOfFameReport = db.HallOfFameReport.Find(HallOfFameReportId);
if (HallOfFameReport != null)
{
db.HallOfFameReport.Remove(HallOfFameReport);
db.SaveChanges();
}
}
}
}

View File

@@ -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.1</Version>
<Product>SZUAbsolventenverein.Module.HallOfFame</Product>
@@ -19,10 +19,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
<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>

View File

@@ -2,16 +2,12 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using System.Net.Http;
using Oqtane.Enums;
using Oqtane.Infrastructure;
using Oqtane.Models;
using Oqtane.Security;
using Oqtane.Shared;
using SZUAbsolventenverein.Module.HallOfFame.Repository;
using Microsoft.AspNetCore.Hosting;
using System.IO;
using System;
namespace SZUAbsolventenverein.Module.HallOfFame.Services
{
@@ -22,16 +18,14 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Services
private readonly ILogManager _logger;
private readonly IHttpContextAccessor _accessor;
private readonly Alias _alias;
private readonly IWebHostEnvironment _environment;
public ServerHallOfFameService(IHallOfFameRepository HallOfFameRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor, IWebHostEnvironment environment)
public ServerHallOfFameService(IHallOfFameRepository HallOfFameRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
{
_HallOfFameRepository = HallOfFameRepository;
_userPermissions = userPermissions;
_logger = logger;
_accessor = accessor;
_alias = tenantManager.GetAlias();
_environment = environment;
}
public Task<List<Models.HallOfFame>> GetHallOfFamesAsync(int ModuleId)
@@ -117,104 +111,5 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Services
}
return Task.CompletedTask;
}
public Task ReportAsync(int HallOfFameId, int ModuleId, string reason)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
{
var report = new Models.HallOfFameReport
{
HallOfFameId = HallOfFameId,
Reason = reason
};
_HallOfFameRepository.AddHallOfFameReport(report);
var hallOfFame = _HallOfFameRepository.GetHallOfFame(HallOfFameId);
if (hallOfFame != null && !hallOfFame.IsReported)
{
hallOfFame.IsReported = true;
_HallOfFameRepository.UpdateHallOfFame(hallOfFame);
}
_logger.Log(LogLevel.Information, this, LogFunction.Update, "HallOfFame Reported {HallOfFameId}", HallOfFameId);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame Report Attempt {HallOfFameId} {ModuleId}", HallOfFameId, ModuleId);
}
return Task.CompletedTask;
}
public Task<List<Models.HallOfFameReport>> GetHallOfFameReportsAsync(int HallOfFameId, int ModuleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
{
return Task.FromResult(_HallOfFameRepository.GetHallOfFameReports(HallOfFameId).ToList());
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame Get Reports Attempt {HallOfFameId} {ModuleId}", HallOfFameId, ModuleId);
return null;
}
}
public Task DeleteHallOfFameReportAsync(int HallOfFameReportId, int ModuleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
{
var report = _HallOfFameRepository.GetHallOfFameReport(HallOfFameReportId);
if (report != null)
{
int hallOfFameId = report.HallOfFameId;
_HallOfFameRepository.DeleteHallOfFameReport(HallOfFameReportId);
// Check if there are any reports left for this entry
var remainingReports = _HallOfFameRepository.GetHallOfFameReports(hallOfFameId);
if (!remainingReports.Any())
{
var hallOfFame = _HallOfFameRepository.GetHallOfFame(hallOfFameId);
if (hallOfFame != null)
{
hallOfFame.IsReported = false;
_HallOfFameRepository.UpdateHallOfFame(hallOfFame);
}
}
}
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "HallOfFame Report Deleted {HallOfFameReportId}", HallOfFameReportId);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized HallOfFame Delete Report Attempt {HallOfFameReportId} {ModuleId}", HallOfFameReportId, ModuleId);
}
return Task.CompletedTask;
}
public async Task<string> UploadFileAsync(Stream stream, string fileName, int ModuleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.Edit))
{
var extension = Path.GetExtension(fileName).ToLower();
if (extension != ".jpg" && extension != ".jpeg" && extension != ".png")
{
return null;
}
var folder = Path.Combine(_environment.WebRootPath, "Content", "HallOfFame");
if (!Directory.Exists(folder))
{
Directory.CreateDirectory(folder);
}
var newFileName = Guid.NewGuid().ToString() + extension;
var path = Path.Combine(folder, newFileName);
using (var fileStream = new FileStream(path, FileMode.Create))
{
await stream.CopyToAsync(fileStream);
}
return "/Content/HallOfFame/" + newFileName;
}
return null;
}
}
}

View File

@@ -1,17 +1 @@
/* Module Custom Styles */
.hof-description-container {
min-height: 120px;
/* Adjust this value based on the desired card size */
margin-bottom: 1rem;
}
.hof-description-line {
display: block;
padding-left: 1.1em;
text-indent: -1.1em;
margin-bottom: 0.2rem;
line-height: 1.5;
word-break: break-word;
text-align: left;
}

View File

@@ -19,8 +19,6 @@ namespace SZUAbsolventenverein.Module.HallOfFame.Models
public string Link { get; set; }
public string Status { get; set; } // "Draft" or "Published"
public int UserId { get; set; } // Owner
public bool IsReported { get; set; }
public string ReportReason { get; set; }
public string CreatedBy { get; set; }

View File

@@ -1,21 +0,0 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Oqtane.Models;
namespace SZUAbsolventenverein.Module.HallOfFame.Models
{
[Table("SZUAbsolventenvereinHallOfFameReport")]
public class HallOfFameReport : IAuditable
{
[Key]
public int HallOfFameReportId { get; set; }
public int HallOfFameId { get; set; }
public string Reason { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedOn { get; set; }
public string ModifiedBy { get; set; }
public DateTime ModifiedOn { get; set; }
}
}

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Version>1.0.1</Version>
<Product>SZUAbsolventenverein.Module.HallOfFame</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>