Badges for 48in24

app/commands/user/challenges/featured_exercises_progress_48_in_24.rb

@@ -73,7 +73,7 @@ def status(exercise)
     completed_exercises = completions[exercise[:slug]].to_a
     return :in_progress if completed_exercises.blank?
 
-    num_completions_in_2024 = completed_exercises.count { |(_, year)| year == 2024 }
+    num_completions_in_2024 = completed_exercises.count { |(_, date)| date >= '2023-12-31' && date <= '2025-01-01' }
     return :in_progress if num_completions_in_2024.zero?
     return :bronze if num_completions_in_2024 < 3
 
@@ -86,11 +86,12 @@ def completions
     user.solutions.completed.
       joins(exercise: :track).
       where(exercise: { slug: EXERCISES.pluck(:slug) }).
-      pluck('exercise.slug', 'tracks.slug', 'YEAR(completed_at)').
+      pluck('exercise.slug', 'tracks.slug', Arel.sql("DATE_FORMAT(completed_at, '%Y-%m-%d')")).
       group_by(&:first).
       transform_values { |entries| entries.map { |entry| entry[1..] } }
   end
 
+  memoize
   def csharp_exercises
     Track.find('csharp').practice_exercises.index_by(&:slug)
   rescue ActiveRecord::RecordNotFound

app/css/components/modal.css

@@ -33,7 +33,8 @@
         & .--close-button {
             @apply fixed rounded-circle shadow-smZ1 bg-purpleDarker3;
             @apply border-2 border-transparent;
-            @apply grid place-items-center;
+            @apply grid place-items-center z-modal;
+
             cursor: pointer;
             top: 48px;
             right: 48px;