#115 chore: display themes ordered and add Theme after each name

joseantmazonsb · Mar 17, 2022 · b93d4a1 · b93d4a1
1 parent a5f38f3
commit b93d4a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Linguard/Web/Pages/_Host.cshtml b/Linguard/Web/Pages/_Host.cshtml
@@ -15,7 +15,7 @@
 
 @section styles {
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css"/>
-    <link id="linguard_style" rel="stylesheet" media="screen" href="@Model?.Stylesheet" >
+    <link id="linguard_style" rel="stylesheet" media="screen" href="@HostModel.Stylesheet" >
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" 
           integrity="sha512-9usAa10IRO0HhonpyAIVpjrylPvoDwiPUiKdWk5t3PyolY1cOd4DSE0Ga+ri4AuTroPR5aQvXU9xC6qOPnzFeg==" 
           crossorigin="anonymous" referrerpolicy="no-referrer" />

diff --git a/Linguard/Web/Pages/_Host.cshtml.cs b/Linguard/Web/Pages/_Host.cshtml.cs
@@ -13,6 +13,6 @@ public HostModel(IConfigurationManager configurationManager) {
     }
 
     private IWebConfiguration Configuration => _configurationManager.Configuration.Web;
-    public string Stylesheet => $"_content/Radzen.Blazor/css/{Style.Default}.css";
+    public static string Stylesheet => $"_content/Radzen.Blazor/css/{Style.Default}.css";
 
 }
diff --git a/Linguard/Web/Shared/ProfileMenu.razor b/Linguard/Web/Shared/ProfileMenu.razor
@@ -6,8 +6,8 @@
 @using Microsoft.Extensions.Options
 <div class="d-flex align-items-center justify-content-end">
     <RadzenDropDown TValue="string" AllowClear="false" class="mx-0 mx-lg-3" 
-                    Data="@Enum.GetNames(typeof(Style)).Select(s => s.ToString())"
-                    Value="Style.Default.ToString()"
+                    Data="@(Enum.GetNames(typeof(Style)).Select(s => $"{s} Theme").OrderBy(s => s))"
+                    Value="@($"{Style.Default} Theme")"
                     ValueChanged="OnStyleChanged">
     </RadzenDropDown>
     <RadzenProfileMenu class="text-end" Click="MenuClick">
@@ -35,7 +35,8 @@
     string GreetingMessage => $"Hi, {_user}";
     string GravatarEmail => _email ?? "[email protected]";
 
-    async Task OnStyleChanged(string styleName) {
+    async Task OnStyleChanged(string value) {
+        var styleName = value.Split(" ").First();
         var style = Enum.Parse<Style>(styleName);
         await _jsRuntime.InvokeVoidAsync("setStylesheet", 
             StyleUtils.GetStylesheet(style));