From 2026fe6ee903486c3daf7056c2a48ec6b2d76722 Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Mon, 13 Feb 2023 21:47:36 -0800
Subject: [PATCH] wip polish

---
 Gemfile                                       |  4 +-
 Gemfile.lock                                  | 10 ++--
 .../_serendipitous_question.html.erb          | 48 ++++++++++---------
 app/views/main/dashboard.html.erb             | 30 +++++++-----
 4 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8b90d587..fa0b358c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,8 +73,8 @@ gem 'barnes'
 #gem 'levenshtein-ffi'
 
 # Forum
-# gem 'thredded', git: 'https://github.com/indentlabs/thredded.git', branch: 'feature/report-posts'
-gem 'thredded', path: "../thredded"
+gem 'thredded', git: 'https://github.com/indentlabs/thredded.git', branch: 'feature/report-posts'
+# gem 'thredded', path: "../thredded"
 
 # gem 'thredded'
 # gem 'thredded', git: 'https://github.com/sudara/thredded', branch: 'master'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1d65eb75..858f15d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,8 +24,10 @@ GIT
   specs:
     serendipitous (0.0.2)
 
-PATH
-  remote: ../thredded
+GIT
+  remote: https://github.com/indentlabs/thredded.git
+  revision: edd58a785cd18fb2d7967c1f74aeaa92d3d82fbd
+  branch: feature/report-posts
   specs:
     thredded (1.0.1)
       active_record_union (>= 1.3.0)
@@ -1482,7 +1484,7 @@ GEM
       nio4r (~> 2.0)
     puma-heroku (2.0.0)
       puma (>= 5.0, < 6.0)
-    pundit (2.2.0)
+    pundit (2.3.0)
       activesupport (>= 3.0.0)
     racc (1.6.0)
     rack (2.2.4)
@@ -1733,4 +1735,4 @@ RUBY VERSION
    ruby 2.7.2p137
 
 BUNDLED WITH
-   2.3.5
+   2.4.6
diff --git a/app/views/main/components/_serendipitous_question.html.erb b/app/views/main/components/_serendipitous_question.html.erb
index 498be44b..e6b82313 100644
--- a/app/views/main/components/_serendipitous_question.html.erb
+++ b/app/views/main/components/_serendipitous_question.html.erb
@@ -1,25 +1,27 @@
-<div class="bg-white shadow-md rounded-md mb-8">
-  <div class="bg-notebook-blue rounded-t-lg">
-    <%= image_tag @content.random_image_including_private(format: :original), class: 'w-full object-cover object-center max-h-48 rounded-t-md' %>
-  </div>
-  <div class="p-4 lg:flex lg:flex-col lg:justify-between ">
-    <div>
-      <%=
-        if @content && @attribute_field_to_question
-          render partial: 'cards/serendipitous/tailwind_content_question', locals: { 
-            content: @content, 
-            field: @attribute_field_to_question,
-            expand_by_default: true,
-            include_quick_reference: false
-          }
-        end
-      %>
-      <p class="text-xs text-gray-500 text-center">
-        <i class="material-icons text-xs mr-1"><%= @content.icon %></i>
-        Your answer will be automatically saved to your
-        <%= link_to @content.name, @content.view_path, class: "#{@content.text_color}", target: '_blank' %>
-        <%= @content.page_type.downcase %> page.
-      </p>
+<% if @content %>
+  <div class="bg-white shadow-md rounded-md mb-8">
+    <div class="bg-notebook-blue rounded-t-lg">
+      <%= image_tag @content.random_image_including_private(format: :original), class: 'w-full object-cover object-center max-h-48 rounded-t-md' %>
+    </div>
+    <div class="p-4 lg:flex lg:flex-col lg:justify-between ">
+      <div>
+        <%=
+          if @attribute_field_to_question
+            render partial: 'cards/serendipitous/tailwind_content_question', locals: { 
+              content: @content, 
+              field: @attribute_field_to_question,
+              expand_by_default: true,
+              include_quick_reference: false
+            }
+          end
+        %>
+        <p class="text-xs text-gray-500 text-center">
+          <i class="material-icons text-xs mr-1"><%= @content.icon %></i>
+          Your answer will be automatically saved to your
+          <%= link_to @content.name, @content.view_path, class: "#{@content.text_color}", target: '_blank' %>
+          <%= @content.page_type.downcase %> page.
+        </p>
+      </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/main/dashboard.html.erb b/app/views/main/dashboard.html.erb
index 44fe0d9b..19b80012 100644
--- a/app/views/main/dashboard.html.erb
+++ b/app/views/main/dashboard.html.erb
@@ -50,15 +50,17 @@
 
       <div class="max-w-7xl mx-auto grid grid-cols-8 my-4 md:px-0 px-4 space-x-4">
         <div class="col-span-5">
-          <h2 class="text-sm leading-6 font-medium text-gray-500 mb-2 text-center">
-            Expand
-            <% if @universe_scope.present? %>
-              <%= link_to @universe_scope.name, @universe_scope, class: Universe.text_color %>
-            <% else %>
-              your worlds
-            <% end %>
-          </h2>
-          <%= render partial: 'main/components/serendipitous_question', locals: { } %>
+          <% if @content %>
+            <h2 class="text-sm leading-6 font-medium text-gray-500 mb-2 text-center">
+              Expand
+              <% if @universe_scope.present? %>
+                <%= link_to @universe_scope.name, @universe_scope, class: Universe.text_color %>
+              <% else %>
+                your worlds
+              <% end %>
+            </h2>
+            <%= render partial: 'main/components/serendipitous_question', locals: { } %>
+          <% end %>
 
           <h2 class="text-sm leading-6 font-medium text-gray-500 mb-2 text-center mt-4">
             Create a new page
@@ -72,10 +74,12 @@
           </h2>
           <%= render partial: 'main/components/active_discussions', locals: { discussions: @most_recent_threads } %>
 
-          <h2 class="text-sm leading-6 font-medium text-gray-500 hover:text-gray-800 mb-2 text-center">
-            <%= link_to 'Your recent edits', recent_content_path %>
-          </h2>
-          <%= render partial: 'main/components/recently_edited_pages', locals: { } %>
+          <% if @recently_edited_pages %>
+            <h2 class="text-sm leading-6 font-medium text-gray-500 hover:text-gray-800 mb-2 text-center">
+              <%= link_to 'Your recent edits', recent_content_path %>
+            </h2>
+            <%= render partial: 'main/components/recently_edited_pages', locals: { } %>
+          <% end %>
         </div>
       </div>
     </main>