diff --git a/app/controllers/timelines_controller.rb b/app/controllers/timelines_controller.rb index 2c67807d..fa94f0d5 100644 --- a/app/controllers/timelines_controller.rb +++ b/app/controllers/timelines_controller.rb @@ -1,4 +1,6 @@ class TimelinesController < ApplicationController + layout 'tailwind', only: [:index] + before_action :authenticate_user!, except: [:show] before_action :set_timeline, only: [:show, :edit, :update, :destroy] @@ -27,8 +29,10 @@ class TimelinesController < ApplicationController else # Add in all timelines from shared universes also @timelines += Timeline.where(universe_id: current_user.contributable_universe_ids) + .where.not(id: @timelines.pluck(:id)) end + @filtered_page_tags = [] @page_tags = PageTag.where( page_type: Timeline.name, page_id: @timelines.pluck(:id) diff --git a/app/views/timelines/index.html.erb b/app/views/timelines/index.html.erb index 8389bbd9..34d35819 100644 --- a/app/views/timelines/index.html.erb +++ b/app/views/timelines/index.html.erb @@ -1,188 +1,370 @@ -<%= content_for :full_width_page_header do %> - <%= render partial: 'content/components/parallax_header', locals: { content_type: 'Timeline', content_class: Timeline } %> -<% end %> - -<% if @timelines.any? %> - -