Commit e892de2

committed

fix: resolve merge conflict with main in IdProofingForm

1 parent a4d3520 commit e892de2Copy full SHA for e892de2

88 files changed

.dockerignore
.github/workflows
.gitignore
.idea
- .gitignore
- .idea.SEBT.Portal/.idea
  - .gitignore
.tflint.hcl
docs/tdd
- analytics-data-layer.md
src
- SEBT.Portal.Api
- SEBT.Portal.Core
  - AppSettings
    - SeedingSettings.cs
    - SmtpClientSettings.cs
  - Seeding
    - SeedScenario.cs
    - SeedScenarios.cs
- SEBT.Portal.Infrastructure.Seeding/Services
  - DatabaseSeeder.cs
- SEBT.Portal.Infrastructure
  - Dependencies.cs
  - Repositories
    - MockHouseholdRepository.cs
  - SEBT.Portal.Infrastructure.csproj
  - Services
    - MailKitClientService.cs
    - SmtpClientService.cs
- SEBT.Portal.Web
  - Dockerfile
  - package.json
  - src
    - app
      - (public)/login/id-proofing/off-boarding
        page.test.tsx
        page.tsx
      - layout.tsx
      - sitemap.ts
    - features/auth
      - api
        index.ts
        submit-id-proofing
        index.ts
        schema.ts
        useSubmitIdProofing.test.tsx
        useSubmitIdProofing.ts
      - components
        id-proofing
        IdProofingForm.test.tsx
        IdProofingForm.tsx
        OffBoardingContent.test.tsx
        OffBoardingContent.tsx
        index.ts
        index.ts
      - index.ts
    - mocks
      - handlers.ts
    - proxy.ts
test/SEBT.Portal.Tests/Unit
- Repositories
  - MockHouseholdRepositoryTests.cs
- Services
  - DatabaseSeederTests.cs
tofu
- config
  - dev-co
  - dev-dc
- modules
  - sebt_application
  - sebt_database
  - sebt_ses

`‎.dockerignore‎`

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 -**/.dockerignore
 +**/.dockerignore
 **/.env
 **/.git
 **/.gitignore
 **/bin
 **/charts
 **/docker-compose*
 -**/Dockerfile*
 **/node_modules
 **/npm-debug.log
 **/obj

Comments

(0)