Merge pull request #688 from thousandtyone/main

Implements static pages.

Author: poppastring

source/DasBlog.Web.Repositories/BlogManager.cs

@@ -59,6 +59,11 @@ public Entry GetBlogPost(string posttitle, DateTime? dt)
 			}
 		}
 
+		public StaticPage GetStaticPage(string posttitle)
+		{
+			return dataService.GetStaticPage(posttitle);
+		}
+
 		public Entry GetBlogPostByGuid(Guid postid)
 		{
 			return dataService.GetEntry(postid.ToString());

source/DasBlog.Web.Repositories/Interfaces/IBlogManager.cs

@@ -8,7 +8,7 @@ namespace DasBlog.Managers.Interfaces
     public interface IBlogManager
     {
         Entry GetBlogPost(string posttitle, DateTime? postDate);
-
+		StaticPage GetStaticPage(string posttitle);	
 		Entry GetBlogPostByGuid(Guid postid);
 
 		Entry GetEntryForEdit(string postid);

source/DasBlog.Web.UI/Controllers/BlogPostController.cs

@@ -41,6 +41,7 @@ public class BlogPostController : DasBlogBaseController
 		private readonly IExternalEmbeddingHandler embeddingHandler;
 		private readonly IRecaptchaService recaptcha;
 
+		
 		public BlogPostController(IBlogManager blogManager, IHttpContextAccessor httpContextAccessor, IDasBlogSettings dasBlogSettings,
 									IMapper mapper, ICategoryManager categoryManager, IFileSystemBinaryManager binaryManager, ILogger<BlogPostController> logger,
 									IBlogPostViewModelCreator modelViewCreator, IMemoryCache memoryCache, IExternalEmbeddingHandler embeddingHandler, IRecaptchaService recaptcha)
@@ -96,6 +97,14 @@ public IActionResult Post(string posttitle, string day, string month, string yea
 			}
 			else
 			{
+				// Post was not found. Let's see if it's a static page before we route user to home page.
+				var sp = blogManager.GetStaticPage(posttitle);
+				if(sp != null)	
+				{
+					var spvm = mapper.Map<StaticPageViewModel>(sp);
+					return View("LoadStaticPage", spvm);
+
+				}
 				return RedirectToAction("index", "home");
 			}
 		}

source/DasBlog.Web.UI/Mappers/ProfileSaticPages.cs

@@ -0,0 +1,21 @@
+using AutoMapper;
+using DasBlog.Web.Models.BlogViewModels;
+using DasBlog.Core.Common;
+using DasBlog.Core.Extensions;
+using newtelligence.DasBlog.Runtime;
+using System.Collections.Generic;
+using System.Linq;
+using DasBlog.Services;
+using DasBlog.Core.Common.Comments;
+using DasBlog.Web.Models.AdminViewModels;
+
+namespace DasBlog.Web.Mappers
+{
+	public class ProfileStaticPage : Profile
+	{
+		public ProfileStaticPage()
+		{
+			CreateMap<StaticPage, StaticPageViewModel>();
+		}
+    }
+}

source/DasBlog.Web.UI/Models/BlogViewModels/StaticPageViewModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Newtonsoft.Json;
+
+namespace DasBlog.Web.Models.BlogViewModels
+{
+	public class StaticPageViewModel
+	{
+		public string Name {get; set; }
+		
+		[DataType(DataType.MultilineText)]
+		public string Content { get; set; }
+
+	}
+}

source/DasBlog.Web.UI/Startup.cs

@@ -232,6 +232,7 @@ public void ConfigureServices(IServiceCollection services)
 					mapperConfig.AddProfile(new ProfileDasBlogUser(serviceProvider.GetService<ISiteSecurityManager>()));
 					mapperConfig.AddProfile(new ProfileSettings());
 					mapperConfig.AddProfile(new ProfileActivityPub());
+					mapperConfig.AddProfile(new ProfileStaticPage());
 				})
 				.AddMvc()
 				.AddXmlSerializerFormatters();

source/DasBlog.Web.UI/Views/BlogPost/LoadStaticPage.cshtml

@@ -0,0 +1,4 @@
+@model DasBlog.Web.Models.BlogViewModels.StaticPageViewModel
+@using DasBlog.Core.Common
+@Html.Raw(Model.Content)
+

source/newtelligence.DasBlog.Runtime/BlogDataService.cs

@@ -1421,5 +1421,21 @@ DateTime IBlogDataService.GetLastCommentUpdate()
 
             return data.lastCommentUpdate;
         }
+
+        public StaticPage GetStaticPage( string pagename )
+        {
+            StaticPage page = new StaticPage();
+            page.Name = pagename;
+            string staticPathLocation = this.contentBaseDirectory + "\\static\\" + pagename + ".html";
+            if (File.Exists(staticPathLocation))
+            {
+                page.Content = File.ReadAllText(staticPathLocation);
+            }
+            else
+            {
+                return null;
+            }
+            return page;
+        }
     }
 }

source/newtelligence.DasBlog.Runtime/IBlogDataService.cs

@@ -233,5 +233,7 @@ EntryCollection GetEntries(
 		/// </summary>
 		/// <returns></returns>
 		DateTime GetLastCommentUpdate();
+
+		StaticPage GetStaticPage( string pagename );
 	}
 }

source/newtelligence.DasBlog.Runtime/StaticPage.cs

@@ -0,0 +1,45 @@
+using NodaTime;
+using System;
+using System.Collections;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+using System.Collections.Generic;
+
+namespace newtelligence.DasBlog.Runtime
+{
+	[Serializable]
+	[XmlRoot(Namespace=Data.NamespaceURI)]
+	[XmlType(Namespace=Data.NamespaceURI)]
+	public class StaticPage 
+	{
+        string _content;
+        string _name;
+
+        public string Name
+        {
+            get
+            {
+                return _name;
+            }
+            set
+            {
+                _name = value;
+            }
+        }
+        public string Content
+        {
+            get
+            {
+                return _content;
+            }
+            set
+            {
+                _content = value;
+            }
+        }
+    }
+}