Clean up styles (#35)

* add migration * update nuget packages * styling and layout
ofpinewood · Aug 10, 2019 · 9f9eec5 · 9f9eec5
1 parent 17e16c5
commit 9f9eec5
Show file tree

Hide file tree

Showing 54 changed files with 618 additions and 243 deletions.
diff --git a/samples/Opw.PineBlog.Sample/Areas/Admin/Pages/Shared/_AdminLayout.cshtml b/samples/Opw.PineBlog.Sample/Areas/Admin/Pages/Shared/_AdminLayout.cshtml
diff --git a/samples/Opw.PineBlog.Sample/Areas/Admin/Pages/Shared/_Header.cshtml b/samples/Opw.PineBlog.Sample/Areas/Admin/Pages/Shared/_Header.cshtml
diff --git a/...reas/Blog/Pages/Shared/_BlogLayout.cshtml → ...e/Areas/Admin/Pages/Shared/_Layout.cshtml b/...reas/Blog/Pages/Shared/_BlogLayout.cshtml → ...e/Areas/Admin/Pages/Shared/_Layout.cshtml
@@ -1,11 +1,10 @@
 @{
-    Layout = "~/Pages/Shared/_SiteLayout.cshtml";
+    Layout = "~/Pages/Shared/_Layout.cshtml";
 }
 @section head {
     @RenderSection("head", required: false)
 }
 @section scripts {
     @RenderSection("scripts", required: false)
 }
-
 @RenderBody()
diff --git a/samples/Opw.PineBlog.Sample/Areas/Blog/Pages/Shared/_Layout.cshtml b/samples/Opw.PineBlog.Sample/Areas/Blog/Pages/Shared/_Layout.cshtml
@@ -0,0 +1,10 @@
+@{
+    Layout = "~/Pages/Shared/_Layout.cshtml";
+}
+@section head {
+    @RenderSection("head", required: false)
+}
+@section scripts {
+    @RenderSection("scripts", required: false)
+}
+@RenderBody()
diff --git a/samples/Opw.PineBlog.Sample/Pages/Shared/_Footer.cshtml b/samples/Opw.PineBlog.Sample/Pages/Shared/_Footer.cshtml
diff --git a/samples/Opw.PineBlog.Sample/Pages/Shared/_Header.cshtml b/samples/Opw.PineBlog.Sample/Pages/Shared/_Header.cshtml
diff --git a/samples/Opw.PineBlog.Sample/Pages/Shared/_Layout.cshtml b/samples/Opw.PineBlog.Sample/Pages/Shared/_Layout.cshtml
@@ -9,7 +9,6 @@
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Merriweather:700">
         <link rel="stylesheet" href="~/css/bootstrap.css" />
         <link rel="stylesheet" href="~/css/font-awesome.min.css">
-        <link rel="stylesheet" href="~/themes/default/css/theme.css">
     </environment>
     <environment exclude="Development">
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Merriweather:700">
@@ -21,7 +20,6 @@
               integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
               crossorigin="anonymous">
         <link rel="stylesheet" href="~/css/font-awesome.min.css" asp-append-version="true">
-        <link rel="stylesheet" href="~/themes/default/css/theme.min.css" asp-append-version="true">
     </environment>
 
     @RenderSection("head", required: false)
@@ -31,13 +29,14 @@
     <link rel="shortcut icon" href="~/favicon.ico">
 </head>
 <body>
+    <partial name="_CookieConsentPartial" />
+
     @RenderBody()
 
     <environment include="Development">
         <script src="~/js/jquery.js"></script>
         <script src="~/js/popper.min.js"></script>
         <script src="~/js/bootstrap.js"></script>
-        <script src="~/themes/default/js/theme.min.js" asp-append-version="true"></script>
     </environment>
     <environment exclude="Development">
         <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
@@ -56,7 +55,6 @@
                 integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
                 crossorigin="anonymous">
         </script>
-        <script src="~/themes/default/js/theme.min.js" asp-append-version="true"></script>
     </environment>
 
     @RenderSection("scripts", required: false)

diff --git a/samples/Opw.PineBlog.Sample/Pages/Shared/_SiteLayout.cshtml b/samples/Opw.PineBlog.Sample/Pages/Shared/_SiteLayout.cshtml
diff --git a/samples/Opw.PineBlog.Sample/Startup.cs b/samples/Opw.PineBlog.Sample/Startup.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Authentication.Cookies;
+using Opw.PineBlog.RazorPages;
 
 namespace Opw.PineBlog.Sample
 {

diff --git a/samples/Opw.PineBlog.Sample/appsettings.json b/samples/Opw.PineBlog.Sample/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    //"DefaultConnection": "Server=.\\SQLEXPRESS; Database=pineblog-sqldb; Trusted_Connection=True;",
+    //"DefaultConnection": "Server=.\\SQLEXPRESS; Database=pineblog-db; Trusted_Connection=True;",
     "DefaultConnection": "Server=inMemory; Database=pineblog-db;"
   },
   "PineBlogOptions": {
@@ -12,8 +12,7 @@
     "CreateAndSeedDatabases": true,
     "AzureStorageConnectionString": "UseDevelopmentStorage=true",
     "AzureStorageBlobContainerName": "pineblog",
-    "FileBaseUrl": "http://127.0.0.1:10000/devstoreaccount1",
-    "CoverImagesPath": "covers"
+    "FileBaseUrl": "http://127.0.0.1:10000/devstoreaccount1"
   },
   "Logging": {
     "LogLevel": {

diff --git a/src/Opw.PineBlog.Abstractions/Models/PostListType.cs b/src/Opw.PineBlog.Abstractions/Models/PostListType.cs
@@ -6,15 +6,20 @@ namespace Opw.PineBlog.Models
     /// </summary>
     public enum PostListType
     {
+        /// <summary>
+        /// Not set.
+        /// </summary>
+        NotSet = 0,
+
         /// <summary>
         /// Default post list.
         /// </summary>
-        Blog,
+        Blog = 1,
 
         /// <summary>
         /// Post list filtered on category.
         /// </summary>
-        Category,
+        Category = 2,
 
         ///// <summary>
         ///// Search results

diff --git a/src/Opw.PineBlog.Abstractions/PineBlogOptions.cs b/src/Opw.PineBlog.Abstractions/PineBlogOptions.cs
@@ -13,6 +13,11 @@ public class PineBlogOptions
         public string CategoryUrlPartFormat { get; set; }
         public bool CreateAndSeedDatabases { get; set; }
 
+        /// <summary>
+        /// The version of the current running code.
+        /// </summary>
+        public string Version { get; set; }
+
         /// <summary>
         /// Cover URL.
         /// </summary>
@@ -34,11 +39,6 @@ public class PineBlogOptions
         /// </summary>
         public string FileBaseUrl { get; set; }
 
-        /// <summary>
-        /// The path for the folder where the cover images are stored.
-        /// </summary>
-        public string CoverImagesPath { get; set; }
-
         /// <summary>
         /// Database connection string.
         /// </summary>

diff --git a/src/Opw.PineBlog.Core/Opw.PineBlog.Core.csproj b/src/Opw.PineBlog.Core/Opw.PineBlog.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
@@ -24,11 +24,11 @@
         <PackageReference Include="MediatR" Version="7.0.0" />
         <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.0.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
         <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
-        <PackageReference Include="MimeMapping" Version="1.0.1.12" />
+        <PackageReference Include="MimeMapping" Version="1.0.1.14" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Opw.PineBlog.Core/Opw.PineBlog.Core.nuspec b/src/Opw.PineBlog.Core/Opw.PineBlog.Core.nuspec
@@ -22,8 +22,8 @@
                 <dependency id="Microsoft.EntityFrameworkCore" version="2.2.6" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.Extensions.Options" version="2.2.0" exclude="Build,Analyzers" />
                 <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.2.0" exclude="Build,Analyzers" />
-                <dependency id="MimeMapping" version="1.0.1.12" exclude="Build,Analyzers" />
-                <dependency id="Microsoft.Azure.Storage.Blob" version="10.0.3" exclude="Build,Analyzers" />
+                <dependency id="MimeMapping" version="1.0.1.14" exclude="Build,Analyzers" />
+                <dependency id="Microsoft.Azure.Storage.Blob" version="11.0.0" exclude="Build,Analyzers" />
 
                 <!-- Opw dependencies -->
                 <!--<dependency id="FluentValidation" version="8.4.0" exclude="Build,Analyzers" />-->

diff --git a/src/Opw.PineBlog.Core/ServiceCollectionExtensions.cs b/src/Opw.PineBlog.Core/ServiceCollectionExtensions.cs
@@ -30,8 +30,8 @@ public static IServiceCollection AddPineBlogCore(this IServiceCollection service
             services.AddOptions();
             services.Configure<PineBlogOptions>(configuration.GetSection(nameof(PineBlogOptions)));
 
-            // TODO: only add MediatR if it has not been added yet
-            services.AddMediatR(typeof(AddPostCommand).Assembly);
+            if (services.BuildServiceProvider().GetService<IMediator>() == null)
+                services.AddMediatR(typeof(AddPostCommand).Assembly);
             ServiceRegistrar.AddMediatRClasses(services, new[] { typeof(AddPostCommand).Assembly });
 
             services.AddTransient(typeof(IPipelineBehavior<,>), typeof(RequestValidationBehavior<,>));