diff --git a/src/web/Client/Features/UserSearch/UserSearchResultComponent.razor b/src/web/Client/Features/UserSearch/UserSearchResultComponent.razor index 66bb4333..6f890e38 100644 --- a/src/web/Client/Features/UserSearch/UserSearchResultComponent.razor +++ b/src/web/Client/Features/UserSearch/UserSearchResultComponent.razor @@ -29,34 +29,35 @@ - @if (user.LookingFor.Any()) + @if (user.Children.Any()) { - Interesseret i + Børn - - @foreach (var lookingFor in user.LookingFor) + + @foreach (var child in user.Children.OrderBy(c => c.DateOfBirth)) { - @lookingFor + + @child.FirstName @child.LastName + } } - @if (user.Children.Any()) + @if (user.LookingFor.Any()) { - + + - Børn + Interesseret i - - @foreach (var child in user.Children.OrderBy(c => c.DateOfBirth)) + + @foreach (var lookingFor in user.LookingFor) { - - @child.FirstName @child.LastName - + @lookingFor } diff --git a/src/web/Client/Pages/Profile/Profile.razor b/src/web/Client/Pages/Profile/Profile.razor index 8fee77d4..cf42438c 100644 --- a/src/web/Client/Pages/Profile/Profile.razor +++ b/src/web/Client/Pages/Profile/Profile.razor @@ -1,11 +1,15 @@ @page "/{userName}" -@using System.Net @inject ISnackbar Snackbar @inject IProfileApiClient ProfileApiClient @inject IJSRuntime JsRuntime - + + + + @if (_profile is null) @@ -26,37 +30,42 @@ - + + + + + @_profile.Description + - @if (_profile.LookingFor.Any()) + @if (_profile.ChildProfiles.Any()) { - Interesseret i + Børn - + - @foreach (var lookingFor in _profile.LookingFor) + @foreach (var child in _profile.ChildProfiles) { - @lookingFor + + @child.FirstName @child.LastName + } } - @if (_profile.ChildProfiles.Any()) + @if (_profile.LookingFor.Any()) { - - - Børn + + + Interesseret i - + - @foreach (var child in _profile.ChildProfiles) + @foreach (var lookingFor in _profile.LookingFor) { - - @child.FirstName @child.LastName - + @lookingFor } @@ -90,8 +99,8 @@ _isLoading = false; } - private async Task GoBack() - { - await JsRuntime.InvokeVoidAsync("history.back"); - } + private async Task GoBack() + { + await JsRuntime.InvokeVoidAsync("history.back"); + } } diff --git a/src/web/Client/Pages/Users/Search.razor b/src/web/Client/Pages/Users/Search.razor index c85d7559..9180e71b 100644 --- a/src/web/Client/Pages/Users/Search.razor +++ b/src/web/Client/Pages/Users/Search.razor @@ -4,6 +4,9 @@ @inject ISnackbar Snackbar @inject ISessionStorageService SessionStorage + +