From e532b4b27ed6a9aa7937d7cdfec5bd23d516cb74 Mon Sep 17 00:00:00 2001
From: Berkan Sasmaz <berkansasmazz@gmail.com>
Date: Fri, 7 May 2021 15:39:59 +0300
Subject: [PATCH] Improve design on creation event page

---
 .../Components/MainNavbar/Default.cshtml      |   2 +-
 src/EventHub.Web/Pages/Events/New.cshtml      |   8 +-
 src/EventHub.Web/Pages/Events/New.js          | 113 +++++++++---------
 3 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
index 70515fb..59e88a6 100644
--- a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
+++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
@@ -59,7 +59,7 @@
                             <a class="dropdown-item" href="@Url.Page("/Profile")" title="@L["Settings"]">
                                 <i class="fas fa-cog"></i> @L["Settings"]
                             </a>
-                            <a class="dropdown-item" href="/Account/Logout?returnUrl=@EventHubExternalUrls.EhWww" title="@L["Logout"]">
+                            <a class="dropdown-item" href="/Account/Logout?returnUrl=@EventHubExternalUrls.EhWww@(System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))" title="@L["Logout"]">
                                 <i class="fas fa-sign-out-alt"></i> @L["Logout"]
                             </a>
                         </div>
diff --git a/src/EventHub.Web/Pages/Events/New.cshtml b/src/EventHub.Web/Pages/Events/New.cshtml
index 11a7505..c3874e5 100644
--- a/src/EventHub.Web/Pages/Events/New.cshtml
+++ b/src/EventHub.Web/Pages/Events/New.cshtml
@@ -10,10 +10,14 @@
 
 @if (!Model.Organizations.Any())
 {
-    <abp-alert alert-type="Danger">
+  <div class="container">
+    <div class="m-5 text-center">
+      <abp-alert alert-type="Danger">
         <p>@L["NewEventYouHaveNoOrganizationYetMessage"]</p>
         <a abp-button="Primary" href="@Url.Page("/Organizations/New")">@L["CreateAnOrganization"]</a>
-    </abp-alert>
+      </abp-alert>
+    </div>
+  </div>
 }
 else
 {
diff --git a/src/EventHub.Web/Pages/Events/New.js b/src/EventHub.Web/Pages/Events/New.js
index 73738ad..c77ba94 100644
--- a/src/EventHub.Web/Pages/Events/New.js
+++ b/src/EventHub.Web/Pages/Events/New.js
@@ -1,89 +1,90 @@
 $(function () {
     var l = abp.localization.getResource('EventHub');
-    
+
     var isOnline = $("#Event_IsOnline option:selected").val()
     if (isOnline === "True") {
         $(".event-link-group").show();
         $(".event-location-group").hide();
-    }else{
+    } else {
         $(".event-link-group").hide();
         $(".event-location-group").show();
     }
-    
-    $('#Event_IsOnline').on('change', '', function() {
+
+    $('#Event_IsOnline').on('change', '', function () {
         var isOnline = $("#Event_IsOnline option:selected").val()
         if (isOnline === "True") {
             $(".event-link-group").show();
             $(".event-location-group").hide();
-        }else{
+        } else {
             $(".event-link-group").hide();
             $(".event-location-group").show();
         }
     });
 
-    var infoArea = document.getElementById( 'upload-label' );
+    var infoArea = document.getElementById('upload-label');
     var fileInput = document.getElementById('Event_CoverImageFile');
     var file;
 
-    fileInput.addEventListener('change', function () {
-        var showFile = true;
+    if (fileInput !== null) {
+        fileInput.addEventListener('change', function () {
+            var showFile = true;
 
-        file = fileInput.files[0];
+            file = fileInput.files[0];
 
-        if (file === undefined){
-            $('#Event_CoverImageFile').val('');
-            $('#imageResult').attr('src', '#');
-            infoArea.textContent = 'Choose file'
-            return;
-        }
+            if (file === undefined) {
+                $('#Event_CoverImageFile').val('');
+                $('#imageResult').attr('src', '#');
+                infoArea.textContent = 'Choose file'
+                return;
+            }
 
-        var permittedExtensions = ["jpg", "jpeg", "png"]
-        var fileExtension = $(this).val().split('.').pop();
-        if (permittedExtensions.indexOf(fileExtension) === -1) {
-            showFile = false;
-            abp.message.error(l('EventCoverImageExtensionNotAllowed'))
-                .then(() => {
-                    $('#Event_CoverImageFile').val('');
-                    file = null;
-                });
-        }
-        else if(file.size > 1024*1024) {
-            showFile = false;
-            abp.message.error(l('EventCoverImageSizeExceedMessage'))
-                .then(() => {
-                    $('#Event_CoverImageFile').val('');
-                    file = null;
-                });
-        }
+            var permittedExtensions = ["jpg", "jpeg", "png"]
+            var fileExtension = $(this).val().split('.').pop();
+            if (permittedExtensions.indexOf(fileExtension) === -1) {
+                showFile = false;
+                abp.message.error(l('EventCoverImageExtensionNotAllowed'))
+                    .then(() => {
+                        $('#Event_CoverImageFile').val('');
+                        file = null;
+                    });
+            } else if (file.size > 1024 * 1024) {
+                showFile = false;
+                abp.message.error(l('EventCoverImageSizeExceedMessage'))
+                    .then(() => {
+                        $('#Event_CoverImageFile').val('');
+                        file = null;
+                    });
+            }
 
-        var img = new Image();
-        img.onload = function () {
-            var imageError = true;
-            var sizes = {
-                width: this.width,
-                height: this.height
-            };
-            URL.revokeObjectURL(this.src);
+            var img = new Image();
+            img.onload = function () {
+                var imageError = true;
+                var sizes = {
+                    width: this.width,
+                    height: this.height
+                };
+                URL.revokeObjectURL(this.src);
 
-            if(showFile && imageError) {
-                readURL(file);
+                if (showFile && imageError) {
+                    readURL(file);
+                }
             }
-        }
 
-        var objectURL = URL.createObjectURL(file);
-        img.src = objectURL;
-    });
-    
-    function readURL(input) {
-        if (input) {
-            var reader = new FileReader();
+            var objectURL = URL.createObjectURL(file);
+            img.src = objectURL;
+        });
 
-            reader.onload = function (e) {
-                $('#imageResult').attr('src', e.target.result);
-                infoArea.textContent = 'File name: ' + input.name;
-            }
+        function readURL(input) {
+            if (input) {
+                var reader = new FileReader();
+
+                reader.onload = function (e) {
+                    $('#imageResult').attr('src', e.target.result);
+                    infoArea.textContent = 'File name: ' + input.name;
+                }
 
-            reader.readAsDataURL(input);
+                reader.readAsDataURL(input);
+            }
         }
     }
 });
\ No newline at end of file