diff --git a/app/controllers/events/days_controller.rb b/app/controllers/events/days_controller.rb new file mode 100644 index 000000000..c2966357d --- /dev/null +++ b/app/controllers/events/days_controller.rb @@ -0,0 +1,8 @@ +class Events::DaysController < ApplicationController + include EventsTimeline + + def index + @events = events_for_activity_day + @next_day = latest_event_before_activity_day&.created_at + end +end diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index f51b1e361..613c7fe36 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -29,7 +29,7 @@ module EventsHelper def event_next_page_link(next_day) if next_day tag.div id: "next_page", - data: { controller: "fetch-on-visible", fetch_on_visible_url_value: events_path(day: next_day.strftime("%Y-%m-%d")) } + data: { controller: "fetch-on-visible", fetch_on_visible_url_value: events_days_path(day: next_day.strftime("%Y-%m-%d")) } end end diff --git a/app/views/events/_day.html.erb b/app/views/events/_day.html.erb index 523679b48..416d67e63 100644 --- a/app/views/events/_day.html.erb +++ b/app/views/events/_day.html.erb @@ -11,7 +11,7 @@ <% events.each do | hour_column, cluster| %> <%= event_cluster_tag(*hour_column) do %> - <%= render cluster.sort_by(&:created_at).reverse %> + <%= render partial: "events/event", collection: cluster.sort_by(&:created_at).reverse %> <%= local_datetime_tag cluster.first.created_at, class: "event__timestamp txt-small translucent" %> <% end %> diff --git a/app/views/events/index.turbo_stream.erb b/app/views/events/days/index.turbo_stream.erb similarity index 100% rename from app/views/events/index.turbo_stream.erb rename to app/views/events/days/index.turbo_stream.erb diff --git a/config/routes.rb b/config/routes.rb index a50e5cc1a..a65b59db3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -65,7 +65,11 @@ Rails.application.routes.draw do end end - resources :events + resources :events, only: :index + namespace :events do + resources :days + end + resources :filters resource :first_run resources :qr_codes