anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Poet/category tables of contents after import; Divan wordmark instead of Ganjoor logo

Browse Source 
- public data import ran with empty HtmlText for poet/category pages (upstream fills it
  with a separate admin TOC job), so poet pages showed no works; the import now
  regenerates tables of contents for the importing user
- replace Ganjoor's logo image (gdap/gdapk) with the Divan wordmark on all pages; delete it

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Anas Rashid 2026-10-08 20:17:24 +02:00
parent 5f2b779e89
commit 4a1d2e0642
16 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DivanRazor/Pages/Auth/Login.cshtml
View File

@ -18,7 +18,7 @@
</head>
<body class="bk-background">
<div id="hdr">
<h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
<h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
</div>
<div id="login">
<div id="login-container">

2
DivanRazor/Pages/Auth/ResetPassword.cshtml
View File

@ -16,7 +16,7 @@
</head>
<body class="bk-background">
<div id="hdr">
<h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
<h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
</div>
<div id="login">
<div id="main">

2
DivanRazor/Pages/Auth/SignUp.cshtml
View File

@ -17,7 +17,7 @@
</head>
<body class="bk-background">
<div id="hdr">
<h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
<h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
</div>
<div id="login">
<div id="main">

2
DivanRazor/Pages/Error.cshtml
View File

@ -61,7 +61,7 @@
<body>
<div id="hdr">
<h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
<h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
</div>
<h1 class="text-danger">غیر متوقع خرابی</h1>

2
DivanRazor/Pages/Misc/Photos.cshtml
View File

@ -108,7 +108,7 @@
<h1>
@if (Model.Poet == null)
{
<a href="/photos" title="چهره‌های دیوان"><img src="/image/gdap.png" alt="@ViewData["Title"]" class="home-logo" /></a>
<a href="/photos" title="چهره‌های دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a>
}
else
{

2
DivanRazor/Pages/Shared/_AdminLayout.cshtml
View File

@ -421,7 +421,7 @@
<header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container">
<a class="navbar-brand" asp-area="" asp-page="/Index" title="دیوان"><img src="/image/gdapk.png" alt="دیوان" style="width:auto;margin:auto;" /></a>
<a class="navbar-brand" asp-area="" asp-page="/Index" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>

2
DivanRazor/Pages/Shared/_SearchHeaderPartial.cshtml
View File

@ -1,6 +1,6 @@
@model DivanRazor.Pages._SearchHeaderPartialModel
<div id="hdr2" class="clearfix">
<h1><a href="/" title="دیوان"><img src="/image/gdapk.png" alt="دیوان" /></a></h1>
<h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
<div class="actionbox">
<form action="/search" method="get" id="searchform">
<input type="text" name="s" id="s" class="inputText" value="@Model.SearchQuery" placeholder="تلاش" />

2
DivanRazor/Pages/Shared/_UserPanelLayout.cshtml
View File

@ -87,7 +87,7 @@
<header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container">
<a class="navbar-brand" asp-area="" asp-page="/Index" title="دیوان"><img src="/image/gdapk.png" alt="دیوان" style="width:auto;margin:auto;" /></a>
<a class="navbar-brand" asp-area="" asp-page="/Index" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>

2
DivanRazor/Pages/errors/404.cshtml
View File

@ -22,7 +22,7 @@
<body>
<div id="hdr">
<h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
<h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
</div>
<h1 class="text-danger">نہیں ملا ....</h1>

2
DivanRazor/Pages/errors/503.cshtml
View File

@ -23,7 +23,7 @@
<body>
<div id="hdr">
<h1><a href="/" title="دیوان"><img src="/image/gdap.png" alt="دیوان" style="width:auto;margin:auto;" /></a></h1>
<h1><a href="/" title="دیوان"><span class="divan-wordmark divan-wordmark--sm">دیوان</span></a></h1>
</div>
<h1 class="text-danger">دیوان کی تازہ کاری جاری ہے</h1>

5
DivanRazor/wwwroot/css/divan.css
View File

@ -56,3 +56,8 @@ h1, h2, h3, .century, .caption a {
background: var(--card-nested);
transform: translateY(-2px);
}
.divan-wordmark--sm {
font-size: 2rem;
line-height: 1.6;
}

BIN
DivanRazor/wwwroot/image/gdap.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
DivanRazor/wwwroot/image/gdapk.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

3
RMuseum/Controllers/DivanController.cs
View File

@ -2269,7 +2269,8 @@ namespace RMuseum.Controllers
{
try
{
var res = _divanService.StartImportFromPublicDataRepo(request.UseHttp, request.Location, request.PoetId);
Guid userId = new Guid(User.Claims.FirstOrDefault(c => c.Type == "UserId").Value);
var res = _divanService.StartImportFromPublicDataRepo(request.UseHttp, request.Location, request.PoetId, userId);
if (!string.IsNullOrEmpty(res.ExceptionString))
return BadRequest(res.ExceptionString);
return Ok();

2
RMuseum/Services/IDivanService.cs
View File

@ -582,7 +582,7 @@ namespace RMuseum.Services
/// <param name="location">base URL or local folder path of the exported data tree</param>
/// <param name="poetId">0 imports every poet; a specific id imports only that poet (useful on a slow connection)</param>
/// <returns></returns>
RServiceResult<bool> StartImportFromPublicDataRepo(bool useHttp, string location, int poetId = 0);
RServiceResult<bool> StartImportFromPublicDataRepo(bool useHttp, string location, int poetId = 0, Guid userId = default);
/// <summary>
/// examine site pages for broken links

8
RMuseum/Services/Implementation/DivanService-Partials/DivanService-PublicDataImport.cs
View File

@ -45,7 +45,7 @@ namespace RMuseum.Services.Implementation
/// <param name="useHttp">true: fetch over HTTP (location is a base URL). false: read from a local folder (location is a path).</param>
/// <param name="location">base URL or local folder path of the exported data tree</param>
/// <param name="poetId">0 imports every poet in the export's manifest; a specific id imports only that poet — useful on a slow connection, or when a developer only needs one poet's data for local testing</param>
public RServiceResult<bool> StartImportFromPublicDataRepo(bool useHttp, string location, int poetId = 0)
public RServiceResult<bool> StartImportFromPublicDataRepo(bool useHttp, string location, int poetId = 0, Guid userId = default)
{
try
{
@ -103,6 +103,12 @@ namespace RMuseum.Services.Implementation
await _RegenerateHalfCenturies(context);
_memoryCache.Remove("divan/centuries"); // same cache key GetCenturiesAsync/the "periods" endpoint use
// divan: poet/category pages are imported with empty HtmlText (upstream fills it
// with a separate admin TOC job); generate the tables of contents now so poet
// and category pages list their works. Needs a real user for the page edit records.
if (userId != Guid.Empty)
await _RegenerateTOCsAsync(userId, context, jobProgressServiceEF);
await jobProgressServiceEF.UpdateJob(job.Id, 100, "", true);
}
catch (Exception exp)