Compare commits
	
		
			31 Commits
		
	
	
		
			16-refacto
			...
			dev-test
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 6709afa2e0 | |||
| c8bede7df3 | |||
| 669fb7d21c | |||
| fcd2952757 | |||
| 91fbbf97a4 | |||
| 9e7a6b4197 | |||
| ee7a15efc2 | |||
| 0ec110f45e | |||
| 03e1778e63 | |||
| ccba80f54e | |||
| 97c83f69eb | |||
| f6029fd89f | |||
| a256ef99c0 | |||
| 39a748ff0e | |||
| 81a01ae4ed | |||
| 4e30f3e7a5 | |||
| 28a1d07e98 | |||
| 222f90df02 | |||
| aae4b28089 | |||
| fa87a56ad1 | |||
| 5b4ee67c23 | |||
| 07f5663c75 | |||
| 6ab5b9f1df | |||
| a55eff43fb | |||
| 99eb10f61d | |||
| f00595187f | |||
| 8c0ad9bc3e | |||
|   | b4056fa715 | ||
|   | b832cd7ecf | ||
|   | 09ff31ac82 | ||
|   | cd49f68db1 | 
							
								
								
									
										33
									
								
								.drone.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								.drone.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,33 @@ | |||||||
|  | kind: pipeline | ||||||
|  | type: docker | ||||||
|  | name: "Backend" | ||||||
|  |  | ||||||
|  | steps: | ||||||
|  | - name: test | ||||||
|  |   image: mcr.microsoft.com/dotnet/sdk:8.0 | ||||||
|  |   commands: | ||||||
|  |   - dotnet build | ||||||
|  |   - dotnet test | ||||||
|  |  | ||||||
|  | - name: publish | ||||||
|  |   image: plugins/docker | ||||||
|  |   settings: | ||||||
|  |     username: prtsie | ||||||
|  |     password: | ||||||
|  |       from_secret: docker_pass | ||||||
|  |     registry: git.prtsie.ru | ||||||
|  |     repo: git.prtsie.ru/prtsie/schengen-visa-${DRONE_BRANCH} | ||||||
|  |     tags: | ||||||
|  |     - latest | ||||||
|  |  | ||||||
|  | - name: deploy | ||||||
|  |   image: appleboy/drone-ssh | ||||||
|  |   settings: | ||||||
|  |     script_stop: true | ||||||
|  |     host: prtsie.ru:1337 | ||||||
|  |     username: deploy | ||||||
|  |     key: | ||||||
|  |       from_secret: ssh_key | ||||||
|  |     script: | ||||||
|  |       - cd /deploy | ||||||
|  |       - ./deploy.sh ${DRONE_BRANCH} | ||||||
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -33,3 +33,5 @@ _UpgradeReport_Files/ | |||||||
| Thumbs.db | Thumbs.db | ||||||
| Desktop.ini | Desktop.ini | ||||||
| .DS_Store | .DS_Store | ||||||
|  |  | ||||||
|  | .env | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ public static class Constants | |||||||
| { | { | ||||||
|     public readonly static Regex EnglishWordRegex = new("^[a-zA-Z']*$"); |     public readonly static Regex EnglishWordRegex = new("^[a-zA-Z']*$"); | ||||||
| 
 | 
 | ||||||
|     public readonly static Regex EnglishPhraseRegex = new(@"^[a-zA-Z №0-9;,\-_+=#*']*$"); |     public readonly static Regex EnglishPhraseRegex = new("""^[a-zA-Z №0-9;,\-_+=#*'\"]*$"""); | ||||||
| 
 | 
 | ||||||
|     public readonly static Regex PhoneNumRegex = new(@"^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$"); |     public readonly static Regex PhoneNumRegex = new(@"^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$"); | ||||||
| } | } | ||||||
| @@ -35,7 +35,7 @@ public class VisaApplicationRequestsHandler( | |||||||
|         return mapper.Map<List<VisaApplicationPreview>>(visaApplications); |         return mapper.Map<List<VisaApplicationPreview>>(visaApplications); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     /// <summary> <inheritdoc cref="IVisaApplicationRequestsHandler.GetApplicationForApplicantAsync"/> </summary> |     /// <inheritdoc cref="IVisaApplicationRequestsHandler.GetApplicationForApplicantAsync"/> | ||||||
|     public async Task<VisaApplicationModel> GetApplicationForApplicantAsync(Guid id, CancellationToken cancellationToken) |     public async Task<VisaApplicationModel> GetApplicationForApplicantAsync(Guid id, CancellationToken cancellationToken) | ||||||
|     { |     { | ||||||
|         var applicant = await applicants.FindByUserIdAsync(userIdProvider.GetUserId(), cancellationToken); |         var applicant = await applicants.FindByUserIdAsync(userIdProvider.GetUserId(), cancellationToken); | ||||||
| @@ -1,5 +1,4 @@ | |||||||
| @using BlazorWebAssemblyVisaApiClient.ErrorHandling | @using BlazorWebAssemblyVisaApiClient.ErrorHandling | ||||||
| 
 |  | ||||||
| <GlobalErrorHandler > | <GlobalErrorHandler > | ||||||
|     <Router AppAssembly="@typeof(App).Assembly"> |     <Router AppAssembly="@typeof(App).Assembly"> | ||||||
|         <Found Context="routeData"> |         <Found Context="routeData"> | ||||||
| @@ -2,7 +2,6 @@ | |||||||
| @using BlazorWebAssemblyVisaApiClient.ErrorHandling | @using BlazorWebAssemblyVisaApiClient.ErrorHandling | ||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider | ||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| @code { | @code { | ||||||
|     public static AuthData? AuthData; |     public static AuthData? AuthData; | ||||||
| 
 | 
 | ||||||
| @@ -1,6 +1,5 @@ | |||||||
| @using BlazorWebAssemblyVisaApiClient.ErrorHandling | @using BlazorWebAssemblyVisaApiClient.ErrorHandling | ||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| @code | @code | ||||||
| { | { | ||||||
|     [CascadingParameter] protected GlobalErrorHandler ErrorHandler { get; set; } = null!; |     [CascadingParameter] protected GlobalErrorHandler ErrorHandler { get; set; } = null!; | ||||||
| @@ -1,5 +1,4 @@ | |||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| <div> | <div> | ||||||
|     <div > |     <div > | ||||||
|         <label > |         <label > | ||||||
| @@ -1,5 +1,4 @@ | |||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| <div> | <div> | ||||||
|     <div > |     <div > | ||||||
|         <label > |         <label > | ||||||
| @@ -1,5 +1,4 @@ | |||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| <div> | <div> | ||||||
|     <div > |     <div > | ||||||
|         <label> |         <label> | ||||||
| @@ -1,6 +1,5 @@ | |||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider | ||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| <div> | <div> | ||||||
|     <div > |     <div > | ||||||
|         <label> |         <label> | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| @using System.Linq.Expressions | @typeparam TItem where TItem : class | ||||||
|  | @using System.Linq.Expressions | ||||||
| @using System.Reflection | @using System.Reflection | ||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers | ||||||
| @typeparam TItem where TItem : class |  | ||||||
| @typeparam TMember where TMember : struct, Enum | @typeparam TMember where TMember : struct, Enum | ||||||
| 
 | 
 | ||||||
| <InputSelect TValue="TMember" @bind-Value="selected"> | <InputSelect TValue="TMember" @bind-Value="selected"> | ||||||
| @@ -1,6 +1,5 @@ | |||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider | ||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| <div> | <div> | ||||||
|     <label> |     <label> | ||||||
|         Issuer:<br/> |         Issuer:<br/> | ||||||
| @@ -1,6 +1,5 @@ | |||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider | ||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| <div> | <div> | ||||||
|     <label> |     <label> | ||||||
|         Number:<br/> |         Number:<br/> | ||||||
| @@ -1,7 +1,6 @@ | |||||||
| @using System.Net | @using System.Net | ||||||
| @using BlazorWebAssemblyVisaApiClient.Common.Exceptions | @using BlazorWebAssemblyVisaApiClient.Common.Exceptions | ||||||
| @using VisaApiClient | @using VisaApiClient | ||||||
| 
 |  | ||||||
| <CascadingValue Value="this"> | <CascadingValue Value="this"> | ||||||
|     <Modal @ref="modal"> |     <Modal @ref="modal"> | ||||||
|         <BodyTemplate> |         <BodyTemplate> | ||||||
| @@ -1,10 +1,10 @@ | |||||||
| @page "/authorities/add" | @page "/authorities/add" | ||||||
| @using AutoMapper | @using AutoMapper | ||||||
| @using BlazorWebAssemblyVisaApiClient.Validation.Applicants.Models |  | ||||||
| @using VisaApiClient |  | ||||||
| @using BlazorWebAssemblyVisaApiClient.Components | @using BlazorWebAssemblyVisaApiClient.Components | ||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers | ||||||
|  | @using BlazorWebAssemblyVisaApiClient.Validation.Applicants.Models | ||||||
| @using FluentValidation | @using FluentValidation | ||||||
|  | @using VisaApiClient | ||||||
| @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase | @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase | ||||||
| 
 | 
 | ||||||
| <EditForm Model="requestModel" class="with-centered-content"> | <EditForm Model="requestModel" class="with-centered-content"> | ||||||
| @@ -1,8 +1,8 @@ | |||||||
| @page "/" | @page "/" | ||||||
| @using BlazorWebAssemblyVisaApiClient.Components.Auth |  | ||||||
| @using VisaApiClient |  | ||||||
| @using BlazorWebAssemblyVisaApiClient.Components.FormComponents.Applicants |  | ||||||
| @using BlazorWebAssemblyVisaApiClient.Components | @using BlazorWebAssemblyVisaApiClient.Components | ||||||
|  | @using BlazorWebAssemblyVisaApiClient.Components.Auth | ||||||
|  | @using BlazorWebAssemblyVisaApiClient.Components.FormComponents.Applicants | ||||||
|  | @using VisaApiClient | ||||||
| @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase | @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase | ||||||
| 
 | 
 | ||||||
| <PageTitle>Authentication</PageTitle> | <PageTitle>Authentication</PageTitle> | ||||||
| @@ -1,11 +1,11 @@ | |||||||
| @page "/authorities/{authorityId}/{oldEmail}" | @page "/authorities/{authorityId}/{oldEmail}" | ||||||
| @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase |  | ||||||
| @using BlazorWebAssemblyVisaApiClient.Common.Exceptions | @using BlazorWebAssemblyVisaApiClient.Common.Exceptions | ||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider |  | ||||||
| @using VisaApiClient |  | ||||||
| @using BlazorWebAssemblyVisaApiClient.Components | @using BlazorWebAssemblyVisaApiClient.Components | ||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers | ||||||
|  | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider | ||||||
| @using FluentValidation | @using FluentValidation | ||||||
|  | @using VisaApiClient | ||||||
|  | @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase | ||||||
| 
 | 
 | ||||||
| <EditForm Model="model" class="with-centered-content"> | <EditForm Model="model" class="with-centered-content"> | ||||||
|     <div > |     <div > | ||||||
| @@ -1,17 +1,17 @@ | |||||||
| @page "/applications/new" | @page "/applications/new" | ||||||
| @using System.Net | @using System.Net | ||||||
| @using AutoMapper | @using AutoMapper | ||||||
| @using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models |  | ||||||
| @using VisaApiClient |  | ||||||
| @using BlazorWebAssemblyVisaApiClient.Components | @using BlazorWebAssemblyVisaApiClient.Components | ||||||
|  | @using BlazorWebAssemblyVisaApiClient.Components.FormComponents | ||||||
| @using BlazorWebAssemblyVisaApiClient.Components.FormComponents.VisaApplications | @using BlazorWebAssemblyVisaApiClient.Components.FormComponents.VisaApplications | ||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers | ||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.DateTimeProvider | ||||||
| @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider | @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider | ||||||
| @using BlazorWebAssemblyVisaApiClient.Validation | @using BlazorWebAssemblyVisaApiClient.Validation | ||||||
|  | @using BlazorWebAssemblyVisaApiClient.Validation.VisaApplications.Models | ||||||
| @using FluentValidation | @using FluentValidation | ||||||
| @using Newtonsoft.Json.Linq | @using Newtonsoft.Json.Linq | ||||||
| @using BlazorWebAssemblyVisaApiClient.Components.FormComponents | @using VisaApiClient | ||||||
| @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase | @inherits BlazorWebAssemblyVisaApiClient.Components.Base.VisaClientComponentBase | ||||||
| 
 | 
 | ||||||
| <PageTitle>New Application</PageTitle> | <PageTitle>New Application</PageTitle> | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user