From 20447214adbc6a0e9f42bdfdbbac7a8d6b670869 Mon Sep 17 00:00:00 2001
From: Hamid Reza Mohammadi <mohammadi.hr@gmail.com>
Date: Sat, 20 Jul 2024 20:22:07 +0330
Subject: [PATCH] #445 tajik pages

---
 TajikGanjoor/Pages/Index.cshtml          |  2 +-
 TajikGanjoor/Pages/Index.cshtml.cs       | 21 +++++++++------------
 TajikGanjoor/Pages/Shared/_Layout.cshtml |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/TajikGanjoor/Pages/Index.cshtml b/TajikGanjoor/Pages/Index.cshtml
index 512c31b9..b12df70b 100644
--- a/TajikGanjoor/Pages/Index.cshtml
+++ b/TajikGanjoor/Pages/Index.cshtml
@@ -50,7 +50,7 @@
         @foreach (var poem in Model.GanjoorPage.PoetOrCat.Cat.Poems)
         {
             <p>
-                <a href="@($"{Model.GanjoorPage.PoetOrCat.Cat}/{poem.UrlSlug}")">@poem.TajikTitle</a>
+                <a href="@($"{Model.GanjoorPage.PoetOrCat.Cat.FullUrl}/{poem.UrlSlug}")">@poem.TajikTitle</a>
             </p>
         }
 
diff --git a/TajikGanjoor/Pages/Index.cshtml.cs b/TajikGanjoor/Pages/Index.cshtml.cs
index 51c2d640..fb054505 100644
--- a/TajikGanjoor/Pages/Index.cshtml.cs
+++ b/TajikGanjoor/Pages/Index.cshtml.cs
@@ -35,7 +35,7 @@ namespace TajikGanjoor.Pages
             }
 
 
-            if(false == await PreparePoetsAsync())
+            if (false == await PreparePoetsAsync())
             {
                 return Page();
             }
@@ -63,7 +63,7 @@ namespace TajikGanjoor.Pages
                     return Page();
                 }
                 GanjoorPage = JObject.Parse(await pageQuery.Content.ReadAsStringAsync()).ToObject<GanjoorPageCompleteViewModel>();
-                if(GanjoorPage == null)
+                if (GanjoorPage == null)
                 {
                     LastError = "GanjoorPage == null";
                     return Page();
@@ -95,7 +95,7 @@ namespace TajikGanjoor.Pages
             if (IsPoetPage)
             {
                 ViewData["Title"] = $"Ганҷур - {GanjoorPage?.PoetOrCat.Poet.TajikNickName}";
-                BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.PoetOrCat.Poet.FullUrl}\">{GanjoorPage?.PoetOrCat.Poet.TajikNickName}\"</a>";
+                BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.PoetOrCat.Poet.FullUrl}\">{GanjoorPage?.PoetOrCat.Poet.TajikNickName}</a>";
             }
             else
             if (IsCatPage || IsPoemPage)
@@ -104,17 +104,14 @@ namespace TajikGanjoor.Pages
                 foreach (var gran in GanjoorPage.PoetOrCat.Cat.Ancestors)
                 {
                     title += $"{gran.TajikTitle} - ";
-                    BreadCrumpUrls += $" - <a href=\"{gran.FullUrl}\">{gran.TajikTitle}\"</a>";
+                    BreadCrumpUrls += $" - <a href=\"{gran.FullUrl}\">{gran.TajikTitle}</a>";
                 }
-                if(IsCatPage)
-                {
-                    title += GanjoorPage.PoetOrCat.Cat.TajikTitle;
-                    BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.PoetOrCat.Cat.FullUrl}\">{GanjoorPage?.PoetOrCat.Cat.TajikTitle}\"</a>";
-                }
-                else
+                title += GanjoorPage.PoetOrCat.Cat.TajikTitle;
+                BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.PoetOrCat.Cat.FullUrl}\">{GanjoorPage?.PoetOrCat.Cat.TajikTitle}</a>";
+                if (IsPoemPage)
                 {
                     title += GanjoorPage.Poem.TajikTitle;
-                    BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.FullUrl}\">{GanjoorPage?.Poem.TajikTitle}\"</a>";
+                    BreadCrumpUrls += $" - <a href=\"{GanjoorPage?.FullUrl}\">{GanjoorPage?.Poem.TajikTitle}</a>";
                 }
                 ViewData["Title"] = title;
             }
@@ -143,7 +140,7 @@ namespace TajikGanjoor.Pages
                         _memoryCache.Set(cacheKey, poets);
                     }
                 }
-                catch(Exception e)
+                catch (Exception e)
                 {
                     LastError = e.ToString();
                     return false;
diff --git a/TajikGanjoor/Pages/Shared/_Layout.cshtml b/TajikGanjoor/Pages/Shared/_Layout.cshtml
index 650c4904..dca3950d 100644
--- a/TajikGanjoor/Pages/Shared/_Layout.cshtml
+++ b/TajikGanjoor/Pages/Shared/_Layout.cshtml
@@ -11,7 +11,7 @@
 <body>
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
-            <div class="container">
+            <div>
                 @Html.Raw(ViewData["BreadCrumpUrls"])
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">