Theme selection from settigs/themes

Author: rxtur

src/App/Pages/Admin/Settings/Index.cshtml

@@ -15,6 +15,7 @@
                     <label class="form-group-label">Title</label>
                     <input type="text" asp-for="BlogItem.Title" class="form-control" />
                     <span asp-validation-for="BlogItem.Title" class="text-danger"></span>
+                    <input type="hidden" asp-for="BlogItem.Theme" />
                 </div>
                 <div class="form-group">
                     <label class="form-group-label">Description</label>
@@ -26,10 +27,6 @@
                     <input type="text" asp-for="BlogItem.ItemsPerPage" class="form-control" />
                     <span asp-validation-for="BlogItem.ItemsPerPage" class="text-danger"></span>
                 </div>
-                <div class="form-group">
-                    <label class="form-group-label">Theme</label>
-                    <select asp-for="BlogItem.Theme" asp-items="Model.BlogItem.BlogThemes" class="form-control custom-select"></select>
-                </div>
                 <div class="form-group">
                     <label class="form-group-label">Logo image</label>
                     <div class="input-group">
@@ -60,6 +57,7 @@
     @if (Model.ShowMessage)
     {
         <script>toastr.success('@Model.Message')</script>
+        Model.Message = "";
     }
     <script src="~/admin/js/app/fileManagerController.js"></script>
-}
+}

src/App/Pages/Admin/Settings/Index.cshtml.cs

@@ -2,9 +2,6 @@
 using Core.Data;
 using Core.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace App.Pages.Admin.Settings
@@ -15,72 +12,45 @@ public class IndexModel : AdminPageModel
         public BlogItem BlogItem { get; set; }
 
         IDataService _db;
-        IStorageService _storage;
         INotificationService _ns;
 
-        public IndexModel(IDataService db, IStorageService storage, INotificationService ns)
+        public IndexModel(IDataService db, INotificationService ns)
         {
             _db = db;
-            _storage = storage;
             _ns = ns;
             BlogItem = new BlogItem();
         }
 
         public async Task<IActionResult> OnGetAsync()
         {
-            var author = await _db.Authors.GetItem(a => a.AppUserName == User.Identity.Name);
-            IsAdmin = author.IsAdmin;
-
-            Notifications = await _ns.GetNotifications(author.Id);
-
-            if (!author.IsAdmin)
+            await SetModel();
+            if (!IsAdmin)
                 return RedirectToPage("../Shared/_Error", new { code = 403 });
 
-            BlogItem = await _db.CustomFields.GetBlogSettings();
-            BlogItem.BlogThemes = GetThemes();
-
             return Page();
         }
 
         public async Task<IActionResult> OnPost()
         {
             if (!ModelState.IsValid)
-            {
                 return Page();
-            }
 
             await _db.CustomFields.SaveBlogSettings(BlogItem);
-
             Message = Resources.Updated;
 
-            return RedirectToPage("Index");
+            await SetModel();
+            if (!IsAdmin)
+                return RedirectToPage("../Shared/_Error", new { code = 403 });
+
+            return Page();
         }
 
-        List<SelectListItem> GetThemes()
+        async Task SetModel()
         {
-            var themes = new List<SelectListItem>();
-            var combined = new List<string>();
-
-            var storageThemes = _storage.GetThemes();
-
-            if(storageThemes != null)
-                combined.AddRange(storageThemes);
-
-            if(AppConfig.EmbeddedThemes != null)
-                combined.AddRange(AppConfig.EmbeddedThemes);
-
-            combined = combined.Distinct().ToList();
-            combined.Sort();
-            
-            if (combined != null && combined.Count > 0)
-            {
-                foreach (var theme in combined)
-                {
-                    themes.Add(new SelectListItem { Text = theme, Value = theme });
-                }
-            }
-           
-            return themes;
+            var author = await _db.Authors.GetItem(a => a.AppUserName == User.Identity.Name);
+            IsAdmin = author.IsAdmin;
+            Notifications = await _ns.GetNotifications(author.Id);
+            BlogItem = await _db.CustomFields.GetBlogSettings();
         }
     }
 }

src/App/Pages/Admin/Settings/Themes.cshtml

@@ -10,26 +10,29 @@
         <div class="bf-posts-grid d-flex" aria-label="posts">
             @foreach (var theme in Model.Themes)
             {
+                var img = $"{Url.Content("~/")}{theme.Cover}";
+                var lnkSet = $"{Url.Content("~/admin/settings/themes")}?id={theme.Title}&act=set";
+                var lnkDel = $"{Url.Content("~/admin/settings/themes")}?id={theme.Title}&act=del";
                 <div class="post-grid-col">
                     <div class="post-grid-item">
-                        <a class="item-link" style="background-image:url(/lib/img/img-placeholder.png);"><div class="item-title mt-auto">@theme.Value</div></a>
+                        <a class="item-link" style="background-image:url(@img);"><div class="item-title mt-auto">&nbsp;</div></a>
                         <div class="item-info d-flex align-items-center">
-                            <span class="item-date mr-auto">@theme.Value</span>
-                            @if (theme.Value == Model.BlogItem.Theme)
+                            <span class="item-date mr-auto">@theme.Title</span>
+                            @if (theme.IsCurrent)
                             {
-                                <button class="btn-unstyled item-favorite ml-3" data-tooltip="" title="" data-original-title="default">
+                                <a class="btn-unstyled item-favorite ml-3" data-tooltip="" title="" data-original-title="default">
                                     <i class="fas fa-star"></i>
-                                </button>
+                                </a>
                                 <a class="item-show ml-3" href="#" target="_blank" data-tooltip="" title="" data-original-title="settings">
                                     <i class="fas fa-sliders-h"></i>
                                 </a>
                             }
                             else
                             {
-                                <button class="btn-unstyled item-favorite ml-3" data-tooltip="" title="" data-original-title="set as default">
+                                <a class="btn-unstyled item-favorite ml-3" href="@lnkSet" data-tooltip="" title="" data-original-title="set as default">
                                     <i class="far fa-star"></i>
-                                </button>
-                                <a class="item-show ml-4" href="#" data-tooltip="" title="" data-original-title="Delete">
+                                </a>
+                                <a class="item-show ml-4" href="@lnkDel" data-tooltip="" title="" data-original-title="Delete">
                                     <i class="fas fa-trash" style="color: #ff6666"></i>
                                 </a>
                             }
@@ -45,5 +48,6 @@
     @if (Model.ShowMessage)
     {
         <script>toastr.success('@Model.Message')</script>
+        Model.Message = "";
     }
 }

src/App/Pages/Admin/Settings/Themes.cshtml.cs

@@ -2,8 +2,8 @@
 using Core.Data;
 using Core.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -15,8 +15,7 @@ public class ThemesModel : AdminPageModel
         IStorageService _storage;
         INotificationService _ns;
 
-        [BindProperty]
-        public IEnumerable<SelectListItem> Themes { get; set; }
+        public IEnumerable<ThemeItem> Themes { get; set; }
         public BlogItem BlogItem { get; set; }
 
         public ThemesModel(IDataService db, IStorageService storage, INotificationService ns)
@@ -26,7 +25,7 @@ public ThemesModel(IDataService db, IStorageService storage, INotificationServic
             _ns = ns;
         }
 
-        public async Task<IActionResult> OnGetAsync()
+        public async Task<IActionResult> OnGetAsync(string id, string act)
         {
             var author = await _db.Authors.GetItem(a => a.AppUserName == User.Identity.Name);
             IsAdmin = author.IsAdmin;
@@ -36,15 +35,28 @@ public async Task<IActionResult> OnGetAsync()
             if (!IsAdmin)
                 return RedirectToPage("../Shared/_Error", new { code = 403 });
 
+            if(act == "set" && !string.IsNullOrEmpty(id))
+            {
+                var theme = _db.CustomFields.Single(f => f.AuthorId == 0 && f.Name == Constants.BlogTheme);
+                theme.Content = id;
+                _db.Complete();
+                Message = Resources.Updated;
+            }
+
+            if(act == "del" && !string.IsNullOrEmpty(id))
+            {
+                Message = Resources.Removed;
+            }
+
             BlogItem = await _db.CustomFields.GetBlogSettings();
             Themes = GetThemes();
 
             return Page();
         }
 
-        List<SelectListItem> GetThemes()
+        List<ThemeItem> GetThemes()
         {
-            var themes = new List<SelectListItem>();
+            var themes = new List<ThemeItem>();
             var combined = new List<string>();
 
             var storageThemes = _storage.GetThemes();
@@ -60,10 +72,17 @@ List<SelectListItem> GetThemes()
 
             if (combined != null && combined.Count > 0)
             {
-                var current = new SelectListItem();
+                var current = new ThemeItem();
                 foreach (var theme in combined)
                 {
-                    var item = new SelectListItem { Text = theme, Value = theme };
+                    var slash = Path.DirectorySeparatorChar.ToString();
+                    var file = $"{AppSettings.WebRootPath}{slash}themes{slash}{theme}{slash}{theme}.png";
+                    var item = new ThemeItem {
+                        Title = theme,
+                        Cover = System.IO.File.Exists(file) ? $"themes/{theme}/{theme}.png" : "lib/img/img-placeholder.png",
+                        IsCurrent = theme == BlogItem.Theme
+                    };
+
                     if (theme == BlogItem.Theme)
                         current = item;
                     else
@@ -75,4 +94,11 @@ List<SelectListItem> GetThemes()
             return themes;
         }
     }
+
+    public class ThemeItem
+    {
+        public string Title { get; set; }
+        public string Cover { get; set; }
+        public bool IsCurrent { get; set; }
+    }
 }

src/App/wwwroot/themes/simple/simple.png

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.0.2</Version>
+    <Version>2.1.0.3</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/App/wwwroot/themes/standard/standard.png

@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Core.Data
 {
@@ -33,6 +31,5 @@ public class BlogItem
         [Required]
         [StringLength(120)]
         public string Theme { get; set; }
-        public IList<SelectListItem> BlogThemes { get; set; }
     }
 }

src/Core/Core.csproj

@@ -47,7 +47,6 @@ public async Task SaveBlogSettings(BlogItem blog)
             var items = _db.CustomFields.Where(f => f.AuthorId == 0 && f.Name == Constants.BlogItemsPerPage).FirstOrDefault();
             var cover = _db.CustomFields.Where(f => f.AuthorId == 0 && f.Name == Constants.BlogCover).FirstOrDefault();
             var logo = _db.CustomFields.Where(f => f.AuthorId == 0 && f.Name == Constants.BlogLogo).FirstOrDefault();
-            var theme = _db.CustomFields.Where(f => f.AuthorId == 0 && f.Name == Constants.BlogTheme).FirstOrDefault();
 
             if (title == null) _db.CustomFields.Add(new CustomField { AuthorId = 0, Name = Constants.BlogTitle, Content = blog.Title });
             else title.Content = blog.Title;
@@ -64,9 +63,6 @@ public async Task SaveBlogSettings(BlogItem blog)
             if (logo == null) _db.CustomFields.Add(new CustomField { AuthorId = 0, Name = Constants.BlogLogo, Content = blog.Logo });
             else logo.Content = blog.Logo;
 
-            if (theme == null) _db.CustomFields.Add(new CustomField { AuthorId = 0, Name = Constants.BlogTheme, Content = blog.Theme });
-            else theme.Content = blog.Theme;
-
             await _db.SaveChangesAsync();
         }
     }