Widgets model added

Author: rxtur

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

@@ -23,9 +23,12 @@
                                 <a class="btn-unstyled item-favorite ml-3" data-tooltip="" title="" data-original-title="default">
                                     <i class="fas fa-star"></i>
                                 </a>
-                                <a class="item-show ml-3" href="#" onclick="return openSettings('@theme.Title')" data-tooltip="" title="" data-original-title="settings">
-                                    <i class="fas fa-sliders-h"></i>
-                                </a>
+                                @if (Model.Widgets != null && Model.Widgets.Widgets.Count > 0)
+                                {
+                                    <a class="item-show ml-3" href="#" onclick="return openSettings('@theme.Title')" data-tooltip="" title="" data-original-title="settings">
+                                        <i class="fas fa-sliders-h"></i>
+                                    </a>
+                                }
                             }
                             else
                             {

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

@@ -2,6 +2,7 @@
 using Core.Data;
 using Core.Services;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -15,9 +16,11 @@ public class ThemesModel : AdminPageModel
         IDataService _db;
         IStorageService _storage;
         INotificationService _ns;
+        string slash = Path.DirectorySeparatorChar.ToString();
 
         public IEnumerable<ThemeItem> Themes { get; set; }
         public BlogItem BlogItem { get; set; }
+        public WidgetsModel Widgets { get; set; }
 
         public ThemesModel(IDataService db, IStorageService storage, INotificationService ns)
         {
@@ -28,30 +31,22 @@ public ThemesModel(IDataService db, IStorageService storage, INotificationServic
 
         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);
+            await SetModel();
 
             if (!IsAdmin)
                 return RedirectToPage("../Shared/_Error", new { code = 403 });
 
-            BlogItem = await _db.CustomFields.GetBlogSettings();
-            Themes = GetThemes();
-
             return Page();
         }
 
         public async Task<IActionResult> OnPostAsync()
         {
             string act = Request.Form["hdnAct"];
             string id = Request.Form["hdnTheme"];
-
+            
             var author = await _db.Authors.GetItem(a => a.AppUserName == User.Identity.Name);
             IsAdmin = author.IsAdmin;
 
-            Notifications = await _ns.GetNotifications(author.Id);
-
             if (!IsAdmin)
                 return RedirectToPage("../Shared/_Error", new { code = 403 });
 
@@ -74,7 +69,7 @@ public async Task<IActionResult> OnPostAsync()
 
             if (act == "del" && !string.IsNullOrEmpty(id))
             {
-                var slash = Path.DirectorySeparatorChar.ToString();
+                
                 var themeContent = $"{AppSettings.WebRootPath}{slash}themes{slash}{id.ToLower()}";
                 var themeViews = $"{AppSettings.ContentRootPath}{slash}Views{slash}Themes{slash}{id}";
 
@@ -94,10 +89,30 @@ public async Task<IActionResult> OnPostAsync()
                 }
             }
 
+            await SetModel();
+
+            return Page();
+        }
+
+        async Task SetModel()
+        {
+            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();
             Themes = GetThemes();
 
-            return Page();
+            string jsonFile = $"{AppSettings.ContentRootPath}{slash}Views{slash}Themes{slash}{BlogItem.Theme}{slash}{BlogItem.Theme}.json";
+            if (System.IO.File.Exists(jsonFile))
+            {
+                using (StreamReader r = new StreamReader(jsonFile))
+                {
+                    string json = r.ReadToEnd();
+                    Widgets = JsonConvert.DeserializeObject<WidgetsModel>(json);
+                }
+            }
         }
 
         List<ThemeItem> GetThemes()

src/App/Views/Themes/Simple/Simple.json

@@ -0,0 +1,22 @@
+{
+  "Name": "Simple",
+  "Widgets": [
+    {
+      "Name": "PostList",
+      "Props": [
+        {
+          "Id": "one",
+          "Value": "1"
+        },
+        {
+          "Id": "two",
+          "Value": "2"
+        }
+      ]
+    },
+    {
+      "Name": "HtmlBlock",
+      "Props": []
+    }
+  ]
+}

src/Core/Data/Models/WidgetsModel.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace Core.Data
+{
+    public class WidgetsModel
+    {
+        public string Name { get; set; }
+        public List<Widget> Widgets { get; set; }
+    }
+
+    public class Prop
+    {
+        public string Id { get; set; }
+        public string Value { get; set; }
+    }
+
+    public class Widget
+    {
+        public string Name { get; set; }
+        public List<Prop> Props { get; set; }
+    }
+}