refactorrr

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/AddAuthority.razor

@@ -19,7 +19,7 @@
 
         <label>
             Password:<br/>
-            <InputText class="rounded" @bind-Value="requestModel.AuthData.Password"/>
+            <InputText type="password" class="rounded" @bind-Value="requestModel.AuthData.Password"/>
             <ValidationMessage For="() => requestModel.AuthData.Password"/>
         </label><br/>
         <p/>

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/Application.razor

@@ -4,6 +4,8 @@
 @using BlazorWebAssemblyVisaApiClient.Components
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
+@using BlazorWebAssemblyVisaApiClient.Validation.Applicants.Models
+@using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models
 @using VisaApiClient
 @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
@@ -42,9 +44,9 @@
             Gender:<br/>
             <em>@application.Applicant.Gender.GetDisplayName()</em>
         </td>
-        <td >
+        <td colspan="2">
             Marital status:<br/>
-            <em>@application.Applicant.MaritalStatus.GetDisplayName()</em>
+            <em>@(((MaritalStatusModel)application.Applicant.MaritalStatus).GetDisplayName())</em>
         </td>
     </tr>
     <tr>
@@ -111,7 +113,7 @@
         </td>
         <td >
             Visa category:<br/>
-            <em>@application.VisaCategory</em>
+            <em>@(((VisaCategoryModel)application.VisaCategory).GetDisplayName())</em>
         </td>
         <td >
             Visa:<br/>

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/Applications.razor

@@ -2,6 +2,7 @@
 @using BlazorWebAssemblyVisaApiClient.Common.Exceptions
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
+@using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models
 @using VisaApiClient
 @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
@@ -33,7 +34,7 @@
 
         <tr class="@rowClass">
             <td>@application.DestinationCountry</td>
-            <td>@application.VisaCategory.GetDisplayName()</td>
+            <td>@(((VisaCategoryModel)application.VisaCategory).GetDisplayName())</td>
             <td>@application.RequestDate.ToString("d")</td>
             <td>@application.ValidDaysRequested</td>
             <td>@application.Status.GetDisplayName()</td>

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/Authority.razor

@@ -16,7 +16,7 @@
 
         <label>
             New password (leave blank if shouldn't be changed):<br/>
-            <InputText class="rounded" @bind-Value="model.Password"/>
+            <InputText type="password" class="rounded" @bind-Value="model.Password"/>
         </label><br/><p/>
 
         <button class="btn-primary rounded" @onclick="Save">Save</button><br/>

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/CreateApplication.razor

@@ -2,7 +2,6 @@
 @using System.Net
 @using AutoMapper
 @using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models
-@using BlazorWebAssemblyVisaApiClient.Components.FormComponents.Applicants
 @using VisaApiClient
 @using BlazorWebAssemblyVisaApiClient.Components
 @using BlazorWebAssemblyVisaApiClient.Components.FormComponents.VisaApplications
@@ -12,6 +11,7 @@
 @using BlazorWebAssemblyVisaApiClient.Validation
 @using FluentValidation
 @using Newtonsoft.Json.Linq
+@using BlazorWebAssemblyVisaApiClient.Components.FormComponents
 @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
 <PageTitle>New Application</PageTitle>
@@ -163,7 +163,7 @@
             <Status @ref="pastVisitStatus"/>
         </div>
 
-        @if (requestModel.VisaCategory is VisaCategory.Transit)
+        @if (requestModel.VisaCategory is VisaCategoryModel.Transit)
         {
             requestModel.PermissionToDestCountry ??= NewPermissionToDestCountry();
             <div class="form-block">

SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/Register.razor

@@ -10,6 +10,7 @@
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
 @using BlazorWebAssemblyVisaApiClient.Validation
 @using BlazorWebAssemblyVisaApiClient.Validation.Applicants.Models
+@using BlazorWebAssemblyVisaApiClient.Components.FormComponents
 @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase
 
 <PageTitle>Registration</PageTitle>