From 124960edd804c153c7d8b102c443e21ffe799c46 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 21 Apr 2023 14:22:31 -0700 Subject: [PATCH] polish on multiverse, notifications, and page type toggling --- .../customization/content_types.html.erb | 32 ++++++++++++------- .../tailwind/navbar/_logged_in.html.erb | 11 +++++++ app/views/universes/hub.html.erb | 6 ++-- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/app/views/customization/content_types.html.erb b/app/views/customization/content_types.html.erb index 4a7128ad..18fcd4c3 100644 --- a/app/views/customization/content_types.html.erb +++ b/app/views/customization/content_types.html.erb @@ -24,9 +24,9 @@ -

Choose your page templates

+

Choose your page types

- Add or remove templates across the site at any time by toggling them here. Disabled templates are hidden, but not deleted. + Add or remove page types across the site at any time by toggling them here. Disabled page types are simply hidden, not deleted.

@@ -48,11 +48,11 @@

Customize your templates

- Each page template comes with a thorough set of categories and questions — which you can fully customize. + Each page type comes with an in-depth template of fully-customizable categories and questions.

- Learn about templates + Learn about templates
@@ -69,8 +69,9 @@

- <%= link_to 'https://docs.google.com/forms/d/1PFOaa97Cu3vrceUvcuFT6nyITaMwR-4wQSarUdVoPSg/edit', target: '_new', class: 'text-base font-medium text-indigo-700 hover:text-indigo-600' do %> - Suggest a new template + <%= link_to 'https://docs.google.com/forms/d/1PFOaa97Cu3vrceUvcuFT6nyITaMwR-4wQSarUdVoPSg/edit', target: '_new', class: 'text-base font-medium text-notebook-blue hover:text-blue-600' do %> + Suggest a new page type + <% end %>
@@ -131,7 +132,10 @@ <% if user_signed_in? %> You've created <%= pluralize @current_user_content.fetch(content_type.name, []).count, "page" %> with this template. <% else %> - Users have created <%= pluralize content_type.last.try(:id) || 0, "page" %> with this template. + Users have created + <%= number_with_delimiter content_type.last.try(:id) || 0 %> + <%= "page".pluralize content_type.last.try(:id) || 0 %> + with this template. <% end %> @@ -227,7 +231,10 @@ <% if user_signed_in? %> You've created <%= pluralize @current_user_content.fetch('Universe', []).count, "page" %> with this template. <% else %> - Users have created <%= pluralize Universe.last.try(:id) || 0, "page" %> with this template. + Users have created + <%= number_with_delimiter Universe.last.try(:id) || 0 %> + <%= "universe".pluralize Universe.last.try(:id) || 0 %> + with this template. <% end %> @@ -259,9 +266,9 @@ <% else %> - <%= link_to send("#{content_type.name.downcase}_worldbuilding_info_path") do %> + <%= link_to send("#{Universe.name.downcase}_worldbuilding_info_path") do %> <% end %> <% end %> @@ -345,7 +352,10 @@ <% if user_signed_in? %> You've created <%= pluralize @current_user_content.fetch(content_type.name, []).count, "page" %> with this template. <% else %> - Users have created <%= pluralize content_type.last.try(:id) || 0, "page" %> with this template. + Users have created + <%= number_with_delimiter content_type.last.try(:id) || 0 %> + <%= "page".pluralize content_type.last.try(:id) || 0 %> + with this template. <% end %> diff --git a/app/views/layouts/tailwind/navbar/_logged_in.html.erb b/app/views/layouts/tailwind/navbar/_logged_in.html.erb index 08d04ea6..7e0d4128 100644 --- a/app/views/layouts/tailwind/navbar/_logged_in.html.erb +++ b/app/views/layouts/tailwind/navbar/_logged_in.html.erb @@ -62,6 +62,17 @@ <% end %> <% end %> + <% if @user_notifications.empty? %> +
+ + + + + Your notifications will appear here
+ ..when you have any! + +
+ <% end %> <%= link_to main_app.mark_all_read_path, class: 'block bg-blue-100 hover:bg-blue-50 text-black text-center py-2' do %> Mark all notifications read <% end %> diff --git a/app/views/universes/hub.html.erb b/app/views/universes/hub.html.erb index f6d4565b..5a2d7d0c 100644 --- a/app/views/universes/hub.html.erb +++ b/app/views/universes/hub.html.erb @@ -12,7 +12,7 @@

Universes are a convenient way to organize your notebook pages into separate worlds. - You can click FOCUS on any universe below to filter your entire notebook to just that universe — + You can click fullscreenFOCUS on any universe below to filter your entire notebook to just that universe — and focus on just the world you're working on.

@@ -56,7 +56,9 @@ <% @current_user_content.fetch('Universe', []).each do |universe| %>
  • - <%= image_tag universe.random_image_including_private, class: 'w-48 h-48 flex-shrink-0 mx-auto rounded-full border-2 border-purple-800' %> + <%= link_to universe.view_path do %> + <%= image_tag universe.random_image_including_private, class: 'w-48 h-48 flex-shrink-0 mx-auto rounded-full border-2 border-purple-800 hover:opacity-80' %> + <% end %>

    <%= universe.name %>

    <%= universe.description %>