Small updates in widgets and pager

Author: rxtur

Blogifier.Core/Configuration.cs

@@ -97,16 +97,12 @@ public static IEnumerable<Assembly> GetAssemblies()
                         var assembly = Assembly.LoadFile(dll);
                         var product = assembly.GetCustomAttribute<AssemblyProductAttribute>().Product;
 
-                        if (!string.IsNullOrEmpty(product) && product.StartsWith("Blogifier."))
+                        if (product.StartsWith("Blogifier.") && !product.StartsWith("Blogifier.Web"))
                         {
-                            if (!product.StartsWith("Blogifier.Web"))
-                            {
-                                assemblies.Add(assembly);
-                            }
+                            assemblies.Add(assembly);
                         }
                     }
-                    catch (FileLoadException) { }
-                    catch (BadImageFormatException) { }
+                    catch { }
                 }
             }
             catch { }

Blogifier.Core/Controllers/PackagesController.cs

@@ -3,7 +3,6 @@
 using Blogifier.Core.Data.Interfaces;
 using Blogifier.Core.Data.Models;
 using Blogifier.Core.Middleware;
-using Blogifier.Core.Services.Search;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
@@ -15,14 +14,13 @@
 namespace Blogifier.Core.Controllers
 {
     [Authorize]
-    [Route("packages")]
-	public class PackagesController : Controller
+    [Route("admin/[controller]")]
+    public class PackagesController : Controller
 	{
 		private readonly string _theme;
         private readonly ILogger _logger;
         private readonly ICompositeViewEngine _engine;
         IUnitOfWork _db;
-        ISearchService _search;
 
 		public PackagesController(IUnitOfWork db, ILogger<AdminController> logger, ICompositeViewEngine engine)
 		{

Blogifier.Web/Blogifier.Web.csproj

@@ -29,7 +29,10 @@
     <ProjectReference Include="..\Blogifier.Core\Blogifier.Core.csproj" />
   </ItemGroup>
 
-  
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="Exists('$(SolutionDir)Packages\Widgets\Newsletter\bin\Debug\netcoreapp2.0\Newsletter.dll')">
+    <Exec Command="xcopy &quot;$(SolutionDir)Packages\Widgets\Newsletter\bin\Debug\netcoreapp2.0\Newsletter.dll&quot; &quot;$(TargetDir)&quot; /Y" />
+    <Exec Command="xcopy &quot;$(SolutionDir)Packages\Widgets\PostList\bin\Debug\netcoreapp2.0\PostList.dll&quot; &quot;$(TargetDir)&quot; /Y" />
+  </Target>
 
   <ItemGroup>
     <Folder Include="Logs\" />

Blogifier.Web/Views/Blogifier/Themes/OneFour/_Shared/_Pager.cshtml

@@ -1,22 +1,18 @@
 @using Blogifier.Core.Common
-@using Blogifier.Core.Data.Models
-@using Blogifier.Core.Extensions
 @model Pager
-
 @if (Model != null)
 {
     @if (Model.ShowOlder || Model.ShowNewer)
     {
         <ul class="pagination justify-content-center">
             @if (Model.ShowOlder)
             {
-                <li class="item item-prev"><a class="item-link" href="~/@ApplicationSettings.BlogRoute@Model.RouteValue@Model.Older"><i class="item-icon fa fa-angle-left"></i></a></li>
+                <li class="item item-prev"><a class="item-link" href="~/@ApplicationSettings.BlogRoute@Model.RouteValue?page=@Model.Older"><i class="item-icon fa fa-angle-left"></i></a></li>
             }
             @if (Model.ShowNewer)
             {
-                <li class="item item-next"><a class="item-link" href="~/@ApplicationSettings.BlogRoute@Model.RouteValue@Model.Newer"><i class="item-icon fa fa-angle-right"></i></a></li>
+                <li class="item item-next"><a class="item-link" href="~/@ApplicationSettings.BlogRoute@Model.RouteValue?page=@Model.Newer"><i class="item-icon fa fa-angle-right"></i></a></li>
             }
         </ul>
     }
-
-}
+}

Packages/Widgets/Newsletter/NewsletterController.cs

@@ -3,25 +3,28 @@
 using Blogifier.Core.Data.Interfaces;
 using Blogifier.Core.Data.Models;
 using Blogifier.Core.Middleware;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace Newsletter
 {
-    public class NewsletterController : Controller
+    [Authorize]
+    [Route("admin/[controller]")]
+    public class PackagesController : Controller
     {
         IUnitOfWork _db;
         static readonly string key = "NEWSLETTER";
 
-        public NewsletterController(IUnitOfWork db)
+        public PackagesController(IUnitOfWork db)
         {
             _db = db;
         }
 
         [VerifyProfile]
-        [HttpGet("admin/packages/widgets/Newsletter")]
+        [HttpGet("widgets/Newsletter")]
         public IActionResult Settings(string search = "")
         {
             var profile = _db.Profiles.Single(b => b.IdentityName == User.Identity.Name);

Packages/Widgets/Newsletter/Views/Shared/Components/Newsletter/Settings.cshtml

@@ -9,6 +9,11 @@
     <!-- Toolbar -->
     <div class="bf-toolbar d-flex">
         <label class="custom-control custom-checkbox my-auto mr-3"><input class="custom-control-input item-checkbox" type="checkbox" id="selectAll" name="selectAll"><span class="item-control custom-control-indicator"></span></label>
+        <div id="postActionButtons" class="btn-group mr-3">
+            <a asp-controller="Packages" asp-action="Widgets" class="btn btn-outline-secondary btn-sm btn-rounded" style="padding: 0 20px">
+                <i class="fa fa-arrow-left"></i> &nbsp; Back
+            </a>
+        </div>
         <div id="postActionButtons" class="btn-group mr-3">
             <button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return newsletter.remove()" title="Remove"><i class="fa fa-trash"></i></button>
         </div>