Cleanup in app settings

Author: rxtur

docs/AppSettings.md

@@ -1,20 +1,10 @@
 Global application settings saved in the `appsettings.json` file.
-It is read/write so, when admin updates settings in UI, they also written in the file.
-When file is updated, admin screen will also pull updated value from the file.
 
 ```
 "Blogifier": {
   "DbProvider": "SQLite",
   "ConnString": "DataSource=app.db",
-  "Title": "Blog title",
-  "Description": "Short description of the blog",
-  "Cover": "data/admin/cover-desk.jpg",
-  "Logo": "lib/img/logo-white.png",
   "Avatar": "lib/img/avatar.jpg",
-  "Theme": "Standard",
-  "BlogThemes": null,
-  "ItemsPerPage": 10,
-  "UseDescInPostList": true,
   "ImportTypes": "zip,7z,xml,pdf,doc,docx,xls,xlsx,mp3,avi",
   "ImageExtensions": "png,jpg,gif,bmp,tiff",
   "DemoMode": true
@@ -27,9 +17,7 @@ Most settings are self-explanatory, here some that might require clarification:
 
 `DbProvider` and `ConnectionString` are used when you need to switch to another database, like MS SQL Server or PostgreSQL
 
-`ItemsPerPage` sets page size for all lists in application, so everything that requires paging will use it
-
-`UseDescInPostList` when set to `true` returns post description instead of content in the post lists
+`ItemsPerPage` sets page size for all lists in the application, so everything that requires paging will use it
 
 `ImportTypes` defines what type of files should be downloaded when importing posts from RSS feed
 

src/App/Pages/Admin/Posts/Edit.cshtml

@@ -6,7 +6,7 @@
 
 <link href="~/admin/markdown/simplemde.min.css" rel="stylesheet" />
 @{
-    var img = string.IsNullOrEmpty(Model.PostItem.Cover) ? Core.AppSettings.DefaultCover : Model.PostItem.Cover;
+    var img = string.IsNullOrEmpty(Model.PostItem.Cover) ? Model.Blog.Cover : Model.PostItem.Cover;
     img = $"{Url.Content("~/")}{img}";
     var btnDisabled = Model.PostItem.Id == 0 ? "disabled" : "";
 }

src/App/Pages/Admin/Posts/Edit.cshtml.cs

@@ -12,6 +12,7 @@ public class EditModel : AdminPageModel
     {
         [BindProperty]
         public PostItem PostItem { get; set; }
+        public BlogItem Blog { get; set; }
 
         IDataService _db;
         INotificationService _ns;
@@ -29,8 +30,8 @@ public async Task OnGetAsync(int id)
 
             Notifications = await _ns.GetNotifications(author.Id);
 
-            var blog = await _db.CustomFields.GetBlogSettings();
-            PostItem = new PostItem { Author = author, Cover = blog.Cover };
+            Blog = await _db.CustomFields.GetBlogSettings();
+            PostItem = new PostItem { Author = author, Cover = Blog.Cover };
 
             if (id > 0)
                 PostItem = await _db.BlogPosts.GetItem(p => p.Id == id);

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

@@ -46,7 +46,7 @@
             @foreach (var post in Model.Posts)
             {
                 var dt = post.Published == DateTime.MinValue ? "DRAFT" : post.Published.ToFriendlyShortDateString();
-                var img = string.IsNullOrEmpty(post.Cover) ? Core.AppSettings.DefaultCover : post.Cover;
+                var img = string.IsNullOrEmpty(post.Cover) ? Model.Blog.Cover : post.Cover;
                 img = $"{Url.Content("~/")}{img}";
                 <div class="post-grid-col">
                     <div class="post-grid-item">

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

@@ -14,6 +14,7 @@ public class IndexModel : AdminPageModel
         [BindProperty]
         public IEnumerable<PostItem> Posts { get; set; }
         public Pager Pager { get; set; }
+        public BlogItem Blog { get; set; }
 
         IDataService _db;
         INotificationService _ns;
@@ -51,8 +52,8 @@ public async Task<IActionResult> OnGetAsync(int pg = 1, string status = "A")
             }
 
             Posts = await _db.BlogPosts.GetList(predicate, Pager);
-
             Notifications = await _ns.GetNotifications(author.Id);
+            Blog = await _db.CustomFields.GetBlogSettings();
 
             return Page();
         }

src/App/Views/Themes/Standard/List.cshtml

@@ -44,7 +44,7 @@
             {
                 foreach (var item in Model.Posts)
                 {
-                    var img = string.IsNullOrEmpty(item.Cover) ? AppSettings.DefaultCover : item.Cover;
+                    var img = string.IsNullOrEmpty(item.Cover) ? Model.Blog.Cover : item.Cover;
                     <article class="post">
                         <div class="post-cover">
                             <img src="~/@img" alt="@item.Title">

src/App/app.db

@@ -1,24 +1,12 @@
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 
 namespace Core
 {
     public class AppSettings
     {
-        public static string Title { get; set; }
-        public static string Description { get; set; }
-        public static string Theme { get; set; }
-
-        public static string Logo { get; set; }
         public static string Avatar { get; set; }
-        public static string Cover { get; set; }
-
-        public static int ItemsPerPage { get; set; }
-        public static bool UseDescInPostList { get; set; }
-        public static string DefaultCover { get; set; }
-
         public static string ImportTypes { get; set; }
         public static string ImageExtensions { get; set; }
         public static bool DemoMode { get; set; }

src/Core/AppSettings.cs

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

src/Core/Core.csproj

@@ -20,9 +20,8 @@ public static class ServiceCollectionExtensions
             services.Configure<T>(section);
             services.AddTransient<IAppService<T>>(provider =>
             {
-                var environment = provider.GetService<IHostingEnvironment>();
                 var options = provider.GetService<IOptionsMonitor<T>>();
-                return new AppService<T>(environment, options, section.Key);
+                return new AppService<T>(options);
             });
         }