diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index 088e1ce0b..d7207cfab 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -119,6 +119,19 @@ } } + .cards--related:not(:hover):not(.drag-and-drop__hover-container) { + .card { + box-shadow: 0 0 1px var(--color-ink-medium); + opacity: 0.9; + transition: box-shadow 450ms ease-in-out, opacity 150ms ease-in-out; + + @media (prefers-color-scheme: dark) { + opacity: 0.8; + transition: opacity 150ms ease-in-out; + } + } + } + /* Column elements /* ------------------------------------------------------------------------ */ diff --git a/app/controllers/accounts/entropy_configurations_controller.rb b/app/controllers/account/entropy_configurations_controller.rb similarity index 81% rename from app/controllers/accounts/entropy_configurations_controller.rb rename to app/controllers/account/entropy_configurations_controller.rb index 07e828242..f3e1b7ebd 100644 --- a/app/controllers/accounts/entropy_configurations_controller.rb +++ b/app/controllers/account/entropy_configurations_controller.rb @@ -1,4 +1,4 @@ -class Accounts::EntropyConfigurationsController < ApplicationController +class Account::EntropyConfigurationsController < ApplicationController def update Entropy::Configuration.default.update!(entropy_configuration_params) diff --git a/app/controllers/accounts/join_codes_controller.rb b/app/controllers/account/join_codes_controller.rb similarity index 78% rename from app/controllers/accounts/join_codes_controller.rb rename to app/controllers/account/join_codes_controller.rb index b6f08bf3c..5c981a2ba 100644 --- a/app/controllers/accounts/join_codes_controller.rb +++ b/app/controllers/account/join_codes_controller.rb @@ -1,4 +1,4 @@ -class Accounts::JoinCodesController < ApplicationController +class Account::JoinCodesController < ApplicationController def show render svg: RQRCode::QRCode.new(join_url(Account.sole.join_code)).as_svg(viewbox: true, fill: :white, color: :black) end diff --git a/app/controllers/accounts/settings_controller.rb b/app/controllers/account/settings_controller.rb similarity index 62% rename from app/controllers/accounts/settings_controller.rb rename to app/controllers/account/settings_controller.rb index e915ad10c..8bad68103 100644 --- a/app/controllers/accounts/settings_controller.rb +++ b/app/controllers/account/settings_controller.rb @@ -1,4 +1,4 @@ -class Accounts::SettingsController < ApplicationController +class Account::SettingsController < ApplicationController include FilterScoped def show diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index abb1e7947..b6b95418b 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -43,4 +43,17 @@ module FiltersHelper concat tag.kbd(key) end end + + def sorted_by_label(sort_value) + case sort_value + when "newest" + "Newest to oldest" + when "oldest" + "Oldest to newest" + when "latest" + "Recently updated" + else + sort_value.humanize + end + end end diff --git a/app/helpers/hotkeys_helper.rb b/app/helpers/hotkeys_helper.rb index 7bd0424d1..062f6ca2d 100644 --- a/app/helpers/hotkeys_helper.rb +++ b/app/helpers/hotkeys_helper.rb @@ -1,19 +1,14 @@ module HotkeysHelper + # Pass in an array of chorded keys, e.g. ["ctrl", "shift", "J"] def hotkey_label(hotkey) - hotkey.split(",").first if hotkey - case hotkey - when Array - hotkey.map { |key| - if key == "ctrl" && platform.mac? - "⌘" - elsif key == "enter" - platform.mac? ? "return" : "enter" - else - key - end - }.join() - else - hotkey.split(",").first if hotkey - end + hotkey.map do |key| + if key == "ctrl" && platform.mac? + "⌘" + elsif key == "enter" + platform.mac? ? "return" : "enter" + else + key + end.capitalize + end.join("+").gsub(/⌘\+/, "⌘") end end diff --git a/app/models/user.rb b/app/models/user.rb index af3ff9315..6c2cc14b8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ class User < ApplicationRecord - include Accessor, Attachable, Assignee, Mentionable, Named, Role, Searcher, - SignalUser, Staff, Transferable, Conversational, AiQuota + include Accessor, AiQuota, Assignee, Attachable, Mentionable, Named, Role, + Searcher, SignalUser, Staff, Transferable, Conversational include Timelined # Depends on Accessor has_one_attached :avatar diff --git a/app/models/user/filtering.rb b/app/models/user/filtering.rb index 448445c0b..065e3bfb0 100644 --- a/app/models/user/filtering.rb +++ b/app/models/user/filtering.rb @@ -56,6 +56,7 @@ class User::Filtering end def show_tags? + return unless Tag.any? expanded? || filter.tags.any? end diff --git a/app/views/accounts/_invite.html.erb b/app/views/account/_invite.html.erb similarity index 100% rename from app/views/accounts/_invite.html.erb rename to app/views/account/_invite.html.erb diff --git a/app/views/accounts/_user.html.erb b/app/views/account/_user.html.erb similarity index 100% rename from app/views/accounts/_user.html.erb rename to app/views/account/_user.html.erb diff --git a/app/views/accounts/settings/_entropy_configuration.html.erb b/app/views/account/settings/_entropy_configuration.html.erb similarity index 86% rename from app/views/accounts/settings/_entropy_configuration.html.erb rename to app/views/account/settings/_entropy_configuration.html.erb index 12dea2bbc..53992b1c4 100644 --- a/app/views/accounts/settings/_entropy_configuration.html.erb +++ b/app/views/account/settings/_entropy_configuration.html.erb @@ -1,5 +1,5 @@
-

Do or Die

+

Sink or Swim

Choose default settings for this account. You can override them in individual collections.

<%= render "entropy/auto_close", model: account.default_entropy_configuration, url: account_entropy_configuration_path %>
diff --git a/app/views/accounts/settings/_users.html.erb b/app/views/account/settings/_users.html.erb similarity index 83% rename from app/views/accounts/settings/_users.html.erb rename to app/views/account/settings/_users.html.erb index 6c834f0e6..cbcbaee50 100644 --- a/app/views/accounts/settings/_users.html.erb +++ b/app/views/account/settings/_users.html.erb @@ -5,13 +5,13 @@ navigable_list_actionable_items_value: true } do %>

People on the account

- <%#= render "accounts/invite" # Scheduled work in https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337 %> + <%#= render "account/invite" # Scheduled work in https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337 %>
diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb index d4122cab5..305b0fbed 100644 --- a/app/views/cards/index.html.erb +++ b/app/views/cards/index.html.erb @@ -36,7 +36,7 @@ dragover->drag-and-drop#dragOver drop->drag-and-drop#drop dragend->drag-and-drop#dragEnd" } do %> -
+
<%= render "cards/index/engagement/on_deck", **@on_deck.to_h %> <%= render "cards/index/engagement/considering", **@considering.to_h %> <%= render "cards/index/engagement/doing", **@doing.to_h %> diff --git a/app/views/cards/index/_workflow_filter.html.erb b/app/views/cards/index/_workflow_filter.html.erb index c5a610e70..d48ba88e0 100644 --- a/app/views/cards/index/_workflow_filter.html.erb +++ b/app/views/cards/index/_workflow_filter.html.erb @@ -1,9 +1,9 @@
diff --git a/app/views/cards/index/engagement/_considering.html.erb b/app/views/cards/index/engagement/_considering.html.erb index f445c1836..edc18a039 100644 --- a/app/views/cards/index/engagement/_considering.html.erb +++ b/app/views/cards/index/engagement/_considering.html.erb @@ -1,4 +1,9 @@ -
+
<%= render "cards/index/add_card_button", user_filtering: @user_filtering %> <% if page.used? %> diff --git a/app/views/cards/index/engagement/_doing.html.erb b/app/views/cards/index/engagement/_doing.html.erb index cf54fc057..b158ce3d6 100644 --- a/app/views/cards/index/engagement/_doing.html.erb +++ b/app/views/cards/index/engagement/_doing.html.erb @@ -1,9 +1,14 @@ -
+
<% if workflow = filter.single_workflow %> <%= render "cards/index/workflow_filter", workflow: workflow, filter: filter %> <% else %>

- Yes! + Working On

<% end %> diff --git a/app/views/cards/index/engagement/_on_deck.html.erb b/app/views/cards/index/engagement/_on_deck.html.erb index 4814dd817..44105b2f6 100644 --- a/app/views/cards/index/engagement/_on_deck.html.erb +++ b/app/views/cards/index/engagement/_on_deck.html.erb @@ -1,5 +1,10 @@ -
-

Maybe?

+
+

On Deck

<% if page.used? %> <%= render partial: "cards/display/preview", collection: page.records, as: :card, locals: { draggable: true }, cached: true %> diff --git a/app/views/collections/edit/_auto_close.html.erb b/app/views/collections/edit/_auto_close.html.erb index 127aab427..33c975269 100644 --- a/app/views/collections/edit/_auto_close.html.erb +++ b/app/views/collections/edit/_auto_close.html.erb @@ -1,4 +1,4 @@ <%= turbo_frame_tag @collection, :entropy_configuration do %> -

Do or Die

+

Sink or Swim

<%= render "entropy/auto_close", model: collection, url: collection_entropy_configuration_path(collection) %> <% end %> diff --git a/app/views/collections/edit/_delete.html.erb b/app/views/collections/edit/_delete.html.erb index 28952d515..a3d6eab5a 100644 --- a/app/views/collections/edit/_delete.html.erb +++ b/app/views/collections/edit/_delete.html.erb @@ -1,6 +1,8 @@ -<%= form_with model: collection, class: "txt-align-center margin-block-start-auto", method: :delete do |form| %> - <%= form.button class: "btn txt-negative borderless txt-small", data: { turbo_confirm: "Are you sure you want to permanently delete this Collection?" } do %> - <%= icon_tag "trash" %> - Delete this Collection +<% if Current.user.collections.many? %> + <%= form_with model: collection, class: "txt-align-center margin-block-start-auto", method: :delete do |form| %> + <%= form.button class: "btn txt-negative borderless txt-small", data: { turbo_confirm: "Are you sure you want to permanently delete this Collection?" } do %> + <%= icon_tag "trash" %> + Delete this Collection + <% end %> <% end %> <% end %> diff --git a/app/views/entropy/_auto_close.html.erb b/app/views/entropy/_auto_close.html.erb index f25b4cc5f..c7ce89d34 100644 --- a/app/views/entropy/_auto_close.html.erb +++ b/app/views/entropy/_auto_close.html.erb @@ -16,7 +16,7 @@
- Cards in Maybe?/Yes! + Cards in On Deck/Working On

Back to The Stream after…

<%= form_with model: model, url: url, data: { controller: "form" } do |form| %> <%= render "entropy/knob", diff --git a/app/views/filters/menu/collections/_all_option.html.erb b/app/views/filters/menu/collections/_all_option.html.erb index b499eb0eb..d5b5ade05 100644 --- a/app/views/filters/menu/collections/_all_option.html.erb +++ b/app/views/filters/menu/collections/_all_option.html.erb @@ -1,13 +1,6 @@ <% clear_url_path = user_filtering.self_filter_path(user_filtering.as_params.except(:collection_ids)) %> -<% if Current.user.collections.one? %> - <%= link_to clear_url_path, class: "popup__group", id: "filter-collection-init", data: { filter_target: "item", navigable_list_target: "item" } do %> - <%= tag.div class: "popup__item btn" do %> - <%= Current.user.collections.first.name %> - GO TO › - <% end %> - <% end %> -<% elsif Current.user.collections.many? %> +<% if Current.user.collections.many? %>
  • <%= link_to clear_url_path, class: "btn txt-xx-small flex-item-no-shrink" do %> <%= check_box_tag "filter_collections", nil, user_filtering.collections.blank?, class: "form-checkbox" %> diff --git a/app/views/filters/settings/_sorted_by.html.erb b/app/views/filters/settings/_sorted_by.html.erb index d2fe0b247..ccd7ef853 100644 --- a/app/views/filters/settings/_sorted_by.html.erb +++ b/app/views/filters/settings/_sorted_by.html.erb @@ -4,7 +4,7 @@
    " data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside"> @@ -26,7 +26,7 @@ <% end %> <%= form.button type: "submit", class: "popup__item btn" do %> - <%= sort.humanize %> + <%= sorted_by_label(sort) %> <% if filter.sorted_by == sort %> <%= icon_tag "check", class: "checked flex-item-justify-end" %> <% end %> diff --git a/app/views/public/collections/show/_doing.html.erb b/app/views/public/collections/show/_doing.html.erb index 557dbd7ff..d072bc614 100644 --- a/app/views/public/collections/show/_doing.html.erb +++ b/app/views/public/collections/show/_doing.html.erb @@ -1,6 +1,6 @@ -
    +

    - Yes! + Working On

    <% if page.used? %> diff --git a/app/views/public/collections/show/_on_deck.html.erb b/app/views/public/collections/show/_on_deck.html.erb index 127e0cf50..5494a2917 100644 --- a/app/views/public/collections/show/_on_deck.html.erb +++ b/app/views/public/collections/show/_on_deck.html.erb @@ -1,6 +1,6 @@

    - Maybe? + On Deck

    <% if page.used? %> diff --git a/config/routes.rb b/config/routes.rb index 6d55b04e5..985445f66 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,8 @@ Rails.application.routes.draw do - resource :account do - resource :join_code, module: :accounts - - scope module: :accounts do - resource :settings - resource :entropy_configuration - end + namespace :account do + resource :join_code + resource :settings + resource :entropy_configuration end resources :users do diff --git a/test/controllers/accounts/entropy_configurations_controller_test.rb b/test/controllers/accounts/entropy_configurations_controller_test.rb index b888b8deb..9d477ca24 100644 --- a/test/controllers/accounts/entropy_configurations_controller_test.rb +++ b/test/controllers/accounts/entropy_configurations_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class Accounts::EntropyConfigurationsControllerTest < ActionDispatch::IntegrationTest +class Account::EntropyConfigurationsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :kevin end diff --git a/test/controllers/accounts/settings_controller_test.rb b/test/controllers/accounts/settings_controller_test.rb index 606245612..d475ad40d 100644 --- a/test/controllers/accounts/settings_controller_test.rb +++ b/test/controllers/accounts/settings_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class Accounts::SettingsControllerTest < ActionDispatch::IntegrationTest +class Account::SettingsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :kevin end diff --git a/test/helpers/hotkeys_helper_test.rb b/test/helpers/hotkeys_helper_test.rb new file mode 100644 index 000000000..ec96f6c9c --- /dev/null +++ b/test/helpers/hotkeys_helper_test.rb @@ -0,0 +1,52 @@ +require "test_helper" + +class HotkeysHelperTest < ActionView::TestCase + include SetPlatform + + test "mac modifier key" do + emulate_mac + + assert_equal "⌘J", hotkey_label([ "⌘", "J" ]) + end + + test "linux modifier key" do + emulate_linux + + assert_equal "Ctrl+J", hotkey_label([ "ctrl", "J" ]) + end + + test "mac enter" do + emulate_mac + + assert_equal "Return+J", hotkey_label([ "enter", "J" ]) + end + + test "linux enter" do + emulate_linux + + assert_equal "Enter+J", hotkey_label([ "enter", "J" ]) + end + + test "mac hyper" do + emulate_mac + + assert_equal "Hyper+J", hotkey_label([ "hyper", "J" ]) + end + + test "linux hyper" do + emulate_linux + + assert_equal "Hyper+J", hotkey_label([ "hyper", "J" ]) + end + + private + def emulate_mac + stub_platform = ApplicationPlatform.new("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.114 Safari/537.36") + self.stubs(:platform).returns(stub_platform) + end + + def emulate_linux + stub_platform = ApplicationPlatform.new("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.114 Safari/537.36") + self.stubs(:platform).returns(stub_platform) + end +end diff --git a/test/routes_test.rb b/test/routes_test.rb new file mode 100644 index 000000000..d1663037b --- /dev/null +++ b/test/routes_test.rb @@ -0,0 +1,15 @@ +require "test_helper" + +class RouteTest < ActionDispatch::IntegrationTest + test "account/join_code" do + assert_recognizes({ controller: "account/join_codes", action: "show" }, "/account/join_code") + end + + test "account/settings" do + assert_recognizes({ controller: "account/settings", action: "show" }, "/account/settings") + end + + test "account/entropy_configuration" do + assert_recognizes({ controller: "account/entropy_configurations", action: "show" }, "/account/entropy_configuration") + end +end