Skip to content

Commit

Permalink
Combine ServiceDefaults and UiCommon into WebCommon project (#1763)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gunndabad
gunndabad authored Dec 20, 2024
1 parent 9e46904 commit 8c7768e
Show file tree
Hide file tree
Showing 127 changed files with 594 additions and 2,961 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ jobs:
TeachingRecordSystem.AuthorizeAccess.Tests,
TeachingRecordSystem.SupportUi.EndToEndTests,
TeachingRecordSystem.AuthorizeAccess.EndToEndTests,
TeachingRecordSystem.WebCommon.Tests,
]

services:
Expand Down
19 changes: 2 additions & 17 deletions TeachingRecordSystem/TeachingRecordSystem.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Suppor
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.Worker", "src\TeachingRecordSystem.Worker\TeachingRecordSystem.Worker.csproj", "{E7D4BCFD-E610-41E2-B209-0BE13799C7A8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.ServiceDefaults", "src\TeachingRecordSystem.ServiceDefaults\TeachingRecordSystem.ServiceDefaults.csproj", "{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.AuthorizeAccess", "src\TeachingRecordSystem.AuthorizeAccess\TeachingRecordSystem.AuthorizeAccess.csproj", "{960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.UiCommon", "src\TeachingRecordSystem.UiCommon\TeachingRecordSystem.UiCommon.csproj", "{3B40F089-387D-4721-A79D-1C39E682D550}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.WebCommon", "src\TeachingRecordSystem.WebCommon\TeachingRecordSystem.WebCommon.csproj", "{3B40F089-387D-4721-A79D-1C39E682D550}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.UiCommon.Tests", "tests\TeachingRecordSystem.UiCommon.Tests\TeachingRecordSystem.UiCommon.Tests.csproj", "{8F71F933-72A9-4512-89A1-B28ACEC38BC4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.WebCommon.Tests", "tests\TeachingRecordSystem.WebCommon.Tests\TeachingRecordSystem.WebCommon.Tests.csproj", "{8F71F933-72A9-4512-89A1-B28ACEC38BC4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeachingRecordSystem.AuthorizeAccess.Tests", "tests\TeachingRecordSystem.AuthorizeAccess.Tests\TeachingRecordSystem.AuthorizeAccess.Tests.csproj", "{08E99A19-AD1F-4F95-BF13-31248D486799}"
EndProject
Expand Down Expand Up @@ -197,18 +195,6 @@ Global
{E7D4BCFD-E610-41E2-B209-0BE13799C7A8}.Release|x64.Build.0 = Release|Any CPU
{E7D4BCFD-E610-41E2-B209-0BE13799C7A8}.Release|x86.ActiveCfg = Release|Any CPU
{E7D4BCFD-E610-41E2-B209-0BE13799C7A8}.Release|x86.Build.0 = Release|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|x64.ActiveCfg = Debug|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|x64.Build.0 = Debug|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|x86.ActiveCfg = Debug|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Debug|x86.Build.0 = Debug|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|Any CPU.Build.0 = Release|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|x64.ActiveCfg = Release|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|x64.Build.0 = Release|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|x86.ActiveCfg = Release|Any CPU
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF}.Release|x86.Build.0 = Release|Any CPU
{960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -309,7 +295,6 @@ Global
{EB46905A-F7B4-4BDC-B376-6091264D6303} = {91DCFC76-6636-4AC1-B81C-7F8AE1F22116}
{407EB5A5-8B4F-4F7D-80BA-E39AB6AD013C} = {91DCFC76-6636-4AC1-B81C-7F8AE1F22116}
{E7D4BCFD-E610-41E2-B209-0BE13799C7A8} = {837E2941-F1CC-41EF-A652-B605101B2E84}
{01E6CAE9-C591-4C04-A3C1-10BB3A7192FF} = {837E2941-F1CC-41EF-A652-B605101B2E84}
{960D652A-7CB1-4EB5-9813-0CEC0BC6AB6C} = {837E2941-F1CC-41EF-A652-B605101B2E84}
{3B40F089-387D-4721-A79D-1C39E682D550} = {837E2941-F1CC-41EF-A652-B605101B2E84}
{8F71F933-72A9-4512-89A1-B28ACEC38BC4} = {91DCFC76-6636-4AC1-B81C-7F8AE1F22116}
Expand Down
4 changes: 2 additions & 2 deletions TeachingRecordSystem/src/TeachingRecordSystem.Api/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
using TeachingRecordSystem.Core.Services.TrnGenerationApi;
using TeachingRecordSystem.Core.Services.TrsDataSync;
using TeachingRecordSystem.Core.Services.Webhooks;
using TeachingRecordSystem.ServiceDefaults;
using TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging;
using TeachingRecordSystem.WebCommon;
using TeachingRecordSystem.WebCommon.Infrastructure.Logging;

[assembly: ApiController]
namespace TeachingRecordSystem.Api;
Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.Api/TeachingRecordSystem.Api.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<ItemGroup>
<ProjectReference Include="..\..\gen\TeachingRecordSystem.Api.Generator\TeachingRecordSystem.Api.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\TeachingRecordSystem.Core\TeachingRecordSystem.Core.csproj" />
<ProjectReference Include="..\TeachingRecordSystem.ServiceDefaults\TeachingRecordSystem.ServiceDefaults.csproj" />
<ProjectReference Include="..\TeachingRecordSystem.WebCommon\TeachingRecordSystem.WebCommon.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2343,7 +2343,7 @@
"dbup-sqlserver": "[5.0.37, )"
}
},
"teachingrecordsystem.servicedefaults": {
"teachingrecordsystem.webcommon": {
"type": "Project",
"dependencies": {
"AspNetCore.HealthChecks.NpgSql": "[8.0.0, )",
Expand Down
2 changes: 1 addition & 1 deletion ...hingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/AuthorizeAccessLinkGenerator.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.AspNetCore.WebUtilities;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess;

Expand Down
2 changes: 1 addition & 1 deletion ...m.AuthorizeAccess/Infrastructure/Filters/AssignViewDataFromFormFlowJourneyResultFilter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow;
using TeachingRecordSystem.UiCommon.FormFlow.State;
using TeachingRecordSystem.WebCommon.FormFlow.State;

namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.Filters;

Expand Down
4 changes: 2 additions & 2 deletions ...cordSystem/src/TeachingRecordSystem.AuthorizeAccess/Infrastructure/FormFlow/Extensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.ModelBinding;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.UiCommon.FormFlow.State;
using TeachingRecordSystem.WebCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow.State;

namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow;

Expand Down
2 changes: 1 addition & 1 deletion ...chingRecordSystem.AuthorizeAccess/Infrastructure/Middleware/AddAnalyticsDataMiddleware.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Dfe.Analytics;
using Dfe.Analytics.AspNetCore;
using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow;
using TeachingRecordSystem.UiCommon.FormFlow.State;
using TeachingRecordSystem.WebCommon.FormFlow.State;

namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.Middleware;

Expand Down
2 changes: 1 addition & 1 deletion ...chingRecordSystem.AuthorizeAccess/Infrastructure/Security/FormFlowJourneySignInHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Security.Claims;
using Microsoft.AspNetCore.Authentication;
using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security;

Expand Down
2 changes: 1 addition & 1 deletion ...ordSystem.AuthorizeAccess/Infrastructure/Security/OneLoginAuthenticationSchemeProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using TeachingRecordSystem.AuthorizeAccess.Infrastructure.FormFlow;
using TeachingRecordSystem.Core.DataStore.Postgres;
using TeachingRecordSystem.Core.DataStore.Postgres.Models;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;
using static TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security.FormFlowJourneySignInHandler;

namespace TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security;
Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/CheckAnswers.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using TeachingRecordSystem.Core.DataStore.Postgres;
using TeachingRecordSystem.Core.DataStore.Postgres.Models;
using TeachingRecordSystem.Core.Models.SupportTaskData;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Connect.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/DebugIdentity.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security;
using TeachingRecordSystem.Core.DataStore.Postgres;
using TeachingRecordSystem.Core.DataStore.Postgres.Models;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Found.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion ...rdSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NationalInsuranceNumber.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotFound.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/NotVerified.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion ...gRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Address.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...rdSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/CheckAnswers.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using TeachingRecordSystem.Core.Dqt;
using TeachingRecordSystem.Core.Dqt.Queries;
using TeachingRecordSystem.Core.Services.Files;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...ordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/DateOfBirth.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...ingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Email.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.Core.Dqt;
using TeachingRecordSystem.Core.Dqt.Queries;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;
using EmailAddress = TeachingRecordSystem.AuthorizeAccess.DataAnnotations.EmailAddressAttribute;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;
Expand Down
2 changes: 1 addition & 1 deletion ...cordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/EmailInUse.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...RecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Identity.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.AuthorizeAccess.DataAnnotations;
using TeachingRecordSystem.Core.Services.Files;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...ingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Index.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...hingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Name.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...c/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NationalInsuranceNumber.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...ordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NotEligible.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...RecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/NpqCheck.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
4 changes: 2 additions & 2 deletions ...rdSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/PreviousName.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.DataAnnotations;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.DataAnnotations;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...ystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/RequestTrnJourneyState.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion ...ecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/RequestTrn/Submitted.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages.RequestTrn;

Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SignOut.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion ...rdSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/SupportRequestSubmitted.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Test.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/Trn.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess.Pages;

Expand Down
10 changes: 5 additions & 5 deletions TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
using TeachingRecordSystem.Core.Infrastructure;
using TeachingRecordSystem.Core.Services.Files;
using TeachingRecordSystem.Core.Services.PersonMatching;
using TeachingRecordSystem.ServiceDefaults;
using TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging;
using TeachingRecordSystem.SupportUi.Infrastructure.FormFlow;
using TeachingRecordSystem.UiCommon.Filters;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.UiCommon.Middleware;
using TeachingRecordSystem.WebCommon;
using TeachingRecordSystem.WebCommon.Filters;
using TeachingRecordSystem.WebCommon.FormFlow;
using TeachingRecordSystem.WebCommon.Infrastructure.Logging;
using TeachingRecordSystem.WebCommon.Middleware;
using static OpenIddict.Abstractions.OpenIddictConstants;

var builder = WebApplication.CreateBuilder(args);
Expand Down
4 changes: 2 additions & 2 deletions TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
using TeachingRecordSystem.Core.DataStore.Postgres.Models;
using TeachingRecordSystem.Core.Dqt.Models;
using TeachingRecordSystem.Core.Services.PersonMatching;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.UiCommon.FormFlow.State;
using TeachingRecordSystem.WebCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow.State;
using static TeachingRecordSystem.AuthorizeAccess.IdModelTypes;

namespace TeachingRecordSystem.AuthorizeAccess;
Expand Down
2 changes: 1 addition & 1 deletion TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyState.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
using Microsoft.AspNetCore.Authentication;
using TeachingRecordSystem.UiCommon.FormFlow;
using TeachingRecordSystem.WebCommon.FormFlow;

namespace TeachingRecordSystem.AuthorizeAccess;

Expand Down
3 changes: 1 addition & 2 deletions ...stem/src/TeachingRecordSystem.AuthorizeAccess/TeachingRecordSystem.AuthorizeAccess.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@

<ItemGroup>
<ProjectReference Include="..\TeachingRecordSystem.Core\TeachingRecordSystem.Core.csproj" />
<ProjectReference Include="..\TeachingRecordSystem.UiCommon\TeachingRecordSystem.UiCommon.csproj" />
<ProjectReference Include="..\TeachingRecordSystem.ServiceDefaults\TeachingRecordSystem.ServiceDefaults.csproj" />
<ProjectReference Include="..\TeachingRecordSystem.WebCommon\TeachingRecordSystem.WebCommon.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit 8c7768e

Please sign in to comment.