Merge pull request #476 from NielsPilgaard/feature/search-result-improvements

Feature/search result improvements

Author: NielsPilgaard

src/shared/Jordnaer.Shared/Extensions/GroupExtensions.cs

@@ -14,6 +14,6 @@ public static string DisplayLocation(this GroupSlim groupDto)
             return groupDto.ZipCode.ToString()!;
         }
 
-        return groupDto.City ?? "Område ikke angivet";
+        return groupDto.City ?? "Ikke angivet";
     }
 }

src/shared/Jordnaer.Shared/Extensions/UserDtoExtensions.cs

@@ -14,6 +14,6 @@ public static string DisplayLocation(this UserDto userDto)
             return userDto.ZipCode.ToString()!;
         }
 
-        return userDto.City ?? "Område ikke angivet";
+        return userDto.City ?? "Ikke angivet";
     }
 }

src/shared/Jordnaer.Shared/Groups/GroupSearchFilter.cs

@@ -11,7 +11,7 @@ public record GroupSearchFilter
 	/// <summary>
 	/// Only show group results within this many kilometers of the <see cref="Location"/>.
 	/// </summary>
-	[Range(1, 50, ErrorMessage = "Afstand skal være mellem 1 og 50 km")]
+	[Range(1, 500, ErrorMessage = "Afstand skal være mellem 1 og 500 km")]
 	[LocationRequired]
 	public int? WithinRadiusKilometers { get; set; }
 
@@ -31,7 +31,7 @@ public record GroupSearchFilter
 	public double? Longitude { get; set; }
 
 	public int PageNumber { get; set; } = 1;
-	public int PageSize { get; set; } = 10;
+	public int PageSize { get; set; } = 11;
 
 	[SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
 	public override int GetHashCode()

src/shared/Jordnaer.Shared/Profile/DTO/ProfileDto.cs

@@ -36,7 +36,7 @@ public class ProfileDto
 		? $"{ZipCode}, {City}"
 		: ZipCode is not null
 			? ZipCode.ToString()!
-			: City ?? "Område ikke angivet";
+			: City ?? "Ikke angivet";
 
 	public string DisplayName => FirstName is not null
 		? $"{FirstName} {LastName}"

src/shared/Jordnaer.Shared/UserSearch/UserSearchFilter.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 
 namespace Jordnaer.Shared;
+
 public record UserSearchFilter
 {
 	public string? Name { get; set; }
@@ -10,7 +11,7 @@ public record UserSearchFilter
 	/// <summary>
 	/// Only show user results within this many kilometers of the <see cref="Location"/>.
 	/// </summary>
-	[Range(1, 50, ErrorMessage = "Afstand skal være mellem 1 og 50 km")]
+	[Range(1, 500, ErrorMessage = "Afstand skal være mellem 1 og 500 km")]
 	[LocationRequired]
 	public int? WithinRadiusKilometers { get; set; }
 
@@ -36,7 +37,7 @@ public record UserSearchFilter
 	public Gender? ChildGender { get; set; }
 
 	public int PageNumber { get; set; } = 1;
-	public int PageSize { get; set; } = 10;
+	public int PageSize { get; set; } = 11;
 
 	[SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
 	public override int GetHashCode()
@@ -107,7 +108,7 @@ protected override ValidationResult IsValid(object? value, ValidationContext val
 
 		// Valid if either Location string is set OR lat/long coordinates are set
 		var hasLocation = !string.IsNullOrEmpty(userSearchFilter.Location) ||
-		                  (userSearchFilter.Latitude.HasValue && userSearchFilter.Longitude.HasValue);
+						  (userSearchFilter.Latitude.HasValue && userSearchFilter.Longitude.HasValue);
 
 		return !hasLocation
 			? new ValidationResult("Område skal vælges når en radius er valgt.")

src/web/Jordnaer/Components/App.razor

@@ -73,6 +73,7 @@
 
     <script src="@Assets["_content/MudBlazor/MudBlazor.min.js"]"></script>
     <script async src="@Assets["js/scroll.js"]"></script>
+    <script async src="@Assets["js/geolocation.js"]"></script>
     <script async src="@Assets["js/utilities.js"]"></script>
     <script async src="@Assets["js/quill-loader.js"]"></script>
     <script async src="@Assets["_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"]"></script>

src/web/Jordnaer/Components/ScrollToBottom.razor.cs

@@ -4,6 +4,7 @@
 using MudBlazor.Utilities;
 
 namespace Jordnaer.Components;
+
 public partial class ScrollToBottom : IDisposable
 {
 	private IScrollListener? _scrollListener;

src/web/Jordnaer/Features/Ad/AdCard.razor

@@ -0,0 +1,29 @@
+<MudLink Href="@Link" Target="_blank" Underline="Underline.None"
+    UserAttributes="@(new Dictionary<string, object> { { "rel", "noopener" } })">
+    <div class="image-ad-wrapper">
+        <div class="image-with-label">
+            <MudImage Src="@ImagePath" Alt="@ImageAlt" Class="ad-image"
+                Style="width: 100%; height: auto; border-radius: 8px;" loading="lazy" />
+            <div class="image-ad-label">Annonce</div>
+        </div>
+    </div>
+</MudLink>
+
+@code {
+    [Parameter, EditorRequired]
+    public required string Link { get; set; }
+
+    [Parameter, EditorRequired]
+    public required string ImagePath { get; set; }
+
+    [Parameter, EditorRequired]
+    public required string ImageAlt { get; set; }
+
+    protected override void OnAfterRender(bool firstRender)
+    {
+        if (firstRender)
+        {
+            JordnaerMetrics.AdViewCounter.Add(1, new KeyValuePair<string, object?>("link", Link));
+        }
+    }
+}

src/web/Jordnaer/Features/Ad/AdCard.razor.css

@@ -0,0 +1,22 @@
+.image-ad-wrapper {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.image-with-label {
+  position: relative;
+}
+
+.image-ad-label {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  background-color: rgba(0, 0, 0, 0.05);
+  color: rgba(0, 0, 0, 0.5);
+  padding: 4px 8px;
+  border-radius: 4px;
+  font-size: 0.65rem;
+  font-weight: 400;
+  opacity: 0.7;
+}

src/web/Jordnaer/Features/Ad/HardcodedAds.cs

@@ -0,0 +1,49 @@
+namespace Jordnaer.Features.Ad;
+
+/// <summary>
+/// Temporary hardcoded ads until the database-backed ad system is implemented (Task 03).
+/// This keeps ad data separate from UI logic.
+/// </summary>
+public static class HardcodedAds
+{
+    private static readonly List<AdData> _ads =
+    [
+        new AdData
+        {
+            Title = "Moon Creative",
+            Description = "Professionel webudvikling og design",
+            ImagePath = "images/ads/mooncreative_mobile.png",
+            Link = "https://www.mooncreative.dk/"
+        }
+    ];
+
+    /// <summary>
+    /// Get ads for user search results.
+    /// Returns multiple copies if needed to fill the requested count.
+    /// </summary>
+    public static List<AdData> GetAdsForSearch(int count)
+    {
+        if (count <= 0 || _ads.Count == 0)
+        {
+            return [];
+        }
+
+        var result = new List<AdData>();
+
+        // Repeat ads to fill the requested count
+        for (int i = 0; i < count; i++)
+        {
+            result.Add(_ads[i % _ads.Count]);
+        }
+
+        return result;
+    }
+}
+
+public record AdData
+{
+    public required string Title { get; init; }
+    public string? Description { get; init; }
+    public required string ImagePath { get; init; }
+    public required string Link { get; init; }
+}