diff --git a/.gitignore b/.gitignore index 9cdd64b..d454b52 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ obj/ riderModule.iml /_ReSharper.Caches/ .idea/ -/SS14.Auth.sln.DotSettings.user +/*.sln.DotSettings.user diff --git a/SS14.Auth.Tests/SS14.Auth.Tests.csproj b/SS14.Auth.Tests/SS14.Auth.Tests.csproj deleted file mode 100644 index 4c83d1d..0000000 --- a/SS14.Auth.Tests/SS14.Auth.Tests.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp3.1 - - - - - - - - - - - - - - diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/SS14.Auth/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml deleted file mode 100644 index 3a99771..0000000 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml +++ /dev/null @@ -1 +0,0 @@ -@using SS14.Auth.Areas.Identity.Pages.Account.Manage diff --git a/SS14.Auth/Properties/AssemblyInfo.cs b/SS14.Auth/Properties/AssemblyInfo.cs deleted file mode 100644 index c399f2a..0000000 --- a/SS14.Auth/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("SS14.Auth.Tests")] \ No newline at end of file diff --git a/SS14.Auth.sln b/SS14.Web.sln similarity index 68% rename from SS14.Auth.sln rename to SS14.Web.sln index 6659077..41b8388 100644 --- a/SS14.Auth.sln +++ b/SS14.Web.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Auth", "SS14.Auth\SS14.Auth.csproj", "{5885E65D-954D-45FE-B1EC-751D41CC4127}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Web", "SS14.Web\SS14.Web.csproj", "{5885E65D-954D-45FE-B1EC-751D41CC4127}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{E8B08827-B7DC-459A-985C-BFAB426B570E}" ProjectSection(SolutionItems) = preProject @@ -16,8 +16,6 @@ ProjectSection(SolutionItems) = preProject .github\workflows\build-test.yml = .github\workflows\build-test.yml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Auth.Tests", "SS14.Auth.Tests\SS14.Auth.Tests.csproj", "{F5A73700-EA78-4805-BC40-709C288B0EB3}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,10 +26,6 @@ Global {5885E65D-954D-45FE-B1EC-751D41CC4127}.Debug|Any CPU.Build.0 = Debug|Any CPU {5885E65D-954D-45FE-B1EC-751D41CC4127}.Release|Any CPU.ActiveCfg = Release|Any CPU {5885E65D-954D-45FE-B1EC-751D41CC4127}.Release|Any CPU.Build.0 = Release|Any CPU - {F5A73700-EA78-4805-BC40-709C288B0EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5A73700-EA78-4805-BC40-709C288B0EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5A73700-EA78-4805-BC40-709C288B0EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5A73700-EA78-4805-BC40-709C288B0EB3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {569B190C-2FE6-44FA-B282-E0E7ACE64226} = {E8B08827-B7DC-459A-985C-BFAB426B570E} diff --git a/SS14.Auth.sln.DotSettings b/SS14.Web.sln.DotSettings similarity index 100% rename from SS14.Auth.sln.DotSettings rename to SS14.Web.sln.DotSettings diff --git a/SS14.Auth/Areas/Identity/IdentityHostingStartup.cs b/SS14.Web/Areas/Identity/IdentityHostingStartup.cs similarity index 77% rename from SS14.Auth/Areas/Identity/IdentityHostingStartup.cs rename to SS14.Web/Areas/Identity/IdentityHostingStartup.cs index 3098a6b..20955a2 100644 --- a/SS14.Auth/Areas/Identity/IdentityHostingStartup.cs +++ b/SS14.Web/Areas/Identity/IdentityHostingStartup.cs @@ -5,10 +5,10 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using SS14.Auth.Data; +using SS14.Web.Data; -[assembly: HostingStartup(typeof(SS14.Auth.Areas.Identity.IdentityHostingStartup))] -namespace SS14.Auth.Areas.Identity +[assembly: HostingStartup(typeof(SS14.Web.Areas.Identity.IdentityHostingStartup))] +namespace SS14.Web.Areas.Identity { public class IdentityHostingStartup : IHostingStartup { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/AccessDenied.cshtml b/SS14.Web/Areas/Identity/Pages/Account/AccessDenied.cshtml similarity index 82% rename from SS14.Auth/Areas/Identity/Pages/Account/AccessDenied.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/AccessDenied.cshtml index 5a965b4..32d6640 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/AccessDenied.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/AccessDenied.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model AccessDeniedModel @{ ViewData["Title"] = "Access denied"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs similarity index 83% rename from SS14.Auth/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs index 7822dc9..082e822 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { public class AccessDeniedModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/SS14.Web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml similarity index 69% rename from SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmail.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml index a2d8e17..3c8fb71 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmail.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model ConfirmEmailModel @{ ViewData["Title"] = "Confirm email"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs similarity index 95% rename from SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs index a435420..494c40e 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs @@ -8,9 +8,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class ConfirmEmailModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml b/SS14.Web/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml similarity index 79% rename from SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml index 1c131b2..762a4ed 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model ConfirmEmailChangeModel @{ ViewData["Title"] = "Confirm email change"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml.cs similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml.cs index dd546cb..6380732 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/ConfirmEmailChange.cshtml.cs @@ -8,9 +8,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class ConfirmEmailChangeModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ExternalLogin.cshtml b/SS14.Web/Areas/Identity/Pages/Account/ExternalLogin.cshtml similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/ExternalLogin.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/ExternalLogin.cshtml index 2a812b1..b778e8b 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ExternalLogin.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/ExternalLogin.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model ExternalLoginModel @{ ViewData["Title"] = "Register"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs similarity index 98% rename from SS14.Auth/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs index 609b8be..f744d03 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs @@ -13,9 +13,9 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class ExternalLoginModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/SS14.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml similarity index 94% rename from SS14.Auth/Areas/Identity/Pages/Account/ForgotPassword.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml index 07bc0a2..b911471 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ForgotPassword.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model ForgotPasswordModel @{ ViewData["Title"] = "Forgot your password?"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs index 554db89..09b153e 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs @@ -10,9 +10,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class ForgotPasswordModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml b/SS14.Web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml similarity index 80% rename from SS14.Auth/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml index 57e1977..2ddd7e3 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model ForgotPasswordConfirmation @{ ViewData["Title"] = "Forgot password confirmation"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs similarity index 86% rename from SS14.Auth/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs index 87fa821..0daafe0 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class ForgotPasswordConfirmation : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Lockout.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Lockout.cshtml similarity index 83% rename from SS14.Auth/Areas/Identity/Pages/Account/Lockout.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Lockout.cshtml index 318fe42..98b6858 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Lockout.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/Lockout.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model LockoutModel @{ ViewData["Title"] = "Locked out"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Lockout.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Lockout.cshtml.cs similarity index 86% rename from SS14.Auth/Areas/Identity/Pages/Account/Lockout.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Lockout.cshtml.cs index d69b1f0..23fc203 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Lockout.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Lockout.cshtml.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class LockoutModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Login.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Login.cshtml similarity index 98% rename from SS14.Auth/Areas/Identity/Pages/Account/Login.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Login.cshtml index 98204b0..1722697 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Login.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/Login.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model LoginModel @{ diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Login.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Login.cshtml.cs similarity index 98% rename from SS14.Auth/Areas/Identity/Pages/Account/Login.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Login.cshtml.cs index 807422c..4f2f90e 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Login.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Login.cshtml.cs @@ -8,9 +8,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class LoginModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/LoginWith2fa.cshtml b/SS14.Web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/LoginWith2fa.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml index b43cb11..33ba516 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/LoginWith2fa.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml @@ -1,6 +1,6 @@ @page @model LoginWith2faModel -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @{ ViewData["Title"] = "Two-factor authentication"; } diff --git a/SS14.Auth/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs index 7a19cef..1d69f77 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs @@ -8,9 +8,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class LoginWith2faModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml b/SS14.Web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml similarity index 95% rename from SS14.Auth/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml index ad8f995..aa6684e 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model LoginWithRecoveryCodeModel @{ ViewData["Title"] = "Recovery code verification"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs index 7b91313..1a55b32 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs @@ -8,9 +8,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class LoginWithRecoveryCodeModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Logout.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Logout.cshtml similarity index 79% rename from SS14.Auth/Areas/Identity/Pages/Account/Logout.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Logout.cshtml index a2d3470..1696e9d 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Logout.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/Logout.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model LogoutModel @{ ViewData["Title"] = "Log out"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Logout.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Logout.cshtml.cs similarity index 94% rename from SS14.Auth/Areas/Identity/Pages/Account/Logout.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Logout.cshtml.cs index 2bc03b0..47521c3 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Logout.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Logout.cshtml.cs @@ -7,9 +7,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class LogoutModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs index adcad43..3b49201 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs @@ -7,10 +7,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; -using SS14.Auth.Sessions; +using SS14.Web.Data; +using SS14.Web.Sessions; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class ChangePasswordModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs index 03f4e2f..d38f160 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class DeletePersonalDataModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs index 08a2ae8..9315480 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class Disable2faModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs index fa24772..7355542 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs @@ -9,9 +9,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class DownloadPersonalDataModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Email.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/Email.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/Email.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/Email.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs similarity index 98% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs index 26b2979..3fa935c 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs @@ -10,9 +10,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public partial class EmailModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs index 6cdb51c..8a3df65 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs @@ -10,9 +10,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class EnableAuthenticatorModel : PageModel { @@ -149,7 +149,7 @@ private string GenerateQrCodeUri(string email, string unformattedKey) { return string.Format( AuthenticatorUriFormat, - _urlEncoder.Encode("SS14.Auth"), + _urlEncoder.Encode("SS14.Web"), _urlEncoder.Encode(email), unformattedKey); } diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs similarity index 98% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs index 85cefa4..da74001 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class ExternalLoginsModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs index df676e4..59cb3b5 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class GenerateRecoveryCodesModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Index.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/Index.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/Index.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/Index.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs index c2a2145..a30ba86 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public partial class IndexModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs index 4b0b938..b79826c 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public static class ManageNavPages { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs similarity index 92% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs index 808b822..953c0cd 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class PersonalDataModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs index 8cbaf52..5bced67 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class ResetAuthenticatorModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs index b27068b..90016fe 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class SetPasswordModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs similarity index 92% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs index faf0833..4765174 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/ShowRecoveryCodes.cshtml.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class ShowRecoveryCodesModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs index df1ef53..7aa1460 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account.Manage +namespace SS14.Web.Areas.Identity.Pages.Account.Manage { public class TwoFactorAuthenticationModel : PageModel { diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/_Layout.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml similarity index 98% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml index bd95178..83f94a3 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml @@ -1,4 +1,4 @@ -@using SS14.Auth.Data +@using SS14.Web.Data @inject SignInManager SignInManager @{ var hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any(); diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml diff --git a/SS14.Web/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml new file mode 100644 index 0000000..4423cdd --- /dev/null +++ b/SS14.Web/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml @@ -0,0 +1 @@ +@using SS14.Web.Areas.Identity.Pages.Account.Manage diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Register.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Register.cshtml similarity index 98% rename from SS14.Auth/Areas/Identity/Pages/Account/Register.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/Register.cshtml index 9ac82ca..c2c438c 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Register.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/Register.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model RegisterModel @{ ViewData["Title"] = "Register"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/Register.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/Register.cshtml.cs similarity index 98% rename from SS14.Auth/Areas/Identity/Pages/Account/Register.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/Register.cshtml.cs index b068e0f..3933656 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -14,10 +14,10 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Logging; -using SS14.Auth.Data; +using SS14.Web.Data; using ISystemClock = Microsoft.Extensions.Internal.ISystemClock; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class RegisterModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml b/SS14.Web/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml similarity index 92% rename from SS14.Auth/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml index c58094e..03b5682 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model RegisterConfirmationModel @{ ViewData["Title"] = "Register confirmation"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs index bd683c0..d6e04cf 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class RegisterConfirmationModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml b/SS14.Web/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml similarity index 94% rename from SS14.Auth/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml index de6356a..f596232 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model ResendEmailConfirmationModel @{ ViewData["Title"] = "Resend email confirmation"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs index 71a9ad8..9aeeb61 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs @@ -10,9 +10,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class ResendEmailConfirmationModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ResetPassword.cshtml b/SS14.Web/Areas/Identity/Pages/Account/ResetPassword.cshtml similarity index 96% rename from SS14.Auth/Areas/Identity/Pages/Account/ResetPassword.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/ResetPassword.cshtml index 30fc28e..b549e42 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ResetPassword.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/ResetPassword.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model ResetPasswordModel @{ ViewData["Title"] = "Reset password"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs similarity index 97% rename from SS14.Auth/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs index 207b25f..5c60d61 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs @@ -9,9 +9,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class ResetPasswordModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml b/SS14.Web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml similarity index 83% rename from SS14.Auth/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml index 5edc5e1..fcca38a 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml @@ -1,5 +1,5 @@ @page -@using SS14.Auth.Areas.Identity.Pages.Account +@using SS14.Web.Areas.Identity.Pages.Account @model ResetPasswordConfirmationModel @{ ViewData["Title"] = "Reset password confirmation"; diff --git a/SS14.Auth/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs b/SS14.Web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs similarity index 87% rename from SS14.Auth/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs rename to SS14.Web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs index 2b4bdd4..1c6b543 100644 --- a/SS14.Auth/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs +++ b/SS14.Web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace SS14.Auth.Areas.Identity.Pages.Account +namespace SS14.Web.Areas.Identity.Pages.Account { [AllowAnonymous] public class ResetPasswordConfirmationModel : PageModel diff --git a/SS14.Auth/Areas/Identity/Pages/Account/_StatusMessage.cshtml b/SS14.Web/Areas/Identity/Pages/Account/_StatusMessage.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/_StatusMessage.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/_StatusMessage.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/Account/_ViewImports.cshtml b/SS14.Web/Areas/Identity/Pages/Account/_ViewImports.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/Account/_ViewImports.cshtml rename to SS14.Web/Areas/Identity/Pages/Account/_ViewImports.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/SS14.Web/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml rename to SS14.Web/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml diff --git a/SS14.Auth/Areas/Identity/Pages/_ViewImports.cshtml b/SS14.Web/Areas/Identity/Pages/_ViewImports.cshtml similarity index 73% rename from SS14.Auth/Areas/Identity/Pages/_ViewImports.cshtml rename to SS14.Web/Areas/Identity/Pages/_ViewImports.cshtml index 17981d0..001a6ab 100644 --- a/SS14.Auth/Areas/Identity/Pages/_ViewImports.cshtml +++ b/SS14.Web/Areas/Identity/Pages/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using Microsoft.AspNetCore.Identity -@using SS14.Auth.Areas.Identity +@using SS14.Web.Areas.Identity @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/SS14.Auth/Areas/Identity/Pages/_ViewStart.cshtml b/SS14.Web/Areas/Identity/Pages/_ViewStart.cshtml similarity index 100% rename from SS14.Auth/Areas/Identity/Pages/_ViewStart.cshtml rename to SS14.Web/Areas/Identity/Pages/_ViewStart.cshtml diff --git a/SS14.Auth/Auth/SS14AuthHandler.cs b/SS14.Web/Auth/SS14AuthHandler.cs similarity index 96% rename from SS14.Auth/Auth/SS14AuthHandler.cs rename to SS14.Web/Auth/SS14AuthHandler.cs index a8ea8ed..67721f1 100644 --- a/SS14.Auth/Auth/SS14AuthHandler.cs +++ b/SS14.Web/Auth/SS14AuthHandler.cs @@ -7,10 +7,10 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; -using SS14.Auth.Data; -using SS14.Auth.Sessions; +using SS14.Web.Data; +using SS14.Web.Sessions; -namespace SS14.Auth.Auth +namespace SS14.Web.Auth { [UsedImplicitly] public sealed class SS14AuthHandler : AuthenticationHandler diff --git a/SS14.Auth/Auth/SS14AuthOptions.cs b/SS14.Web/Auth/SS14AuthOptions.cs similarity index 83% rename from SS14.Auth/Auth/SS14AuthOptions.cs rename to SS14.Web/Auth/SS14AuthOptions.cs index 8decf6e..82361df 100644 --- a/SS14.Auth/Auth/SS14AuthOptions.cs +++ b/SS14.Web/Auth/SS14AuthOptions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authentication; -namespace SS14.Auth.Auth +namespace SS14.Web.Auth { public class SS14AuthOptions : AuthenticationSchemeOptions { diff --git a/SS14.Auth/Controllers/AuthApiController.cs b/SS14.Web/Controllers/AuthApiController.cs similarity index 98% rename from SS14.Auth/Controllers/AuthApiController.cs rename to SS14.Web/Controllers/AuthApiController.cs index 47ff590..537554f 100644 --- a/SS14.Auth/Controllers/AuthApiController.cs +++ b/SS14.Web/Controllers/AuthApiController.cs @@ -9,11 +9,11 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Internal; -using SS14.Auth.Areas.Identity.Pages.Account; -using SS14.Auth.Data; -using SS14.Auth.Sessions; +using SS14.Web.Areas.Identity.Pages.Account; +using SS14.Web.Data; +using SS14.Web.Sessions; -namespace SS14.Auth.Controllers +namespace SS14.Web.Controllers { /// /// Contains the API endpoints used by the launcher to log in and such. diff --git a/SS14.Auth/Controllers/HomeController.cs b/SS14.Web/Controllers/HomeController.cs similarity index 95% rename from SS14.Auth/Controllers/HomeController.cs rename to SS14.Web/Controllers/HomeController.cs index 48b9286..2705030 100644 --- a/SS14.Auth/Controllers/HomeController.cs +++ b/SS14.Web/Controllers/HomeController.cs @@ -5,9 +5,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using SS14.Auth.Models; +using SS14.Web.Models; -namespace SS14.Auth.Controllers +namespace SS14.Web.Controllers { public class HomeController : Controller { diff --git a/SS14.Auth/Controllers/SessionApiController.cs b/SS14.Web/Controllers/SessionApiController.cs similarity index 98% rename from SS14.Auth/Controllers/SessionApiController.cs rename to SS14.Web/Controllers/SessionApiController.cs index 663a122..1dbd8ec 100644 --- a/SS14.Auth/Controllers/SessionApiController.cs +++ b/SS14.Web/Controllers/SessionApiController.cs @@ -6,9 +6,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Internal; using Microsoft.IdentityModel.Tokens; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Controllers +namespace SS14.Web.Controllers { [ApiController] [Route("/api/session")] diff --git a/SS14.Auth/Data/ApplicationDbContext.cs b/SS14.Web/Data/ApplicationDbContext.cs similarity index 98% rename from SS14.Auth/Data/ApplicationDbContext.cs rename to SS14.Web/Data/ApplicationDbContext.cs index b20498f..7b73dc3 100644 --- a/SS14.Auth/Data/ApplicationDbContext.cs +++ b/SS14.Web/Data/ApplicationDbContext.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -namespace SS14.Auth.Data +namespace SS14.Web.Data { public class ApplicationDbContext : IdentityDbContext { diff --git a/SS14.Auth/Data/AuthHash.cs b/SS14.Web/Data/AuthHash.cs similarity index 93% rename from SS14.Auth/Data/AuthHash.cs rename to SS14.Web/Data/AuthHash.cs index ed308ba..db749fd 100644 --- a/SS14.Auth/Data/AuthHash.cs +++ b/SS14.Web/Data/AuthHash.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace SS14.Auth.Data +namespace SS14.Web.Data { public class AuthHash { diff --git a/SS14.Auth/Data/LoginSession.cs b/SS14.Web/Data/LoginSession.cs similarity index 93% rename from SS14.Auth/Data/LoginSession.cs rename to SS14.Web/Data/LoginSession.cs index b7c27e8..3d68f0d 100644 --- a/SS14.Auth/Data/LoginSession.cs +++ b/SS14.Web/Data/LoginSession.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace SS14.Auth.Data +namespace SS14.Web.Data { public class LoginSession { diff --git a/SS14.Auth/Data/SpaceRole.cs b/SS14.Web/Data/SpaceRole.cs similarity index 83% rename from SS14.Auth/Data/SpaceRole.cs rename to SS14.Web/Data/SpaceRole.cs index 40cf5eb..e70c2df 100644 --- a/SS14.Auth/Data/SpaceRole.cs +++ b/SS14.Web/Data/SpaceRole.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Identity; -namespace SS14.Auth.Data +namespace SS14.Web.Data { public class SpaceRole : IdentityRole { diff --git a/SS14.Auth/Data/SpaceUser.cs b/SS14.Web/Data/SpaceUser.cs similarity index 93% rename from SS14.Auth/Data/SpaceUser.cs rename to SS14.Web/Data/SpaceUser.cs index dc09aa5..20ac0be 100644 --- a/SS14.Auth/Data/SpaceUser.cs +++ b/SS14.Web/Data/SpaceUser.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Identity; -namespace SS14.Auth.Data +namespace SS14.Web.Data { public class SpaceUser : IdentityUser { diff --git a/SS14.Auth/Data/SpaceUserManager.cs b/SS14.Web/Data/SpaceUserManager.cs similarity index 98% rename from SS14.Auth/Data/SpaceUserManager.cs rename to SS14.Web/Data/SpaceUserManager.cs index 6364940..4ca4cb2 100644 --- a/SS14.Auth/Data/SpaceUserManager.cs +++ b/SS14.Web/Data/SpaceUserManager.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace SS14.Auth.Data +namespace SS14.Web.Data { [UsedImplicitly] public sealed class SpaceUserManager : UserManager diff --git a/SS14.Auth/EmailSender.cs b/SS14.Web/EmailSender.cs similarity index 94% rename from SS14.Auth/EmailSender.cs rename to SS14.Web/EmailSender.cs index 4f5e863..9ed946f 100644 --- a/SS14.Auth/EmailSender.cs +++ b/SS14.Web/EmailSender.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.UI.Services; -namespace SS14.Auth +namespace SS14.Web { public class EmailSender : IEmailSender { diff --git a/SS14.Auth/Migrations/20200916211222_Init.Designer.cs b/SS14.Web/Migrations/20200916211222_Init.Designer.cs similarity index 91% rename from SS14.Auth/Migrations/20200916211222_Init.Designer.cs rename to SS14.Web/Migrations/20200916211222_Init.Designer.cs index 80bb113..a64b72e 100644 --- a/SS14.Auth/Migrations/20200916211222_Init.Designer.cs +++ b/SS14.Web/Migrations/20200916211222_Init.Designer.cs @@ -5,9 +5,9 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Migrations +namespace SS14.Web.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20200916211222_Init")] @@ -122,7 +122,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("AspNetUserTokens"); }); - modelBuilder.Entity("SS14.Auth.Data.AuthHash", b => + modelBuilder.Entity("SS14.Web.Data.AuthHash", b => { b.Property("AuthHashId") .ValueGeneratedOnAdd() @@ -149,7 +149,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("AuthHashes"); }); - modelBuilder.Entity("SS14.Auth.Data.LoginSession", b => + modelBuilder.Entity("SS14.Web.Data.LoginSession", b => { b.Property("LoginSessionId") .ValueGeneratedOnAdd() @@ -176,7 +176,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("ActiveSessions"); }); - modelBuilder.Entity("SS14.Auth.Data.SpaceRole", b => + modelBuilder.Entity("SS14.Web.Data.SpaceRole", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -203,7 +203,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("AspNetRoles"); }); - modelBuilder.Entity("SS14.Auth.Data.SpaceUser", b => + modelBuilder.Entity("SS14.Web.Data.SpaceUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -255,7 +255,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => { - b.HasOne("SS14.Auth.Data.SpaceRole", null) + b.HasOne("SS14.Web.Data.SpaceRole", null) .WithMany() .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade) @@ -264,7 +264,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", null) + b.HasOne("SS14.Web.Data.SpaceUser", null) .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -273,7 +273,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", null) + b.HasOne("SS14.Web.Data.SpaceUser", null) .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -282,13 +282,13 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => { - b.HasOne("SS14.Auth.Data.SpaceRole", null) + b.HasOne("SS14.Web.Data.SpaceRole", null) .WithMany() .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("SS14.Auth.Data.SpaceUser", null) + b.HasOne("SS14.Web.Data.SpaceUser", null) .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -297,25 +297,25 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", null) + b.HasOne("SS14.Web.Data.SpaceUser", null) .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("SS14.Auth.Data.AuthHash", b => + modelBuilder.Entity("SS14.Web.Data.AuthHash", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", "SpaceUser") + b.HasOne("SS14.Web.Data.SpaceUser", "SpaceUser") .WithMany("AuthHashes") .HasForeignKey("SpaceUserId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("SS14.Auth.Data.LoginSession", b => + modelBuilder.Entity("SS14.Web.Data.LoginSession", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", "SpaceUser") + b.HasOne("SS14.Web.Data.SpaceUser", "SpaceUser") .WithMany("LoginSessions") .HasForeignKey("SpaceUserId") .OnDelete(DeleteBehavior.Cascade) diff --git a/SS14.Auth/Migrations/20200916211222_Init.cs b/SS14.Web/Migrations/20200916211222_Init.cs similarity index 99% rename from SS14.Auth/Migrations/20200916211222_Init.cs rename to SS14.Web/Migrations/20200916211222_Init.cs index 310a67c..defdea9 100644 --- a/SS14.Auth/Migrations/20200916211222_Init.cs +++ b/SS14.Web/Migrations/20200916211222_Init.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -namespace SS14.Auth.Migrations +namespace SS14.Web.Migrations { public partial class Init : Migration { diff --git a/SS14.Auth/Migrations/ApplicationDbContextModelSnapshot.cs b/SS14.Web/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 91% rename from SS14.Auth/Migrations/ApplicationDbContextModelSnapshot.cs rename to SS14.Web/Migrations/ApplicationDbContextModelSnapshot.cs index 05c0707..4360e47 100644 --- a/SS14.Auth/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/SS14.Web/Migrations/ApplicationDbContextModelSnapshot.cs @@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Migrations +namespace SS14.Web.Migrations { [DbContext(typeof(ApplicationDbContext))] partial class ApplicationDbContextModelSnapshot : ModelSnapshot @@ -120,7 +120,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AspNetUserTokens"); }); - modelBuilder.Entity("SS14.Auth.Data.AuthHash", b => + modelBuilder.Entity("SS14.Web.Data.AuthHash", b => { b.Property("AuthHashId") .ValueGeneratedOnAdd() @@ -147,7 +147,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AuthHashes"); }); - modelBuilder.Entity("SS14.Auth.Data.LoginSession", b => + modelBuilder.Entity("SS14.Web.Data.LoginSession", b => { b.Property("LoginSessionId") .ValueGeneratedOnAdd() @@ -174,7 +174,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("ActiveSessions"); }); - modelBuilder.Entity("SS14.Auth.Data.SpaceRole", b => + modelBuilder.Entity("SS14.Web.Data.SpaceRole", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -201,7 +201,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("AspNetRoles"); }); - modelBuilder.Entity("SS14.Auth.Data.SpaceUser", b => + modelBuilder.Entity("SS14.Web.Data.SpaceUser", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -253,7 +253,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => { - b.HasOne("SS14.Auth.Data.SpaceRole", null) + b.HasOne("SS14.Web.Data.SpaceRole", null) .WithMany() .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade) @@ -262,7 +262,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", null) + b.HasOne("SS14.Web.Data.SpaceUser", null) .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -271,7 +271,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", null) + b.HasOne("SS14.Web.Data.SpaceUser", null) .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -280,13 +280,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => { - b.HasOne("SS14.Auth.Data.SpaceRole", null) + b.HasOne("SS14.Web.Data.SpaceRole", null) .WithMany() .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("SS14.Auth.Data.SpaceUser", null) + b.HasOne("SS14.Web.Data.SpaceUser", null) .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -295,25 +295,25 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", null) + b.HasOne("SS14.Web.Data.SpaceUser", null) .WithMany() .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("SS14.Auth.Data.AuthHash", b => + modelBuilder.Entity("SS14.Web.Data.AuthHash", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", "SpaceUser") + b.HasOne("SS14.Web.Data.SpaceUser", "SpaceUser") .WithMany("AuthHashes") .HasForeignKey("SpaceUserId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("SS14.Auth.Data.LoginSession", b => + modelBuilder.Entity("SS14.Web.Data.LoginSession", b => { - b.HasOne("SS14.Auth.Data.SpaceUser", "SpaceUser") + b.HasOne("SS14.Web.Data.SpaceUser", "SpaceUser") .WithMany("LoginSessions") .HasForeignKey("SpaceUserId") .OnDelete(DeleteBehavior.Cascade) diff --git a/SS14.Auth/Models/ErrorViewModel.cs b/SS14.Web/Models/ErrorViewModel.cs similarity index 86% rename from SS14.Auth/Models/ErrorViewModel.cs rename to SS14.Web/Models/ErrorViewModel.cs index 643bfa7..19cb903 100644 --- a/SS14.Auth/Models/ErrorViewModel.cs +++ b/SS14.Web/Models/ErrorViewModel.cs @@ -1,6 +1,6 @@ using System; -namespace SS14.Auth.Models +namespace SS14.Web.Models { public class ErrorViewModel { diff --git a/SS14.Auth/Program.cs b/SS14.Web/Program.cs similarity index 95% rename from SS14.Auth/Program.cs rename to SS14.Web/Program.cs index 6730d94..d99af78 100644 --- a/SS14.Auth/Program.cs +++ b/SS14.Web/Program.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -namespace SS14.Auth +namespace SS14.Web { public class Program { diff --git a/SS14.Web/Properties/AssemblyInfo.cs b/SS14.Web/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a4a4978 --- /dev/null +++ b/SS14.Web/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("SS14.Web.Tests")] \ No newline at end of file diff --git a/SS14.Auth/Properties/launchSettings.json b/SS14.Web/Properties/launchSettings.json similarity index 100% rename from SS14.Auth/Properties/launchSettings.json rename to SS14.Web/Properties/launchSettings.json diff --git a/SS14.Auth/SS14.Auth.csproj b/SS14.Web/SS14.Web.csproj similarity index 100% rename from SS14.Auth/SS14.Auth.csproj rename to SS14.Web/SS14.Web.csproj diff --git a/SS14.Auth/SS14UserValidator.cs b/SS14.Web/SS14UserValidator.cs similarity index 98% rename from SS14.Auth/SS14UserValidator.cs rename to SS14.Web/SS14UserValidator.cs index 4593e9b..d840220 100644 --- a/SS14.Auth/SS14UserValidator.cs +++ b/SS14.Web/SS14UserValidator.cs @@ -5,9 +5,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; using Robust.Shared.AuthLib; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth +namespace SS14.Web { public sealed class SS14UserValidator : UserValidator { diff --git a/SS14.Auth/Sessions/SessionManager.cs b/SS14.Web/Sessions/SessionManager.cs similarity index 98% rename from SS14.Auth/Sessions/SessionManager.cs rename to SS14.Web/Sessions/SessionManager.cs index ce38124..c8ee701 100644 --- a/SS14.Auth/Sessions/SessionManager.cs +++ b/SS14.Web/Sessions/SessionManager.cs @@ -4,9 +4,9 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Internal; -using SS14.Auth.Data; +using SS14.Web.Data; -namespace SS14.Auth.Sessions +namespace SS14.Web.Sessions { public sealed class SessionManager { diff --git a/SS14.Auth/Sessions/SessionToken.cs b/SS14.Web/Sessions/SessionToken.cs similarity index 96% rename from SS14.Auth/Sessions/SessionToken.cs rename to SS14.Web/Sessions/SessionToken.cs index c583796..0999293 100644 --- a/SS14.Auth/Sessions/SessionToken.cs +++ b/SS14.Web/Sessions/SessionToken.cs @@ -2,7 +2,7 @@ #nullable enable -namespace SS14.Auth.Sessions +namespace SS14.Web.Sessions { public readonly struct SessionToken { diff --git a/SS14.Auth/Startup.cs b/SS14.Web/Startup.cs similarity index 98% rename from SS14.Auth/Startup.cs rename to SS14.Web/Startup.cs index 6047fd8..8411efa 100644 --- a/SS14.Auth/Startup.cs +++ b/SS14.Web/Startup.cs @@ -5,16 +5,16 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.EntityFrameworkCore; -using SS14.Auth.Data; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Internal; -using SS14.Auth.Auth; -using SS14.Auth.Sessions; +using SS14.Web.Auth; +using SS14.Web.Data; +using SS14.Web.Sessions; -namespace SS14.Auth +namespace SS14.Web { public class Startup { diff --git a/SS14.Auth/Views/Home/Index.cshtml b/SS14.Web/Views/Home/Index.cshtml similarity index 100% rename from SS14.Auth/Views/Home/Index.cshtml rename to SS14.Web/Views/Home/Index.cshtml diff --git a/SS14.Auth/Views/Home/Privacy.cshtml b/SS14.Web/Views/Home/Privacy.cshtml similarity index 100% rename from SS14.Auth/Views/Home/Privacy.cshtml rename to SS14.Web/Views/Home/Privacy.cshtml diff --git a/SS14.Auth/Views/Shared/Error.cshtml b/SS14.Web/Views/Shared/Error.cshtml similarity index 100% rename from SS14.Auth/Views/Shared/Error.cshtml rename to SS14.Web/Views/Shared/Error.cshtml diff --git a/SS14.Auth/Views/Shared/_Layout.cshtml b/SS14.Web/Views/Shared/_Layout.cshtml similarity index 100% rename from SS14.Auth/Views/Shared/_Layout.cshtml rename to SS14.Web/Views/Shared/_Layout.cshtml diff --git a/SS14.Auth/Views/Shared/_LoginPartial.cshtml b/SS14.Web/Views/Shared/_LoginPartial.cshtml similarity index 97% rename from SS14.Auth/Views/Shared/_LoginPartial.cshtml rename to SS14.Web/Views/Shared/_LoginPartial.cshtml index 9c2711d..80ea882 100644 --- a/SS14.Auth/Views/Shared/_LoginPartial.cshtml +++ b/SS14.Web/Views/Shared/_LoginPartial.cshtml @@ -1,5 +1,5 @@ @using Microsoft.AspNetCore.Identity -@using SS14.Auth.Data +@using SS14.Web.Data @inject SignInManager SignInManager @inject UserManager UserManager diff --git a/SS14.Auth/Views/Shared/_ValidationScriptsPartial.cshtml b/SS14.Web/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from SS14.Auth/Views/Shared/_ValidationScriptsPartial.cshtml rename to SS14.Web/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/SS14.Auth/Views/_ViewImports.cshtml b/SS14.Web/Views/_ViewImports.cshtml similarity index 54% rename from SS14.Auth/Views/_ViewImports.cshtml rename to SS14.Web/Views/_ViewImports.cshtml index 14caf79..c918db0 100644 --- a/SS14.Auth/Views/_ViewImports.cshtml +++ b/SS14.Web/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ -@using SS14.Auth -@using SS14.Auth.Models +@using SS14.Web +@using SS14.Web.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/SS14.Auth/Views/_ViewStart.cshtml b/SS14.Web/Views/_ViewStart.cshtml similarity index 100% rename from SS14.Auth/Views/_ViewStart.cshtml rename to SS14.Web/Views/_ViewStart.cshtml diff --git a/SS14.Auth/appsettings.Development.json b/SS14.Web/appsettings.Development.json similarity index 100% rename from SS14.Auth/appsettings.Development.json rename to SS14.Web/appsettings.Development.json diff --git a/SS14.Auth/appsettings.json b/SS14.Web/appsettings.json similarity index 100% rename from SS14.Auth/appsettings.json rename to SS14.Web/appsettings.json diff --git a/SS14.Auth/wwwroot/css/site.css b/SS14.Web/wwwroot/css/site.css similarity index 100% rename from SS14.Auth/wwwroot/css/site.css rename to SS14.Web/wwwroot/css/site.css diff --git a/SS14.Auth/wwwroot/favicon.ico b/SS14.Web/wwwroot/favicon.ico similarity index 100% rename from SS14.Auth/wwwroot/favicon.ico rename to SS14.Web/wwwroot/favicon.ico diff --git a/SS14.Auth/wwwroot/js/site.js b/SS14.Web/wwwroot/js/site.js similarity index 100% rename from SS14.Auth/wwwroot/js/site.js rename to SS14.Web/wwwroot/js/site.js diff --git a/SS14.Auth/wwwroot/lib/bootstrap/LICENSE b/SS14.Web/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/LICENSE rename to SS14.Web/wwwroot/lib/bootstrap/LICENSE diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js rename to SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js rename to SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map similarity index 100% rename from SS14.Auth/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map rename to SS14.Web/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map diff --git a/SS14.Auth/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/SS14.Web/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt rename to SS14.Web/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/SS14.Auth/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/SS14.Web/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to SS14.Web/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/SS14.Auth/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/SS14.Web/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to SS14.Web/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/SS14.Auth/wwwroot/lib/jquery-validation/LICENSE.md b/SS14.Web/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery-validation/LICENSE.md rename to SS14.Web/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/SS14.Auth/wwwroot/lib/jquery-validation/dist/additional-methods.js b/SS14.Web/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to SS14.Web/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/SS14.Auth/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/SS14.Web/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to SS14.Web/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/SS14.Auth/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/SS14.Web/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to SS14.Web/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/SS14.Auth/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/SS14.Web/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to SS14.Web/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/SS14.Auth/wwwroot/lib/jquery/LICENSE.txt b/SS14.Web/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery/LICENSE.txt rename to SS14.Web/wwwroot/lib/jquery/LICENSE.txt diff --git a/SS14.Auth/wwwroot/lib/jquery/dist/jquery.js b/SS14.Web/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery/dist/jquery.js rename to SS14.Web/wwwroot/lib/jquery/dist/jquery.js diff --git a/SS14.Auth/wwwroot/lib/jquery/dist/jquery.min.js b/SS14.Web/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery/dist/jquery.min.js rename to SS14.Web/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/SS14.Auth/wwwroot/lib/jquery/dist/jquery.min.map b/SS14.Web/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from SS14.Auth/wwwroot/lib/jquery/dist/jquery.min.map rename to SS14.Web/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/SS14.Auth/wwwroot/logo-long-auth-o.svg b/SS14.Web/wwwroot/logo-long-auth-o.svg similarity index 100% rename from SS14.Auth/wwwroot/logo-long-auth-o.svg rename to SS14.Web/wwwroot/logo-long-auth-o.svg diff --git a/SS14.Auth/wwwroot/logo-long-auth.svg b/SS14.Web/wwwroot/logo-long-auth.svg similarity index 100% rename from SS14.Auth/wwwroot/logo-long-auth.svg rename to SS14.Web/wwwroot/logo-long-auth.svg diff --git a/SS14.Auth/wwwroot/logo-long.svg b/SS14.Web/wwwroot/logo-long.svg similarity index 100% rename from SS14.Auth/wwwroot/logo-long.svg rename to SS14.Web/wwwroot/logo-long.svg diff --git a/SS14.Auth/wwwroot/stripeback.svg b/SS14.Web/wwwroot/stripeback.svg similarity index 100% rename from SS14.Auth/wwwroot/stripeback.svg rename to SS14.Web/wwwroot/stripeback.svg