From 4c8ee19c36fa8ced35b3fa77d87eecaa2592677b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vegard=20L=C3=B8kken?= <vegard@loekken.org>
Date: Thu, 5 Sep 2024 10:37:50 +0200
Subject: [PATCH] Add dummy avatar image for users w/o profile pic

---
 Tevling/Components/ChallengeCard.razor   |   3 +-
 Tevling/Services/ChallengeService.cs     |  66 +++++++++++------------
 Tevling/wwwroot/avatar/athlete/large.png | Bin 0 -> 322 bytes
 3 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 Tevling/wwwroot/avatar/athlete/large.png

diff --git a/Tevling/Components/ChallengeCard.razor b/Tevling/Components/ChallengeCard.razor
index 3b0a627..9750ea7 100644
--- a/Tevling/Components/ChallengeCard.razor
+++ b/Tevling/Components/ChallengeCard.razor
@@ -29,10 +29,11 @@
         @if (ShowScoreBoard && ScoreBoard != null)
         {
             <ul class="list-group list-group-flush list-group-numbered overflow-auto" style="max-height: 14rem">
+                @{var i = 0;}
                 @foreach (AthleteScore score in ScoreBoard.Scores)
                 {
                     <li class="list-group-item d-flex justify-content-between">
-                        <span>@score.Name</span>
+                        <span>@(++i == 1 ? "🥇" : i == 2 ? "🥈" : i == 3 ? "🥉" : "") @score.Name</span>
                         <span class="score">@score.Score</span>
                     </li>
                 }
diff --git a/Tevling/Services/ChallengeService.cs b/Tevling/Services/ChallengeService.cs
index e984b13..30b13ca 100644
--- a/Tevling/Services/ChallengeService.cs
+++ b/Tevling/Services/ChallengeService.cs
@@ -46,19 +46,19 @@ public async Task<Challenge[]> GetChallengesAsync(int currentAthleteId, Challeng
             .Where(challenge => filter.OnlyJoinedChallenges
                 ? challenge.Athletes!.Any(a => a.Id == currentAthleteId)
                 : !challenge.IsPrivate
-                  || challenge.InvitedAthletes!.Any(a => a.Id == currentAthleteId)
-                  || challenge.CreatedById == currentAthleteId)
+                || challenge.InvitedAthletes!.Any(a => a.Id == currentAthleteId)
+                || challenge.CreatedById == currentAthleteId)
             .Where(challenge => !filter.ByAthleteId.HasValue
-                                || challenge.Athletes!.Any(athlete => athlete.Id == filter.ByAthleteId.Value) == true
-                                || challenge.CreatedById == filter.ByAthleteId.Value)
+                || challenge.Athletes!.Any(athlete => athlete.Id == filter.ByAthleteId.Value) == true
+                || challenge.CreatedById == filter.ByAthleteId.Value)
             // TODO: Filter out outdated challenges when DB supports it
             //       (Time to switch to PostgreSQL?)
             // .Where(challenge => filter.IncludeOutdatedChallenges
             //     || challenge.End.UtcDateTime.Date >= DateTimeOffset.UtcNow.Date)
             .Where(c => string.IsNullOrWhiteSpace(filter.SearchText)
-                        // TODO: Use EF.Functions.ILike when switching to PostgreSQL
-                        //       to keep the search text case-insensitive
-                        || EF.Functions.Like(c.Title, $"%{filter.SearchText}%"))
+                // TODO: Use EF.Functions.ILike when switching to PostgreSQL
+                //       to keep the search text case-insensitive
+                || EF.Functions.Like(c.Title, $"%{filter.SearchText}%"))
             .OrderByDescending(challenge => challenge.Start)
             .ThenBy(challenge => challenge.Title)
             .ThenBy(challenge => challenge.Id)
@@ -110,13 +110,13 @@ public async Task<Challenge> UpdateChallengeAsync(int challengeId, ChallengeForm
         using DataContext dataContext = await _dataContextFactory.CreateDbContextAsync(ct);
 
         Challenge challenge = await dataContext.Challenges
-                                  .Include(c => c.Athletes)
-                                  .Include(c => c.CreatedBy)
-                                  .Include(c => c.InvitedAthletes)
-                                  .AsSplitQuery()
-                                  .AsTracking()
-                                  .FirstOrDefaultAsync(c => c.Id == challengeId, ct)
-                              ?? throw new Exception($"Unknown challenge ID {challengeId}");
+                .Include(c => c.Athletes)
+                .Include(c => c.CreatedBy)
+                .Include(c => c.InvitedAthletes)
+                .AsSplitQuery()
+                .AsTracking()
+                .FirstOrDefaultAsync(c => c.Id == challengeId, ct)
+            ?? throw new Exception($"Unknown challenge ID {challengeId}");
 
         _logger.LogInformation("Updating challenge ID {ChallengeId}", challengeId);
 
@@ -155,16 +155,16 @@ public async Task<Challenge> JoinChallengeAsync(int athleteId, int challengeId,
         using DataContext dataContext = await _dataContextFactory.CreateDbContextAsync(ct);
 
         Challenge challenge = await dataContext.Challenges
-                                  .Include(c => c.Athletes)
-                                  .Include(c => c.CreatedBy)
-                                  .AsTracking()
-                                  .FirstOrDefaultAsync(c => c.Id == challengeId, ct)
-                              ?? throw new Exception($"Challenge ID {challengeId} not found");
+                .Include(c => c.Athletes)
+                .Include(c => c.CreatedBy)
+                .AsTracking()
+                .FirstOrDefaultAsync(c => c.Id == challengeId, ct)
+            ?? throw new Exception($"Challenge ID {challengeId} not found");
 
         Athlete athlete = await dataContext.Athletes
-                              .AsTracking()
-                              .FirstOrDefaultAsync(a => a.Id == athleteId, ct)
-                          ?? throw new Exception($"Athlete ID {athleteId} not found");
+                .AsTracking()
+                .FirstOrDefaultAsync(a => a.Id == athleteId, ct)
+            ?? throw new Exception($"Athlete ID {athleteId} not found");
 
         challenge.Athletes!.Add(athlete);
 
@@ -180,11 +180,11 @@ public async Task<Challenge> LeaveChallengeAsync(int athleteId, int challengeId,
         using DataContext dataContext = await _dataContextFactory.CreateDbContextAsync(ct);
 
         Challenge challenge = await dataContext.Challenges
-                                  .Include(c => c.Athletes)
-                                  .Include(c => c.CreatedBy)
-                                  .AsTracking()
-                                  .FirstOrDefaultAsync(c => c.Id == challengeId, ct)
-                              ?? throw new Exception($"Challenge ID {challengeId} not found");
+                .Include(c => c.Athletes)
+                .Include(c => c.CreatedBy)
+                .AsTracking()
+                .FirstOrDefaultAsync(c => c.Id == challengeId, ct)
+            ?? throw new Exception($"Challenge ID {challengeId} not found");
 
         Athlete? athlete = challenge.Athletes!.FirstOrDefault(a => a.Id == athleteId);
 
@@ -202,9 +202,9 @@ public async Task DeleteChallengeAsync(int challengeId, CancellationToken ct = d
         using DataContext dataContext = await _dataContextFactory.CreateDbContextAsync(ct);
 
         Challenge challenge = await dataContext.Challenges
-                                  .Include(c => c.Athletes) // TODO: Is this necessary?
-                                  .FirstOrDefaultAsync(c => c.Id == challengeId, ct)
-                              ?? throw new Exception($"Unknown challenge ID {challengeId}");
+                .Include(c => c.Athletes) // TODO: Is this necessary?
+                .FirstOrDefaultAsync(c => c.Id == challengeId, ct)
+            ?? throw new Exception($"Unknown challenge ID {challengeId}");
 
         _logger.LogInformation("Deleting challenge ID {ChallengeId}", challengeId);
         _ = await dataContext.RemoveChallengeAsync(challenge, ct);
@@ -245,9 +245,9 @@ operation which EFCore requires.
                 a.Athlete,
                 Activities = a.Activities!
                     .Where(a => a.Details.StartDate >= result.Challenge.Start
-                                && a.Details.StartDate < result.Challenge.End
-                                && (result.Challenge.ActivityTypes.Count == 0
-                                    || result.Challenge.ActivityTypes.Contains(a.Details.Type)))
+                        && a.Details.StartDate < result.Challenge.End
+                        && (result.Challenge.ActivityTypes.Count == 0
+                            || result.Challenge.ActivityTypes.Contains(a.Details.Type)))
             })
             .Select(a => new
             {
diff --git a/Tevling/wwwroot/avatar/athlete/large.png b/Tevling/wwwroot/avatar/athlete/large.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b3d0befe3d5ee2f59c57f8d5aac708723f816f7
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq002e+002e=0{{R3g8=`x0000aP)t-s-{0u}
z|Nr6P>HYow`uhCz^!M@c_4oJr=;-g{<m}?&>g((APEGB}0002lNkl<ZNXPBczYf7r
z9L4dg{x%jzL)Q{^jbOzfMy!?!gHh8L=wkN@*3P`2Xs>9SI+_qM^gDl&`%CT-Sy_LW
zy6ewQg0}@Q<fM#y2WmFHY0_)pr?HDl2(pMNNHZoTCr$4|lTYzhQJMuY6=_^SvVGDJ
ztd4J{)F?Ip-4L{jgMlmF<%zGPcm@aR)d4VClWiPL1Zn$M<br4OWYR^rRic?hjLvrY
z$RgVT+0Z#=>ItS5Gd1=W*>oYrJw?dKrmK*VO)F-EXo=sygpBN7X@@gJR@TqD0m}p@
UFd;B`@c;k-07*qoM6N<$g1@_(m;e9(

literal 0
HcmV?d00001