Merge pull request #41 from DurkaTechnologies/develop

Release 1.1 built successfully

Author: ColdForeign

.dockerignore

@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

WebUI/Abstractions/IViewRenderService.cs

@@ -1,11 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using System.Threading.Tasks;
 
 namespace WebUI.Abstractions
 {
 	public interface IViewRenderService
 	{
-		Task<string> RenderViewToStringAsync<TModel>(string viewName, TModel model);
+		Task<string> RenderViewToStringAsync<TModel>(string viewName, TModel model, ITempDataDictionary data = null);
 
 		string RenderRazorViewToString(Controller controller, string viewName, object model = null);
 

WebUI/Areas/Admin/Controllers/UserController.cs

@@ -78,7 +78,7 @@ public async Task<IActionResult> OnGetCreate()
 				{
 					isValid = true,
 					html = await _viewRenderer.RenderViewToStringAsync("_Create",
-					new UserViewModel() { CommunitiesList = freeCommunities })
+					new UserViewModel() { CommunitiesList = freeCommunities }, TempData)
 				});
 			}
 
@@ -90,7 +90,7 @@ public async Task<IActionResult> OnGetCreate()
 		[Authorize(Roles = "SuperAdmin")]
 		public async Task<IActionResult> OnPostCreate(UserViewModel userModel, string fileName, IFormFile blob)
 		{
-			if (ModelState.IsValid)
+			if (ModelState.IsValid && !String.IsNullOrEmpty(fileName) && blob != null)
 			{
 				string imagePath;
 				userModel.Password ??= "1";
@@ -144,7 +144,7 @@ public async Task<IActionResult> OnPostCreate(UserViewModel userModel, string fi
 
 					await _mediator.Send(new AddLogCommand() { Log = log });
 
-					var htmlData = await _viewRenderer.RenderViewToStringAsync("_ViewAll", await GetUsersExceptCurrentAsync());
+					var htmlData = await _viewRenderer.RenderViewToStringAsync("_ViewAll", await GetUsersExceptCurrentAsync(), TempData);
 					return new JsonResult(new { isValid = true, html = htmlData });
 				}
 
@@ -154,7 +154,9 @@ public async Task<IActionResult> OnPostCreate(UserViewModel userModel, string fi
 				ImageService.RemoveImageFromServer(imagePath);
 			}
 
-			var html = await _viewRenderer.RenderViewToStringAsync("_Create", userModel);
+			_notify.Success($"Фото профілю не вибрано");
+
+			var html = await _viewRenderer.RenderViewToStringAsync("_Create", userModel, TempData);
 			return new JsonResult(new { isValid = false, html = html });
 		}
 

WebUI/Areas/Admin/Views/Profile/Edit.cshtml

@@ -30,10 +30,9 @@
 								<!-- Dropdown - User Information -->
 								<div class="dropdown-menu dropdown-menu-left shadow animated--grow-in" aria-labelledby="userDropdown">
 									<div class="dropdown-item p-0">
-										<input accept=".png,.jpg,.jpeg,.gif,.tif"
+										<input accept=".png,.jpg,.jpeg,.gif"
 											   asp-for="@Model.ProfilePicture"
 											   type="file" class="custom-file-input"
-											   onchange="jQueryModalGet('/admin/profile/ChangeProfileImage?id=@Model.Id', 'Обріжте нове зображення профілю')"
 											   id="customFile">
 										<label class="my-file-label" for="customFile"><i class="fas fa-upload"></i> Завантажити</label>
 									</div>
@@ -125,11 +124,21 @@
 			minimumResultsForSearch: 5,
 			placeholder: "Виберіть громади"
 		});
-		//registerSummernote('#summernote', 5000, function (max) {
-		//	$('#lenghtContentPost').text(max)
-		//}, 400, 400);d
 
-		//document.getElementById("summernote").hidden = true;
+		$("#customFile").on("change", function (e) {
+			var noInvalidFiles = true;
+			if (this.files.length == 1) {
+				var file = this.files[0];
+				var array = this.getAttribute("accept").split(",");
+				var extension = file.name.substring(file.name.lastIndexOf('.'));
+				noInvalidFiles = array.includes(extension);
+
+				if (!noInvalidFiles)
+					alert("Вибрано не підримуваний файл.");
+				else
+					jQueryModalGet('/admin/profile/ChangeProfileImage?id=@Model.Id', 'Обріжте нове зображення профілю')
+			}
+		});
 
 		$('.ukrainephone').mask("(999) 999-9999");
 	});

WebUI/Areas/Admin/Views/Profile/Index.cshtml

@@ -73,41 +73,43 @@
 				</div>
 			</div>
 		</div>
-		@if (!String.IsNullOrEmpty(Model.Description))
-		{
-			<div class="col-xl-7 col-lg-6 p-2">
-				<div class="card p-4 m-0">
+		
+		<div class="col-xl-7 col-lg-6 p-2">
+			@if (!String.IsNullOrEmpty(Model.Description))
+			{
+				<div class="card p-4 m-0 mb-3">
 					<h4 class="text-center d-block">Опис</h4>
 
 					@Html.Raw(Model.Description)
 				</div>
-				@if (CheckEdit)
-				{
-					<div class="d-flex justify-content-end my-3">
-						<a class="btn btn-secondary btn-icon-split" href="#" data-toggle="modal" data-target="#logoutModal">
-							<span class="icon text-white-50">
-								<i class="fas fa-sign-out-alt"></i>
-							</span>
-							<span class="text">Вийти</span>
-						</a>
+			}
+			@if (CheckEdit)
+			{
+				<div class="d-flex justify-content-end mb-3">
+					<a class="btn btn-secondary btn-icon-split" href="#" data-toggle="modal" data-target="#logoutModal">
+						<span class="icon text-white-50">
+							<i class="fas fa-sign-out-alt"></i>
+						</span>
+						<span class="text">Вийти</span>
+					</a>
 
-						<a asp-area="Identity" asp-page="/Account/AuditLog" asp-route-id="current" class="btn btn-primary btn-icon-split ml-3">
-							<span class="icon text-white-50">
-								<i class="fas fa-list"></i>
-							</span>
-							<span class="text">Історія дій</span>
-						</a>
+					<a asp-area="Identity" asp-page="/Account/AuditLog" asp-route-id="current" class="btn btn-primary btn-icon-split ml-3">
+						<span class="icon text-white-50">
+							<i class="fas fa-list"></i>
+						</span>
+						<span class="text">Історія дій</span>
+					</a>
 
-						<a asp-controller="Profile" asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-success btn-icon-split ml-3">
-							<span class="icon text-white-50">
-								<i class="fas fa-pen"></i>
-							</span>
-							<span class="text">Редагувати</span>
-						</a>
-					</div>
-				}
-			</div>
-		}
+					<a asp-controller="Profile" asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-success btn-icon-split ml-3">
+						<span class="icon text-white-50">
+							<i class="fas fa-pen"></i>
+						</span>
+						<span class="text">Редагувати</span>
+					</a>
+				</div>
+			}
+		</div>
+		
 	</div>
 
 </div>

WebUI/Areas/Admin/Views/User/_Create.cshtml

@@ -1,5 +1,7 @@
 @using WebUI.Areas.Admin.Models
 @using Application.Constants
+@using AspNetCoreHero.ToastNotification.Abstractions
+@using AspNetCoreHero.ToastNotification.Notyf
 
 @model UserViewModel
 
@@ -60,9 +62,10 @@
 					<label class="col-md-3 col-form-label">Фото</label>
 					<div class="col-md-9">
 						<div class="custom-file form-image">
-							<input accept=".png,.jpg,.jpeg,.gif,.tif"
+							<input accept=".png,.jpg,.jpeg,.gif"
 								   type="file" class="custom-file-input"
 								   id="customFile">
+
 							<label class="custom-file-label" for="customFile">Виберіть картинку</label>
 						</div>
 					</div>
@@ -133,21 +136,25 @@
 
 			var $uploadCrop;
 			var $blob;
-
-			$uploadCrop = $('#cropper').croppie({
-				viewport: {
-					width: 300,
-					height: 300,
-					type: 'square'
-				},
-				boundary: {
-					width: 400,
-					height: 400
-				},
-				showZoomer: false,
-				enforceBoundary: true,
-				enableExif: true
-			});
+			var fileName = null;
+
+			function InitCropper() {
+				$uploadCrop = $('#cropper').croppie({
+					viewport: {
+						width: 300,
+						height: 300,
+						type: 'square'
+					},
+					boundary: {
+						width: 400,
+						height: 400
+					},
+					showZoomer: false,
+					enforceBoundary: true,
+					enableExif: true
+				});
+			}
+			InitCropper();
 
 			function readFile(e) {
 				var reader = new FileReader();
@@ -166,7 +173,28 @@
 				$("#profilePicture").addClass("d-none");
 			}
 
-			document.getElementById("customFile").addEventListener("change", readFile);
+			$("#customFile").on("change", function (e) {
+				var noInvalidFiles = true;
+				if (this.files.length == 1) {
+
+					var file = this.files[0];
+					var array = this.getAttribute("accept").split(",");
+					var extension = file.name.substring(file.name.lastIndexOf('.'));
+					noInvalidFiles = array.includes(extension);
+
+					if (!noInvalidFiles) {
+						fileName = null;
+						$blob = null;
+						$('#cropper').croppie('destroy');
+						$("#imageBox").addClass("d-none");
+						InitCropper();
+						$("#mainForm").toggleClass("col-xl-7 col-lg-5");
+						alert("Вибрано не підримуваний файл.");
+					}
+					else
+						readFile(e);
+				}
+			});
 
 			$("#croppImage").on('click', function () {
 				$uploadCrop.croppie('result', {
@@ -179,17 +207,17 @@
 					$blob = blob;
 					var urlCreator = window.URL || window.webkitURL;
 					var imageUrl = urlCreator.createObjectURL(blob);
+					fileName = $('#customFile').val();
 					$("#profilePicture").attr('src', imageUrl);
 					$("#cropperBox").addClass("d-none");
 					$("#profilePicture").removeClass("d-none");
 				});
 			});
 
 			$("#create-form").submit(function (f) {
-				//$("#create-form").css('visibility', 'hidden');
 
 				var formData = new FormData(this);
-				formData.append('fileName', $('#customFile').val());
+				formData.append('fileName', fileName);
 				formData.append('blob', $blob);
 
 				try {

WebUI/Areas/Admin/Views/User/_ViewAll.cshtml

@@ -49,8 +49,8 @@
 								}
 							</a>
 							<div class="col-sm">
-								<a asp-area="Admin" asp-controller="Profile" asp-action="Index" asp-route-id="@user.Id" class="font-weight-bolder text-dark">
-									@user.FirstName @user.LastName
+								<a asp-area="Admin" asp-controller="Profile" asp-action="Index" asp-route-id="@user.Id" class="font-weight-bolder text-black text-dark worker-name">
+									@user.MiddleName @user.FirstName @user.LastName
 								</a>
 								<br>
 								<small>

WebUI/Areas/Dashboard/Views/Home/Index.cshtml

@@ -1,17 +1,30 @@
 @using MarkdownSharpAdapted
-@using System.IO
+@using System.Net
 
 <div class="container">
-    @{
-        string text = File.ReadAllText("../README.md");
+	@{
+		string text;
+		try
+		{
+			Uri url = new Uri("https://raw.githubusercontent.com/DurkaTechnologies/AdminPanel/master/README.md");
+			using (WebClient client = new WebClient())
+			{
+				text = client.DownloadString(url);
+			}
+			Markdown markdown = new Markdown();
+			text = markdown.Transform(text);
+		}
+		catch (Exception ex)
+		{
+			text = "Файл з інстуркуцією не знайдено";
+		}
+	}
+	@if (!String.IsNullOrEmpty(text))
+	{
+		@Html.Raw(text)
+	}
 
-        Markdown markdown = new Markdown();
-        string html = markdown.Transform(text);
-    }
-
-    @Html.Raw(html)
-
-    <a id="reload" class="btn text-white" href="~/ReadmeFiles/unknown.png" target="_blank"></a>
-    <a id="reload" class="btn text-white" href="~/ReadmeFiles/giphy.mp4" target="_blank"></a>
-    <a id="reload" class="btn text-white" href="~/ReadmeFiles/nesalo.jpeg" target="_blank"></a>
+	<a id="reload" class="btn text-white" href="~/ReadmeFiles/unknown.png" target="_blank"></a>
+	<a id="reload" class="btn text-white" href="~/ReadmeFiles/giphy.mp4" target="_blank"></a>
+	<a id="reload" class="btn text-white" href="~/ReadmeFiles/nesalo.jpeg" target="_blank"></a>
 </div>

WebUI/Areas/Entities/Controllers/CommunityController.cs

@@ -190,9 +190,10 @@ private async Task<List<GetAllCommunitiesCachedResponse>> FillUserName(List<GetA
 				if (user == null)
 					el.ApplicationUserName = "Громада вільна";
 				else
-					el.ApplicationUserName = user.LastName + " " + user.FirstName;
+					el.ApplicationUserName = user.MiddleName + " " + user.FirstName + " " + user.LastName;
 			}
 			return list;
 		}
 	}
 }
+

WebUI/Dockerfile

@@ -0,0 +1,25 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+WORKDIR /src
+COPY ["WebUI/WebUI.csproj", "WebUI/"]
+COPY ["Infrastructure/Infrastructure.csproj", "Infrastructure/"]
+COPY ["Domain/Domain.csproj", "Domain/"]
+COPY ["Application/Application.csproj", "Application/"]
+RUN dotnet restore "WebUI/WebUI.csproj"
+COPY . .
+WORKDIR "/src/WebUI"
+RUN dotnet build "WebUI.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "WebUI.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "WebUI.dll"]