-
+
+
@Body
diff --git a/MiniSpace.Web/src/MiniSpace.Web/wwwroot/css/site.css b/MiniSpace.Web/src/MiniSpace.Web/wwwroot/css/site.css index 059bfc627..7af8055cd 100644 --- a/MiniSpace.Web/src/MiniSpace.Web/wwwroot/css/site.css +++ b/MiniSpace.Web/src/MiniSpace.Web/wwwroot/css/site.css @@ -361,7 +361,7 @@ html, body { .left-side, .right-side { width: 100%; - flex: none !important; + /* flex: none !important; */ } .left-side { diff --git a/MiniSpace.Web/src/MiniSpace.Web/wwwroot/icons/menu-left.svg b/MiniSpace.Web/src/MiniSpace.Web/wwwroot/icons/menu-left.svg new file mode 100644 index 000000000..5d14b1c57 --- /dev/null +++ b/MiniSpace.Web/src/MiniSpace.Web/wwwroot/icons/menu-left.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 101350129be0d231f3ec02a07370811e5ff73492 Mon Sep 17 00:00:00 2001 From: Andrii Voznesenskyi Date: Tue, 30 Jul 2024 17:13:23 +0200 Subject: [PATCH 102/175] (#330) studentDto update --- MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs b/MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs index 95e6ec488..52326c689 100644 --- a/MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs +++ b/MiniSpace.Web/src/MiniSpace.Web/DTO/StudentDto.cs @@ -29,8 +29,10 @@ public class StudentDto public string TwoFactorSecret { get; set; } public IEnumerable InterestedInEvents { get; set; } public IEnumerable SignedUpEvents { get; set; } - public List GalleryOfImageUrls { get; set; } - + public List GalleryOfImageUrls { get; set; } + public string Country { get; set; } + public string City { get; set; } + public bool IsInvitationPending { get; set; } public bool InvitationSent { get; set; } From 663ac53743e7c2f790c5dfe4c44716da7e7a3146 Mon Sep 17 00:00:00 2001 From: Andrii Voznesenskyi Date: Tue, 30 Jul 2024 17:25:45 +0200 Subject: [PATCH 103/175] (#330) show account view refactor --- .../Areas/Students/IStudentsService.cs | 4 +++- .../Areas/Students/StudentsService.cs | 18 ++++++++++-------- .../Pages/Account/PrivacyComponent.razor | 3 +++ .../Pages/Account/ProfileComponent.razor | 3 --- .../Pages/Account/ShowAccount.razor | 8 ++++++-- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/MiniSpace.Web/src/MiniSpace.Web/Areas/Students/IStudentsService.cs b/MiniSpace.Web/src/MiniSpace.Web/Areas/Students/IStudentsService.cs index 31a1c3a24..c2fd9ca87 100644 --- a/MiniSpace.Web/src/MiniSpace.Web/Areas/Students/IStudentsService.cs +++ b/MiniSpace.Web/src/MiniSpace.Web/Areas/Students/IStudentsService.cs @@ -30,7 +30,9 @@ Task UpdateStudentAsync( string twoFactorSecret, IEnumerable education, IEnumerable work, - string phoneNumber); + string phoneNumber, + string country, + string city); public Task> CompleteStudentRegistrationAsync(Guid studentId, string profileImageUrl, string description, DateTime dateOfBirth, bool emailNotifications, string contactEmail); Task GetStudentStateAsync(Guid studentId); diff --git a/MiniSpace.Web/src/MiniSpace.Web/Areas/Students/StudentsService.cs b/MiniSpace.Web/src/MiniSpace.Web/Areas/Students/StudentsService.cs index 2bc0fa43f..b6bf41229 100644 --- a/MiniSpace.Web/src/MiniSpace.Web/Areas/Students/StudentsService.cs +++ b/MiniSpace.Web/src/MiniSpace.Web/Areas/Students/StudentsService.cs @@ -65,7 +65,9 @@ public async Task UpdateStudentAsync( string twoFactorSecret, IEnumerable education, IEnumerable work, - string phoneNumber) + string phoneNumber, + string country, + string city) { var accessToken = await _identityService.GetAccessTokenAsync(); _httpClient.SetAccessToken(accessToken); @@ -79,14 +81,16 @@ public async Task UpdateStudentAsync( description, emailNotifications, contactEmail, - languages = languages.Select(l => l.ToString()).ToList(), - interests = interests.Select(i => i.ToString()).ToList(), + languages = languages.ToList(), + interests = interests.ToList(), enableTwoFactor, disableTwoFactor, twoFactorSecret, education, work, - phoneNumber + phoneNumber, + country, + city }; var jsonData = JsonSerializer.Serialize(updateStudentData); @@ -111,7 +115,6 @@ public async Task GetStudentStateAsync(Guid studentId) return student != null ? student.State : "invalid"; } - // Updated method for notification preferences public async Task UpdateUserNotificationPreferencesAsync(Guid studentId, NotificationPreferencesDto preferencesDto, bool emailNotifications) { var accessToken = await _identityService.GetAccessTokenAsync(); @@ -131,7 +134,6 @@ public async Task UpdateUserNotificationPreferencesAsync(Guid studentId, Notific preferencesDto.FriendsNotifications }; - // Serialize the data to JSON and log it var jsonData = JsonSerializer.Serialize(updatePreferencesData); Console.WriteLine($"Sending UpdateUserNotificationPreferences request: {jsonData}"); @@ -187,8 +189,8 @@ public async Task UpdateStudentLanguagesAndInterestsAsync( var updateData = new { - languages = languages.Select(l => l.ToString()).ToList(), - interests = interests.Select(i => i.ToString()).ToList() + languages = languages.ToList(), + interests = interests.ToList() }; var jsonData = JsonSerializer.Serialize(updateData); diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/PrivacyComponent.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/PrivacyComponent.razor index be47ed214..b9f509c83 100644 --- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/PrivacyComponent.razor +++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/PrivacyComponent.razor @@ -11,6 +11,9 @@ else { + + + Save privacy } diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ProfileComponent.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ProfileComponent.razor index 56d6d9726..5505bf27d 100644 --- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ProfileComponent.razor +++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ProfileComponent.razor @@ -51,9 +51,6 @@ else - - - diff --git a/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor b/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor index 79d4de90d..81c7513bf 100644 --- a/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor +++ b/MiniSpace.Web/src/MiniSpace.Web/Pages/Account/ShowAccount.razor @@ -22,7 +22,7 @@