From c514d63c95ce7745c097672d00d5d4d34a94e329 Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 14:27:24 +0200
Subject: [PATCH 01/15] (#57) set form fields not to allow floating labels at
 page for updating an event

---
 .../Pages/Events/EventCreate.razor            |  3 +-
 .../Pages/Events/EventUpdate.razor            | 45 ++++++++++++-------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventCreate.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventCreate.razor
index 0cdca58ed..a215bcfaf 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventCreate.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventCreate.razor
@@ -146,7 +146,8 @@
                                     </RadzenRadioButtonList>
                                     @if (publishInfo == 2)
                                     {
-                                        <RadzenFormField Text="Publish date" Variant="Variant.Outlined">
+                                        <RadzenFormField Text="Publish date" Variant="Variant.Outlined"
+                                                         AllowFloatingLabel="false">
                                             <RadzenDatePicker @bind-Value="@_createEventModel.PublishDate" Name="publish-date"
                                                               ShowTime="true" MinutesStep="5" DateFormat="dd/MM/yyyy HH:mm" />
                                             <RadzenCustomValidator Component="publish-date" Style="position: relative"
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventUpdate.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventUpdate.razor
index 1ba3680b6..62e5f3a44 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventUpdate.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventUpdate.razor
@@ -29,36 +29,42 @@
                 <RadzenRow Gap="1rem" JustifyContent="JustifyContent.Center">
                     <RadzenColumn Size="12" SizeSM="4">
                         <RadzenStack>
-                            <RadzenFormField Text="Name" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Name" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenTextBox @bind-Value="@updateEventModel.Name" Name="name" />
                                 <RadzenRequiredValidator Component="name" Style="position: relative"
                                                          Text="Name is required" />
                                 <RadzenLengthValidator Component="name"  Max="300" Style="position: relative"
                                                        Text="Name should have at most 300 characters" />
                             </RadzenFormField>
-                            <RadzenFormField Text="Start date" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Start date" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenDatePicker @bind-Value="@updateEventModel.StartDate" Name="start-date"
                                                   ShowTime="true" MinutesStep="5" DateFormat="@dateFormat" />
                                 <RadzenCustomValidator Component="start-date" Style="position: relative"
                                                        Validator="@(() => ValidateDates(updateEventModel.StartDate, DateTime.Now))"
                                                        Text="Start date should be in the future"/>
                             </RadzenFormField>
-                            <RadzenFormField Text="Building name" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Building name" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenTextBox @bind-Value="@updateEventModel.BuildingName" Name="building-name" />
                                 <RadzenRequiredValidator Component="building-name" Style="position: relative"
                                                          Text="Building name is required" />
                             </RadzenFormField>
-                            <RadzenFormField Text="Building number" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Building number" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenTextBox @bind-Value="@updateEventModel.BuildingNumber" Name="building-number" />
                                 <RadzenRequiredValidator Component="building-number" Style="position: relative"
                                                          Text="Building number is required"/>
                             </RadzenFormField>
-                            <RadzenFormField Text="City" Variant="Variant.Outlined">
+                            <RadzenFormField Text="City" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenTextBox @bind-Value="@updateEventModel.City" Name="city" />
                                 <RadzenRequiredValidator Component="city" Style="position: relative"
                                                          Text="City is required"/>
                             </RadzenFormField>
-                            <RadzenFormField Text="Capacity" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Capacity" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenNumeric @bind-Value="@updateEventModel.Capacity" Name="capacity" />
                                 <RadzenNumericRangeValidator Component="capacity" Min="1" Max="1000" Style="position: relative"
                                                              Text="Capacity should be between 1 and 1000" />
@@ -67,10 +73,12 @@
                     </RadzenColumn>
                     <RadzenColumn Size="12" SizeSM="4">
                         <RadzenStack>
-                             <RadzenFormField Text="Category" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Category" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                  <RadzenDropDown Data=@categories @bind-Value="@updateEventModel.Category" />
                              </RadzenFormField>
-                             <RadzenFormField Text="End date" Variant="Variant.Outlined">
+                            <RadzenFormField Text="End date" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                  <RadzenDatePicker @bind-Value="@updateEventModel.EndDate" Name="end-date"
                                                    ShowTime="true" MinutesStep="5" DateFormat="@dateFormat" />
                                  <RadzenCustomValidator Component="end-date" Style="position: relative"
@@ -80,25 +88,30 @@
                                                         Validator="@(() => ValidateDates(updateEventModel.EndDate, updateEventModel.StartDate))"
                                                         Text="End date should be later than start date"/>
                              </RadzenFormField>
-                            <RadzenFormField Text="Street" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Street" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenTextBox @bind-Value="@updateEventModel.Street" Name="street" />
                                 <RadzenRequiredValidator Component="street" Style="position: relative"
                                                          Text="Street is required" />
                             </RadzenFormField>
-                            <RadzenFormField Text="Apartment number" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Apartment number" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenTextBox @bind-Value="@updateEventModel.ApartmentNumber" />
                             </RadzenFormField>
-                            <RadzenFormField Text="Zip code" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Zip code" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenTextBox @bind-Value="@updateEventModel.ZipCode" Name="zip-code" />
                                 <RadzenRequiredValidator Component="zip-code" Style="position: relative"
                                                          Text="Zip code is required" />
                             </RadzenFormField>
-                            <RadzenFormField Text="Fee" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Fee" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenNumeric @bind-Value="@updateEventModel.Fee" Placeholder="0.00" Step="0.01" Name="fee"/>
                                 <RadzenNumericRangeValidator Component="fee" Min="0.0" Max="1000.0" Style="position: relative"
                                                              Text="Fee should be between 0.0 and 1000.0" />
                             </RadzenFormField>
-                            <RadzenFormField Text="Publish time" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Publish time" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenStack Orientation="Orientation.Vertical">
                                     <RadzenRadioButtonList @bind-Value="@publishInfo" TValue="int" class="rz-m-4 rz-mt-8">
                                         <Items>
@@ -108,7 +121,8 @@
                                     </RadzenRadioButtonList>
                                     @if (publishInfo == 2)
                                     {
-                                        <RadzenFormField Text="Publish date" Variant="Variant.Outlined">
+                                        <RadzenFormField Text="Publish date" Variant="Variant.Outlined"
+                                                         AllowFloatingLabel="false">
                                             <RadzenDatePicker @bind-Value="@updateEventModel.PublishDate" Name="publish-date"
                                                               ShowTime="true" MinutesStep="5" DateFormat="@dateFormat" />
                                             <RadzenCustomValidator Component="publish-date" Style="position: relative"
@@ -131,7 +145,8 @@
                 <RadzenRow Gap="1rem" JustifyContent="JustifyContent.Center">
                     <RadzenColumn Size="12" SizeSM="8">
                         <RadzenStack>
-                            <RadzenFormField Text="Description" Variant="Variant.Outlined">
+                            <RadzenFormField Text="Description" Variant="Variant.Outlined"
+                                             AllowFloatingLabel="false">
                                 <RadzenTextArea Style="height: 100px" @bind-Value="@updateEventModel.Description" Name="description"/>
                                 <RadzenRequiredValidator Component="description" Style="position: relative"
                                                          Text="Description is required" />

From e7cd62b5ffb7e6a09e68c86059399034c9bad11c Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 14:29:34 +0200
Subject: [PATCH 02/15] (#57) fix url in navigation after handling post update

---
 MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/PostUpdate.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/PostUpdate.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/PostUpdate.razor
index 36a8c8fbf..ddf77fe04 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/PostUpdate.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/PostUpdate.razor
@@ -100,7 +100,7 @@
         }
         else
         {
-            NavigationManager.NavigateTo($"events/{EventId}/posts/{PostId}/author/{AuthorName}");
+            NavigationManager.NavigateTo($"events/{EventId}/posts/{PostId}");
         }
     }
 }

From 47d8ceb3230d1f72f98cbfcc984d70a1cf7cbfde Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 14:35:28 +0200
Subject: [PATCH 03/15] (#57) fix wrapping text without spaces for post content

---
 .../src/MiniSpace.Web/Components/RadzenPostCard.razor          | 3 ++-
 MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/Post.razor         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Components/RadzenPostCard.razor b/MiniSpace.Web/src/MiniSpace.Web/Components/RadzenPostCard.razor
index 5ea09ab64..5c332ce62 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Components/RadzenPostCard.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Components/RadzenPostCard.razor
@@ -33,7 +33,8 @@
     <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" Gap="1rem">
         <RadzenStack Gap="1em">
             <RadzenStack></RadzenStack>
-            <RadzenText TextStyle="TextStyle.Body1" TextAlign="TextAlign.Left" Class="rz-mb-0">
+            <RadzenText TextStyle="TextStyle.Body1" TextAlign="TextAlign.Left" Class="rz-mb-0"
+                        Style="word-wrap: anywhere">
                 <strong>@(Post.TextContent)</strong>
             </RadzenText>
         </RadzenStack>
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/Post.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/Post.razor
index 57afafb39..1384cec7b 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/Post.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Posts/Post.razor
@@ -91,7 +91,8 @@
             <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" Gap="1rem" class="rz-pb-4">
                 <RadzenStack Gap="1em">
                     <RadzenStack></RadzenStack>
-                    <RadzenText TextStyle="TextStyle.Body1" TextAlign="TextAlign.Left" Class="rz-mb-0">
+                    <RadzenText TextStyle="TextStyle.Body1" TextAlign="TextAlign.Left" Class="rz-mb-0"
+                                Style="word-wrap: anywhere">
                         <strong>@(post.TextContent)</strong>
                     </RadzenText>
                 </RadzenStack>

From 8bd2228f3ae8200bafc235a55f49a9cfcfa894ba Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 15:03:49 +0200
Subject: [PATCH 04/15] (#57) first fixes for (#259)

---
 .../Pages/Events/Dialogs/InviteFriendsToEventDialog.razor   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/InviteFriendsToEventDialog.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/InviteFriendsToEventDialog.razor
index cde004a66..4686d0d87 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/InviteFriendsToEventDialog.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/InviteFriendsToEventDialog.razor
@@ -26,7 +26,7 @@
                 <RadzenImage Path=@GetImage(friend.FriendId) Style="width: 100px; height: 100px; object-fit: cover; border-radius: 50%;" />
                 <RadzenStack Gap="0">
                     <RadzenText TextStyle="TextStyle.Overline" class="rz-display-flex rz-mt-2 rz-my-0">Friend</RadzenText>
-                    <RadzenText TextStyle="TextStyle.Body1"><b>@($"{friend.StudentDetails.FirstName} {friend.StudentDetails.LastName}")</b></RadzenText>
+                    <RadzenText TextStyle="TextStyle.Body1"><b>@($"{friend.StudentDetails?.FirstName} {friend.StudentDetails?.LastName}")</b></RadzenText>
                     <RadzenCheckBox Value="@IsFriendSelected(friend.FriendId)" 
                         Change="@((bool value) => SetFriendSelected(friend.FriendId, value))" />
                 </RadzenStack>
@@ -60,8 +60,10 @@
     {
         foreach (var friend in friends)
         {
+            if (friend.StudentDetails == null) continue;
+            Console.WriteLine(friend.StudentDetails.ProfileImage);
             var result = await MediaFilesService.GetFileAsync(friend.StudentDetails.ProfileImage);
-            images[friend.FriendId] = result?.Base64Content ?? "images/user_default.png";
+            images[friend.StudentDetails.Id] = result?.Base64Content ?? "images/user_default.png";
         }
     }
 

From 128d60efc49514526caeeb4727490978f1e6d8dd Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 15:12:30 +0200
Subject: [PATCH 05/15] (#57) fix #259 but only by frontend side

---
 .../Dialogs/InviteFriendsToEventDialog.razor  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/InviteFriendsToEventDialog.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/InviteFriendsToEventDialog.razor
index 4686d0d87..96c7d18a3 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/InviteFriendsToEventDialog.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/InviteFriendsToEventDialog.razor
@@ -21,17 +21,20 @@
 
     @foreach (var friend in friends)
     {
-        <RadzenCard Class="rz-my-3 rz-mx-auto" Style="max-width: 420px">
-            <RadzenStack Orientation="Orientation.Horizontal" JustifyContent="JustifyContent.Start" Gap="1rem" Class="rz-p-4">
-                <RadzenImage Path=@GetImage(friend.FriendId) Style="width: 100px; height: 100px; object-fit: cover; border-radius: 50%;" />
-                <RadzenStack Gap="0">
-                    <RadzenText TextStyle="TextStyle.Overline" class="rz-display-flex rz-mt-2 rz-my-0">Friend</RadzenText>
-                    <RadzenText TextStyle="TextStyle.Body1"><b>@($"{friend.StudentDetails?.FirstName} {friend.StudentDetails?.LastName}")</b></RadzenText>
-                    <RadzenCheckBox Value="@IsFriendSelected(friend.FriendId)" 
-                        Change="@((bool value) => SetFriendSelected(friend.FriendId, value))" />
+        @if (friend.StudentDetails != null)
+        {
+            <RadzenCard Class="rz-my-3 rz-mx-auto" Style="max-width: 420px">
+                <RadzenStack Orientation="Orientation.Horizontal" JustifyContent="JustifyContent.Start" Gap="1rem" Class="rz-p-4">
+                    <RadzenImage Path=@GetImage(friend.FriendId) Style="width: 100px; height: 100px; object-fit: cover; border-radius: 50%;" />
+                    <RadzenStack Gap="0">
+                        <RadzenText TextStyle="TextStyle.Overline" class="rz-display-flex rz-mt-2 rz-my-0">Friend</RadzenText>
+                        <RadzenText TextStyle="TextStyle.Body1"><b>@($"{friend.StudentDetails?.FirstName} {friend.StudentDetails?.LastName}")</b></RadzenText>
+                        <RadzenCheckBox Value="@IsFriendSelected(friend.FriendId)" 
+                                        Change="@((bool value) => SetFriendSelected(friend.FriendId, value))" />
+                    </RadzenStack>
                 </RadzenStack>
-            </RadzenStack>
-        </RadzenCard>
+            </RadzenCard>   
+        }
     }
 </div>
 

From 2fbea5e6a087408b9654e63bbba16b04af563e38 Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 15:55:19 +0200
Subject: [PATCH 06/15] (#57) update default values of fields for creating an
 event

---
 .../src/MiniSpace.Web/Pages/Events/EventCreate.razor      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventCreate.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventCreate.razor
index a215bcfaf..c7efbebd6 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventCreate.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventCreate.razor
@@ -225,18 +225,18 @@
     private CreateEventModel _createEventModel = new()
     {
         Name = "One of first events!",
-        Category = "Art",
+        Category = "Education",
         StartDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0,0,0),
-        EndDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0,0,0),
+        EndDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day + 1, 0,0,0),
         BuildingName = "Gmach Główny",
         Street = "Plac Politechniki",
         BuildingNumber = "1",
         ApartmentNumber = "1",
         City = "Warszawa",
-        ZipCode = "00-061",
+        ZipCode = "00-661",
         Description = "Great event!",
         Capacity = 30,
-        Fee = 34.44M
+        Fee = 15.00M
     };
     private bool showError = false;
     private string errorMessage = string.Empty;

From adb1c60478cf8e6ccd2b9dbd4ddabb66d6a06187 Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 16:08:05 +0200
Subject: [PATCH 07/15] (#57) fix fullname at show account page

---
 MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs               | 1 +
 MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs b/MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs
index 629e4c423..f05da8759 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs
+++ b/MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs
@@ -9,6 +9,7 @@ public class StudentDto
         public string Email { get; set; }
         public string FirstName { get; set; }
         public string LastName { get; set; }
+        public string FullName => $"{FirstName} {LastName}";
         public int NumberOfFriends { get; set; }
         public Guid ProfileImage { get; set; }
         public string Description { get; set; }
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor
index ccf90f556..bfb1ab0bb 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor
@@ -39,7 +39,7 @@
             </RadzenStack>
         }
         
-        <RadzenLabels Id="fullname" LabelText="Fullname:" Value="@studentDto.FirstName"/>
+        <RadzenLabels Id="fullname" LabelText="Fullname:" Value="@studentDto.FullName"/>
         <RadzenLabels Id="email" LabelText="Email:" Value="@studentDto.Email"/>
         
         @if (studentDto.State == "valid")

From 6ba97f2fc0c0b16269c195b1e661e7a016dba959 Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 16:22:23 +0200
Subject: [PATCH 08/15] (#57) add refreshing datagrid component for admin
 reports

---
 MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor
index 8ba6a53a4..c2910342f 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor
@@ -200,5 +200,6 @@
                 Width = "700px", Height = "600px", Resizable = true, Draggable = true,
                 AutoFocusFirstElement = false
             });
+        StateHasChanged();
     }
 }

From a76bb1be9e999785a21b1b4fecd141330528d00e Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 16:39:47 +0200
Subject: [PATCH 09/15] (#57)(#260) add using of LocalStorage to save criteria
 for searching events

---
 .../Pages/Events/EventsSearch.razor           | 52 ++++++++++++-------
 .../src/MiniSpace.Web/Shared/MainLayout.razor |  1 +
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsSearch.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsSearch.razor
index 887fc8e9f..51f68fec4 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsSearch.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsSearch.razor
@@ -22,7 +22,7 @@
 @inject IStudentsService StudentsService
 @inject IIdentityService IdentityService
 @inject NavigationManager NavigationManager
-
+@inject Blazored.LocalStorage.ILocalStorageService LocalStorage
 
 <div class="breadcrumbs-container">
     <MudBreadcrumbs Class="custom-breadcrumbs" Items="_items"></MudBreadcrumbs>
@@ -137,25 +137,13 @@
     
     protected override async Task OnInitializedAsync()
     {
-        var tmp = await EventsService.SearchEventsAsync(searchEventsModel.Name, searchEventsModel.Organizer,
-            searchEventsModel.Organization.Id, searchEventsModel.Organization.RootId, searchEventsModel.Category,
-            searchEventsModel.State, searchEventsModel.Friends, searchEventsModel.FriendsEngagementType,
-            searchEventsModel.DateFrom.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
-            searchEventsModel.DateTo.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
-            searchEventsModel.Pageable);
-        if (tmp.Content != null)
+        var searchEventsCriteria = await LocalStorage.GetItemAsync<SearchEventsModel>("searchEventsCriteria");
+        if (searchEventsCriteria != null)
         {
-            totalPages = tmp.Content.TotalPages;
-            totalElements = tmp.Content.TotalElements;
-            events = tmp.Content.Content;
-        }
-        else
-        {
-            totalPages = 0;
-            totalElements = 0;
-            events = new List<EventDto>();
+            searchEventsModel = searchEventsCriteria;
         }
 
+        await SearchEvents();
         pageInitialized = true;
     }
 
@@ -185,6 +173,30 @@
         };
     }
     
+    private async Task SearchEvents()
+    {
+        var response = await EventsService.SearchEventsAsync(searchEventsModel.Name, searchEventsModel.Organizer,
+            searchEventsModel.Organization.Id, searchEventsModel.Organization.RootId, searchEventsModel.Category,
+            searchEventsModel.State, searchEventsModel.Friends, searchEventsModel.FriendsEngagementType,
+            searchEventsModel.DateFrom.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
+            searchEventsModel.DateTo.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
+            searchEventsModel.Pageable);
+        if (response.Content != null)
+        {
+            totalPages = response.Content.TotalPages;
+            totalElements = response.Content.TotalElements;
+            events = response.Content.Content;
+        }
+        else
+        {
+            totalPages = 0;
+            totalElements = 0;
+            events = new List<EventDto>();
+        }
+        
+        await LocalStorage.SetItemAsync("searchEventsCriteria", searchEventsModel);
+    }
+    
     private async void SelectedPageChanged(int pageNumber)
     {
         searchEventsModel.Pageable.Page = pageNumber;
@@ -208,7 +220,7 @@
                 Width = "800px", Height = "650px", Resizable = true, Draggable = true,
                 AutoFocusFirstElement = false
             });
-        await OnInitializedAsync();
+        await SearchEvents();
     }
     
     private async Task OpenFriendsDialog()
@@ -216,7 +228,7 @@
         var result = await DialogService.OpenAsync<FriendsDialog>($"Filter events by friends",
             null, new DialogOptions() { Width = "700px", Height = "512px", Resizable = true, Draggable = true });
         searchEventsModel.Friends = result;
-        await OnInitializedAsync();
+        await SearchEvents();
     }
     
     private Task RedirectToFollowedEvents()
@@ -228,7 +240,7 @@
     private async Task ClearFilters()
     {
         searchEventsModel = InitializeSearchModel();
-        await OnInitializedAsync();
+        await SearchEvents();
     }
     
 }
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Shared/MainLayout.razor b/MiniSpace.Web/src/MiniSpace.Web/Shared/MainLayout.razor
index 73ad789b3..bd625218e 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Shared/MainLayout.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Shared/MainLayout.razor
@@ -217,6 +217,7 @@
         await localStorage.RemoveItemAsync("searchReportsCriteria");
         await localStorage.RemoveItemAsync("studentReportDto");
         await localStorage.RemoveItemAsync("getReportsCriteria");
+        await localStorage.RemoveItemAsync("searchEventsCriteria");
         
         await localStorage.RemoveItemAsync("accessToken");
         await localStorage.RemoveItemAsync("jwtDto");

From ff119b4af26e623396efa3346e8093171eef3e3d Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 16:54:18 +0200
Subject: [PATCH 10/15] (#57)(#260) add saving friends criteria for searching
 events

---
 .../Models/Events/SearchEventsModel.cs            |  2 +-
 .../MiniSpace.Web/Pages/Events/EventsSearch.razor |  8 ++++----
 .../Pages/Friends/Dialogs/FriendsDialog.razor     | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Models/Events/SearchEventsModel.cs b/MiniSpace.Web/src/MiniSpace.Web/Models/Events/SearchEventsModel.cs
index 727644eae..0e026c914 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Models/Events/SearchEventsModel.cs
+++ b/MiniSpace.Web/src/MiniSpace.Web/Models/Events/SearchEventsModel.cs
@@ -12,7 +12,7 @@ public class SearchEventsModel
         public OrganizationModel Organization { get; set; }
         public string Category { get; set; }
         public string State { get; set; }
-        public IEnumerable<Guid> Friends { get; set; }
+        public HashSet<Guid> Friends { get; set; }
         public string FriendsEngagementType { get; set; }
         public DateTime DateFrom { get; set; }
         public DateTime DateTo { get; set; }
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsSearch.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsSearch.razor
index 51f68fec4..101428815 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsSearch.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsSearch.razor
@@ -156,7 +156,7 @@
             Organization = new OrganizationModel(),
             Category = "",
             State = "",
-            Friends = [],
+            Friends = new HashSet<Guid>(),
             FriendsEngagementType = "",
             DateFrom = DateTime.Now.AddDays(-7),
             DateTo = DateTime.Now.AddDays(30),
@@ -225,9 +225,9 @@
     
     private async Task OpenFriendsDialog()
     {
-        var result = await DialogService.OpenAsync<FriendsDialog>($"Filter events by friends",
-            null, new DialogOptions() { Width = "700px", Height = "512px", Resizable = true, Draggable = true });
-        searchEventsModel.Friends = result;
+        await DialogService.OpenAsync<FriendsDialog>($"Filter events by friends",
+            new Dictionary<string, object>() { { "SearchEventsModel", searchEventsModel } },
+            new DialogOptions() { Width = "700px", Height = "512px", Resizable = true, Draggable = true });
         await SearchEvents();
     }
     
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/Dialogs/FriendsDialog.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/Dialogs/FriendsDialog.razor
index 07ff6591c..0e19b17b8 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/Dialogs/FriendsDialog.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/Dialogs/FriendsDialog.razor
@@ -1,6 +1,7 @@
 @using MiniSpace.Web.Areas.Identity
 @using MiniSpace.Web.Areas.Friends
 @using MiniSpace.Web.DTO
+@using MiniSpace.Web.Models.Events
 @using Radzen
 @using System.Globalization
 @inject Radzen.DialogService DialogService
@@ -32,12 +33,22 @@
     </RadzenStack>
 </RadzenFieldset>
 @code {
+    [Parameter]
+    public SearchEventsModel SearchEventsModel { get; set; }
+    
     private IEnumerable<StudentDto> friends;
 
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
         friends = (await FriendsService.GetAllFriendsAsync(IdentityService.GetCurrentUserId())).Select(f => f.StudentDetails);
+        foreach (var friend in friends)
+        {
+            if (SearchEventsModel.Friends.Contains(friend.Id))
+            {
+                friend.Selected = true;
+            }
+        }
         StateHasChanged();
     }
 
@@ -48,7 +59,7 @@
 
     private void SelectFriends()
     {
-        var selectedFriends = friends.Where(f => f.Selected).Select(f => f.Id).ToList();
-        DialogService.Close(selectedFriends);
+        SearchEventsModel.Friends = friends.Where(f => f.Selected).Select(f => f.Id).ToHashSet();
+        DialogService.Close();
     }
 }
\ No newline at end of file

From 9c44cd13fa9f447ac0651878902a43e33200bc18 Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 17:37:04 +0200
Subject: [PATCH 11/15] (#57)(#260) add saving organization criteria for
 searching events

---
 .../Events/Dialogs/EventsSearchDialog.razor    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/EventsSearchDialog.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/EventsSearchDialog.razor
index 6bc6443ae..5c7660358 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/EventsSearchDialog.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/Dialogs/EventsSearchDialog.razor
@@ -76,6 +76,11 @@
                 <h4>Select an organization (also suborganizations are included in results):</h4>
 
                 <RadzenTree Data="@rootOrganizations" Expand="@OnExpand" @bind-Value=@selectedItem>
+                    <RadzenTreeLevel TextProperty="Name" ChildrenProperty="Children"/>
+                    <RadzenTreeLevel TextProperty="Name" ChildrenProperty="Children"/>
+                    <RadzenTreeLevel TextProperty="Name" ChildrenProperty="Children"/>
+                    <RadzenTreeLevel TextProperty="Name" ChildrenProperty="Children"/>
+                    <RadzenTreeLevel TextProperty="Name" ChildrenProperty="Children"/>
                     <RadzenTreeLevel TextProperty="Name" ChildrenProperty="Children"/>
                     <RadzenTreeLevel TextProperty="Name" ChildrenProperty="Children"/>
                     <RadzenTreeLevel TextProperty="Name" ChildrenProperty="Children"/>
@@ -188,18 +193,25 @@
         StateHasChanged();
     }
     
-    private static void ConvertOrganizationDtoList(IEnumerable<OrganizationDto> input, IList<OrganizationModel> result, Guid? rootId)
+    private void ConvertOrganizationDtoList(IEnumerable<OrganizationDto> input, IList<OrganizationModel> result, Guid? rootId)
     {
         result.Clear();
         foreach (var organization in input)
         {
-            result.Add(new OrganizationModel()
+            var newNode = new OrganizationModel()
             {
                 Id = organization.Id,
                 Name = organization.Name,
                 RootId = rootId ?? organization.Id,
                 Children = new List<OrganizationModel>()
-            });
+            };
+            
+            if (SearchEventsModel.Organization.Id == organization.Id)
+            {
+                selectedItem = newNode;
+            }
+            
+            result.Add(newNode);
         }
     }
     

From 70a4323e21098af457e52681b3759531ec79361a Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 17:51:14 +0200
Subject: [PATCH 12/15] (#57)(#260) add using of LocalStorage for searching
 organizer events

---
 .../Pages/Events/EventsOrganize.razor         | 53 ++++++++++++-------
 .../src/MiniSpace.Web/Shared/MainLayout.razor |  1 +
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsOrganize.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsOrganize.razor
index 83baa90d2..d73c2c6f1 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsOrganize.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Events/EventsOrganize.razor
@@ -16,6 +16,7 @@
 @inject IEventsService EventsService
 @inject IIdentityService IdentityService
 @inject NavigationManager NavigationManager
+@inject Blazored.LocalStorage.ILocalStorageService LocalStorage
 
 <h1 class="rz-p-8 organize-font">Organize events</h1>
 
@@ -108,24 +109,14 @@
         {
             organizerId = IdentityService.GetCurrentUserId();
             searchOrganizerEventsModel.OrganizerId = organizerId;
-        
-            var tmp = await EventsService.SearchOrganizerEventsAsync(searchOrganizerEventsModel.OrganizerId,
-                searchOrganizerEventsModel.Name, searchOrganizerEventsModel.State,
-                searchOrganizerEventsModel.DateFrom.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
-                searchOrganizerEventsModel.DateTo.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
-                searchOrganizerEventsModel.Pageable);
-            if (tmp.Content != null)
+
+            var searchOrganizerEventsCriteria = await LocalStorage.GetItemAsync<SearchOrganizerEventsModel>("searchOrganizerEventsCriteria");
+            if (searchOrganizerEventsCriteria != null)
             {
-                totalPages = tmp.Content.TotalPages;
-                totalElements = tmp.Content.TotalElements;
-                events = tmp.Content.Content;
+                searchOrganizerEventsModel = searchOrganizerEventsCriteria;
             }
-            else
-            {
-                totalPages = 0;
-                totalElements = 0;
-                events = new List<EventDto>();
-            }   
+            
+            await SearchOrganizerEvents();
         }
 
         pageInitialized = true;
@@ -152,6 +143,31 @@
         };
     }
 
+    private async Task SearchOrganizerEvents()
+    {
+        if (IdentityService.IsAuthenticated && IdentityService.GetCurrentUserRole() == "organizer")
+        {
+            var response = await EventsService.SearchOrganizerEventsAsync(searchOrganizerEventsModel.OrganizerId,
+                searchOrganizerEventsModel.Name, searchOrganizerEventsModel.State,
+                searchOrganizerEventsModel.DateFrom.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
+                searchOrganizerEventsModel.DateTo.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
+                searchOrganizerEventsModel.Pageable);
+            if (response.Content != null)
+            {
+                totalPages = response.Content.TotalPages;
+                totalElements = response.Content.TotalElements;
+                events = response.Content.Content;
+            }
+            else
+            {
+                totalPages = 0;
+                totalElements = 0;
+                events = new List<EventDto>();
+            }
+            
+            await LocalStorage.SetItemAsync("searchOrganizerEventsCriteria", searchOrganizerEventsModel);
+        }
+    }
     
     private async void SelectedPageChanged(int pageNumber)
     {
@@ -175,12 +191,13 @@
                 Width = "800px", Resizable = true, Draggable = true,
                 AutoFocusFirstElement = false
             });
-        await OnInitializedAsync();
+        await SearchOrganizerEvents();
     }
     
     private async Task ClearFilters()
     {
         searchOrganizerEventsModel = InitializeOrganizerSearchModel();
-        await OnInitializedAsync();
+        searchOrganizerEventsModel.OrganizerId = organizerId;
+        await SearchOrganizerEvents();
     }
 }
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Shared/MainLayout.razor b/MiniSpace.Web/src/MiniSpace.Web/Shared/MainLayout.razor
index bd625218e..4451cdd90 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Shared/MainLayout.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Shared/MainLayout.razor
@@ -218,6 +218,7 @@
         await localStorage.RemoveItemAsync("studentReportDto");
         await localStorage.RemoveItemAsync("getReportsCriteria");
         await localStorage.RemoveItemAsync("searchEventsCriteria");
+        await localStorage.RemoveItemAsync("searchOrganizerEventsCriteria");
         
         await localStorage.RemoveItemAsync("accessToken");
         await localStorage.RemoveItemAsync("jwtDto");

From bad62aa8044d2d626f9809280eb17ffc98daeb8d Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 18:10:51 +0200
Subject: [PATCH 13/15] (#57) add progress bar circular for friends pages

---
 .../src/MiniSpace.Web/Pages/Friends/Friends.razor  | 14 +++++++++++++-
 .../Pages/Friends/FriendsRequests.razor            |  8 +++++++-
 .../Pages/Friends/FriendsSearch.razor              | 12 ++++++++++++
 .../MiniSpace.Web/Pages/Friends/SentRequests.razor |  8 +++++++-
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/Friends.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/Friends.razor
index 691424699..16d87c68c 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/Friends.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/Friends.razor
@@ -11,7 +11,7 @@
 @using MiniSpace.Web.Areas.MediaFiles
 @inject IMediaFilesService MediaFilesService
 @using MudBlazor
-
+@using Radzen
 
 
 <div class="breadcrumbs-container">
@@ -50,6 +50,15 @@
                 </div>
             }
         }
+        else if (!pageInitialized)
+        {
+            <div style="display: flex; justify-content: center; align-items: center;">
+                <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                           Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+                    <Template>Loading...</Template>
+                </RadzenProgressBarCircular>
+            </div>
+        }
         else
         {
             <p>No friends to show. Start connecting now!</p>
@@ -135,6 +144,7 @@
     private Guid studentId;
     private string searchTerm;
     private Dictionary<Guid, string> images = new ();
+    private bool pageInitialized;
 
     protected override async Task OnInitializedAsync()
     {
@@ -160,6 +170,8 @@
                 NotificationService.Notify(Radzen.NotificationSeverity.Error, "Failed to Load Friends", $"An error occurred: {ex.Message}", 5000);
                 friends = new List<FriendDto>();  
             }
+
+            pageInitialized = true;
         }
         else
         {
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/FriendsRequests.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/FriendsRequests.razor
index b18d0b4ac..66dfec306 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/FriendsRequests.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/FriendsRequests.razor
@@ -13,6 +13,7 @@
 @using MiniSpace.Web.Areas.MediaFiles
 @inject IMediaFilesService MediaFilesService
 @using MudBlazor
+@using Radzen
 
 <div class="breadcrumbs-container">
     <MudBreadcrumbs Class="custom-breadcrumbs" Items="_items"></MudBreadcrumbs>
@@ -39,7 +40,12 @@
         <div class="card-container">
             @if (incomingRequests == null)
             {
-                <p>Loading...</p>
+                <div style="display: flex; justify-content: center; align-items: center;">
+                    <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                               Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+                        <Template>Loading...</Template>
+                    </RadzenProgressBarCircular>
+                </div>
             }
             else if (filteredIncomingRequests != null && filteredIncomingRequests.Any())
             {
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/FriendsSearch.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/FriendsSearch.razor
index 0a16db851..794a2b62b 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/FriendsSearch.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/FriendsSearch.razor
@@ -13,6 +13,7 @@
 @inject Radzen.NotificationService NotificationService
 @inject IJSRuntime JSRuntime
 @using MudBlazor
+@using Radzen
 
 <div class="breadcrumbs-container">
     <MudBreadcrumbs Class="custom-breadcrumbs" Items="_items"></MudBreadcrumbs>
@@ -31,6 +32,15 @@
             <RadzenTextBox @bind-Value="searchTerm" Placeholder="Search friends..." Style="width: 75%;" />
             <RadzenButton Text="Search" Click="@SearchFriends" ButtonStyle="Radzen.ButtonStyle.Secondary" Icon="search" Style="margin-left: 10px; width: 23%;" />
         </div>
+        @if (!pageInitialized)
+        {
+            <div style="display: flex; justify-content: center; align-items: center;">
+                <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                           Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+                    <Template>Loading...</Template>
+                </RadzenProgressBarCircular>
+            </div>
+        }
         <div class="card-container">
             @foreach (var student in students)
             {
@@ -337,6 +347,7 @@
     private Dictionary<Guid, string> images = new ();
     private IEnumerable<FriendDto> allFriends;
     private IEnumerable<FriendRequestDto> incomingRequests;
+    private bool pageInitialized;
 
     protected override async Task OnInitializedAsync() 
     {
@@ -349,6 +360,7 @@
             allFriends = await FriendsService.GetAllFriendsAsync(IdentityService.GetCurrentUserId());
 
             await LoadStudents();
+            pageInitialized = true;
             StateHasChanged();
             
             var tasks = new List<Task>();
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/SentRequests.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/SentRequests.razor
index e1ff3bd93..20d0071cb 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/SentRequests.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Friends/SentRequests.razor
@@ -13,6 +13,7 @@
 @using MiniSpace.Web.Areas.MediaFiles
 @inject IMediaFilesService MediaFilesService
 @using MudBlazor
+@using Radzen
 
 <div class="breadcrumbs-container">
     <MudBreadcrumbs Class="custom-breadcrumbs" Items="_items"></MudBreadcrumbs>
@@ -40,7 +41,12 @@
         <div class="card-container">
             @if (sentRequests == null)
             {
-                <p>Loading...</p>
+                <div style="display: flex; justify-content: center; align-items: center;">
+                    <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                               Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+                        <Template>Loading...</Template>
+                    </RadzenProgressBarCircular>
+                </div>
             }
             else if (filteredSentRequests.Any())
             {

From f4900d493bfe91a8b6b9bddc13df85f010c5e73e Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 18:14:31 +0200
Subject: [PATCH 14/15] (#57) add progress bar circular for notifications pages

---
 .../Pages/Notifications/AllNotifications.razor             | 7 ++++++-
 .../Pages/Notifications/HistoryNotifications.razor         | 7 ++++++-
 .../Pages/Notifications/NewNotifications.razor             | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/AllNotifications.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/AllNotifications.razor
index 058cf3c5e..12d267ac2 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/AllNotifications.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/AllNotifications.razor
@@ -25,7 +25,12 @@
 
 @if (notifications == null)
 {
-    <p><em>Loading...</em></p>
+    <div style="display: flex; justify-content: center; align-items: center;">
+        <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                   Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+            <Template>Loading...</Template>
+        </RadzenProgressBarCircular>
+    </div>
 }
 else if (notifications.Any())
 {
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/HistoryNotifications.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/HistoryNotifications.razor
index e815b2334..b983702ce 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/HistoryNotifications.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/HistoryNotifications.razor
@@ -27,7 +27,12 @@
 
 @if (notifications == null)
 {
-    <p><em>Loading...</em></p>
+    <div style="display: flex; justify-content: center; align-items: center;">
+        <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                   Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+            <Template>Loading...</Template>
+        </RadzenProgressBarCircular>
+    </div>
 }
 else if (notifications.Any())
 {
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/NewNotifications.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/NewNotifications.razor
index 6139bd68f..8ebeb1865 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/NewNotifications.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Notifications/NewNotifications.razor
@@ -26,7 +26,12 @@
 
 @if (notifications == null)
 {
-    <p><em>Loading...</em></p>
+    <div style="display: flex; justify-content: center; align-items: center;">
+        <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                   Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+            <Template>Loading...</Template>
+        </RadzenProgressBarCircular>
+    </div>
 }
 else if (notifications.Any())
 {

From 54fd3bf9ce50e7cac67520b6730aed8ff696eb2b Mon Sep 17 00:00:00 2001
From: Amadeusz Nowak <an2508374@gmail.com>
Date: Sun, 2 Jun 2024 18:19:38 +0200
Subject: [PATCH 15/15] (#57) add progress bar circular for reports and admin
 pages

---
 .../MiniSpace.Web/Pages/Admin/ManageOrganizations.razor    | 7 ++++++-
 .../src/MiniSpace.Web/Pages/Admin/ManageReports.razor      | 7 ++++++-
 .../src/MiniSpace.Web/Pages/Admin/ManageStudents.razor     | 7 ++++++-
 .../src/MiniSpace.Web/Pages/Reports/StudentReports.razor   | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageOrganizations.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageOrganizations.razor
index e3118819e..d24515519 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageOrganizations.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageOrganizations.razor
@@ -17,7 +17,12 @@
 
 @if (!pageInitialized)
 {
-    <h3 class="rz-p-12">Loading...</h3>
+    <div style="display: flex; justify-content: center; align-items: center;">
+        <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light"
+                                   Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+            <Template>Loading...</Template>
+        </RadzenProgressBarCircular>
+    </div>
 }
 else
 {
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor
index c2910342f..f2709724b 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageReports.razor
@@ -20,7 +20,12 @@
 
 @if (!pageInitialized)
 {
-    <h3 class="rz-p-12">Loading...</h3>
+    <div style="display: flex; justify-content: center; align-items: center;">
+        <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                   Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+            <Template>Loading...</Template>
+        </RadzenProgressBarCircular>
+    </div>
 }
 @if (pageInitialized && adminId != Guid.Empty)
 {
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageStudents.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageStudents.razor
index 1df447a56..dcb167112 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageStudents.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Admin/ManageStudents.razor
@@ -13,7 +13,12 @@
 
 @if (!pageInitialized)
 {
-    <h3 class="rz-p-12">Loading...</h3>
+    <div style="display: flex; justify-content: center; align-items: center;">
+        <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                   Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+            <Template>Loading...</Template>
+        </RadzenProgressBarCircular>
+    </div>
 }
 @if (pageInitialized && adminId != Guid.Empty)
 {
diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Reports/StudentReports.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Reports/StudentReports.razor
index e5b1abf90..867668a53 100644
--- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Reports/StudentReports.razor
+++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Reports/StudentReports.razor
@@ -34,7 +34,12 @@
 
 @if (!pageInitialized)
 {
-    <h3 class="rz-p-12">Loading...</h3>
+    <div style="display: flex; justify-content: center; align-items: center;">
+        <RadzenProgressBarCircular ShowValue="true" ProgressBarStyle="ProgressBarStyle.Light" 
+                                   Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Large">
+            <Template>Loading...</Template>
+        </RadzenProgressBarCircular>
+    </div>
 }
 @if (pageInitialized && studentId != Guid.Empty)
 {