Refactor

BlueWest.Views/Controllers/Data/BanksController.cs

@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlueWest.Views.Controllers.Data;
-
-public class BanksController : Controller
-{
-    // GET
-    public IActionResult Index()
-    {
-        return View();
-    }
-}

BlueWest.Views/Controllers/Data/CompaniesController.cs

@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlueWest.Views.Controllers;
-
-public class CompaniesController : Controller
-{
-    // GET
-    public IActionResult Index()
-    {
-        return View("../Data/Companies/Index");
-    }
-}

BlueWest.Views/Controllers/Data/CountriesController.cs

@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlueWest.Views.Controllers;
-
-public class CountriesController : Controller
-{
-    // GET
-    public IActionResult Index()
-    {
-        return View("../Data/Countries/Index");
-    }
-}

BlueWest.Views/Controllers/Data/CurrenciesController.cs

@@ -1,8 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlueWest.Views.Controllers;
-
-public class CurrenciesController : Controller
-{
-    
-}

BlueWest.Views/Controllers/Data/DataController.cs

@@ -1,66 +0,0 @@
-using System.Web.Mvc;
-using BlueWest.Data.Auth.Context.Users;
-using BlueWest.Views.Utils;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Mvc;
-using Controller = Microsoft.AspNetCore.Mvc.Controller;
-using Microsoft.AspNetCore.Http;
-
-namespace BlueWest.Views.Controllers
-{
-    [Authorize]
-
-    public class DataController : UserController
-    {
-
-        public DataController(ApplicationUserManager userManager, ILogger<UserController> logger) : base(userManager,
-            logger)
-        {
-            _userManager = userManager;
-            _logger = logger;
-        }
-
-        public async Task<IActionResult> Index()
-        {
-            await OnEveryAction();
-            return View();
-        }
-
-        [ChildActionOnly]
-        public async Task<IActionResult> Countries()
-        {
-            await OnEveryAction();
-            return View("Countries/Index");
-        }
-
-        [ChildActionOnly]
-
-        public async Task<IActionResult> Companies()
-        {
-            await OnEveryAction();
-            return View("Companies/Index");
-        }
-
-        [ChildActionOnly]
-
-        public async Task<IActionResult> Banks()
-        {
-            await OnEveryAction();
-            return View("Companies/Index");
-        }
-
-        [ChildActionOnly]
-
-        public async Task<IActionResult> Currencies()
-        {
-            await OnEveryAction();
-            return View("Currencies/Index");
-        }
-
-        public override void OnInitialization()
-        {
-            SetFooterMenu(LayoutCache.DataRouteRecord.Children);
-        }
-    }
-
-}

BlueWest.Views/GlobalUsings.cs

@@ -1,3 +0,0 @@
-// Global using directives
-
-global using static BlueWest.Views.Utils.Routes;

BlueWest.Views/Views/Data/Banks/Index.cshtml

@@ -1,6 +0,0 @@
-<div class="text-center">
-    <h1 class="display-4">Banks</h1>
-</div>
-
-
-@await Html.PartialAsync("_FooterMenu");

BlueWest.Views/Views/Data/Companies/Index.cshtml

@@ -1,6 +0,0 @@
-<div class="text-center">
-    <h1 class="display-4">Companies Module</h1>
-</div>
-
-
-@await Html.PartialAsync("_FooterMenu");

BlueWest.Views/Views/Data/Countries/Index.cshtml

@@ -1,6 +0,0 @@
-<div class="text-center">
-    <h1 class="display-4">Data Module</h1>
-</div>
-
-
-@await Html.PartialAsync("_FooterMenu");

BlueWest.Views/Views/Data/Currencies/Index.cshtml

@@ -1,11 +0,0 @@
-@using BlueWest.Views.Utils
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-<div class="text-center">
-    <h1 class="display-4">Currencies Module</h1>
-</div>
-
-
-@await Html.PartialAsync("_FooterMenu");

BlueWest.Views/Views/Data/Index.cshtml

@@ -1,7 +0,0 @@
-
-<div class="text-center">
-    <h1 class="display-4">Data Module</h1>
-</div>
-
-
-@await Html.PartialAsync("_FooterMenu");

BlueWest.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32819.101
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueWest", "BlueWest\BlueWest.csproj", "{293E7852-8AFD-4EFB-8C2D-F1BBE68AEE78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeLiturgy", "CodeLiturgy\CodeLiturgy.csproj", "{293E7852-8AFD-4EFB-8C2D-F1BBE68AEE78}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueWest.Data.Capital", "BlueWest.Data.Capital\BlueWest.Data.Capital.csproj", "{E518C62D-768C-4885-9C9D-FD5761605B54}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeLiturgy.Data.Capital", "CodeLiturgy.Data.Capital\CodeLiturgy.Data.Capital.csproj", "{E518C62D-768C-4885-9C9D-FD5761605B54}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueWest.MapTo", "include\BlueWest.MapTo\src\BlueWest.MapTo\BlueWest.MapTo.csproj", "{72B37540-A12F-466E-A58F-7BA2B247CB74}"
 EndProject
@@ -29,17 +29,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "README", "README", "{E9E3CE
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{552B9217-4BB2-432A-B1B5-45E9B1AB13BC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueWest.EfMethods", "include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.csproj", "{BBF5E860-A880-450B-B6C9-EF92F6421B3D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlueWest.Data.Application", "BlueWest.Data.Application\BlueWest.Data.Application.csproj", "{F0F4A1F3-E279-4374-B146-1E1D82011574}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeLiturgy.Data.Application", "CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj", "{F0F4A1F3-E279-4374-B146-1E1D82011574}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlueWest.Views", "BlueWest.Views\BlueWest.Views.csproj", "{59714691-B930-416E-9B93-D91BAE37318F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeLiturgy.Views", "CodeLiturgy.Views\CodeLiturgy.Views.csproj", "{59714691-B930-416E-9B93-D91BAE37318F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlueWest.Domain", "BlueWest.Domain\BlueWest.Domain.csproj", "{1085FF6E-E568-441E-9A2D-23F50AB613AF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeLiturgy.Domain", "CodeLiturgy.Domain\CodeLiturgy.Domain.csproj", "{1085FF6E-E568-441E-9A2D-23F50AB613AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlueWest.Data.Auth", "BlueWest.Data.Auth\BlueWest.Data.Auth.csproj", "{2998FE17-18AD-4888-A696-7F6340F8A543}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeLiturgy.Data.Auth", "CodeLiturgy.Data.Auth\CodeLiturgy.Data.Auth.csproj", "{2998FE17-18AD-4888-A696-7F6340F8A543}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -96,14 +94,11 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{293E7852-8AFD-4EFB-8C2D-F1BBE68AEE78} = {552B9217-4BB2-432A-B1B5-45E9B1AB13BC}
 		{72B37540-A12F-466E-A58F-7BA2B247CB74} = {A1606EEC-6AC5-4779-B140-F57089F5A05F}
 		{30637214-EDE9-4C2E-BFD6-E4B163FA308B} = {A1606EEC-6AC5-4779-B140-F57089F5A05F}
 		{08F4484E-5FD8-4590-A8D7-12FBE47120C8} = {A1606EEC-6AC5-4779-B140-F57089F5A05F}
 		{5BE0A68C-B3ED-4FA1-B74B-3E857504899B} = {A1606EEC-6AC5-4779-B140-F57089F5A05F}
 		{BBF5E860-A880-450B-B6C9-EF92F6421B3D} = {A1606EEC-6AC5-4779-B140-F57089F5A05F}
-		{F0F4A1F3-E279-4374-B146-1E1D82011574} = {552B9217-4BB2-432A-B1B5-45E9B1AB13BC}
-		{E518C62D-768C-4885-9C9D-FD5761605B54} = {552B9217-4BB2-432A-B1B5-45E9B1AB13BC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F24E44CA-98BA-4B44-A1E1-57912CC5DCC3}

BlueWest/Data/MemoryData.cs

@@ -1 +0,0 @@
-

CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj

@@ -4,6 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace>BlueWest.Data.Application</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>

CodeLiturgy.Data.Auth/CodeLiturgy.Data.Auth.csproj

@@ -40,8 +40,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\BlueWest.Data.Application\BlueWest.Data.Application.csproj" />
+      <ProjectReference Include="..\CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj" />
-      <ProjectReference Include="..\BlueWest.Domain\BlueWest.Domain.csproj" />
+      <ProjectReference Include="..\CodeLiturgy.Domain\CodeLiturgy.Domain.csproj" />
     </ItemGroup>
 
     <ItemGroup>

CodeLiturgy.Data.Auth/Users/UserRepository.cs

@@ -1,5 +1,5 @@
 using BlueWest.Data.Application.Users;
-using BlueWest.Domain;
+using CodeLiturgy.Domain;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;

CodeLiturgy.Domain/ApplicationUserDbContext.cs

@@ -1,10 +1,10 @@
 using BlueWest.Data.Application.Users;
 using BlueWest.EfMethods;
-using BlueWest.Domain.Model;
+using CodeLiturgy.Domain.Model;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlueWest.Domain
+namespace CodeLiturgy.Domain
 {
     /// <summary>
     /// Application User Db Context

CodeLiturgy.Domain/CodeLiturgy.Domain.csproj

@@ -3,7 +3,6 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <LangVersion>10</LangVersion>
-        <RootNamespace>BlueWest.Domain</RootNamespace>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <PublishDependencyDocumentationFiles>true</PublishDependencyDocumentationFiles>
@@ -33,8 +32,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\BlueWest.Data.Application\BlueWest.Data.Application.csproj" />
+        <ProjectReference Include="..\CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj" />
-        <ProjectReference Include="..\BlueWest.Data.Capital\BlueWest.Data.Capital.csproj" />
+        <ProjectReference Include="..\CodeLiturgy.Data.Capital\CodeLiturgy.Data.Capital.csproj" />
         <ProjectReference Include="..\include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
 
     </ItemGroup>

CodeLiturgy.Domain/CountryDbContext.cs

@@ -1,11 +1,11 @@
 using BlueWest.Data;
-using BlueWest.Domain.Model;
+using CodeLiturgy.Domain.Model;
-using BlueWest.Domain.Extensions;
+using CodeLiturgy.Domain.Extensions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using BlueWest.EfMethods;
 
-namespace BlueWest.Domain
+namespace CodeLiturgy.Domain
 {
    
     /// <summary>

CodeLiturgy.Domain/Extensions/ModelBuilderCountryDbContextExtensions.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using BlueWest.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlueWest.Domain.Extensions
+namespace CodeLiturgy.Domain.Extensions
 {
     /// <summary>
     /// Code first model builder

CodeLiturgy.Domain/Extensions/ModelBuilderExtensions.cs

@@ -3,7 +3,7 @@ using BlueWest.Data.Application;
 using BlueWest.Data.Application.Users;
 using Microsoft.EntityFrameworkCore;
 
-namespace BlueWest.Domain.Model
+namespace CodeLiturgy.Domain.Model
 {
     /// <summary>
     /// Database model configuration extensions

CodeLiturgy.Domain/UserDbContext.cs

@@ -1,9 +1,9 @@
 using BlueWest.Data;
-using BlueWest.Domain.Model;
+using CodeLiturgy.Domain.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 
-namespace BlueWest.Domain
+namespace CodeLiturgy.Domain
 {
     
     /// <summary>

CodeLiturgy.Views/CodeLiturgy.Views.csproj

@@ -5,7 +5,6 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <RootNamespace>BlueWest.Views</RootNamespace>
     </PropertyGroup>
 
   <ItemGroup>
@@ -18,8 +17,8 @@
     </PackageReference>
   </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\BlueWest.Data.Auth\BlueWest.Data.Auth.csproj" />
+      <ProjectReference Include="..\CodeLiturgy.Data.Auth\CodeLiturgy.Data.Auth.csproj" />
-      <ProjectReference Include="..\BlueWest.Domain\BlueWest.Domain.csproj" />
+      <ProjectReference Include="..\CodeLiturgy.Domain\CodeLiturgy.Domain.csproj" />
     </ItemGroup>
 
     <ItemGroup>

CodeLiturgy.Views/Controllers/AccountController.cs

@@ -2,11 +2,11 @@ using System.Diagnostics;
 using System.Web.Mvc;
 using BlueWest.Data.Auth.Context.Users;
 using Microsoft.AspNetCore.Mvc;
-using BlueWest.Views.Models;
+using CodeLiturgy.Views.Models;
-using BlueWest.Views.Utils;
+using CodeLiturgy.Views.Utils;
 using Controller = Microsoft.AspNetCore.Mvc.Controller;
 
-namespace BlueWest.Views.Controllers;
+namespace CodeLiturgy.Views.Controllers;
 
 public class AccountController : UserController
 {

CodeLiturgy.Views/Controllers/AuthController.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Controller = Microsoft.AspNetCore.Mvc.Controller;
 
-namespace BlueWest.Views.Controllers
+namespace CodeLiturgy.Views.Controllers
 {
     public class AuthController : UserController
     {

CodeLiturgy.Views/Controllers/HomeController.cs

@@ -1,12 +1,12 @@
 using BlueWest.Data.Auth.Context.Users;
 using Microsoft.AspNetCore.Mvc;
-using BlueWest.Views.Utils;
+using CodeLiturgy.Views.Utils;
 using Duende.IdentityServer.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Options;
 using Controller = Microsoft.AspNetCore.Mvc.Controller;
 
-namespace BlueWest.Views.Controllers;
+namespace CodeLiturgy.Views.Controllers;
 
 [System.Web.Mvc.Route("/")]
 [System.Web.Mvc.Authorize]

CodeLiturgy.Views/Controllers/System/ApplicationUsersController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace BlueWest.Views.Controllers;
+namespace CodeLiturgy.Views.Controllers;
 
 public class ApplicationUsersController : Controller
 {

CodeLiturgy.Views/Controllers/System/DataUsersController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace BlueWest.Views.Controllers;
+namespace CodeLiturgy.Views.Controllers;
 
 public class DataUsersController : Controller
 {

CodeLiturgy.Views/Controllers/System/LogsController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace BlueWest.Views.Controllers;
+namespace CodeLiturgy.Views.Controllers;
 
 public class LogsController : Controller
 {

CodeLiturgy.Views/Controllers/System/RolesController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace BlueWest.Views.Controllers;
+namespace CodeLiturgy.Views.Controllers;
 
 [System.Web.Mvc.Route($"{SystemRouteLocation}/roles")]
 

CodeLiturgy.Views/Controllers/System/SystemController.cs

@@ -1,8 +1,8 @@
 using BlueWest.Data.Auth.Context.Users;
-using BlueWest.Views.Utils;
+using CodeLiturgy.Views.Utils;
 using Microsoft.AspNetCore.Mvc;
 
-namespace BlueWest.Views.Controllers
+namespace CodeLiturgy.Views.Controllers
 {
     public class SystemController : UserController
     {

CodeLiturgy.Views/Controllers/UserController.cs

@@ -2,13 +2,13 @@ using System.Net;
 using System.Net.Sockets;
 using BlueWest.Data.Application.Users;
 using BlueWest.Data.Auth.Context.Users;
-using BlueWest.Views.Models;
+using CodeLiturgy.Views.Models;
-using BlueWest.Views.Utils;
+using CodeLiturgy.Views.Utils;
 using Duende.IdentityServer.Extensions;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace BlueWest.Views.Controllers;
+namespace CodeLiturgy.Views.Controllers;
 
 public class UserController : Controller
 {

CodeLiturgy.Views/Controllers/UsersController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace BlueWest.Views.Controllers;
+namespace CodeLiturgy.Views.Controllers;
 
 public class UsersController : Controller
 {