wip polish

This commit is contained in:
Andrew Brown 2023-02-13 21:47:36 -08:00
parent fa997fcc98
commit 2026fe6ee9
4 changed files with 50 additions and 42 deletions

View File

@ -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'

View File

@ -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

View File

@ -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>
<% end %>

View File

@ -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>