From 0747eadb816f9c1865b64c43c9c9651280ba8ee2 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 21 Nov 2025 14:10:46 -0600 Subject: [PATCH 01/12] For some reason 1pw wants to fill this field, avoid overflow --- app/assets/stylesheets/steps.css | 3 ++- app/views/cards/display/perma/_steps.html.erb | 4 ++-- app/views/cards/steps/edit.html.erb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/steps.css b/app/assets/stylesheets/steps.css index 3e271137f..f106859ac 100644 --- a/app/assets/stylesheets/steps.css +++ b/app/assets/stylesheets/steps.css @@ -33,7 +33,7 @@ transform-origin: center; transition: 150ms transform ease-in-out; } - + &:checked::before { transform: scale(1) rotate(10deg); } @@ -73,6 +73,7 @@ @supports (field-sizing: content) { field-sizing: content; + max-inline-size: 100%; min-inline-size: 15ch; } } diff --git a/app/views/cards/display/perma/_steps.html.erb b/app/views/cards/display/perma/_steps.html.erb index 6cca251d2..f65892324 100644 --- a/app/views/cards/display/perma/_steps.html.erb +++ b/app/views/cards/display/perma/_steps.html.erb @@ -3,8 +3,8 @@
  • - <%= form_with model: [card, Step.new], url: card_steps_path(card), data: { controller: "form", action: "submit->form#preventEmptySubmit turbo:submit-end->form#reset" } do |form| %> - <%= form.text_field :content, class: "input step__content hide-focus-ring", placeholder: "Add a step…", autocomplete: "off", data: { form_target: "input" }, aria: { label: "Add a step" } %> + <%= form_with model: [card, Step.new], url: card_steps_path(card), class: "min-width", data: { controller: "form", action: "submit->form#preventEmptySubmit turbo:submit-end->form#reset" } do |form| %> + <%= form.text_field :content, class: "input step__content hide-focus-ring", placeholder: "Add a step…", autocomplete: "off", data: { form_target: "input", "1p-ignore": "true" }, aria: { label: "Add a step" } %> <% end %>
    • diff --git a/app/views/cards/steps/edit.html.erb b/app/views/cards/steps/edit.html.erb index 7114c1c5e..9784fe6ac 100644 --- a/app/views/cards/steps/edit.html.erb +++ b/app/views/cards/steps/edit.html.erb @@ -3,7 +3,7 @@ <%= form_with model: [@card, @step], class: "step", data: { controller: "form" } do |form| %> <%= form.check_box :completed, { class: "step__checkbox", checked: @step.completed?, disabled: true } %> <%= form.text_field :content, class: "input step__content step__content--edit hide-focus-ring", placeholder: "Name this step…", required: true, autofocus: true, autocomplete: "off", - data: { action: "keydown.esc->form#cancel focus->form#select" } %> + data: { action: "keydown.esc->form#cancel focus->form#select", "1p-ignore": "true" } %> <%= form.button type: "submit", class: "btn btn--positive txt-xx-small" do %> <%= icon_tag "check" %> Save changes From 5aaaeab5eab2c94f0d3f204d8d1deff0a8b1b960 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 21 Nov 2025 14:17:41 -0600 Subject: [PATCH 02/12] Try the edit button on the bottom line --- app/views/cards/container/_closure.html.erb | 19 +++++++++++++------ app/views/cards/container/_title.html.erb | 5 ----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb index 941122578..0093fc664 100644 --- a/app/views/cards/container/_closure.html.erb +++ b/app/views/cards/container/_closure.html.erb @@ -7,12 +7,19 @@ <% end %> <% else %> - <%= button_to card_closure_path(card), class: "btn borderless", - data: { controller: "hotkey", form_target: "submit", action: "keydown.d@document->hotkey#click" }, - form: { data: { controller: "form" } } do %> - Mark as Done - d - <% end %> +
    + <%= link_to edit_card_path(card), class: "btn borderless", data: { controller: "hotkey", action: "keydown.e@document->hotkey#click" } do %> + Edit + e + <% end %> + + <%= button_to card_closure_path(card), class: "btn borderless", + data: { controller: "hotkey", form_target: "submit", action: "keydown.d@document->hotkey#click" }, + form: { data: { controller: "form" } } do %> + Mark as Done + d + <% end %> +
    <% if card.entropic? && card.open? && !card.postponed? %> diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb index 15f1ed856..179659d71 100644 --- a/app/views/cards/container/_title.html.erb +++ b/app/views/cards/container/_title.html.erb @@ -10,11 +10,6 @@ <%= card.description %>
    <% end %> - - <%= link_to edit_card_path(card), class: "btn fit-content txt-small", data: { controller: "hotkey", action: "keydown.e@document->hotkey#click" } do %> - Edit - e - <% end %> <% end %> <% else %> From c8012ef4d4728e6c29ba00e0b5ca8c225e182ef9 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 21 Nov 2025 14:29:22 -0600 Subject: [PATCH 03/12] Improve assignments picker when few/short names --- app/views/cards/assignments/new.html.erb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb index 07ad6531b..ee7f38c2d 100644 --- a/app/views/cards/assignments/new.html.erb +++ b/app/views/cards/assignments/new.html.erb @@ -1,5 +1,5 @@ <%= turbo_frame_tag @card, :assignment do %> - <%= tag.div class: "max-width", data: { + <%= tag.div class: "max-width full-width", data: { action: "turbo:before-cache@document->dialog#close dialog:show@document->navigable-list#reset keydown->navigable-list#navigate filter:changed->navigable-list#reset", controller: "filter navigable-list", dialog_target: "dialog", @@ -11,10 +11,8 @@ a - <% if @users.many? %> - <%= text_field_tag :search, nil, placeholder: "Filter…", class: "input input--transparent txt-small margin-block-half", autofocus: true, - type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %> - <% end %> + <%= text_field_tag :search, nil, placeholder: "Filter…", class: "input input--transparent txt-small margin-block-half", autofocus: true, + type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
      <% @users.each do |user| %> From a9bbd9d5397aa1a93b24b391c464f6e9fd56418d Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 21 Nov 2025 16:07:36 -0600 Subject: [PATCH 04/12] Special handling on mobile --- app/assets/stylesheets/buttons.css | 6 ++++++ app/views/cards/container/_closure.html.erb | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/buttons.css b/app/assets/stylesheets/buttons.css index 69c2a682d..a4e7199e0 100644 --- a/app/assets/stylesheets/buttons.css +++ b/app/assets/stylesheets/buttons.css @@ -113,7 +113,12 @@ span:last-of-type { display: none; } + } + } + @media (min-width: 640px) { + .btn--circle-mobile .icon--mobile-only { + display: none !important; } } @@ -221,6 +226,7 @@ } } + /* Button groups /* ------------------------------------------------------------------------ */ diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb index 0093fc664..f14e602b0 100644 --- a/app/views/cards/container/_closure.html.erb +++ b/app/views/cards/container/_closure.html.erb @@ -8,14 +8,16 @@ <% else %>
      - <%= link_to edit_card_path(card), class: "btn borderless", data: { controller: "hotkey", action: "keydown.e@document->hotkey#click" } do %> + <%= link_to edit_card_path(card), class: "btn btn--circle-mobile borderless", data: { controller: "hotkey", action: "keydown.e@document->hotkey#click" } do %> + <%= icon_tag "pencil", class: "icon--mobile-only" %> Edit e <% end %> - <%= button_to card_closure_path(card), class: "btn borderless", + <%= button_to card_closure_path(card), class: "btn btn--circle-mobile borderless", data: { controller: "hotkey", form_target: "submit", action: "keydown.d@document->hotkey#click" }, form: { data: { controller: "form" } } do %> + <%= icon_tag "check", class: "icon--mobile-only" %> Mark as Done d <% end %> From af0e2488d0cca1a22c63d4dc6bdc0685002cb192 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 21 Nov 2025 13:47:34 -0500 Subject: [PATCH 05/12] Improve avatar image handling - redirect avatar image requests to the rails_blob_url, instead of streaming them through the web app - use a thumbnail variant for avatar images - only put avatar initials behind the stale? check (not the image redirect, which would result in browsers rendering broken images when an avatar is changed, until max-age expires) --- app/controllers/users/avatars_controller.rb | 14 ++++-------- app/models/user.rb | 4 +++- .../users/avatars_controller_test.rb | 22 +++++++++++++++++-- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/app/controllers/users/avatars_controller.rb b/app/controllers/users/avatars_controller.rb index 76b2825ed..9101ee401 100644 --- a/app/controllers/users/avatars_controller.rb +++ b/app/controllers/users/avatars_controller.rb @@ -7,8 +7,10 @@ class Users::AvatarsController < ApplicationController before_action :ensure_permission_to_administer_user, only: :destroy def show - if stale? @user, cache_control: cache_control - render_avatar_or_initials + if @user.avatar.attached? + redirect_to rails_blob_url(@user.avatar.variant(:thumb), disposition: "inline") + elsif stale? @user, cache_control: cache_control + render_initials end end @@ -34,14 +36,6 @@ class Users::AvatarsController < ApplicationController end end - def render_avatar_or_initials - if @user.avatar.attached? - send_blob_stream @user.avatar - else - render_initials - end - end - def render_initials render formats: :svg end diff --git a/app/models/user.rb b/app/models/user.rb index 4458712a5..94380b8d9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,7 +3,9 @@ class User < ApplicationRecord Mentionable, Named, Notifiable, Role, Searcher, Watcher include Timelined # Depends on Accessor - has_one_attached :avatar + has_one_attached :avatar do |attachable| + attachable.variant :thumb, resize_to_limit: [ 256, 256 ] + end belongs_to :account belongs_to :identity, optional: true diff --git a/test/controllers/users/avatars_controller_test.rb b/test/controllers/users/avatars_controller_test.rb index f23044ef3..afdf89e1a 100644 --- a/test/controllers/users/avatars_controller_test.rb +++ b/test/controllers/users/avatars_controller_test.rb @@ -5,19 +5,37 @@ class Users::AvatarsControllerTest < ActionDispatch::IntegrationTest sign_in_as :david end - test "show self without caching" do + test "show own initials without caching" do get user_avatar_path(users(:david)) assert_match "image/svg+xml", @response.content_type assert @response.cache_control[:private] assert_equal "0", @response.cache_control[:max_age] end - test "show other with caching" do + test "show other initials with caching" do get user_avatar_path(users(:kevin)) assert_match "image/svg+xml", @response.content_type assert_equal 30.minutes.to_s, @response.cache_control[:max_age] end + test "show own image redirects to the blob url" do + users(:david).avatar.attach(io: File.open(file_fixture("moon.jpg")), filename: "moon.jpg", content_type: "image/jpeg") + assert users(:david).avatar.attached? + + get user_avatar_path(users(:david)) + + assert_redirected_to rails_blob_url(users(:david).avatar.variant(:thumb), disposition: "inline") + end + + test "show other image redirects to the blob url" do + users(:kevin).avatar.attach(io: File.open(file_fixture("moon.jpg")), filename: "moon.jpg", content_type: "image/jpeg") + assert users(:kevin).avatar.attached? + + get user_avatar_path(users(:kevin)) + + assert_redirected_to rails_blob_url(users(:kevin).avatar.variant(:thumb), disposition: "inline") + end + test "delete self" do delete user_avatar_path(users(:david)) assert_redirected_to users(:david) From ec8974640f47eae73f434c36d3540eab7bfab60c Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 21 Nov 2025 16:07:47 -0500 Subject: [PATCH 06/12] User avatar responses have cache-control "public" ref: https://app.fizzy.do/5986089/cards/3125 --- app/controllers/users/avatars_controller.rb | 2 +- test/controllers/users/avatars_controller_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/users/avatars_controller.rb b/app/controllers/users/avatars_controller.rb index 9101ee401..39dda87f8 100644 --- a/app/controllers/users/avatars_controller.rb +++ b/app/controllers/users/avatars_controller.rb @@ -32,7 +32,7 @@ class Users::AvatarsController < ApplicationController if @user == Current.user {} else - { max_age: 30.minutes, stale_while_revalidate: 1.week } + { max_age: 30.minutes, stale_while_revalidate: 1.week, public: true } end end diff --git a/test/controllers/users/avatars_controller_test.rb b/test/controllers/users/avatars_controller_test.rb index afdf89e1a..9d39c0fa9 100644 --- a/test/controllers/users/avatars_controller_test.rb +++ b/test/controllers/users/avatars_controller_test.rb @@ -15,6 +15,7 @@ class Users::AvatarsControllerTest < ActionDispatch::IntegrationTest test "show other initials with caching" do get user_avatar_path(users(:kevin)) assert_match "image/svg+xml", @response.content_type + assert @response.cache_control[:public] assert_equal 30.minutes.to_s, @response.cache_control[:max_age] end From ec0681bbed0dd9a75097354c14134946337fd3f1 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Fri, 21 Nov 2025 14:32:10 -0600 Subject: [PATCH 07/12] Better focus and clearing when searching --- app/assets/stylesheets/card-columns.css | 4 ++++ app/javascript/controllers/bar_controller.js | 10 +++++++++- app/views/searches/_form.html.erb | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index 633281269..5fda5823b 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -176,6 +176,10 @@ [aria-selected] & .card[aria-selected] { outline: var(--focus-ring-size) solid var(--color-selected-dark); outline-offset: var(--focus-ring-offset); + + @media (prefers-color-scheme: dark) { + outline-color: oklch(var(--lch-blue-medium)); + } } } diff --git a/app/javascript/controllers/bar_controller.js b/app/javascript/controllers/bar_controller.js index 6b10a27b4..941b791f6 100644 --- a/app/javascript/controllers/bar_controller.js +++ b/app/javascript/controllers/bar_controller.js @@ -1,5 +1,6 @@ import { Controller } from "@hotwired/stimulus" import { post } from "@rails/request.js" +import { nextFrame } from "helpers/timing_helpers"; export default class extends Controller { static targets = [ "turboFrame", "search", "searchInput", "form", "buttonsContainer" ] @@ -21,6 +22,11 @@ export default class extends Controller { this.#hideItem(this.searchTarget) } + clearInput() { + this.searchInputTarget.value = "" + this.searchInputTarget.focus() + } + showModalAndSubmit(event) { this.showModal() this.formTarget.requestSubmit() @@ -50,10 +56,12 @@ export default class extends Controller { this.turboFrameTarget.innerHtml = "" } - #showItem(element) { + async #showItem(element) { element.removeAttribute("hidden") const autofocusElement = element.querySelector("[autofocus]") + + await nextFrame() autofocusElement?.focus() autofocusElement?.select() } diff --git a/app/views/searches/_form.html.erb b/app/views/searches/_form.html.erb index f9a1b778a..11fcc853f 100644 --- a/app/views/searches/_form.html.erb +++ b/app/views/searches/_form.html.erb @@ -9,7 +9,7 @@ data: { bar_target: "searchInput", action: "keydown.enter->bar#showModalAndSubmit:prevent keydown.esc->bar#reset" } %> - From 3399b00139a98638f32f8dfc25c9ac7a33b93c93 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Fri, 21 Nov 2025 15:17:17 -0600 Subject: [PATCH 08/12] Ability to close search when input is empty --- app/javascript/controllers/bar_controller.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/javascript/controllers/bar_controller.js b/app/javascript/controllers/bar_controller.js index 941b791f6..a1fb7e144 100644 --- a/app/javascript/controllers/bar_controller.js +++ b/app/javascript/controllers/bar_controller.js @@ -23,8 +23,12 @@ export default class extends Controller { } clearInput() { - this.searchInputTarget.value = "" - this.searchInputTarget.focus() + if (this.searchInputTarget.value) { + this.searchInputTarget.value = "" + this.searchInputTarget.focus() + } else { + this.reset() + } } showModalAndSubmit(event) { From 2141dfc9b87a9bde18741aeccbd988dbbc259fdc Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 21 Nov 2025 16:31:07 -0600 Subject: [PATCH 09/12] Copy edits --- app/views/join_codes/inactive.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/join_codes/inactive.html.erb b/app/views/join_codes/inactive.html.erb index 1bddb6e42..375a0e6cc 100644 --- a/app/views/join_codes/inactive.html.erb +++ b/app/views/join_codes/inactive.html.erb @@ -1,12 +1,12 @@ -<% @page_title = "You can't join #{@join_code.account.name} right now." %> +<% @page_title = "That code is all used up" %>

      <%= @page_title %>

      -

      This join code has no invitations left on it.

      +

      Ask someone from <%= @join_code.account.name %> to send you a new link or increase the limit.

      - <%= link_to "Check out Fizzy", "https://www.fizzy.do" %>. + <%= link_to "OK", "https://www.fizzy.do", class: "btn btn--link" %>

      From d3365e4ac29e68204bdeb38928534973e4472e2e Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 21 Nov 2025 16:37:06 -0600 Subject: [PATCH 10/12] Typo --- app/assets/stylesheets/reactions.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/reactions.css b/app/assets/stylesheets/reactions.css index 80bde798a..898e999d1 100644 --- a/app/assets/stylesheets/reactions.css +++ b/app/assets/stylesheets/reactions.css @@ -75,7 +75,7 @@ max-inline-size: 100%; opacity: 1; padding: 0.1em 0.12em; - postion: relative; + position: relative; transition: opacity 100ms ease-in-out, transform 150ms ease-in-out; .btn { From 805c505f8da6fc4340d528ab7268b0050e07a833 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 21 Nov 2025 16:48:40 -0600 Subject: [PATCH 11/12] Fussy padding tweaks on boosts --- app/assets/stylesheets/reactions.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/reactions.css b/app/assets/stylesheets/reactions.css index 898e999d1..d736b03cb 100644 --- a/app/assets/stylesheets/reactions.css +++ b/app/assets/stylesheets/reactions.css @@ -74,10 +74,14 @@ gap: 0.25ch; max-inline-size: 100%; opacity: 1; - padding: 0.1em 0.12em; + padding: 0.1em 0.36em 0.1em 0.12em; position: relative; transition: opacity 100ms ease-in-out, transform 150ms ease-in-out; + &:has(span.txt-small.txt-medium) { /* emoji only reactions */ + padding: 0.1em 0.12em; + } + .btn { font-size: 0.6em; inline-size: auto; From 0482d3b5badb1f720472093f98c5c52d45cac340 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 21 Nov 2025 17:08:04 -0600 Subject: [PATCH 12/12] Update test --- test/controllers/join_codes_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/join_codes_controller_test.rb b/test/controllers/join_codes_controller_test.rb index de126abd8..9b386cb8f 100644 --- a/test/controllers/join_codes_controller_test.rb +++ b/test/controllers/join_codes_controller_test.rb @@ -25,7 +25,7 @@ class JoinCodesControllerTest < ActionDispatch::IntegrationTest get join_path(code: @join_code.code, script_name: @account.slug) assert_response :gone - assert_in_body "This join code has no invitations left on it" + assert_in_body "That code is all used up" end test "create" do