diff --git a/app/templates/posts/show.html.slim b/app/templates/posts/show.html.slim index c80c24a..76e7c4b 100644 --- a/app/templates/posts/show.html.slim +++ b/app/templates/posts/show.html.slim @@ -25,17 +25,26 @@ article class="h-entry" img class="shadow-solid shadow-pink-100 dark:shadow-pink-200 rounded mb-4" src=post.large_map - if post.tags.map(&:label).include? "weekly" - div class="max-w-prose mx-auto text-gray-600 dark:text-gray-200 flex" - div hx-get="/post/top_tracks/#{post.slug}" hx-trigger="load" + div class="max-w-prose mx-auto text-gray-600 dark:text-gray-200 flex gap-4" + div class="grow" hx-get="/post/top_tracks/#{post.slug}" hx-trigger="load" - - if past_posts.count > 0 + - if text_posts.count > 0 div class="block grow bg-blue-100 dark:bg-blue-600 rounded px-4 py-2 mb-12" p class="text-sm mb-0" This week, years ago ul class="mt-0" - - past_posts.each do |past_post| + - text_posts.each do |past_post| li class="m-0" a class="hover:underline" href=past_post.permalink = "#{past_post.display_title} (#{past_post.published_at.year})" + + div class="max-w-prose mx-auto text-gray-600 dark:text-gray-200 flex" + - photo_posts.group_by{ |p| p.published_at.year }.each do |year, posts| + div class="max-w-prose mx-auto text-gray-600 dark:text-gray-200" + div class="max-w-prose mx-auto text-gray-600 dark:text-gray-200" + = year + div class="grid grid-cols-3 gap-4 mb-4 max-w-prose mx-auto" + -posts.each do |post| + == render "shared/photo_post", post: post div class="mb-4 max-w-screen-md mx-auto border-t-4 border-solid border-gray-400 dark:border-gray-600" div class="max-w-prose mx-auto text-gray-600 dark:text-gray-200 flex" diff --git a/app/templates/posts/top_tracks.html.slim b/app/templates/posts/top_tracks.html.slim index 7c742ce..602a10d 100644 --- a/app/templates/posts/top_tracks.html.slim +++ b/app/templates/posts/top_tracks.html.slim @@ -1,12 +1,11 @@ -div class="mx-auto mr-4" +div class="mx-auto" a href=url class="block flex bg-pink-100 dark:bg-pink-600 rounded px-4 py-2 mb-12" div class="mr-4 my-auto" div class="w-34 h-34 my-auto text-[2.041rem] block dark:hidden" 👩🏼‍🎤 div class="w-34 h-34 my-auto text-[2.041rem] hidden dark:block" 👨🏽‍🎤 div - p class="text-sm" Top track this week + p class="text-sm" Top track p class="hover:underline" - span class="font-semibold"= name - span by - span class="font-semibold"= artist + p class="font-semibold"= name + p class=""= artist diff --git a/app/views/posts/show.rb b/app/views/posts/show.rb index 7ffa375..5ddd8dc 100644 --- a/app/views/posts/show.rb +++ b/app/views/posts/show.rb @@ -16,6 +16,14 @@ module Adamantium posts = post_repo.from_the_archives(start_date: start_date, end_date: end_date) posts.map { |p| Decorators::Posts::Decorator.new(p) } end + + expose :text_posts do |past_posts| + past_posts.reject(&:photos?) + end + + expose :photo_posts do |past_posts| + past_posts.select(&:photos?) + end end end end