From 8f3ef44d26f18c62091d7e0ce972543ce0683775 Mon Sep 17 00:00:00 2001
From: trungduong <trungduong@atggroup.vn>
Date: Mon, 9 Jun 2025 09:51:31 +0700
Subject: [PATCH] 09/06

---
 VinFontApp/Json/navlist.json           | 29 +++++++++++++-------------
 VinFontApp/Views/Partial/MenuAP.cshtml |  5 +++--
 VinFontApp/VinFontApp.csproj           |  8 +++++++
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/VinFontApp/Json/navlist.json b/VinFontApp/Json/navlist.json
index 221b180..54b6712 100644
--- a/VinFontApp/Json/navlist.json
+++ b/VinFontApp/Json/navlist.json
@@ -4,6 +4,7 @@
         "name": "Trang Chủ",
         "icon": "home",
         "group": 0,
+        "flexpage": true,
         "url": "/",
         "sub-item": ""
     },
@@ -17,37 +18,37 @@
             {
                 "id": "2001",
                 "name": "All Type Fonts",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/TypeFonts"
             },
             {
                 "id": "2002",
                 "name": "Font Serif",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/TypeFonts/Serif"
             },
             {
                 "id": "2003",
                 "name": "Font San-Serif",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/TypeFonts/San-Serif"
             },
             {
                 "id": "2004",
                 "name": "Font Việt Hóa",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/TypeFonts/Viet-Hoa"
             },
             {
                 "id": "2005",
                 "name": "Font Vintage",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/TypeFonts/Vintage"
             },
             {
                 "id": "2006",
                 "name": "Font Wibu",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/TypeFonts/Wibu"
             }
         ]
@@ -62,13 +63,13 @@
             {
                 "id": "3001",
                 "name": "Icons",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/GlyphFonts/Icons"
             },
             {
                 "id": "3002",
                 "name": "Glyps",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/GlyphFonts/Glyps"
             }
         ]
@@ -83,13 +84,13 @@
             {
                 "id": "4001",
                 "name": "Vectors",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/Images/Vectors"
             },
             {
                 "id": "4002",
                 "name": "Ảnh Chụp",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/Images/Photos"
             }
         ]
@@ -104,13 +105,13 @@
             {
                 "id": "5001",
                 "name": "Vectors",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/Images/Vectors"
             },
             {
                 "id": "5002",
                 "name": "Ảnh Chụp",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/Images/Photos"
             }
         ]
@@ -125,13 +126,13 @@
             {
                 "id": "6001",
                 "name": "Vectors",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/Images/Vectors"
             },
             {
                 "id": "6002",
                 "name": "Ảnh Chụp",
-                "flexPage": "true",
+                "flexpage": true,
                 "url": "/Images/Photos"
             }
         ]
diff --git a/VinFontApp/Views/Partial/MenuAP.cshtml b/VinFontApp/Views/Partial/MenuAP.cshtml
index 91eedda..eb872f9 100644
--- a/VinFontApp/Views/Partial/MenuAP.cshtml
+++ b/VinFontApp/Views/Partial/MenuAP.cshtml
@@ -1,6 +1,7 @@
 @using AppLibs.Libs
 @{
     List<NavItem> t = WSNavigation.GetListMenu();
+   
 }
 
 @foreach (var i in t)
@@ -8,7 +9,7 @@
     if (i.SubItem == null)
     {
         <div class="nav-i">
-            <a href="@i.Url" nav-id="@i.ID" class="nav-item">@i.Name</a>
+            <a href="@i.Url" @i.ToFlexPageAttribute() nav-id="@i.ID" class="nav-item">@i.Name</a>
         </div>
     }
     else
@@ -18,7 +19,7 @@
             <div class="sub-item">
                 @foreach (var j in i.SubItem)
                 {
-                    <div class="nav-i"><a href="@j.Url" nav-id="@j.ID" class="nav-link"><span>@j.Name</span></a></div>
+                    <div class="nav-i"><a href="@j.Url" @i.ToFlexPageAttribute() @Html.Raw(i.IsFlexPage) nav-id="@j.ID" class="nav-link"><span>@j.Name</span></a></div>
                 }
             </div>
         </div>
diff --git a/VinFontApp/VinFontApp.csproj b/VinFontApp/VinFontApp.csproj
index 6d4eac2..dc14d2d 100644
--- a/VinFontApp/VinFontApp.csproj
+++ b/VinFontApp/VinFontApp.csproj
@@ -66,6 +66,12 @@
     </Reference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="Json\navlist.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Keys\app\VFApp.pfx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -75,4 +81,6 @@
     </None>
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties json_4navlist_1json__JsonSchema="https://api.app-prg1.zerops.io/api/rest/public/settings/import-project-yml-json-schema.json" /></VisualStudio></ProjectExtensions>
+
 </Project>