Develop (#122)

* Features/upgrate to dotnet 6 (#108) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Features/fix email bugs (#110) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Fixed e-mail issues * Features/fix email bugs (#112) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Fixed e-mail issues * Feature/fix email send issues (#114) * Removed development files * Updated .gitignore * Added MailKit library * Implemented e-mail sender with MailKit * Feature/minor changes (#116) * Updated nuget packages * Improved HtmlHelperExtensions logic and added possibility to use with slugs * Added "About me" menu item * Feature/code improvements (#117) * Add possibility to use global.json * Add global.json file with targeting SDK 6.0.403 * Removed warnings * Add exclusion of generated code * Exclude Identity pages from null check * Update packages; Add ardalis.GuardClauses * Remove warnings * Remove null warnings; Minor code improvements * Fixed post not being saved * Fixed post not being saved * Add filter to prevent articles to appear before publishing time * Add filter to prevent articles to appear before publishing time * Add about me and subscribe; Reorder menu * Add Author partial view * Change DateTime format * Add SASS package * Reduce padding; Add max-height of 100% * Minor improvements (#118) * Develop (#113) * Features/upgrate to dotnet 6 (#108) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Features/fix email bugs (#110) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Fixed e-mail issues * Features/fix email bugs (#112) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Fixed e-mail issues * Bugfix for e-mail sending (#115) * Features/upgrate to dotnet 6 (#108) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Features/fix email bugs (#110) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Fixed e-mail issues * Features/fix email bugs (#112) * Moved files to src; Adapted C# code to a more modern approach; Minor refactoring everywhere * Removed old project folders/files * Removed temporary old solution * Refactored code; Set some members to nullable * Changed usage on TryUpdateModelAsync * Fixed e-mail issues * Feature/fix email send issues (#114) * Removed development files * Updated .gitignore * Added MailKit library * Implemented e-mail sender with MailKit * Feature/remove contact form (#120) * Add empty connection strings * Removed Contact form and references * Redirected contact route to index * Feature/fix merge issues (#121)
davidsonsousa · Jun 19, 2023 · 8044fb7 · 8044fb7
1 parent 63d5f1f
commit 8044fb7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 95 deletions.
diff --git a/src/CmsEngine.Ui/Controllers/HomeController.cs b/src/CmsEngine.Ui/Controllers/HomeController.cs
@@ -2,20 +2,15 @@ namespace CmsEngine.Ui.Controllers;
 
 public class HomeController : BaseController
 {
-    private readonly ICmsEngineEmailSender _emailSender;
     private readonly IPageService _pageService;
     private readonly IXmlService _xmlService;
-    private readonly IEmailService _emailService;
 
-    public HomeController(ILoggerFactory loggerFactory, ICmsEngineEmailSender emailSender, IPageService pageService, IXmlService xmlService,
-                          ICategoryService categoryService, ITagService tagService, IService service, IPostService postService,
-                          IEmailService emailService)
+    public HomeController(ILoggerFactory loggerFactory, IPageService pageService, IXmlService xmlService,
+                          ICategoryService categoryService, ITagService tagService, IService service, IPostService postService)
                          : base(loggerFactory, service, categoryService, pageService, postService, tagService)
     {
-        _emailSender = emailSender;
         _pageService = pageService;
         _xmlService = xmlService;
-        _emailService = emailService;
     }
 
     public IActionResult Index()
@@ -43,41 +38,6 @@ public IActionResult Archive()
         return View(Instance);
     }
 
-    public IActionResult Contact()
-    {
-        Instance.PageTitle = $"Contact - {Instance.Name}";
-        return View(Instance);
-    }
-
-    [HttpPost]
-    public async Task<IActionResult> ContactAsync(ContactForm contactForm)
-    {
-        if (!ModelState.IsValid)
-        {
-            TempData[MessageConstants.WarningMessage] = "Please double check the information in the form and try again.";
-            return View(Instance);
-        }
-
-        contactForm.To = Instance.ContactDetails?.Email;
-
-        try
-        {
-            if ((await _emailService.Save(contactForm)).IsError)
-            {
-                throw new Exception("Error when saving e-mail");
-            }
-
-            await _emailSender.SendEmailAsync(contactForm);
-            TempData[MessageConstants.SuccessMessage] = "Your message was sent. I will answer as soon as I can.";
-        }
-        catch (EmailException)
-        {
-            TempData[MessageConstants.DangerMessage] = "We could not send the messsage. Please try other communication channels.";
-        }
-
-        return RedirectToAction(nameof(HomeController.Contact));
-    }
-
     public async Task<IActionResult> SitemapAsync()
     {
         var sitemap = await _xmlService.GenerateSitemap();

diff --git a/src/CmsEngine.Ui/Program.cs b/src/CmsEngine.Ui/Program.cs
@@ -176,10 +176,11 @@
     pattern: "archive",
     defaults: new { controller = "Home", action = "Archive" });
 
+// Deprecated route, redirecting to Index
 app.MapControllerRoute(
     name: "contact",
     pattern: "contact",
-    defaults: new { controller = "Home", action = "Contact" });
+    defaults: new { controller = "Home", action = "Index" });
 
 app.MapControllerRoute(
     name: "error",

diff --git a/src/CmsEngine.Ui/Views/Home/Contact.cshtml b/src/CmsEngine.Ui/Views/Home/Contact.cshtml
diff --git a/src/CmsEngine.Ui/Views/Shared/_Layout.cshtml b/src/CmsEngine.Ui/Views/Shared/_Layout.cshtml
@@ -81,7 +81,7 @@
                             <a asp-controller="Home" asp-action="Archive" class="nav-link @Html.IsSelected(controllers: "Home", actions: "Archive")">Archive</a>
                         </li>
                         <li class="nav-item">
-                            <a asp-controller="Home" asp-action="Contact" class="nav-link @Html.IsSelected(controllers: "Home", actions: "Contact")">Contact</a>
+                            <a href="/subscribe" class="nav-link @Html.IsSelected(slugs: "subscribe")">Subscribe</a>
                         </li>
                         <li class="nav-item">
                             <a href="/subscribe" class="nav-link @Html.IsSelected(slugs: "subscribe")">Subscribe</a>

diff --git a/src/CmsEngine.Ui/appsettings.json b/src/CmsEngine.Ui/appsettings.json
@@ -1,4 +1,7 @@
 {
+  "ConnectionStrings": {
+    "DefaultConnection": ""
+  },
   "Logging": {
     "Logging": {
       "LogLevel": {