Merge branch 'main' into improvements

TelosLabs · Sep 17, 2024 · bcae547 · bcae547
2 parents 1a20b77 + 43d65c0
commit bcae547
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/assets/images/icons/bookmark-full.svg b/app/assets/images/icons/bookmark-full.svg
diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb
@@ -9,6 +9,6 @@ def show
   private
 
   def filter_params
-    params.permit(:starts_at, :live, :past, :starting_soon)
+    params.permit(:starts_at, :live, :past, :starting_soon).merge(show_private: user_signed_in?)
   end
 end
diff --git a/app/views/profiles/show.html.erb b/app/views/profiles/show.html.erb
@@ -7,7 +7,7 @@
     <div class="z-10 flex flex-col items-start w-full max-w-screen-sm px-5 pt-6 pb-12">
       <div class="flex flex-row items-center">
         <% if @profile.image.attached? %>
-          <div class="flex flex-col items-center justify-center relative w-[120px] bg-cover bg-no-repeat bg-center h-[120px] rounded-full" style="background-image: url(<%= url_for(@profile.image) %>)">
+          <div class="flex flex-col items-center justify-center shrink-0 relative w-[120px] bg-cover bg-no-repeat bg-center h-[120px] rounded-full" style="background-image: url(<%= url_for(@profile.image) %>)">
           </div>
         <% else %>
           <div class="w-[120px] h-[120px] rounded-full bg-slate-300 p-5 flex flex-row items-center justify-center">