P0
/
CodeLiturgy.Dashboard
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Scale down project

This commit is contained in:
code liturgy 2022-11-18 00:15:53 +00:00
parent e3a74ff18d
commit bd24e655ca
92 changed files with 165 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CodeLiturgy.Dashboard.sln
View File

@ -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

30
CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj
View File

@ -1,30 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>BlueWest.Data.Application</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\include\BlueWest.MapTo\src\BlueWest.MapTo\BlueWest.MapTo.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\include\Math-Expression-Evaluator\SimpleExpressionEvaluator\SimpleExpressionEvaluator.csproj" />
</ItemGroup>
<ItemGroup>
<Content Include="obj\rider.project.restore.info" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.10.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Application" />
</ItemGroup>
<Import Project="..\include\BlueWest.MapTo\src\BlueWest.MapTo\MapTo.props" />
</Project>

12
CodeLiturgy.Data.Application/Configuration/ConnectionString.cs
View File

@ -1,12 +0,0 @@
namespace BlueWest.WebApi.Configuration
{
public class ConnectionStringDocker
{
public string MySql { get; set; }
}
public class ConnectionStringNoDocker
{
public string MySql { get; set; }
}
}

14
CodeLiturgy.Data.Application/Geo/Coordinate.cs
View File

@ -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; }
}
}

41
CodeLiturgy.Data.Application/Geo/Country/Country.cs
View File

@ -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; }
/// <summary>
/// ISO 3166-1 numeric code
/// </summary>
public int Code { get; set; }
public string Name { get; set; }
/// <summary>
/// ISO 3166-1 State Name
/// </summary>
public string StateName { get; set; }
[MaxLength(2)] public string Alpha2Code { get; set; }
public string TLD { get; set; }
public List<ApplicationUser> Users { get; set; }
public DateTime CreationDate { get; set; }
}
}

27
CodeLiturgy.Data.Application/Geo/Country/CountryCreate.cs
View File

@ -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<CurrencyUnique> CurrenciesToCreate { get; set; }
public string Alpha2Code { get; set; }
public string TLD { get; set; }
public DateTime CreateTime { get; } = DateTime.Now;
}
}

26
CodeLiturgy.Data.Application/Geo/Country/CountryUnique.cs
View File

@ -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; }
}
}

21
CodeLiturgy.Data.Application/Geo/Country/CountryUpdate.cs
View File

@ -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; }
/// <summary>
/// ISO 3166-1 numeric code
/// </summary>
public int Code { get; set; }
}
}

45
CodeLiturgy.Data.Auth/CodeLiturgy.Data.Auth.csproj
View File

@ -1,45 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>10</LangVersion>
<RootNamespace>BlueWest.WebApi</RootNamespace>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DocumentationFile>bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile>
<PublishDependencyDocumentationFiles>true</PublishDependencyDocumentationFiles>
<AnalysisLevel>preview</AnalysisLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj" />
<ProjectReference Include="..\CodeLiturgy.Domain\CodeLiturgy.Domain.csproj" />
</ItemGroup>
</Project>

58
CodeLiturgy.Domain/CodeLiturgy.Domain.csproj
View File

@ -1,58 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>10</LangVersion>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PublishDependencyDocumentationFiles>true</PublishDependencyDocumentationFiles>
<AnalysisLevel>preview</AnalysisLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
<PackageReference Include="Npgsql" Version="7.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj" />
<ProjectReference Include="..\include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>
<Content Include="obj\rider.project.restore.info" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="Templates\AddToListTemplate.csx" />
<AdditionalFiles Include="Templates\AddToTemplate.csx" />
<AdditionalFiles Include="Templates\GetListTemplate.csx" />
<AdditionalFiles Include="Templates\GetManyTemplate.csx" />
<AdditionalFiles Include="Templates\GetOneByTemplate.csx" />
<AdditionalFiles Include="Templates\GetOneFromListTemplate.csx" />
<AdditionalFiles Include="Templates\GetOneTemplate.csx" />
<AdditionalFiles Include="Templates\UpdateTemplate.csx" />
</ItemGroup>
<Import Project="..\include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.props" />
</Project>

64
CodeLiturgy.Domain/DbContexts/CountryDbContext.cs
View File

@ -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
{
/// <summary>
/// Countries and Currencies
/// </summary>
[EfGenerator]
public sealed class CountryDbContext : DbContext
{
#region Countries
/// <summary>
/// Countries
/// </summary>
[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<Country> Countries { get; set; }
#endregion
#region Initialization
/// <summary>
/// App Configuration
/// </summary>
public IConfiguration Configuration;
/// <summary>
/// CountryDbContext Constructor.
/// </summary>
/// <param name="options"></param>
public CountryDbContext(DbContextOptions<CountryDbContext> options) : base(options)
{
Database.EnsureCreated();
}
/// <summary>
/// On model creating.
/// </summary>
/// <param name="modelBuilder"></param>
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
modelBuilder.ConfigureCurrentDbModel();
}
#endregion
}
}

2
CodeLiturgy.Data.Application/AccessToken.cs → CodeLiturgy.Views/AccessToken.cs
View File

@ -1,5 +1,5 @@
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
public class AccessToken
{

2
CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDevice.cs → CodeLiturgy.Views/Application/ApplicationDevice/ApplicationDevice.cs
View File

@ -1,7 +1,7 @@
using System.Globalization;
using System.Net;
namespace BlueWest.Data.Application
namespace CodeLiturgy.Data.Application
{
public class ApplicationDevice
{

2
CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDeviceCreate.cs → CodeLiturgy.Views/Application/ApplicationDevice/ApplicationDeviceCreate.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace BlueWest.Data.Application
namespace CodeLiturgy.Data.Application
{
public class ApplicationDeviceCreate

2
CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientOperatingSystem.cs → CodeLiturgy.Views/Application/ApplicationDevice/ClientOperatingSystem.cs
View File

@ -1,4 +1,4 @@
namespace BlueWest.Data.Application
namespace CodeLiturgy.Data.Application
{
public enum ClientOperatingSystem
{

2
CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientPlatformType.cs → CodeLiturgy.Views/Application/ApplicationDevice/ClientPlatformType.cs
View File

@ -1,4 +1,4 @@
namespace BlueWest.Data.Application;
namespace CodeLiturgy.Data.Application;
public enum ClientPlatformType
{

2
CodeLiturgy.Data.Application/Application/ApplicationDevice/OperatingSystemType.cs → CodeLiturgy.Views/Application/ApplicationDevice/OperatingSystemType.cs
View File

@ -1,4 +1,4 @@
namespace BlueWest.Data.Application
namespace CodeLiturgy.Data.Application
{
public enum OperatingSystemType
{

2
CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRole.cs → CodeLiturgy.Views/Application/ApplicationRole/ApplicationRole.cs
View File

@ -1,7 +1,7 @@
using MapTo;
using Microsoft.AspNetCore.Identity;
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
/// <inheritdoc />
[MapFrom(typeof(ApplicationRoleUnique))]

2
CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRoleUnique.cs → CodeLiturgy.Views/Application/ApplicationRole/ApplicationRoleUnique.cs
View File

@ -1,6 +1,6 @@
using MapTo;
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
[MapFrom(typeof(ApplicationRole))]
public partial class ApplicationRoleUnique

2
CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs → CodeLiturgy.Views/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs
View File

@ -2,7 +2,7 @@ using System;
using Microsoft.AspNetCore.Identity;
using MapTo;
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
/// <inheritdoc />

2
CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs → CodeLiturgy.Views/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs
View File

@ -1,6 +1,6 @@
using MapTo;
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
[MapFrom(typeof(ApplicationRoleClaim))]
public partial class ApplicationRoleClaimUnique

6
CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUser.cs → CodeLiturgy.Views/Application/ApplicationUser/ApplicationUser.cs
View File

@ -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
{
/// <summary>
/// Application User in the Identity System.

2
CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUserUnique.cs → CodeLiturgy.Views/Application/ApplicationUser/ApplicationUserUnique.cs
View File

@ -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

2
CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaim.cs → CodeLiturgy.Views/Application/ApplicationUserClaim/ApplicationUserClaim.cs
View File

@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Identity;
using MapTo;
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
[MapFrom(typeof(ApplicationUserClaimUnique))]

2
CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs → CodeLiturgy.Views/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs
View File

@ -1,6 +1,6 @@
using MapTo;
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
[MapFrom(typeof(ApplicationUserClaim))]
public partial class ApplicationUserClaimUnique

2
CodeLiturgy.Data.Application/Application/ApplicationUserLogin/ApplicationUserLogin.cs → CodeLiturgy.Views/Application/ApplicationUserLogin/ApplicationUserLogin.cs
View File

@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Identity;
namespace BlueWest.Data.Application.Users;
namespace CodeLiturgy.Data.Application.Users;
/// <inheritdoc />
public class ApplicationUserLogin : IdentityUserLogin<string> { }

2
CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRole.cs → CodeLiturgy.Views/Application/ApplicationUserRole/ApplicationUserRole.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using Microsoft.AspNetCore.Identity;
using MapTo;
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
/// <inheritdoc />

2
CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs → CodeLiturgy.Views/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs
View File

@ -1,6 +1,6 @@
using MapTo;
namespace BlueWest.Data.Application.Users
namespace CodeLiturgy.Data.Application.Users
{
[MapFrom(typeof(ApplicationUserRole))]
public partial class ApplicationUserRoleUnique

2
CodeLiturgy.Data.Application/Application/ApplicationUserToken/ApplicationUserToken.cs → CodeLiturgy.Views/Application/ApplicationUserToken/ApplicationUserToken.cs
View File

@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Identity;
namespace BlueWest.Data.Application.Users;
namespace CodeLiturgy.Data.Application.Users;
/// <inheritdoc />
public class ApplicationUserToken : IdentityUserToken<string>

2
CodeLiturgy.Data.Application/Session/LoginRequest.cs → CodeLiturgy.Views/Application/Session/LoginRequest.cs
View File

@ -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
/// <summary>

4
CodeLiturgy.Data.Application/Session/RegisterRequest.cs → CodeLiturgy.Views/Application/Session/RegisterRequest.cs
View File

@ -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;
/// <summary>
///

2
CodeLiturgy.Data.Application/Session/SessionConstants.cs → CodeLiturgy.Views/Application/Session/SessionConstants.cs
View File

@ -1,6 +1,6 @@
using System;
namespace BlueWest.Data.Auth
namespace CodeLiturgy.Data.Auth
{
public static class SessionConstants
{

4
CodeLiturgy.Data.Auth/Users/ApplicationUserManager.cs → CodeLiturgy.Views/Application/Users/ApplicationUserManager.cs
View File

@ -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;
/// <summary>
/// User Manager Object

3
CodeLiturgy.Data.Auth/Users/Auth/AuthConsts.cs → CodeLiturgy.Views/Application/Users/Auth/AuthConsts.cs
View File

@ -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
{

6
CodeLiturgy.Data.Auth/Users/Auth/AuthManager.cs → CodeLiturgy.Views/Application/Users/Auth/AuthManager.cs
View File

@ -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
{
/// <summary>
/// Authentication Manager for the Application Users

0
CodeLiturgy.Data.Auth/Users/Auth/Crypto/BaseCryptoItem.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/BaseCryptoItem.cs
View File

4
CodeLiturgy.Data.Auth/Users/Auth/Crypto/Hasher.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/Hasher.cs
View File

@ -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;

4
CodeLiturgy.Data.Auth/Users/Auth/Crypto/IHasher.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/IHasher.cs
View File

@ -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;

4
CodeLiturgy.Data.Auth/Users/Auth/Crypto/IJwtFactory.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/IJwtFactory.cs
View File

@ -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
{

2
CodeLiturgy.Data.Auth/Users/Auth/Crypto/IJwtTokenHandler.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/IJwtTokenHandler.cs
View File

@ -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
{

0
CodeLiturgy.Data.Auth/Users/Auth/Crypto/ISessionHasher.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/ISessionHasher.cs
View File

2
CodeLiturgy.Data.Auth/Users/Auth/Crypto/ITokenFactory.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/ITokenFactory.cs
View File

@ -1,4 +1,4 @@
namespace BlueWest.Data.Auth.Context.Users;
namespace CodeLiturgy.Data.Auth.Context.Users;
internal interface ITokenFactory
{

6
CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtFactory.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtFactory.cs
View File

@ -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
{

2
CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtIssuerOptions.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtIssuerOptions.cs
View File

@ -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
{

2
CodeLiturgy.Data.Auth/Users/Auth/Crypto/JwtTokenHandler.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/JwtTokenHandler.cs
View File

@ -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
{

0
CodeLiturgy.Data.Auth/Users/Auth/Crypto/SHA_512.cs → CodeLiturgy.Views/Application/Users/Auth/Crypto/SHA_512.cs
View File

4
CodeLiturgy.Data.Auth/Users/Auth/IAuthManager.cs → CodeLiturgy.Views/Application/Users/Auth/IAuthManager.cs
View File

@ -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;
/// <summary>
/// Auth manager contract interface.

4
CodeLiturgy.Data.Auth/Users/Auth/SignInManager.cs → CodeLiturgy.Views/Application/Users/Auth/SignInManager.cs
View File

@ -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;
/// <summary>
/// SignInManager

2
CodeLiturgy.Data.Auth/Users/Constants.cs → CodeLiturgy.Views/Application/Users/Constants.cs
View File

@ -1,4 +1,4 @@
namespace BlueWest.Data.Auth.Context.Users;
namespace CodeLiturgy.Data.Auth.Context.Users;
public static class Constants
{

4
CodeLiturgy.Data.Auth/Users/IUserManager.cs → CodeLiturgy.Views/Application/Users/IUserManager.cs
View File

@ -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
{

0
CodeLiturgy.Data.Auth/Users/SessionExtensions.cs → CodeLiturgy.Views/Application/Users/SessionExtensions.cs
View File

4
CodeLiturgy.Data.Auth/Users/UserRepository.cs → CodeLiturgy.Views/Application/Users/UserRepository.cs
View File

@ -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
{
/// <summary>
/// Users Repository

0
CodeLiturgy.Data.Auth/AuthSettings.cs → CodeLiturgy.Views/AuthSettings.cs
View File

20
CodeLiturgy.Views/CodeLiturgy.Views.csproj
View File

@ -108,12 +108,32 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Extensions" />
<Folder Include="wwwroot\static\profile" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj" />
<ProjectReference Include="..\include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="Templates\AddToListTemplate.csx" />
<AdditionalFiles Include="Templates\AddToTemplate.csx" />
<AdditionalFiles Include="Templates\GetListTemplate.csx" />
<AdditionalFiles Include="Templates\GetManyTemplate.csx" />
<AdditionalFiles Include="Templates\GetOneByTemplate.csx" />
<AdditionalFiles Include="Templates\GetOneFromListTemplate.csx" />
<AdditionalFiles Include="Templates\GetOneTemplate.csx" />
<AdditionalFiles Include="Templates\UpdateTemplate.csx" />
<AdditionalFiles Include="Views\Auth\Account.cshtml" />
<AdditionalFiles Include="Views\EnvironmentsPage\Index.cshtml" />
</ItemGroup>
<Import Project="..\include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.props" />
<ItemGroup>
<ProjectReference Include="..\include\BlueWest.MapTo\src\BlueWest.MapTo\BlueWest.MapTo.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\include\Math-Expression-Evaluator\SimpleExpressionEvaluator\SimpleExpressionEvaluator.csproj" />
</ItemGroup>
<Import Project="..\include\BlueWest.MapTo\src\BlueWest.MapTo\MapTo.props" />
</Project>

2
CodeLiturgy.Views/Controllers/AccountController.cs
View File

@ -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;

4
CodeLiturgy.Views/Controllers/AuthController.cs
View File

@ -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;

2
CodeLiturgy.Views/Controllers/EnvironmentsPageController.cs
View File

@ -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;

2
CodeLiturgy.Views/Controllers/HomeController.cs
View File

@ -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;

2
CodeLiturgy.Views/Controllers/SitesController.cs
View File

@ -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;

2
CodeLiturgy.Views/Controllers/System/SystemController.cs
View File

@ -1,4 +1,4 @@
using BlueWest.Data.Auth.Context.Users;
using CodeLiturgy.Data.Auth.Context.Users;
using CodeLiturgy.Views.Utils;
using Microsoft.AspNetCore.Mvc;

4
CodeLiturgy.Views/Controllers/UserController.cs
View File

@ -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;

2
CodeLiturgy.Domain/DbContexts/ApplicationUserDbContext.cs → CodeLiturgy.Views/DbContexts/ApplicationUserDbContext.cs
View File

@ -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;

2
CodeLiturgy.Domain/DbContexts/SiteDbContext.cs → CodeLiturgy.Views/DbContexts/SiteDbContext.cs
View File

@ -13,6 +13,8 @@ namespace CodeLiturgy.Domain
public DbSet<Site> Sites { get; set; }
public DbSet<SiteEnvironment> Environments { get; set; }
/// <summary>
/// SiteDbContext Constructor.
/// </summary>

2
CodeLiturgy.Domain/Extensions/ModelBuilderCountryDbContextExtensions.cs → CodeLiturgy.Views/Models/ModelBuilderCountryDbContextExtensions.cs
View File

@ -1,5 +1,5 @@
using System.Collections.Generic;
using BlueWest.Data;
using CodeLiturgy.Data;
using Microsoft.EntityFrameworkCore;
namespace CodeLiturgy.Domain.Extensions

67
CodeLiturgy.Domain/Extensions/ModelBuilderExtensions.cs → CodeLiturgy.Views/Models/ModelBuilderExtensions.cs
View File

@ -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,9 +23,9 @@ namespace CodeLiturgy.Domain.Model
{
modelBuilder
.ConfigureDatabaseKeys()
.CurrencyModel()
.ConfigureAppContextModel()
.ConfigureUserModel()
.ConfigureAppContextModel();
.ConfigureEnvironmentModel();
//.ConfigureIdentityModel();
}
@ -38,9 +39,8 @@ namespace CodeLiturgy.Domain.Model
/// Configure App context model
/// </summary>
/// <param name="modelBuilder"></param>
private static void ConfigureAppContextModel(this ModelBuilder builder)
private static ModelBuilder ConfigureAppContextModel(this ModelBuilder builder)
{
builder.Entity<ApplicationUserRole>().ToTable("UserRoles");
builder.Entity<ApplicationUser>(b =>
{
b.HasMany<ApplicationUserRole>()
@ -49,7 +49,7 @@ namespace CodeLiturgy.Domain.Model
});
builder.Entity<ApplicationUser>().ToTable("ApplicationUser")
builder.Entity<ApplicationUser>()
.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<ApplicationRoleClaim>(b =>
{
b.HasKey(rc => rc.Id);
b.ToTable("RoleClaims");
});
builder.Entity<ApplicationUserRole>(b =>
{
b.HasKey(r => new {r.UserId, r.RoleId});
b.ToTable("UserRoles");
});
builder.Entity<ApplicationRoleClaim>().ToTable("RoleClaims");
builder.Entity<ApplicationUserRole>().ToTable("UserRole");
return builder;
//.ConfigureIdentityModel();
}
@ -98,13 +94,24 @@ namespace CodeLiturgy.Domain.Model
private static ModelBuilder ConfigureDatabaseKeys(this ModelBuilder modelBuilder)
{
// Country
// Site
modelBuilder
.Entity<Country>(builder => builder
.HasKey(country => country.Id))
.Entity<Country>().Property(country => country.Id)
.Entity<Site>(builder => builder
.HasKey(site => site.Id))
.Entity<Site>().Property(site => site.Id)
.ValueGeneratedOnAdd();
// Site Environment
modelBuilder
.Entity<SiteEnvironment>(builder => builder
.HasKey(site => site.Id))
.Entity<Site>().Property(site => site.Id)
.ValueGeneratedOnAdd();
// FinanceOp
return
modelBuilder;
@ -115,16 +122,24 @@ namespace CodeLiturgy.Domain.Model
#region Database Models
private static ModelBuilder CurrencyModel(this ModelBuilder modelBuilder)
{
modelBuilder.Entity<Country>().ToTable("Countries");
return modelBuilder;
}
private static ModelBuilder ConfigureUserModel(this ModelBuilder modelBuilder)
{
modelBuilder.Entity<ApplicationUser>()
.HasMany(x => x.Environments)
.WithOne(u => u.User)
.HasForeignKey(x => x.UserId);
return modelBuilder;
}
private static ModelBuilder ConfigureEnvironmentModel(this ModelBuilder modelBuilder)
{
modelBuilder.Entity<SiteEnvironment>().ToTable("site_env");
modelBuilder
.Entity<SiteEnvironment>()
.HasMany(x => x.Sites)
.WithOne(x => x.Environment)
.HasForeignKey(x => x.EnvironmentId);
return modelBuilder;
}

4
CodeLiturgy.Views/Utils/DataUtil.cs → CodeLiturgy.Views/RazorUtils/DataUtil.cs
View File

@ -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;

0
CodeLiturgy.Views/Utils/LayoutCache.cs → CodeLiturgy.Views/RazorUtils/LayoutCache.cs
View File

0
CodeLiturgy.Views/Utils/LinkViewInformation.cs → CodeLiturgy.Views/RazorUtils/LinkViewInformation.cs
View File

0
CodeLiturgy.Views/Utils/Menus.cs → CodeLiturgy.Views/RazorUtils/Menus.cs
View File

0
CodeLiturgy.Views/Utils/RouteRecord.cs → CodeLiturgy.Views/RazorUtils/RouteRecord.cs
View File

0
CodeLiturgy.Views/Utils/Routes.cs → CodeLiturgy.Views/RazorUtils/Routes.cs
View File

0
CodeLiturgy.Views/Utils/ViewType.cs → CodeLiturgy.Views/RazorUtils/ViewType.cs
View File

0
CodeLiturgy.Data.Application/Sites/EnvironmentType.cs → CodeLiturgy.Views/Sites/EnvironmentType.cs
View File

6
CodeLiturgy.Data.Application/Sites/Site.cs → CodeLiturgy.Views/Sites/Site.cs
View File

@ -15,11 +15,13 @@ 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; }

0
CodeLiturgy.Data.Application/Sites/SiteCreate.cs → CodeLiturgy.Views/Sites/SiteCreate.cs
View File

0
CodeLiturgy.Data.Application/Sites/SiteDbExtensions.cs → CodeLiturgy.Views/Sites/SiteDbExtensions.cs
View File

6
CodeLiturgy.Data.Application/Sites/SiteEnvironment.cs → CodeLiturgy.Views/Sites/SiteEnvironment.cs
View File

@ -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<Site> Sites { get; set; }
}
}

0
CodeLiturgy.Data.Application/Sites/SiteUnique.cs → CodeLiturgy.Views/Sites/SiteUnique.cs
View File

2
CodeLiturgy.Views/Startup.cs
View File

@ -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;

26
CodeLiturgy.Views/StartupExtensions.cs
View File

@ -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<SiteDbContext>(options => options.UsePsqlConfiguration(configuration))
.AddDbContextPool<CountryDbContext>(options => options.UsePsqlConfiguration(configuration))
.AddDbContextPool<ApplicationUserDbContext>(options =>
options.UsePsqlConfiguration(configuration));
}

56
CodeLiturgy.Views/System/SystemExtensions.cs
View File

@ -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);
}
}
}
}

0
CodeLiturgy.Domain/Templates/AddToListTemplate.csx → CodeLiturgy.Views/Templates/AddToListTemplate.csx
View File

0
CodeLiturgy.Domain/Templates/AddToTemplate.csx → CodeLiturgy.Views/Templates/AddToTemplate.csx
View File

0
CodeLiturgy.Domain/Templates/GetListTemplate.csx → CodeLiturgy.Views/Templates/GetListTemplate.csx
View File

0
CodeLiturgy.Domain/Templates/GetManyTemplate.csx → CodeLiturgy.Views/Templates/GetManyTemplate.csx
View File

0
CodeLiturgy.Domain/Templates/GetOneByTemplate.csx → CodeLiturgy.Views/Templates/GetOneByTemplate.csx
View File

0
CodeLiturgy.Domain/Templates/GetOneFromListTemplate.csx → CodeLiturgy.Views/Templates/GetOneFromListTemplate.csx
View File

0
CodeLiturgy.Domain/Templates/GetOneTemplate.csx → CodeLiturgy.Views/Templates/GetOneTemplate.csx
View File

0
CodeLiturgy.Domain/Templates/UpdateTemplate.csx → CodeLiturgy.Views/Templates/UpdateTemplate.csx
View File

2
CodeLiturgy.Views/Views/Shared/_HeaderMenu.cshtml
View File

@ -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();

2
CodeLiturgy.Views/Views/Shared/_Layout.cshtml
View File

@ -1,5 +1,5 @@
@using CodeLiturgy.Views.Utils
@using BlueWest.Data.Auth
@using CodeLiturgy.Data.Auth
@{
var applicationUser = ViewData.GetUserViewData();
var rootUrl = SessionConstants.CookieDomain;

15
CodeLiturgy.Views/appsettings.json
View File

@ -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;"
"ConnectionString": {
"local": {
"db": "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;"
"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"