UI: Move section navigation to sidebar

btcpayserver · Feb 13, 2024 · 4e62c65 · 4e62c65
1 parent 335f345
commit 4e62c65
Show file tree

Hide file tree

Showing 68 changed files with 250 additions and 224 deletions.
diff --git a/BTCPayServer.Abstractions/Extensions/ViewsRazor.cs b/BTCPayServer.Abstractions/Extensions/ViewsRazor.cs
@@ -12,7 +12,7 @@ public static class ViewsRazor
         private const string ACTIVE_CATEGORY_KEY = "ActiveCategory";
         private const string ACTIVE_PAGE_KEY = "ActivePage";
         private const string ACTIVE_ID_KEY = "ActiveId";
-        private const string ActivePageClass = "active";
+        private const string ACTIVE_CLASS = "active";
 
         public enum DateDisplayFormat
         {
@@ -55,50 +55,58 @@ public static void SetActiveCategory(this ViewDataDictionary viewData, string ac
             viewData[ACTIVE_CATEGORY_KEY] = activeCategory;
         }
 
-        public static string IsActiveCategory<T>(this ViewDataDictionary viewData, T category, object id = null)
+        public static bool IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
         {
-            return IsActiveCategory(viewData, category.ToString(), id);
+            if (!viewData.ContainsKey(ACTIVE_CATEGORY_KEY)) return false;
+            var activeId = viewData[ACTIVE_ID_KEY];
+            var activeCategory = viewData[ACTIVE_CATEGORY_KEY]?.ToString();
+            var categoryMatch = category.Equals(activeCategory, StringComparison.InvariantCultureIgnoreCase);
+            var idMatch = id == null || activeId == null || id.Equals(activeId);
+            return categoryMatch && idMatch;
         }
 
-        public static string IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
+        public static bool IsActivePage(this ViewDataDictionary viewData, string page, string category, object id = null)
         {
-            if (!viewData.ContainsKey(ACTIVE_CATEGORY_KEY))
-            {
-                return null;
-            }
+            if (!viewData.ContainsKey(ACTIVE_PAGE_KEY)) return false;
             var activeId = viewData[ACTIVE_ID_KEY];
+            var activePage = viewData[ACTIVE_PAGE_KEY]?.ToString();
             var activeCategory = viewData[ACTIVE_CATEGORY_KEY]?.ToString();
-            var categoryMatch = category.Equals(activeCategory, StringComparison.InvariantCultureIgnoreCase);
+            var categoryAndPageMatch = page.Equals(activePage, StringComparison.InvariantCultureIgnoreCase) &&
+                (category == null || activeCategory != null && activeCategory.Equals(category, StringComparison.InvariantCultureIgnoreCase));
             var idMatch = id == null || activeId == null || id.Equals(activeId);
-            return categoryMatch && idMatch ? ActivePageClass : null;
+            return categoryAndPageMatch && idMatch;
         }
-
-        public static string IsActivePage<T>(this ViewDataDictionary viewData, T page, object id = null)
+        
+        public static bool IsActivePage<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null)
             where T : IConvertible
         {
-            return IsActivePage(viewData, page.ToString(), page.GetType().ToString(), id);
+            return pages.Any(page => ActivePageClass(viewData, page.ToString(), page.GetType().ToString(), id) == ACTIVE_CLASS);
+        }
+
+        public static string ActiveCategoryClass<T>(this ViewDataDictionary viewData, T category, object id = null)
+        {
+            return ActiveCategoryClass(viewData, category.ToString(), id);
         }
 
-        public static string IsActivePage<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null)
+        public static string ActiveCategoryClass(this ViewDataDictionary viewData, string category, object id = null)
+        {
+            return IsActiveCategory(viewData, category, id) ? ACTIVE_CLASS : null;
+        }
+
+        public static string ActivePageClass<T>(this ViewDataDictionary viewData, T page, object id = null)
             where T : IConvertible
         {
-            return pages.Any(page => IsActivePage(viewData, page.ToString(), page.GetType().ToString(), id) == ActivePageClass)
-                ? ActivePageClass
-                : null;
+            return ActivePageClass(viewData, page.ToString(), page.GetType().ToString(), id);
         }
 
-        public static string IsActivePage(this ViewDataDictionary viewData, string page, string category, object id = null)
+        public static string ActivePageClass(this ViewDataDictionary viewData, string page, string category, object id = null)
         {
-            if (!viewData.ContainsKey(ACTIVE_PAGE_KEY))
-            {
-                return null;
-            }
-            var activeId = viewData[ACTIVE_ID_KEY];
-            var activePage = viewData[ACTIVE_PAGE_KEY]?.ToString();
-            var activeCategory = viewData[ACTIVE_CATEGORY_KEY]?.ToString();
-            var categoryAndPageMatch = (category == null || activeCategory.Equals(category, StringComparison.InvariantCultureIgnoreCase)) && page.Equals(activePage, StringComparison.InvariantCultureIgnoreCase);
-            var idMatch = id == null || activeId == null || id.Equals(activeId);
-            return categoryAndPageMatch && idMatch ? ActivePageClass : null;
+            return IsActivePage(viewData, page, category, id) ? ACTIVE_CLASS : null;
+        }
+
+        public static string ActivePageClass<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null) where T : IConvertible
+        {
+            return IsActivePage(viewData, pages, id) ? ACTIVE_CLASS : null;
         }
 
         public static HtmlString ToBrowserDate(this DateTimeOffset date, DateDisplayFormat format = DateDisplayFormat.Localized)