diff --git a/CodeLiturgy.Dashboard.sln b/CodeLiturgy.Dashboard.sln index fd15521..a75b405 100644 --- a/CodeLiturgy.Dashboard.sln +++ b/CodeLiturgy.Dashboard.sln @@ -29,14 +29,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "README", "README", "{E9E3CE 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}") = "CodeLiturgy.Data.Application", "CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj", "{F0F4A1F3-E279-4374-B146-1E1D82011574}" -EndProject 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}") = "CodeLiturgy.Domain", "CodeLiturgy.Domain\CodeLiturgy.Domain.csproj", "{1085FF6E-E568-441E-9A2D-23F50AB613AF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeLiturgy.Data.Auth", "CodeLiturgy.Data.Auth\CodeLiturgy.Data.Auth.csproj", "{2998FE17-18AD-4888-A696-7F6340F8A543}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharp.Augeas", "include\Sharp.Augeas\Sharp.Augeas\Sharp.Augeas.csproj", "{F12DB2F1-2F2C-4A4C-BBAA-944AF5FB0E59}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharp.Augeas.Test", "include\Sharp.Augeas\Sharp.Augeas.Test\Sharp.Augeas.Test.csproj", "{03308684-19AC-454B-8CD3-AB1C26B8BBBF}" @@ -75,22 +69,10 @@ Global {BBF5E860-A880-450B-B6C9-EF92F6421B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BBF5E860-A880-450B-B6C9-EF92F6421B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU {BBF5E860-A880-450B-B6C9-EF92F6421B3D}.Release|Any CPU.Build.0 = Release|Any CPU - {F0F4A1F3-E279-4374-B146-1E1D82011574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0F4A1F3-E279-4374-B146-1E1D82011574}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0F4A1F3-E279-4374-B146-1E1D82011574}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0F4A1F3-E279-4374-B146-1E1D82011574}.Release|Any CPU.Build.0 = Release|Any CPU {59714691-B930-416E-9B93-D91BAE37318F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {59714691-B930-416E-9B93-D91BAE37318F}.Debug|Any CPU.Build.0 = Debug|Any CPU {59714691-B930-416E-9B93-D91BAE37318F}.Release|Any CPU.ActiveCfg = Release|Any CPU {59714691-B930-416E-9B93-D91BAE37318F}.Release|Any CPU.Build.0 = Release|Any CPU - {1085FF6E-E568-441E-9A2D-23F50AB613AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1085FF6E-E568-441E-9A2D-23F50AB613AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1085FF6E-E568-441E-9A2D-23F50AB613AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1085FF6E-E568-441E-9A2D-23F50AB613AF}.Release|Any CPU.Build.0 = Release|Any CPU - {2998FE17-18AD-4888-A696-7F6340F8A543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2998FE17-18AD-4888-A696-7F6340F8A543}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2998FE17-18AD-4888-A696-7F6340F8A543}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2998FE17-18AD-4888-A696-7F6340F8A543}.Release|Any CPU.Build.0 = Release|Any CPU {F12DB2F1-2F2C-4A4C-BBAA-944AF5FB0E59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F12DB2F1-2F2C-4A4C-BBAA-944AF5FB0E59}.Debug|Any CPU.Build.0 = Debug|Any CPU {F12DB2F1-2F2C-4A4C-BBAA-944AF5FB0E59}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj b/CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj deleted file mode 100644 index a814462..0000000 --- a/CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - net7.0 - enable - enable - BlueWest.Data.Application - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CodeLiturgy.Data.Application/Configuration/ConnectionString.cs b/CodeLiturgy.Data.Application/Configuration/ConnectionString.cs deleted file mode 100644 index 57bc5fd..0000000 --- a/CodeLiturgy.Data.Application/Configuration/ConnectionString.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace BlueWest.WebApi.Configuration -{ - public class ConnectionStringDocker - { - public string MySql { get; set; } - } - public class ConnectionStringNoDocker - { - public string MySql { get; set; } - } -} - diff --git a/CodeLiturgy.Data.Application/Geo/Coordinate.cs b/CodeLiturgy.Data.Application/Geo/Coordinate.cs deleted file mode 100644 index 095e4ad..0000000 --- a/CodeLiturgy.Data.Application/Geo/Coordinate.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace BlueWest.Data.Geography -{ - public partial class Coordinate - { - public Guid Key { get; set; } - public double Latitude { get; set; } - public double Longitude { get; set; } - public Country Country { get; set; } - public long CreatedTime { get; set; } - } -} - diff --git a/CodeLiturgy.Data.Application/Geo/Country/Country.cs b/CodeLiturgy.Data.Application/Geo/Country/Country.cs deleted file mode 100644 index d940413..0000000 --- a/CodeLiturgy.Data.Application/Geo/Country/Country.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text.Json.Serialization; -using BlueWest.Data.Application.Users; -using MapTo; - -namespace BlueWest.Data -{ - [MapFrom(new [] - { - typeof(CountryUpdate), - typeof(CountryCreate), - typeof(CountryUnique) - })] - - public partial class Country - { - public int Id { get; set; } - /// - /// ISO 3166-1 numeric code - /// - public int Code { get; set; } - - public string Name { get; set; } - - /// - /// ISO 3166-1 State Name - /// - public string StateName { get; set; } - - [MaxLength(2)] public string Alpha2Code { get; set; } - public string TLD { get; set; } - - public List Users { get; set; } - - public DateTime CreationDate { get; set; } - - } -} - diff --git a/CodeLiturgy.Data.Application/Geo/Country/CountryCreate.cs b/CodeLiturgy.Data.Application/Geo/Country/CountryCreate.cs deleted file mode 100644 index c414af2..0000000 --- a/CodeLiturgy.Data.Application/Geo/Country/CountryCreate.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using MapTo; - -namespace BlueWest.Data -{ - [MapFrom( typeof(Country))] - public partial class CountryCreate - { - // ISO 3166-1 numeric code - public int Code { get; set; } - - public string Name { get; set; } - public string StateName { get; set; } - - //public List CurrenciesToCreate { get; set; } - - public string Alpha2Code { get; set; } - - public string TLD { get; set; } - public DateTime CreateTime { get; } = DateTime.Now; - - - } -} - diff --git a/CodeLiturgy.Data.Application/Geo/Country/CountryUnique.cs b/CodeLiturgy.Data.Application/Geo/Country/CountryUnique.cs deleted file mode 100644 index c15fd78..0000000 --- a/CodeLiturgy.Data.Application/Geo/Country/CountryUnique.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using MapTo; - -namespace BlueWest.Data -{ - [MapFrom( typeof(Country))] - - public partial class CountryUnique - { - // ISO 3166-1 numeric code - public int Id { get; set; } - - public int Code { get; set; } - - public string Name { get; set; } - - public string StateName { get; set; } - - [MaxLength(2)] public string Alpha2Code { get; set; } - - public string TLD { get; set; } - - } -} - diff --git a/CodeLiturgy.Data.Application/Geo/Country/CountryUpdate.cs b/CodeLiturgy.Data.Application/Geo/Country/CountryUpdate.cs deleted file mode 100644 index a0c11d4..0000000 --- a/CodeLiturgy.Data.Application/Geo/Country/CountryUpdate.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using MapTo; - -namespace BlueWest.Data -{ - [MapFrom( typeof(Country))] - - public partial class CountryUpdate - { - public string Name { get; set; } - public string StateName { get; set; } - public string Alpha2Code { get; set; } - public string TLD { get; set; } - /// - /// ISO 3166-1 numeric code - /// - public int Code { get; set; } - } -} - diff --git a/CodeLiturgy.Data.Auth/CodeLiturgy.Data.Auth.csproj b/CodeLiturgy.Data.Auth/CodeLiturgy.Data.Auth.csproj deleted file mode 100644 index aee1593..0000000 --- a/CodeLiturgy.Data.Auth/CodeLiturgy.Data.Auth.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - net6.0 - enable - enable - - - - net7.0 - 10 - BlueWest.WebApi - true - true - bin\$(Configuration)\$(AssemblyName).xml - true - preview - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - diff --git a/CodeLiturgy.Domain/CodeLiturgy.Domain.csproj b/CodeLiturgy.Domain/CodeLiturgy.Domain.csproj deleted file mode 100644 index d019bce..0000000 --- a/CodeLiturgy.Domain/CodeLiturgy.Domain.csproj +++ /dev/null @@ -1,58 +0,0 @@ - - - - net7.0 - 10 - true - true - true - preview - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CodeLiturgy.Domain/DbContexts/CountryDbContext.cs b/CodeLiturgy.Domain/DbContexts/CountryDbContext.cs deleted file mode 100644 index e1820fb..0000000 --- a/CodeLiturgy.Domain/DbContexts/CountryDbContext.cs +++ /dev/null @@ -1,64 +0,0 @@ -using BlueWest.Data; -using CodeLiturgy.Domain.Model; -using CodeLiturgy.Domain.Extensions; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using BlueWest.EfMethods; - -namespace CodeLiturgy.Domain -{ - - /// - /// Countries and Currencies - /// - [EfGenerator] - public sealed class CountryDbContext : DbContext - { - - #region Countries - - /// - /// Countries - /// - - [EfGetOneBy(nameof(Country.Id), typeof(CountryUnique))] - [EfGetOne(typeof(CountryUnique))] - - [EfAddMethods(createType: typeof(CountryCreate), returnType: typeof(CountryUnique))] - [EfUpdateMethods( updateType: typeof(CountryUpdate), returnType: typeof(CountryUnique), keyPropertyMemberName: nameof(Country.Id))] - - [EfGetMany(typeof(CountryUnique))] - public DbSet Countries { get; set; } - - #endregion - - - #region Initialization - /// - /// App Configuration - /// - public IConfiguration Configuration; - - - /// - /// CountryDbContext Constructor. - /// - /// - public CountryDbContext(DbContextOptions options) : base(options) - { - Database.EnsureCreated(); - } - - /// - /// On model creating. - /// - /// - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - base.OnModelCreating(modelBuilder); - modelBuilder.ConfigureCurrentDbModel(); - } - #endregion - - } -} diff --git a/CodeLiturgy.Data.Application/AccessToken.cs b/CodeLiturgy.Views/AccessToken.cs similarity index 86% rename from CodeLiturgy.Data.Application/AccessToken.cs rename to CodeLiturgy.Views/AccessToken.cs index 9dec456..0527ef0 100644 --- a/CodeLiturgy.Data.Application/AccessToken.cs +++ b/CodeLiturgy.Views/AccessToken.cs @@ -1,5 +1,5 @@ -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { public class AccessToken { diff --git a/CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDevice.cs b/CodeLiturgy.Views/Application/ApplicationDevice/ApplicationDevice.cs similarity index 89% rename from CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDevice.cs rename to CodeLiturgy.Views/Application/ApplicationDevice/ApplicationDevice.cs index f0dd28f..4b7f72f 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDevice.cs +++ b/CodeLiturgy.Views/Application/ApplicationDevice/ApplicationDevice.cs @@ -1,7 +1,7 @@ using System.Globalization; using System.Net; -namespace BlueWest.Data.Application +namespace CodeLiturgy.Data.Application { public class ApplicationDevice { diff --git a/CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDeviceCreate.cs b/CodeLiturgy.Views/Application/ApplicationDevice/ApplicationDeviceCreate.cs similarity index 88% rename from CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDeviceCreate.cs rename to CodeLiturgy.Views/Application/ApplicationDevice/ApplicationDeviceCreate.cs index b46e6af..1dd0f38 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDeviceCreate.cs +++ b/CodeLiturgy.Views/Application/ApplicationDevice/ApplicationDeviceCreate.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BlueWest.Data.Application +namespace CodeLiturgy.Data.Application { public class ApplicationDeviceCreate diff --git a/CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientOperatingSystem.cs b/CodeLiturgy.Views/Application/ApplicationDevice/ClientOperatingSystem.cs similarity index 94% rename from CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientOperatingSystem.cs rename to CodeLiturgy.Views/Application/ApplicationDevice/ClientOperatingSystem.cs index 4213583..7c8d0da 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientOperatingSystem.cs +++ b/CodeLiturgy.Views/Application/ApplicationDevice/ClientOperatingSystem.cs @@ -1,4 +1,4 @@ -namespace BlueWest.Data.Application +namespace CodeLiturgy.Data.Application { public enum ClientOperatingSystem { diff --git a/CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientPlatformType.cs b/CodeLiturgy.Views/Application/ApplicationDevice/ClientPlatformType.cs similarity index 83% rename from CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientPlatformType.cs rename to CodeLiturgy.Views/Application/ApplicationDevice/ClientPlatformType.cs index 4b78e42..56c9355 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientPlatformType.cs +++ b/CodeLiturgy.Views/Application/ApplicationDevice/ClientPlatformType.cs @@ -1,4 +1,4 @@ -namespace BlueWest.Data.Application; +namespace CodeLiturgy.Data.Application; public enum ClientPlatformType { diff --git a/CodeLiturgy.Data.Application/Application/ApplicationDevice/OperatingSystemType.cs b/CodeLiturgy.Views/Application/ApplicationDevice/OperatingSystemType.cs similarity index 76% rename from CodeLiturgy.Data.Application/Application/ApplicationDevice/OperatingSystemType.cs rename to CodeLiturgy.Views/Application/ApplicationDevice/OperatingSystemType.cs index c192858..3b508dc 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationDevice/OperatingSystemType.cs +++ b/CodeLiturgy.Views/Application/ApplicationDevice/OperatingSystemType.cs @@ -1,4 +1,4 @@ -namespace BlueWest.Data.Application +namespace CodeLiturgy.Data.Application { public enum OperatingSystemType { diff --git a/CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRole.cs b/CodeLiturgy.Views/Application/ApplicationRole/ApplicationRole.cs similarity index 91% rename from CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRole.cs rename to CodeLiturgy.Views/Application/ApplicationRole/ApplicationRole.cs index 48f3744..74b84ae 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRole.cs +++ b/CodeLiturgy.Views/Application/ApplicationRole/ApplicationRole.cs @@ -1,7 +1,7 @@ using MapTo; using Microsoft.AspNetCore.Identity; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { /// [MapFrom(typeof(ApplicationRoleUnique))] diff --git a/CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRoleUnique.cs b/CodeLiturgy.Views/Application/ApplicationRole/ApplicationRoleUnique.cs similarity index 84% rename from CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRoleUnique.cs rename to CodeLiturgy.Views/Application/ApplicationRole/ApplicationRoleUnique.cs index fa0d2d5..7b59c59 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRoleUnique.cs +++ b/CodeLiturgy.Views/Application/ApplicationRole/ApplicationRoleUnique.cs @@ -1,6 +1,6 @@ using MapTo; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { [MapFrom(typeof(ApplicationRole))] public partial class ApplicationRoleUnique diff --git a/CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs b/CodeLiturgy.Views/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs similarity index 92% rename from CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs rename to CodeLiturgy.Views/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs index 440caac..e1e71a4 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs +++ b/CodeLiturgy.Views/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs @@ -2,7 +2,7 @@ using System; using Microsoft.AspNetCore.Identity; using MapTo; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { /// diff --git a/CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs b/CodeLiturgy.Views/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs similarity index 86% rename from CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs rename to CodeLiturgy.Views/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs index d792356..5a595f4 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs +++ b/CodeLiturgy.Views/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs @@ -1,6 +1,6 @@ using MapTo; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { [MapFrom(typeof(ApplicationRoleClaim))] public partial class ApplicationRoleClaimUnique diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUser.cs b/CodeLiturgy.Views/Application/ApplicationUser/ApplicationUser.cs similarity index 83% rename from CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUser.cs rename to CodeLiturgy.Views/Application/ApplicationUser/ApplicationUser.cs index 8a2033c..1b293d9 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUser.cs +++ b/CodeLiturgy.Views/Application/ApplicationUser/ApplicationUser.cs @@ -2,13 +2,13 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using BlueWest.Data; -using BlueWest.Data.Application; +using CodeLiturgy.Data; +using CodeLiturgy.Data.Application; using CodeLiturgy.Data.Application; using MapTo; using Microsoft.AspNetCore.Identity; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { /// /// Application User in the Identity System. diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUserUnique.cs b/CodeLiturgy.Views/Application/ApplicationUser/ApplicationUserUnique.cs similarity index 95% rename from CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUserUnique.cs rename to CodeLiturgy.Views/Application/ApplicationUser/ApplicationUserUnique.cs index eb38e7f..f2bfa88 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUserUnique.cs +++ b/CodeLiturgy.Views/Application/ApplicationUser/ApplicationUserUnique.cs @@ -1,7 +1,7 @@ using System; using MapTo; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { [MapFrom(typeof(ApplicationUser))] public partial class ApplicationUserUnique diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaim.cs b/CodeLiturgy.Views/Application/ApplicationUserClaim/ApplicationUserClaim.cs similarity index 94% rename from CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaim.cs rename to CodeLiturgy.Views/Application/ApplicationUserClaim/ApplicationUserClaim.cs index 7bc5c6d..0f7b3a9 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaim.cs +++ b/CodeLiturgy.Views/Application/ApplicationUserClaim/ApplicationUserClaim.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Identity; using MapTo; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { [MapFrom(typeof(ApplicationUserClaimUnique))] diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs b/CodeLiturgy.Views/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs similarity index 87% rename from CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs rename to CodeLiturgy.Views/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs index d02aad7..f4c492b 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs +++ b/CodeLiturgy.Views/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs @@ -1,6 +1,6 @@ using MapTo; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { [MapFrom(typeof(ApplicationUserClaim))] public partial class ApplicationUserClaimUnique diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUserLogin/ApplicationUserLogin.cs b/CodeLiturgy.Views/Application/ApplicationUserLogin/ApplicationUserLogin.cs similarity index 72% rename from CodeLiturgy.Data.Application/Application/ApplicationUserLogin/ApplicationUserLogin.cs rename to CodeLiturgy.Views/Application/ApplicationUserLogin/ApplicationUserLogin.cs index b2b8cdc..960da88 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationUserLogin/ApplicationUserLogin.cs +++ b/CodeLiturgy.Views/Application/ApplicationUserLogin/ApplicationUserLogin.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Identity; -namespace BlueWest.Data.Application.Users; +namespace CodeLiturgy.Data.Application.Users; /// public class ApplicationUserLogin : IdentityUserLogin { } \ No newline at end of file diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRole.cs b/CodeLiturgy.Views/Application/ApplicationUserRole/ApplicationUserRole.cs similarity index 93% rename from CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRole.cs rename to CodeLiturgy.Views/Application/ApplicationUserRole/ApplicationUserRole.cs index b6d25d4..5d6d944 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRole.cs +++ b/CodeLiturgy.Views/Application/ApplicationUserRole/ApplicationUserRole.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Identity; using MapTo; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { /// diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs b/CodeLiturgy.Views/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs similarity index 82% rename from CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs rename to CodeLiturgy.Views/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs index 879d03e..f26a157 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs +++ b/CodeLiturgy.Views/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs @@ -1,6 +1,6 @@ using MapTo; -namespace BlueWest.Data.Application.Users +namespace CodeLiturgy.Data.Application.Users { [MapFrom(typeof(ApplicationUserRole))] public partial class ApplicationUserRoleUnique diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUserToken/ApplicationUserToken.cs b/CodeLiturgy.Views/Application/ApplicationUserToken/ApplicationUserToken.cs similarity index 76% rename from CodeLiturgy.Data.Application/Application/ApplicationUserToken/ApplicationUserToken.cs rename to CodeLiturgy.Views/Application/ApplicationUserToken/ApplicationUserToken.cs index dbdf31a..04d63ac 100644 --- a/CodeLiturgy.Data.Application/Application/ApplicationUserToken/ApplicationUserToken.cs +++ b/CodeLiturgy.Views/Application/ApplicationUserToken/ApplicationUserToken.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Identity; -namespace BlueWest.Data.Application.Users; +namespace CodeLiturgy.Data.Application.Users; /// public class ApplicationUserToken : IdentityUserToken diff --git a/CodeLiturgy.Data.Application/Session/LoginRequest.cs b/CodeLiturgy.Views/Application/Session/LoginRequest.cs similarity index 95% rename from CodeLiturgy.Data.Application/Session/LoginRequest.cs rename to CodeLiturgy.Views/Application/Session/LoginRequest.cs index 8a1867a..e9b4a2c 100644 --- a/CodeLiturgy.Data.Application/Session/LoginRequest.cs +++ b/CodeLiturgy.Views/Application/Session/LoginRequest.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BlueWest.Data.Auth.Context.Users +namespace CodeLiturgy.Data.Auth.Context.Users { // from: https://github.com/dotnet/aspnetcore/tree/main/src/Identity/samples/IdentitySample.Mvc/Models/AccountViewModels /// diff --git a/CodeLiturgy.Data.Application/Session/RegisterRequest.cs b/CodeLiturgy.Views/Application/Session/RegisterRequest.cs similarity index 94% rename from CodeLiturgy.Data.Application/Session/RegisterRequest.cs rename to CodeLiturgy.Views/Application/Session/RegisterRequest.cs index 5b3f826..56a316d 100644 --- a/CodeLiturgy.Data.Application/Session/RegisterRequest.cs +++ b/CodeLiturgy.Views/Application/Session/RegisterRequest.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; /// /// diff --git a/CodeLiturgy.Data.Application/Session/SessionConstants.cs b/CodeLiturgy.Views/Application/Session/SessionConstants.cs similarity index 94% rename from CodeLiturgy.Data.Application/Session/SessionConstants.cs rename to CodeLiturgy.Views/Application/Session/SessionConstants.cs index 01a98d3..deaaf48 100644 --- a/CodeLiturgy.Data.Application/Session/SessionConstants.cs +++ b/CodeLiturgy.Views/Application/Session/SessionConstants.cs @@ -1,6 +1,6 @@ using System; -namespace BlueWest.Data.Auth +namespace CodeLiturgy.Data.Auth { public static class SessionConstants { diff --git a/CodeLiturgy.Data.Auth/Users/ApplicationUserManager.cs b/CodeLiturgy.Views/Application/Users/ApplicationUserManager.cs similarity index 97% rename from CodeLiturgy.Data.Auth/Users/ApplicationUserManager.cs rename to CodeLiturgy.Views/Application/Users/ApplicationUserManager.cs index 3be389c..359c849 100644 --- a/CodeLiturgy.Data.Auth/Users/ApplicationUserManager.cs +++ b/CodeLiturgy.Views/Application/Users/ApplicationUserManager.cs @@ -1,11 +1,11 @@ using BlueWest.Cryptography; -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; /// /// User Manager Object diff --git a/CodeLiturgy.Data.Auth/Users/Auth/AuthConsts.cs b/CodeLiturgy.Views/Application/Users/Auth/AuthConsts.cs similarity index 79% rename from CodeLiturgy.Data.Auth/Users/Auth/AuthConsts.cs rename to CodeLiturgy.Views/Application/Users/Auth/AuthConsts.cs index e48d598..fda36ec 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/AuthConsts.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/AuthConsts.cs @@ -1,9 +1,8 @@ using System.Security.Claims; using System.Threading.Tasks; -using BlueWest.Data.Application; using Microsoft.AspNetCore.Identity; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; public static class AuthConsts { diff --git a/CodeLiturgy.Data.Auth/Users/Auth/AuthManager.cs b/CodeLiturgy.Views/Application/Users/Auth/AuthManager.cs similarity index 95% rename from CodeLiturgy.Data.Auth/Users/Auth/AuthManager.cs rename to CodeLiturgy.Views/Application/Users/Auth/AuthManager.cs index a0c9c53..ad30fde 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/AuthManager.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/AuthManager.cs @@ -1,11 +1,11 @@ using System.Security.Claims; using BlueWest.Cryptography; -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Identity; -using static BlueWest.Data.Auth.Context.Users.AuthConsts; +using static CodeLiturgy.Data.Auth.Context.Users.AuthConsts; -namespace BlueWest.Data.Auth.Context.Users +namespace CodeLiturgy.Data.Auth.Context.Users { /// /// Authentication Manager for the Application Users diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/BaseCryptoItem.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/BaseCryptoItem.cs similarity index 100% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/BaseCryptoItem.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/BaseCryptoItem.cs diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/Hasher.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/Hasher.cs similarity index 97% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/Hasher.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/Hasher.cs index 60c1203..94a54b2 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/Hasher.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/Crypto/Hasher.cs @@ -1,6 +1,6 @@ using System; -using BlueWest.Data.Application.Users; -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Application.Users; +using CodeLiturgy.Data.Auth.Context.Users; using Microsoft.AspNetCore.Identity; diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/IHasher.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/IHasher.cs similarity index 91% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/IHasher.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/IHasher.cs index 8c58f31..29f11f5 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/IHasher.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/Crypto/IHasher.cs @@ -1,5 +1,5 @@ -using BlueWest.Data.Application.Users; -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Application.Users; +using CodeLiturgy.Data.Auth.Context.Users; using Microsoft.AspNetCore.Identity; namespace BlueWest.Cryptography; diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/IJwtFactory.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/IJwtFactory.cs similarity index 60% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/IJwtFactory.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/IJwtFactory.cs index cd1c45a..afefcab 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/IJwtFactory.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/Crypto/IJwtFactory.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; public interface IJwtFactory { diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/IJwtTokenHandler.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/IJwtTokenHandler.cs similarity index 87% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/IJwtTokenHandler.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/IJwtTokenHandler.cs index aced078..9b63b1e 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/IJwtTokenHandler.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/Crypto/IJwtTokenHandler.cs @@ -2,7 +2,7 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using Microsoft.IdentityModel.Tokens; -namespace BlueWest.Data.Auth.Context.Users +namespace CodeLiturgy.Data.Auth.Context.Users { public interface IJwtTokenHandler { diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/ISessionHasher.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/ISessionHasher.cs similarity index 100% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/ISessionHasher.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/ISessionHasher.cs diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/ITokenFactory.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/ITokenFactory.cs similarity index 61% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/ITokenFactory.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/ITokenFactory.cs index 91eb892..3fa129d 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/ITokenFactory.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/Crypto/ITokenFactory.cs @@ -1,4 +1,4 @@ -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; internal interface ITokenFactory { diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtFactory.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtFactory.cs similarity index 95% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtFactory.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtFactory.cs index 26d2910..735bb7e 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtFactory.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtFactory.cs @@ -2,11 +2,11 @@ using System; using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using System.Security.Principal; -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; using Microsoft.Extensions.Options; -using static BlueWest.Data.Auth.Context.Users.Constants; +using static CodeLiturgy.Data.Auth.Context.Users.Constants; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; public class JwtFactory : IJwtFactory { diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtIssuerOptions.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtIssuerOptions.cs similarity index 97% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtIssuerOptions.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtIssuerOptions.cs index 858189d..16f3b89 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtIssuerOptions.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtIssuerOptions.cs @@ -2,7 +2,7 @@ using System; using System.Threading.Tasks; using Microsoft.IdentityModel.Tokens; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; public class JwtIssuerOptions { diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtTokenHandler.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtTokenHandler.cs similarity index 96% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtTokenHandler.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtTokenHandler.cs index df8b6d5..e8e5adb 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtTokenHandler.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtTokenHandler.cs @@ -3,7 +3,7 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using Microsoft.IdentityModel.Tokens; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; public class JwtTokenHandler : IJwtTokenHandler { diff --git a/CodeLiturgy.Data.Auth/Users/Auth/Crypto/SHA_512.cs b/CodeLiturgy.Views/Application/Users/Auth/Crypto/SHA_512.cs similarity index 100% rename from CodeLiturgy.Data.Auth/Users/Auth/Crypto/SHA_512.cs rename to CodeLiturgy.Views/Application/Users/Auth/Crypto/SHA_512.cs diff --git a/CodeLiturgy.Data.Auth/Users/Auth/IAuthManager.cs b/CodeLiturgy.Views/Application/Users/Auth/IAuthManager.cs similarity index 85% rename from CodeLiturgy.Data.Auth/Users/Auth/IAuthManager.cs rename to CodeLiturgy.Views/Application/Users/Auth/IAuthManager.cs index e70c008..eb90cd0 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/IAuthManager.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/IAuthManager.cs @@ -1,10 +1,10 @@ using System; using System.Security.Claims; using System.Threading.Tasks; -using BlueWest.Data.Application; +using CodeLiturgy.Data.Application; using Microsoft.AspNetCore.Identity; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; /// /// Auth manager contract interface. diff --git a/CodeLiturgy.Data.Auth/Users/Auth/SignInManager.cs b/CodeLiturgy.Views/Application/Users/Auth/SignInManager.cs similarity index 90% rename from CodeLiturgy.Data.Auth/Users/Auth/SignInManager.cs rename to CodeLiturgy.Views/Application/Users/Auth/SignInManager.cs index a55e057..3726b7d 100644 --- a/CodeLiturgy.Data.Auth/Users/Auth/SignInManager.cs +++ b/CodeLiturgy.Views/Application/Users/Auth/SignInManager.cs @@ -1,12 +1,12 @@ -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; /// /// SignInManager diff --git a/CodeLiturgy.Data.Auth/Users/Constants.cs b/CodeLiturgy.Views/Application/Users/Constants.cs similarity index 93% rename from CodeLiturgy.Data.Auth/Users/Constants.cs rename to CodeLiturgy.Views/Application/Users/Constants.cs index 95f2ade..1c9c672 100644 --- a/CodeLiturgy.Data.Auth/Users/Constants.cs +++ b/CodeLiturgy.Views/Application/Users/Constants.cs @@ -1,4 +1,4 @@ -namespace BlueWest.Data.Auth.Context.Users; +namespace CodeLiturgy.Data.Auth.Context.Users; public static class Constants { diff --git a/CodeLiturgy.Data.Auth/Users/IUserManager.cs b/CodeLiturgy.Views/Application/Users/IUserManager.cs similarity index 92% rename from CodeLiturgy.Data.Auth/Users/IUserManager.cs rename to CodeLiturgy.Views/Application/Users/IUserManager.cs index 598f996..42bd195 100644 --- a/CodeLiturgy.Data.Auth/Users/IUserManager.cs +++ b/CodeLiturgy.Views/Application/Users/IUserManager.cs @@ -1,9 +1,9 @@ using System.Security.Claims; -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; using Microsoft.AspNetCore.Identity; -namespace BlueWest.Data.Auth.Context.Users +namespace CodeLiturgy.Data.Auth.Context.Users { public interface IUserManager { diff --git a/CodeLiturgy.Data.Auth/Users/SessionExtensions.cs b/CodeLiturgy.Views/Application/Users/SessionExtensions.cs similarity index 100% rename from CodeLiturgy.Data.Auth/Users/SessionExtensions.cs rename to CodeLiturgy.Views/Application/Users/SessionExtensions.cs diff --git a/CodeLiturgy.Data.Auth/Users/UserRepository.cs b/CodeLiturgy.Views/Application/Users/UserRepository.cs similarity index 95% rename from CodeLiturgy.Data.Auth/Users/UserRepository.cs rename to CodeLiturgy.Views/Application/Users/UserRepository.cs index b6e3439..51b74cc 100644 --- a/CodeLiturgy.Data.Auth/Users/UserRepository.cs +++ b/CodeLiturgy.Views/Application/Users/UserRepository.cs @@ -1,10 +1,10 @@ -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; using CodeLiturgy.Domain; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -namespace BlueWest.Data.Auth.Context.Users +namespace CodeLiturgy.Data.Auth.Context.Users { /// /// Users Repository diff --git a/CodeLiturgy.Data.Auth/AuthSettings.cs b/CodeLiturgy.Views/AuthSettings.cs similarity index 100% rename from CodeLiturgy.Data.Auth/AuthSettings.cs rename to CodeLiturgy.Views/AuthSettings.cs diff --git a/CodeLiturgy.Views/CodeLiturgy.Views.csproj b/CodeLiturgy.Views/CodeLiturgy.Views.csproj index 76d45a4..dcba0e7 100644 --- a/CodeLiturgy.Views/CodeLiturgy.Views.csproj +++ b/CodeLiturgy.Views/CodeLiturgy.Views.csproj @@ -108,12 +108,32 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/CodeLiturgy.Views/Controllers/AccountController.cs b/CodeLiturgy.Views/Controllers/AccountController.cs index fb2c60a..0be1814 100644 --- a/CodeLiturgy.Views/Controllers/AccountController.cs +++ b/CodeLiturgy.Views/Controllers/AccountController.cs @@ -1,6 +1,6 @@ using System.Diagnostics; using System.Web.Mvc; -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Auth.Context.Users; using Microsoft.AspNetCore.Mvc; using CodeLiturgy.Views.Models; using CodeLiturgy.Views.Utils; diff --git a/CodeLiturgy.Views/Controllers/AuthController.cs b/CodeLiturgy.Views/Controllers/AuthController.cs index 9ea291b..a0cc1d1 100644 --- a/CodeLiturgy.Views/Controllers/AuthController.cs +++ b/CodeLiturgy.Views/Controllers/AuthController.cs @@ -1,6 +1,6 @@ using System.Security.Claims; -using BlueWest.Data.Auth; -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Auth; +using CodeLiturgy.Data.Auth.Context.Users; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authorization; diff --git a/CodeLiturgy.Views/Controllers/EnvironmentsPageController.cs b/CodeLiturgy.Views/Controllers/EnvironmentsPageController.cs index a153d68..e827f61 100644 --- a/CodeLiturgy.Views/Controllers/EnvironmentsPageController.cs +++ b/CodeLiturgy.Views/Controllers/EnvironmentsPageController.cs @@ -1,4 +1,4 @@ -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Auth.Context.Users; using CodeLiturgy.Views.Utils; using Duende.IdentityServer.Extensions; using Microsoft.AspNetCore.Mvc; diff --git a/CodeLiturgy.Views/Controllers/HomeController.cs b/CodeLiturgy.Views/Controllers/HomeController.cs index e234a59..c082f67 100644 --- a/CodeLiturgy.Views/Controllers/HomeController.cs +++ b/CodeLiturgy.Views/Controllers/HomeController.cs @@ -1,4 +1,4 @@ -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Auth.Context.Users; using Microsoft.AspNetCore.Mvc; using CodeLiturgy.Views.Utils; using Duende.IdentityServer.Extensions; diff --git a/CodeLiturgy.Views/Controllers/SitesController.cs b/CodeLiturgy.Views/Controllers/SitesController.cs index 1ff628b..80ea722 100644 --- a/CodeLiturgy.Views/Controllers/SitesController.cs +++ b/CodeLiturgy.Views/Controllers/SitesController.cs @@ -1,4 +1,4 @@ -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Auth.Context.Users; using CodeLiturgy.Data.Application; using CodeLiturgy.Domain; using Microsoft.AspNetCore.Authorization; diff --git a/CodeLiturgy.Views/Controllers/System/SystemController.cs b/CodeLiturgy.Views/Controllers/System/SystemController.cs index 5662d67..5dc6d2a 100644 --- a/CodeLiturgy.Views/Controllers/System/SystemController.cs +++ b/CodeLiturgy.Views/Controllers/System/SystemController.cs @@ -1,4 +1,4 @@ -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Auth.Context.Users; using CodeLiturgy.Views.Utils; using Microsoft.AspNetCore.Mvc; diff --git a/CodeLiturgy.Views/Controllers/UserController.cs b/CodeLiturgy.Views/Controllers/UserController.cs index 30a7033..0aba5fd 100644 --- a/CodeLiturgy.Views/Controllers/UserController.cs +++ b/CodeLiturgy.Views/Controllers/UserController.cs @@ -1,7 +1,7 @@ using System.Net; using System.Net.Sockets; -using BlueWest.Data.Application.Users; -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Application.Users; +using CodeLiturgy.Data.Auth.Context.Users; using CodeLiturgy.Views.Models; using CodeLiturgy.Views.Utils; using Duende.IdentityServer.Extensions; diff --git a/CodeLiturgy.Domain/DbContexts/ApplicationUserDbContext.cs b/CodeLiturgy.Views/DbContexts/ApplicationUserDbContext.cs similarity index 97% rename from CodeLiturgy.Domain/DbContexts/ApplicationUserDbContext.cs rename to CodeLiturgy.Views/DbContexts/ApplicationUserDbContext.cs index 1cfb3f3..5c0a7cf 100644 --- a/CodeLiturgy.Domain/DbContexts/ApplicationUserDbContext.cs +++ b/CodeLiturgy.Views/DbContexts/ApplicationUserDbContext.cs @@ -1,4 +1,4 @@ -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data.Application.Users; using BlueWest.EfMethods; using CodeLiturgy.Domain.Model; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; diff --git a/CodeLiturgy.Domain/DbContexts/SiteDbContext.cs b/CodeLiturgy.Views/DbContexts/SiteDbContext.cs similarity index 90% rename from CodeLiturgy.Domain/DbContexts/SiteDbContext.cs rename to CodeLiturgy.Views/DbContexts/SiteDbContext.cs index c826a42..371d495 100644 --- a/CodeLiturgy.Domain/DbContexts/SiteDbContext.cs +++ b/CodeLiturgy.Views/DbContexts/SiteDbContext.cs @@ -13,6 +13,8 @@ namespace CodeLiturgy.Domain public DbSet Sites { get; set; } + public DbSet Environments { get; set; } + /// /// SiteDbContext Constructor. /// diff --git a/CodeLiturgy.Domain/Extensions/ModelBuilderCountryDbContextExtensions.cs b/CodeLiturgy.Views/Models/ModelBuilderCountryDbContextExtensions.cs similarity index 92% rename from CodeLiturgy.Domain/Extensions/ModelBuilderCountryDbContextExtensions.cs rename to CodeLiturgy.Views/Models/ModelBuilderCountryDbContextExtensions.cs index c9fbb7e..7d9af08 100644 --- a/CodeLiturgy.Domain/Extensions/ModelBuilderCountryDbContextExtensions.cs +++ b/CodeLiturgy.Views/Models/ModelBuilderCountryDbContextExtensions.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using BlueWest.Data; +using CodeLiturgy.Data; using Microsoft.EntityFrameworkCore; namespace CodeLiturgy.Domain.Extensions diff --git a/CodeLiturgy.Domain/Extensions/ModelBuilderExtensions.cs b/CodeLiturgy.Views/Models/ModelBuilderExtensions.cs similarity index 67% rename from CodeLiturgy.Domain/Extensions/ModelBuilderExtensions.cs rename to CodeLiturgy.Views/Models/ModelBuilderExtensions.cs index 503a3db..29d4396 100644 --- a/CodeLiturgy.Domain/Extensions/ModelBuilderExtensions.cs +++ b/CodeLiturgy.Views/Models/ModelBuilderExtensions.cs @@ -1,6 +1,7 @@ -using BlueWest.Data; -using BlueWest.Data.Application; -using BlueWest.Data.Application.Users; +using CodeLiturgy.Data; +using CodeLiturgy.Data.Application; +using CodeLiturgy.Data.Application.Users; +using CodeLiturgy.Data.Application; using Microsoft.EntityFrameworkCore; namespace CodeLiturgy.Domain.Model @@ -22,10 +23,10 @@ namespace CodeLiturgy.Domain.Model { modelBuilder .ConfigureDatabaseKeys() - .CurrencyModel() + .ConfigureAppContextModel() .ConfigureUserModel() - .ConfigureAppContextModel(); - + .ConfigureEnvironmentModel(); + //.ConfigureIdentityModel(); } @@ -38,9 +39,8 @@ namespace CodeLiturgy.Domain.Model /// Configure App context model /// /// - private static void ConfigureAppContextModel(this ModelBuilder builder) + private static ModelBuilder ConfigureAppContextModel(this ModelBuilder builder) { - builder.Entity().ToTable("UserRoles"); builder.Entity(b => { b.HasMany() @@ -49,7 +49,7 @@ namespace CodeLiturgy.Domain.Model }); - builder.Entity().ToTable("ApplicationUser") + builder.Entity() .HasKey(x => x.Id); @@ -57,7 +57,7 @@ namespace CodeLiturgy.Domain.Model { b.HasKey(r => r.Id); b.HasIndex(r => r.NormalizedName).HasDatabaseName("RoleNameIndex").IsUnique(); - b.ToTable("Roles"); + b.ToTable("roles"); b.Property(r => r.ConcurrencyStamp).IsConcurrencyToken(); b.Property(u => u.Name).HasMaxLength(256); @@ -75,20 +75,16 @@ namespace CodeLiturgy.Domain.Model builder.Entity(b => { b.HasKey(rc => rc.Id); - b.ToTable("RoleClaims"); }); builder.Entity(b => { b.HasKey(r => new {r.UserId, r.RoleId}); - b.ToTable("UserRoles"); }); - builder.Entity().ToTable("RoleClaims"); - builder.Entity().ToTable("UserRole"); - + return builder; //.ConfigureIdentityModel(); } @@ -98,12 +94,23 @@ namespace CodeLiturgy.Domain.Model private static ModelBuilder ConfigureDatabaseKeys(this ModelBuilder modelBuilder) { - // Country + + // Site modelBuilder - .Entity(builder => builder - .HasKey(country => country.Id)) - .Entity().Property(country => country.Id) + .Entity(builder => builder + .HasKey(site => site.Id)) + .Entity().Property(site => site.Id) .ValueGeneratedOnAdd(); + + + // Site Environment + modelBuilder + .Entity(builder => builder + .HasKey(site => site.Id)) + .Entity().Property(site => site.Id) + .ValueGeneratedOnAdd(); + + // FinanceOp return @@ -115,16 +122,24 @@ namespace CodeLiturgy.Domain.Model #region Database Models - private static ModelBuilder CurrencyModel(this ModelBuilder modelBuilder) - { - - modelBuilder.Entity().ToTable("Countries"); - return modelBuilder; - - } - private static ModelBuilder ConfigureUserModel(this ModelBuilder modelBuilder) { + modelBuilder.Entity() + .HasMany(x => x.Environments) + .WithOne(u => u.User) + .HasForeignKey(x => x.UserId); + + return modelBuilder; + } + + private static ModelBuilder ConfigureEnvironmentModel(this ModelBuilder modelBuilder) + { + modelBuilder.Entity().ToTable("site_env"); + modelBuilder + .Entity() + .HasMany(x => x.Sites) + .WithOne(x => x.Environment) + .HasForeignKey(x => x.EnvironmentId); return modelBuilder; } diff --git a/CodeLiturgy.Views/Utils/DataUtil.cs b/CodeLiturgy.Views/RazorUtils/DataUtil.cs similarity index 91% rename from CodeLiturgy.Views/Utils/DataUtil.cs rename to CodeLiturgy.Views/RazorUtils/DataUtil.cs index 19747b6..dc8b86d 100644 --- a/CodeLiturgy.Views/Utils/DataUtil.cs +++ b/CodeLiturgy.Views/RazorUtils/DataUtil.cs @@ -1,5 +1,5 @@ -using BlueWest.Data.Application.Users; -using BlueWest.Data.Auth; +using CodeLiturgy.Data.Application.Users; +using CodeLiturgy.Data.Auth; using CodeLiturgy.Views.Models; using Microsoft.AspNetCore.Mvc.ViewFeatures; diff --git a/CodeLiturgy.Views/Utils/LayoutCache.cs b/CodeLiturgy.Views/RazorUtils/LayoutCache.cs similarity index 100% rename from CodeLiturgy.Views/Utils/LayoutCache.cs rename to CodeLiturgy.Views/RazorUtils/LayoutCache.cs diff --git a/CodeLiturgy.Views/Utils/LinkViewInformation.cs b/CodeLiturgy.Views/RazorUtils/LinkViewInformation.cs similarity index 100% rename from CodeLiturgy.Views/Utils/LinkViewInformation.cs rename to CodeLiturgy.Views/RazorUtils/LinkViewInformation.cs diff --git a/CodeLiturgy.Views/Utils/Menus.cs b/CodeLiturgy.Views/RazorUtils/Menus.cs similarity index 100% rename from CodeLiturgy.Views/Utils/Menus.cs rename to CodeLiturgy.Views/RazorUtils/Menus.cs diff --git a/CodeLiturgy.Views/Utils/RouteRecord.cs b/CodeLiturgy.Views/RazorUtils/RouteRecord.cs similarity index 100% rename from CodeLiturgy.Views/Utils/RouteRecord.cs rename to CodeLiturgy.Views/RazorUtils/RouteRecord.cs diff --git a/CodeLiturgy.Views/Utils/Routes.cs b/CodeLiturgy.Views/RazorUtils/Routes.cs similarity index 100% rename from CodeLiturgy.Views/Utils/Routes.cs rename to CodeLiturgy.Views/RazorUtils/Routes.cs diff --git a/CodeLiturgy.Views/Utils/ViewType.cs b/CodeLiturgy.Views/RazorUtils/ViewType.cs similarity index 100% rename from CodeLiturgy.Views/Utils/ViewType.cs rename to CodeLiturgy.Views/RazorUtils/ViewType.cs diff --git a/CodeLiturgy.Data.Application/Sites/EnvironmentType.cs b/CodeLiturgy.Views/Sites/EnvironmentType.cs similarity index 100% rename from CodeLiturgy.Data.Application/Sites/EnvironmentType.cs rename to CodeLiturgy.Views/Sites/EnvironmentType.cs diff --git a/CodeLiturgy.Data.Application/Sites/Site.cs b/CodeLiturgy.Views/Sites/Site.cs similarity index 75% rename from CodeLiturgy.Data.Application/Sites/Site.cs rename to CodeLiturgy.Views/Sites/Site.cs index b3416c2..635b706 100644 --- a/CodeLiturgy.Data.Application/Sites/Site.cs +++ b/CodeLiturgy.Views/Sites/Site.cs @@ -14,12 +14,14 @@ namespace CodeLiturgy.Data.Application { [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public string Id { get; set; } - - public string Name { get; set; } - + + public SiteEnvironment Environment { get; set; } + + public string EnvironmentId { get; set; } + public string Domain { get; set; } - public string Ip { get; set; } + public string UrlAddress { get; set; } public EnvironmentType EnvironmentType { get; set; } diff --git a/CodeLiturgy.Data.Application/Sites/SiteCreate.cs b/CodeLiturgy.Views/Sites/SiteCreate.cs similarity index 100% rename from CodeLiturgy.Data.Application/Sites/SiteCreate.cs rename to CodeLiturgy.Views/Sites/SiteCreate.cs diff --git a/CodeLiturgy.Data.Application/Sites/SiteDbExtensions.cs b/CodeLiturgy.Views/Sites/SiteDbExtensions.cs similarity index 93% rename from CodeLiturgy.Data.Application/Sites/SiteDbExtensions.cs rename to CodeLiturgy.Views/Sites/SiteDbExtensions.cs index 39bec40..2258ce8 100644 --- a/CodeLiturgy.Data.Application/Sites/SiteDbExtensions.cs +++ b/CodeLiturgy.Views/Sites/SiteDbExtensions.cs @@ -2,7 +2,7 @@ namespace CodeLiturgy.Data.Application { public static class SiteDbExtensions { - + } } diff --git a/CodeLiturgy.Data.Application/Sites/SiteEnvironment.cs b/CodeLiturgy.Views/Sites/SiteEnvironment.cs similarity index 51% rename from CodeLiturgy.Data.Application/Sites/SiteEnvironment.cs rename to CodeLiturgy.Views/Sites/SiteEnvironment.cs index 6f6f18f..2daedaf 100644 --- a/CodeLiturgy.Data.Application/Sites/SiteEnvironment.cs +++ b/CodeLiturgy.Views/Sites/SiteEnvironment.cs @@ -1,10 +1,16 @@ using System.Collections.Generic; +using CodeLiturgy.Data.Application.Users; namespace CodeLiturgy.Data.Application { public class SiteEnvironment { public string Id { get; set; } + + public string Name { get; set; } + public ApplicationUser User { get; set; } + + public string UserId { get; set; } public List Sites { get; set; } } } diff --git a/CodeLiturgy.Data.Application/Sites/SiteUnique.cs b/CodeLiturgy.Views/Sites/SiteUnique.cs similarity index 100% rename from CodeLiturgy.Data.Application/Sites/SiteUnique.cs rename to CodeLiturgy.Views/Sites/SiteUnique.cs diff --git a/CodeLiturgy.Views/Startup.cs b/CodeLiturgy.Views/Startup.cs index 613ecdb..0e773c8 100644 --- a/CodeLiturgy.Views/Startup.cs +++ b/CodeLiturgy.Views/Startup.cs @@ -1,5 +1,5 @@ using System.Globalization; -using BlueWest.Data.Auth; +using CodeLiturgy.Data.Auth; using CodeLiturgy.Views.Utils; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Localization; diff --git a/CodeLiturgy.Views/StartupExtensions.cs b/CodeLiturgy.Views/StartupExtensions.cs index 8ac66da..c0eedf3 100644 --- a/CodeLiturgy.Views/StartupExtensions.cs +++ b/CodeLiturgy.Views/StartupExtensions.cs @@ -1,8 +1,8 @@ using System.Text; using BlueWest.Cryptography; -using BlueWest.Data.Application.Users; -using BlueWest.Data.Auth; -using BlueWest.Data.Auth.Context.Users; +using CodeLiturgy.Data.Application.Users; +using CodeLiturgy.Data.Auth; +using CodeLiturgy.Data.Auth.Context.Users; using CodeLiturgy.Domain; using BlueWest.WebApi.Context.Users; using CodeLiturgy.Views.Utils; @@ -21,27 +21,20 @@ public static class StartupExtensions new(new Version(major, minor, build)); */ - private static string GetConnectionString(this IConfiguration configurationRoot, string db) + private static string GetDbConnectionString(this IConfiguration configurationRoot, string key) { var startupMode = configurationRoot["mode"]; - if (!string.IsNullOrEmpty(startupMode) && startupMode == "docker") + if (!string.IsNullOrEmpty(startupMode)) { - var config = configurationRoot.GetSection("ConnectionStringDocker")[db]; + var config = configurationRoot.GetSection($"ConnectionString:{startupMode}")[key]; return config; } - else - { - return configurationRoot.GetSection("ConnectionStringNoDocker")[db] ?? string.Empty; - } + return String.Empty; + } - private static bool IsDockerMode(this IConfiguration config) - { - var startupMode = config["mode"]; - return startupMode == "docker"; - } internal static IServiceCollection AddAuthServerServices(this IServiceCollection services, IConfiguration configuration, IWebHostEnvironment environment) @@ -172,7 +165,7 @@ public static class StartupExtensions private static DbContextOptionsBuilder UsePsqlConfiguration(this DbContextOptionsBuilder builder, IConfiguration configuration) { - var connString = configuration.GetConnectionString("database"); + var connString = configuration.GetDbConnectionString("db"); builder.UseNpgsql(connString); return builder; } @@ -190,7 +183,6 @@ public static class StartupExtensions { return serviceCollection .AddDbContextPool(options => options.UsePsqlConfiguration(configuration)) - .AddDbContextPool(options => options.UsePsqlConfiguration(configuration)) .AddDbContextPool(options => options.UsePsqlConfiguration(configuration)); } diff --git a/CodeLiturgy.Views/System/SystemExtensions.cs b/CodeLiturgy.Views/System/SystemExtensions.cs deleted file mode 100644 index a3c5b37..0000000 --- a/CodeLiturgy.Views/System/SystemExtensions.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Diagnostics; - -namespace CodeLiturgy.Views -{ - public static class SystemExtensions - { - public static void ExecuteCommand(string command) - { - Process proc = new(); - proc.StartInfo.FileName = "/bin/bash"; - proc.StartInfo.Arguments = "-c \" " + command + " \""; - proc.StartInfo.UseShellExecute = false; - proc.StartInfo.RedirectStandardOutput = true; - proc.Start (); - while (!proc.StandardOutput.EndOfStream) { - Console.WriteLine (proc.StandardOutput.ReadLine ()); - } - } - - public static void AddUser( - string username, - bool createHome, - bool useSudo) - { - var sudoStr = useSudo ? "sudo" : ""; - var createHomeStr = createHome ? "-m" : ""; - var addUser = $"{sudoStr} useradd {createHomeStr} {username}"; - var deletePass = $"{sudoStr} passwd -d {username}"; - var lockPass = $"{sudoStr} passwd -l {username} "; - - ExecuteCommand(addUser); - ExecuteCommand(deletePass); - ExecuteCommand(lockPass); - } - - - public static void DeleteUser( - string username, - bool deleteHome, - bool useSudo) - { - var sudo = useSudo ? "sudo" : ""; - var rmUser = $"{sudo} userdel {username}"; - ExecuteCommand(rmUser); - - if (deleteHome) - { - var delHome = $"{sudo} rm -rf /home/{username}"; - ExecuteCommand(delHome); - } - } - - - } -} - diff --git a/CodeLiturgy.Domain/Templates/AddToListTemplate.csx b/CodeLiturgy.Views/Templates/AddToListTemplate.csx similarity index 100% rename from CodeLiturgy.Domain/Templates/AddToListTemplate.csx rename to CodeLiturgy.Views/Templates/AddToListTemplate.csx diff --git a/CodeLiturgy.Domain/Templates/AddToTemplate.csx b/CodeLiturgy.Views/Templates/AddToTemplate.csx similarity index 100% rename from CodeLiturgy.Domain/Templates/AddToTemplate.csx rename to CodeLiturgy.Views/Templates/AddToTemplate.csx diff --git a/CodeLiturgy.Domain/Templates/GetListTemplate.csx b/CodeLiturgy.Views/Templates/GetListTemplate.csx similarity index 100% rename from CodeLiturgy.Domain/Templates/GetListTemplate.csx rename to CodeLiturgy.Views/Templates/GetListTemplate.csx diff --git a/CodeLiturgy.Domain/Templates/GetManyTemplate.csx b/CodeLiturgy.Views/Templates/GetManyTemplate.csx similarity index 100% rename from CodeLiturgy.Domain/Templates/GetManyTemplate.csx rename to CodeLiturgy.Views/Templates/GetManyTemplate.csx diff --git a/CodeLiturgy.Domain/Templates/GetOneByTemplate.csx b/CodeLiturgy.Views/Templates/GetOneByTemplate.csx similarity index 100% rename from CodeLiturgy.Domain/Templates/GetOneByTemplate.csx rename to CodeLiturgy.Views/Templates/GetOneByTemplate.csx diff --git a/CodeLiturgy.Domain/Templates/GetOneFromListTemplate.csx b/CodeLiturgy.Views/Templates/GetOneFromListTemplate.csx similarity index 100% rename from CodeLiturgy.Domain/Templates/GetOneFromListTemplate.csx rename to CodeLiturgy.Views/Templates/GetOneFromListTemplate.csx diff --git a/CodeLiturgy.Domain/Templates/GetOneTemplate.csx b/CodeLiturgy.Views/Templates/GetOneTemplate.csx similarity index 100% rename from CodeLiturgy.Domain/Templates/GetOneTemplate.csx rename to CodeLiturgy.Views/Templates/GetOneTemplate.csx diff --git a/CodeLiturgy.Domain/Templates/UpdateTemplate.csx b/CodeLiturgy.Views/Templates/UpdateTemplate.csx similarity index 100% rename from CodeLiturgy.Domain/Templates/UpdateTemplate.csx rename to CodeLiturgy.Views/Templates/UpdateTemplate.csx diff --git a/CodeLiturgy.Views/Views/Shared/_HeaderMenu.cshtml b/CodeLiturgy.Views/Views/Shared/_HeaderMenu.cshtml index 06ea147..7edf133 100644 --- a/CodeLiturgy.Views/Views/Shared/_HeaderMenu.cshtml +++ b/CodeLiturgy.Views/Views/Shared/_HeaderMenu.cshtml @@ -1,6 +1,6 @@ @using CodeLiturgy.Views.Utils @using Duende.IdentityServer.Extensions -@using BlueWest.Data.Auth +@using CodeLiturgy.Data.Auth @{ Layout = null; var userAuthenticated = User.IsAuthenticated(); diff --git a/CodeLiturgy.Views/Views/Shared/_Layout.cshtml b/CodeLiturgy.Views/Views/Shared/_Layout.cshtml index 040dbf7..8ca8ce7 100644 --- a/CodeLiturgy.Views/Views/Shared/_Layout.cshtml +++ b/CodeLiturgy.Views/Views/Shared/_Layout.cshtml @@ -1,5 +1,5 @@ @using CodeLiturgy.Views.Utils -@using BlueWest.Data.Auth +@using CodeLiturgy.Data.Auth @{ var applicationUser = ViewData.GetUserViewData(); var rootUrl = SessionConstants.CookieDomain; diff --git a/CodeLiturgy.Views/appsettings.json b/CodeLiturgy.Views/appsettings.json index 9987243..d5bcee2 100644 --- a/CodeLiturgy.Views/appsettings.json +++ b/CodeLiturgy.Views/appsettings.json @@ -5,13 +5,18 @@ "Microsoft.AspNetCore": "Warning" } }, - "mode": "no-docker", + "mode": "local", "AllowedHosts": "*", - "ConnectionStringDocker": { - "database": "Server=127.0.0.1;User Id=clbdlocal;Password=C79J#MV))!YAiy/SzkCf;Database=cldblocal;" - }, - "ConnectionStringNoDocker": { - "database": "Server=127.0.0.1;User Id=clbdlocal;Password=C79J#MV))!YAiy/SzkCf;Database=cldblocal;" + "ConnectionString": { + "local": { + "db": "Server=127.0.0.1;User Id=clbdlocal;Password=C79J#MV))!YAiy/SzkCf;Database=cldblocal;" + }, + "dev": { + "db": "Server=127.0.0.1;User Id=clbdlocal;Password=C79J#MV))!YAiy/SzkCf;Database=cldblocal;" + }, + "staging": { + "db": "Server=127.0.0.1;User Id=clbdlocal;Password=C79J#MV))!YAiy/SzkCf;Database=cldblocal;" + } }, "AuthSettings": { "SecretKey": "iJWHDmHLpUA283sqsfhqGbMRdRj1PVkH"