From 5a840c7e7986cfd140367474eeb1b3da2cd96ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?= <onurpicakci@hotmail.com>
Date: Tue, 13 Dec 2022 16:33:59 +0300
Subject: [PATCH 1/3] fix some bug on eventHub

---
 .../Pages/OrganizationManagement.razor           |  8 ++++----
 .../Pages/OrganizationManagement.razor.cs        |  6 ++++++
 .../Organizations/OrganizationContst.cs          |  2 +-
 .../CreateOrEditEventArea/_eventSection.cshtml   | 16 ++++++++--------
 .../MembersArea/_memberListSection.cshtml        |  8 +++++---
 src/EventHub.Web/Pages/Organizations/New.cshtml  |  2 +-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
index 65cc909..110a38b 100644
--- a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
+++ b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
@@ -111,7 +111,7 @@
         <Form id="EditOrganizationForm">
             <ModalHeader>
                 <ModalTitle>@L["UpdateOrganization"]</ModalTitle>
-                <CloseButton Clicked="() => EditOrganizationModal.Hide()"/>
+                <CloseButton Clicked="@CancelButtonClose"/>
             </ModalHeader>
             <ModalBody>
                 <Tabs SelectedTab="@SelectedTabInEditModal" SelectedTabChanged="@OnSelectedTabChangedInEditModal">
@@ -241,7 +241,7 @@
                                     <Column ColumnSize="ColumnSize.Is3">
                                         @if (DisabledProfileImageButton)
                                         {
-                                            <Button disabled Color="Color.Secondary" Clicked="@OnDeleteCoverImageButtonClicked">@L["DeleteCoverImage"]</Button>
+                                            <Button disabled Color="Color.Dark" Clicked="@OnDeleteCoverImageButtonClicked" >@L["DeleteCoverImage"]</Button>
                                         }
                                         else
                                         {
@@ -256,8 +256,8 @@
             </ModalBody>
             <ModalFooter>
                 <Button Color="Color.Secondary"
-                        Clicked="() => EditOrganizationModal.Hide()">
-                    @L["Cancel"]
+                        Clicked="@CancelButtonClose">
+                     @L["Cancel"]
                 </Button>
                 <Button Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary"
                         Clicked="UpdateOrganizationAsync">
diff --git a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs
index a740942..ee1c5ea 100644
--- a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs
+++ b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs
@@ -102,6 +102,12 @@ namespace EventHub.Admin.Web.Pages
             IsLoadingProfileImage = false;
         }
 
+        private void CancelButtonClose()
+        {
+            DisabledProfileImageButton = false;
+            EditOrganizationModal.Hide();
+        }
+        
         private async Task DeleteOrganizationAsync(OrganizationInListDto organization)
         {
             await OrganizationAppService.DeleteAsync(organization.Id);
diff --git a/src/EventHub.Domain.Shared/Organizations/OrganizationContst.cs b/src/EventHub.Domain.Shared/Organizations/OrganizationContst.cs
index 89dd99e..c42b421 100644
--- a/src/EventHub.Domain.Shared/Organizations/OrganizationContst.cs
+++ b/src/EventHub.Domain.Shared/Organizations/OrganizationContst.cs
@@ -13,7 +13,7 @@
         public const int MinDescriptionNameLength = 50;
         public const int MaxDescriptionNameLength = 1000;
 
-        public const int MaxProfilePictureFileSize = 5 * 1024 * 1024;
+        public const int MaxProfilePictureFileSize = 1 * 1024 * 1024;
         
         public const int MaxWebsiteLength = 512;
         
diff --git a/src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml b/src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml
index dae929d..aa33d25 100644
--- a/src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml
+++ b/src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_eventSection.cshtml
@@ -60,27 +60,27 @@
                   <div class="col-md-6">
                     <div class="form-label-group">
                       <input type="text" id="inputTitle" asp-for="@Model.Title" class="form-control" placeholder="Title">
-                      <label for="inputTitle">Title</label>
+                      <label for="inputTitle">Title *</label>
                       <span asp-validation-for="@Model.Title" class="text-danger"></span>
                     </div>
                   </div>
                   <div class="col-md-6">
                     <div class="form-label-group">
                       <input id="inputStartdate" asp-for="@Model.StartTime" class="form-control" placeholder="Start Date">
-                      <label for="inputStartdate">Start Date</label>
+                      <label for="inputStartdate">Start Date *</label>
                       <span asp-validation-for="@Model.StartTime" class="text-danger"></span>
                     </div>
                   </div>
                   <div class="col-md-6">
                     <div class="form-label-group">
                       <input  id="inputEnddate" asp-for="@Model.EndTime" class="form-control" placeholder="End Date">
-                      <label for="inputEnddate">End Date</label>
+                      <label for="inputEnddate">End Date *</label>
                       <span asp-validation-for="@Model.EndTime" class="text-danger"></span>
                     </div>
                   </div>
                   <div class="col-md-12">
                     <div class="form-label-group">
-                      <textarea type="text" id="inputDescription" asp-for="@Model.Description" class="form-control" placeholder="Description"></textarea>
+                      <textarea type="text" id="inputDescription" asp-for="@Model.Description" class="form-control" placeholder="Description*" style="resize: none"></textarea>
                       <span asp-validation-for="@Model.Description" class="text-danger"></span>
                     </div>
                   </div>
@@ -126,20 +126,20 @@
                   </div>
                   <div class="col-md-6">
                     <div class="form-label-group">
-                      <input type="number" id="inputCapacity" asp-for="@Model.Capacity" class="form-control" placeholder="Capacity">
-                      <label for="inputCapacity">Capacity</label>
+                      <input type="number" id="inputCapacity" min="0" oninput="validity.valid||(value='');" asp-for="@Model.Capacity" class="form-control" placeholder="Capacity" >
+                      <label for="inputCapacity">Capacity </label>
                       <span asp-validation-for="@Model.Capacity" class="text-danger"></span>
                     </div>
                   </div>
                   <div class="col-md-6 event-location-group">
                     <select asp-for="@Model.CountryId" asp-items="countries" class="form-select">
-                      <option selected="" value="">Country</option>
+                      <option selected="" value="">Country *</option>
                     </select>
                     <span asp-validation-for="@Model.CountryId" class="text-danger"></span>
                   </div>
                   <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">
+                      <input type="text" id="inputCity" asp-for="@Model.City" class="form-control" placeholder="City*">
                       <label for="inputCity">City</label>
                       <span asp-validation-for="@Model.City" class="text-danger"></span>
                     </div>
diff --git a/src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml b/src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
index d244ecb..25c77c3 100644
--- a/src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
@@ -4,9 +4,11 @@
 {
     <div>
         <div>
-            <a href="/users/@member.UserName">
-                <img gravatar-email="@member.Email" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-bs-toggle="tooltip" title="@member.UserName"/>
-            </a>
+            <p>
+                <a href="/users/@member.UserName">
+                    <img gravatar-email="@member.Email" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-bs-toggle="tooltip" title="@member.UserName"/>
+                </a>@member.UserName</p>
+            
             <span class="member-name" style="display: none">
                 @if (!string.IsNullOrWhiteSpace(member.Name) && !string.IsNullOrWhiteSpace(member.Surname))
                 {
diff --git a/src/EventHub.Web/Pages/Organizations/New.cshtml b/src/EventHub.Web/Pages/Organizations/New.cshtml
index 2786eb5..ba0fefd 100644
--- a/src/EventHub.Web/Pages/Organizations/New.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/New.cshtml
@@ -57,7 +57,7 @@
                                 </div>
                                 <div class="col-md-12">
                                     <div class="form-label-group">
-                                        <textarea rows="5" type="text" id="inputDescription" asp-for="Organization.Description" class="form-control" placeholder="Description*" required=""></textarea>
+                                        <textarea rows="5" type="text" id="inputDescription" asp-for="Organization.Description" class="form-control" placeholder="Description*" required="" style="resize: none; "></textarea>
                                          <span asp-validation-for="Organization.Description" class="text-danger"></span>
                                     </div>
                                 </div>

From 0ea666efbf8795e8248a8e4a345b1534d9b75322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?= <onurpicakci@hotmail.com>
Date: Tue, 13 Dec 2022 16:39:23 +0300
Subject: [PATCH 2/3] Update OrganizationManagement.razor

---
 src/EventHub.Admin.Web/Pages/OrganizationManagement.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
index 110a38b..ac9149d 100644
--- a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
+++ b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
@@ -241,7 +241,7 @@
                                     <Column ColumnSize="ColumnSize.Is3">
                                         @if (DisabledProfileImageButton)
                                         {
-                                            <Button disabled Color="Color.Dark" Clicked="@OnDeleteCoverImageButtonClicked" >@L["DeleteCoverImage"]</Button>
+                                            <Button disabled Color="Color.Secondary" Clicked="@OnDeleteCoverImageButtonClicked" >@L["DeleteCoverImage"]</Button>
                                         }
                                         else
                                         {

From 210c9bd798cb59e07246242491d083ccc14b1800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?= <onurpicakci@hotmail.com>
Date: Wed, 14 Dec 2022 12:38:33 +0300
Subject: [PATCH 3/3] Edited method name

---
 src/EventHub.Admin.Web/Pages/OrganizationManagement.razor    | 4 ++--
 src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
index ac9149d..22ec4d5 100644
--- a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
+++ b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
@@ -111,7 +111,7 @@
         <Form id="EditOrganizationForm">
             <ModalHeader>
                 <ModalTitle>@L["UpdateOrganization"]</ModalTitle>
-                <CloseButton Clicked="@CancelButtonClose"/>
+                <CloseButton Clicked="@ClouseUpdateOrganizationModal"/>
             </ModalHeader>
             <ModalBody>
                 <Tabs SelectedTab="@SelectedTabInEditModal" SelectedTabChanged="@OnSelectedTabChangedInEditModal">
@@ -256,7 +256,7 @@
             </ModalBody>
             <ModalFooter>
                 <Button Color="Color.Secondary"
-                        Clicked="@CancelButtonClose">
+                        Clicked="@ClouseUpdateOrganizationModal">
                      @L["Cancel"]
                 </Button>
                 <Button Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary"
diff --git a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs
index ee1c5ea..291608d 100644
--- a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs
+++ b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs
@@ -102,7 +102,7 @@ namespace EventHub.Admin.Web.Pages
             IsLoadingProfileImage = false;
         }
 
-        private void CancelButtonClose()
+        private void ClouseUpdateOrganizationModal()
         {
             DisabledProfileImageButton = false;
             EditOrganizationModal.Hide();