From 05cd15f7c61290adb9be4e4288f3cf4f6ae26b4c Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 24 Jan 2025 14:56:21 +0800
Subject: [PATCH 1/8] FIx logout problem

---
 .../EventHub.IdentityServer.csproj            |  2 +-
 .../Pages/Account/LoggedOut.cshtml            | 34 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/EventHub.IdentityServer/EventHub.IdentityServer.csproj b/src/EventHub.IdentityServer/EventHub.IdentityServer.csproj
index a686d69..2134161 100644
--- a/src/EventHub.IdentityServer/EventHub.IdentityServer.csproj
+++ b/src/EventHub.IdentityServer/EventHub.IdentityServer.csproj
@@ -48,7 +48,7 @@
     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="9.0.0" />
     <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="9.0.0" />
     <PackageReference Include="Volo.Abp.Account.Application" Version="9.0.0" />
-	 <PackageReference Include="Volo.Abp.Account.HttpApi" Version="9.0.0" />
+    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="9.0.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml b/src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml
index c088de1..f890a83 100644
--- a/src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml
+++ b/src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml
@@ -1,4 +1,5 @@
-page "/Account/LoggedOut"
+@page "/Account/LoggedOut"
+
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.Account.Localization
 @using Volo.Abp.Account.Web.Pages.Account
@@ -18,18 +19,19 @@ page "/Account/LoggedOut"
 @section styles {
     <abp-style src="/Pages/Account/LoggedOut.css" />
 }
-
-<abp-card class="loggedOutCard">
-    <abp-card-body>
-        <abp-card-title>@L["LoggedOutTitle"]</abp-card-title>
-        <abp-card-text>@L["LoggedOutText"]</abp-card-text>
-        @if (Model.PostLogoutRedirectUri != null)
-        {
-            <a abp-button="Primary" id="redirectButton" href="@Model.PostLogoutRedirectUri" cname="@Model.ClientName">@L["ReturnToText"]</a>
-        }
-        @if (Model.SignOutIframeUrl != null)
-        {
-            <iframe class="signout logoutiframe" src="@Model.SignOutIframeUrl"></iframe>
-        }
-    </abp-card-body>
-</abp-card>
\ No newline at end of file
+<div class="container mt-5">
+    <abp-card class="loggedOutCard">
+        <abp-card-body>
+            <abp-card-title>@L["LoggedOutTitle"]</abp-card-title>
+            <abp-card-text>@L["LoggedOutText"]</abp-card-text>
+            @if (Model.PostLogoutRedirectUri != null)
+            {
+                <a abp-button="Primary" id="redirectButton" href="@Model.PostLogoutRedirectUri" cname="@Model.ClientName">@L["ReturnToText"]</a>
+            }
+            @if (Model.SignOutIframeUrl != null)
+            {
+                <iframe class="signout logoutiframe" src="@Model.SignOutIframeUrl"></iframe>
+            }
+        </abp-card-body>
+    </abp-card>
+</div>
\ No newline at end of file

From dd1f7aa74379835743a3d215c61c1935be2f5d48 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 24 Jan 2025 15:23:23 +0800
Subject: [PATCH 2/8] Fix login problem

---
 .../Themes/EventHub/Components/MainNavbar/Default.cshtml   | 7 +++++++
 1 file changed, 7 insertions(+)

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 a8bb708..268d49f 100644
--- a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
+++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
@@ -14,10 +14,17 @@
 
 @{
     var returnUrl = WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery());
+    
+    if(Context.Request.Path.Equals("/Account/Login", StringComparison.OrdinalIgnoreCase))
+    {
+        returnUrl = WebUtility.UrlEncode(Context.Request.Query["returnUrl"]);
+    }
+    
     if (returnUrl.IsNullOrWhiteSpace())
     {
         returnUrl = "/";
     }
+    
 }
 <nav class="navbar navbar-expand-lg navbar-light bg-light static-top">
     <div class="container">

From 494617bd057cd88aaa428fd3b692551db56e0b93 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 24 Jan 2025 15:37:40 +0800
Subject: [PATCH 3/8] Remove past and upcoming buttons if no event

---
 .../Components/EventsArea/Default.cshtml      |  2 +-
 .../Pages/Organizations/Profile.cshtml        | 31 ++++++++++++-------
 .../Pages/Organizations/Profile.cshtml.cs     | 23 +++++++++++++-
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/EventHub.Web/Pages/Events/Components/EventsArea/Default.cshtml b/src/EventHub.Web/Pages/Events/Components/EventsArea/Default.cshtml
index 76c1ba9..b37c3b3 100644
--- a/src/EventHub.Web/Pages/Events/Components/EventsArea/Default.cshtml
+++ b/src/EventHub.Web/Pages/Events/Components/EventsArea/Default.cshtml
@@ -1,6 +1,6 @@
 @model EventHub.Web.Pages.Events.Components.EventsArea.EventsAreaViewComponent.ListAreaViewComponentModel
 
-@if (Model.Events != null && Model.Events.Count > 0)
+@if (Model.Events is { Count: > 0 })
 {
     <div id="EventList" class="row" data-hash-code="@Model.GetHashCode()" data-total-count="@Model.TotalCount" data-skip-count="@Model.SkipCount" data-max-result-count="@Model.MaxResultCount">
         <partial name="~/Pages/Events/Components/EventsArea/_eventListSection.cshtml" model="@Model.Events"/>
diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
index 0e8b350..4b1b767 100644
--- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
@@ -132,18 +132,27 @@
                         <div class="row mb-4">
                             <div class="col-md">
                             </div>
-                            <div class="col-md-auto">
-                                <div class="list-style">
-                                    <ul class="nav nav-pills events" role="tablist">
-                                        <li class="nav-item">
-                                            <a href="#PastEvent" class="selected" data-bs-toggle="tab"><img src="/assets/past.svg"> Past</a>
-                                        </li>
-                                        <li class="nav-item">
-                                            <a href="#UpcomingEvent" data-bs-toggle="tab"><img src="/assets/now.svg"> Upcoming</a>
-                                        </li>
-                                    </ul>
+                            @if (Model.HasPastEvents || Model.HasUpcomingEvents)
+                            {
+                                <div class="col-md-auto">
+                                    <div class="list-style">
+                                        <ul class="nav nav-pills events" role="tablist">
+                                            @if (Model.HasPastEvents)
+                                            {
+                                                <li class="nav-item">
+                                                    <a href="#PastEvent" class="selected" data-bs-toggle="tab"><img src="/assets/past.svg"> Past</a>
+                                                </li>
+                                            }
+                                            @if (Model.HasUpcomingEvents)
+                                            {
+                                                <li class="nav-item">
+                                                    <a href="#UpcomingEvent" data-bs-toggle="tab"><img src="/assets/now.svg"> Upcoming</a>
+                                                </li>
+                                            }
+                                        </ul>
+                                    </div>
                                 </div>
-                            </div>
+                            }
                         </div>
                         <div class="tab-content">
                             <div id="PastEvent" class="tab-pane active">
diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml.cs b/src/EventHub.Web/Pages/Organizations/Profile.cshtml.cs
index a430958..8084e88 100644
--- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml.cs
+++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Threading.Tasks;
+using EventHub.Events;
 using EventHub.Organizations;
 using EventHub.Organizations.Memberships;
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Dtos;
 
 namespace EventHub.Web.Pages.Organizations
 {
@@ -16,14 +18,21 @@ namespace EventHub.Web.Pages.Organizations
         public bool IsOrganizationOwner { get; private set; }
 
         public bool IsShowSocialMediaContent { get; set; }
+
+        public bool HasPastEvents { get; set; } 
+        
+        public bool HasUpcomingEvents { get; set; } 
         
         private readonly IOrganizationAppService _organizationAppService;
+        private readonly IEventAppService _eventAppService;
 
         public ProfilePageModel(
             IOrganizationAppService organizationAppService,
-            IOrganizationMembershipAppService organizationMembershipAppService)
+            IOrganizationMembershipAppService organizationMembershipAppService,
+            IEventAppService eventAppService)
         {
             _organizationAppService = organizationAppService;
+            _eventAppService = eventAppService;
         }
 
         public async Task OnGetAsync()
@@ -31,6 +40,18 @@ namespace EventHub.Web.Pages.Organizations
             await GetProfileAsync();
 
             IsOrganizationOwner = await _organizationAppService.IsOrganizationOwnerAsync(Organization.Id);
+
+            HasPastEvents = (await _eventAppService.GetListAsync(new EventListFilterDto()
+            {
+                OrganizationId = Organization.Id,
+                MaxDate = Clock.Now.ClearTime()
+            })).TotalCount > 0;
+            
+            HasUpcomingEvents = (await _eventAppService.GetListAsync(new EventListFilterDto()
+            {
+                OrganizationId = Organization.Id,
+                MinDate = Clock.Now.ClearTime()
+            })).TotalCount > 0;
         }
 
         private async Task GetProfileAsync()

From 877c08b16d62d77fe54cf891b438e9412a62eea5 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 24 Jan 2025 16:06:48 +0800
Subject: [PATCH 4/8] Improve error page

---
 .../Views/Error/Default.cshtml                | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/EventHub.Web.Theme/Views/Error/Default.cshtml

diff --git a/src/EventHub.Web.Theme/Views/Error/Default.cshtml b/src/EventHub.Web.Theme/Views/Error/Default.cshtml
new file mode 100644
index 0000000..8db9451
--- /dev/null
+++ b/src/EventHub.Web.Theme/Views/Error/Default.cshtml
@@ -0,0 +1,35 @@
+@using Localization.Resources.AbpUi
+@using Microsoft.AspNetCore.Mvc.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Alert
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Blockquote
+@using Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
+@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Views.Error.AbpErrorViewModel
+@inject IHtmlLocalizer<AbpUiResource> L
+
+<div class="container">
+    <div class="row">
+        <div class="col-lg-10 col-md-11 mx-auto">
+            <div class="d-flex flex-column justify-content-center min-vh-100 align-items-center">
+                <div class="card">
+                    <div class="card-body p-lg-5">
+                        <div class="row">
+                            <div class="col-auto d-flex align-items-center">
+                                <i class="bi bi-emoji-frown text-primary mb-3 mb-md-0 mx-3 mx-md-4" style="font-size: 12em;"></i>
+                            </div>
+                            <div class="col ps-2 ps-lg-4">
+                                <div class="status-content">
+                                    <h1 class="fw-bolder display-1 text-brand">@Model.HttpStatusCode</h1>
+                                    <h5 class="text-muted">@Model.ErrorInfo.Message</h5>
+                                    <p class="mt-3 mb-4">@Model.ErrorInfo.Details</p>
+
+                                    <a href="javascript:history.back()" class="btn btn-primary soft me-2">@L["GoBack"]</a>
+                                    <a href="/" class="btn btn-primary">@L["GoHomePage"]</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

From a0d109a81d136547f467360005203fa5678349bf Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 24 Jan 2025 16:09:07 +0800
Subject: [PATCH 5/8] Add * on the City field

---
 src/EventHub.Web.Theme/Views/Error/Default.cshtml               | 1 -
 .../Components/CreateOrEditEventArea/_eventSection.cshtml       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/EventHub.Web.Theme/Views/Error/Default.cshtml b/src/EventHub.Web.Theme/Views/Error/Default.cshtml
index 8db9451..c08a51e 100644
--- a/src/EventHub.Web.Theme/Views/Error/Default.cshtml
+++ b/src/EventHub.Web.Theme/Views/Error/Default.cshtml
@@ -2,7 +2,6 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Alert
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Blockquote
-@using Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Views.Error.AbpErrorViewModel
 @inject IHtmlLocalizer<AbpUiResource> L
 
diff --git a/src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml b/src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml
index aa33d25..bfb1301 100644
--- a/src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml
+++ b/src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml
@@ -140,7 +140,7 @@
                   <div class="col-md-6 event-location-group">
                     <div class="form-label-group">
                       <input type="text" id="inputCity" asp-for="@Model.City" class="form-control" placeholder="City*">
-                      <label for="inputCity">City</label>
+                      <label for="inputCity">City *</label>
                       <span asp-validation-for="@Model.City" class="text-danger"></span>
                     </div>
                   </div>

From e352d8f5882c7ae20cdda2f74d13bee4fc4166c5 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 24 Jan 2025 16:45:20 +0800
Subject: [PATCH 6/8] improve

---
 .../wwwroot/appsettings.json                  |  2 +-
 .../EventHubHttpApiHostModule.cs              |  3 +-
 .../Pages/Organizations/Profile.cshtml        | 39 ++++++++++++-------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/EventHub.Admin.Web/wwwroot/appsettings.json b/src/EventHub.Admin.Web/wwwroot/appsettings.json
index 043dc32..cd414ea 100644
--- a/src/EventHub.Admin.Web/wwwroot/appsettings.json
+++ b/src/EventHub.Admin.Web/wwwroot/appsettings.json
@@ -9,7 +9,7 @@
   },
   "RemoteServices": {
     "Default": {
-      "BaseUrl": "https://localhost:44305"
+      "BaseUrl": "https://localhost:44362"
     }
   },
   "AbpCli": {
diff --git a/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs b/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
index be166b5..bea3856 100644
--- a/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
+++ b/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
@@ -176,7 +176,8 @@ namespace EventHub
                 {
                     builder
                         .WithOrigins(
-                            EventHubUrlOptions.GetWwwConfigValue(configuration)
+                            EventHubUrlOptions.GetWwwConfigValue(configuration),
+                            EventHubUrlOptions.GetAdminConfigValue(configuration)
                         )
                         .WithAbpExposedHeaders()
                         .SetIsOriginAllowedToAllowWildcardSubdomains()
diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
index 4b1b767..cd1fe03 100644
--- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
@@ -155,20 +155,31 @@
                             }
                         </div>
                         <div class="tab-content">
-                            <div id="PastEvent" class="tab-pane active">
-                                @await Component.InvokeAsync(typeof(EventsAreaViewComponent), new
-                                {
-                                    organizationId = Model.Organization.Id,
-                                    maxDate = Clock.Now.ClearTime()
-                                })
-                            </div>
-                            <div id="UpcomingEvent" class="tab-pane">
-                                @await Component.InvokeAsync(typeof(EventsAreaViewComponent), new
-                                {
-                                    organizationId = Model.Organization.Id,
-                                    minDate = Clock.Now.ClearTime()
-                                })
-                            </div>
+                            @if (!Model.HasPastEvents && !Model.HasUpcomingEvents)
+                            {
+                                <p>There is no Event</p>
+                            }
+                            @if (Model.HasPastEvents)
+                            {
+                                <div id="PastEvent" class="tab-pane active">
+                                    @await Component.InvokeAsync(typeof(EventsAreaViewComponent), new
+                                    {
+                                        organizationId = Model.Organization.Id,
+                                        maxDate = Clock.Now.ClearTime()
+                                    })
+                                </div>
+                            }
+                            @if (Model.HasUpcomingEvents)
+                            {
+                                var isActive = Model.HasPastEvents ? "" : "active";
+                                <div id="UpcomingEvent" class="tab-pane @isActive">
+                                    @await Component.InvokeAsync(typeof(EventsAreaViewComponent), new
+                                    {
+                                        organizationId = Model.Organization.Id,
+                                        minDate = Clock.Now.ClearTime()
+                                    })
+                                </div>
+                            }
                         </div>
                     </div>
                     <div id="members-section" class="tab-pane fade">

From 465adddc6cfa796b62121119f57a6889c0feba8f Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 24 Jan 2025 17:02:05 +0800
Subject: [PATCH 7/8] Update appsettings.json

---
 src/EventHub.Admin.Web/wwwroot/appsettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EventHub.Admin.Web/wwwroot/appsettings.json b/src/EventHub.Admin.Web/wwwroot/appsettings.json
index cd414ea..043dc32 100644
--- a/src/EventHub.Admin.Web/wwwroot/appsettings.json
+++ b/src/EventHub.Admin.Web/wwwroot/appsettings.json
@@ -9,7 +9,7 @@
   },
   "RemoteServices": {
     "Default": {
-      "BaseUrl": "https://localhost:44362"
+      "BaseUrl": "https://localhost:44305"
     }
   },
   "AbpCli": {

From d0158f936eb7e097452b8ac9810fd623682d50a8 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Mon, 3 Feb 2025 11:57:53 +0800
Subject: [PATCH 8/8] Fix returnUrl problem

---
 .../Themes/EventHub/Components/MainNavbar/Default.cshtml   | 7 +------
 1 file changed, 1 insertion(+), 6 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 268d49f..46dd030 100644
--- a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
+++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
@@ -13,12 +13,7 @@
 @inject IOptions<EventHubUrlOptions> UrlOptions
 
 @{
-    var returnUrl = WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery());
-    
-    if(Context.Request.Path.Equals("/Account/Login", StringComparison.OrdinalIgnoreCase))
-    {
-        returnUrl = WebUtility.UrlEncode(Context.Request.Query["returnUrl"]);
-    }
+    var returnUrl = WebUtility.UrlEncode(Context.Request.Query.ContainsKey("returnUrl") ? Context.Request.Query["returnUrl"] : Context.Request.GetEncodedPathAndQuery());
     
     if (returnUrl.IsNullOrWhiteSpace())
     {