From c0f3ff46d76d967b6c22d00e02c1e18ceec86629 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 7 Apr 2025 21:39:18 +0200 Subject: [PATCH 01/21] Reorder for better grouping --- config/routes.rb | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 91b6559c8..f2198ab37 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - root "events#index" + resource :first_run resource :account do scope module: :accounts do @@ -59,8 +59,11 @@ Rails.application.routes.draw do resources :days end + resources :workflows do + resources :stages, module: :workflows + end + resources :filters - resource :first_run resources :qr_codes namespace :my do @@ -73,25 +76,14 @@ Rails.application.routes.draw do end end - resources :uploads, only: :create - get "/u/*slug" => "uploads#show", as: :upload - resources :users do scope module: :users do resource :avatar end end - resources :workflows do - resources :stages, module: :workflows - end - get "join/:join_code", to: "users#new", as: :join post "join/:join_code", to: "users#create" - get "up", to: "rails/health#show", as: :rails_health_check - get "manifest" => "rails/pwa#manifest", as: :pwa_manifest - - resource :terminal, only: [ :show, :edit ] resolve "Bubble" do |bubble, options| route_for :bucket_bubble, bubble.bucket, bubble, options @@ -101,4 +93,9 @@ Rails.application.routes.draw do options[:anchor] = ActionView::RecordIdentifier.dom_id(comment) route_for :bucket_bubble, comment.bubble.bucket, comment.bubble, options end + + get "up", to: "rails/health#show", as: :rails_health_check + get "manifest" => "rails/pwa#manifest", as: :pwa_manifest + + root "events#index" end From d992ba7ede0c6a43b54ab23790f75464c37487cc Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Mon, 7 Apr 2025 15:01:06 -0500 Subject: [PATCH 02/21] Perma cards should not always be 100% width --- app/views/bubbles/cards/_perma.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/bubbles/cards/_perma.html.erb b/app/views/bubbles/cards/_perma.html.erb index 4dd1dc684..281ce1ff8 100644 --- a/app/views/bubbles/cards/_perma.html.erb +++ b/app/views/bubbles/cards/_perma.html.erb @@ -1,5 +1,5 @@ <% cache bubble do %> -
From c3c4823c95069893beb8f5d5368fe01fce5fe307 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 7 Apr 2025 15:44:38 -0500 Subject: [PATCH 03/21] Fix visual regression in popup menus --- app/views/bubbles/assignments/new.html.erb | 8 ++++---- app/views/bubbles/taggings/new.html.erb | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/bubbles/assignments/new.html.erb b/app/views/bubbles/assignments/new.html.erb index e130994ae..286573068 100644 --- a/app/views/bubbles/assignments/new.html.erb +++ b/app/views/bubbles/assignments/new.html.erb @@ -4,10 +4,10 @@
<% @bubble.bucket.users.active.alphabetically.each do |user| %> -
- <%= button_to user.name, bubble_assignments_path(@bubble, params: { assignee_id: user.id }), method: :post %> - <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.assignees.include?(user) %> -
+ <%= button_to bubble_assignments_path(@bubble, params: { assignee_id: user.id }), method: :post, class: "btn popup__item full-width" do %> + <%= user.name %> + <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.assignees.include?(user) %> + <% end %> <% end %>
diff --git a/app/views/bubbles/taggings/new.html.erb b/app/views/bubbles/taggings/new.html.erb index 28ba578f7..4122a8f1d 100644 --- a/app/views/bubbles/taggings/new.html.erb +++ b/app/views/bubbles/taggings/new.html.erb @@ -10,12 +10,12 @@ <% end %> <% end %> -
+
<% @tags.each do |tag| %> -
- <%= button_to tag.hashtag, bubble_taggings_path(@bubble, params: { tag_title: tag.title }), method: :post %> - <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.tagged_with?(tag) %> -
+ <%= button_to bubble_taggings_path(@bubble, params: { tag_title: tag.title }), method: :post, class: "btn full-width popup__item" do %> + <%= tag.hashtag %> + <%= icon_tag "check", size: 18, class: "checked flex-item-justify-end" if @bubble.tagged_with?(tag) %> + <% end %> <% end %>
From d251320e1da65d4c2e158d729815c4a203ef94e3 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 7 Apr 2025 15:45:18 -0500 Subject: [PATCH 04/21] Retore route removed in c0f3ff46d76d967b6c22d00e02c1e18ceec86629 --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index f2198ab37..0c2c74b8b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -97,5 +97,7 @@ Rails.application.routes.draw do get "up", to: "rails/health#show", as: :rails_health_check get "manifest" => "rails/pwa#manifest", as: :pwa_manifest + resource :terminal, only: [ :show, :edit ] + root "events#index" end From 6082c7863ac839e09beaa41b4c2d7822ef6fbe6d Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 7 Apr 2025 15:49:49 -0500 Subject: [PATCH 05/21] Restore additional missing routes removed in c0f3ff46d76d967b6c22d00e02c1e18ceec86629 --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 0c2c74b8b..2508ae3b0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -97,6 +97,9 @@ Rails.application.routes.draw do get "up", to: "rails/health#show", as: :rails_health_check get "manifest" => "rails/pwa#manifest", as: :pwa_manifest + resources :uploads, only: :create + get "/u/*slug" => "uploads#show", as: :upload + resource :terminal, only: [ :show, :edit ] root "events#index" From 7a545f5afd9e2d59905089b1be4610263afedfc0 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 7 Apr 2025 21:48:17 -0500 Subject: [PATCH 06/21] Tighten up --- app/assets/stylesheets/cards.css | 26 +++++++++++++++++++------- app/views/bubbles/show.html.erb | 7 +++---- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 1b9231cae..d6352661b 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -112,9 +112,12 @@ } .card__actions-container { + --border-radius: 1em; + background-color: var(--color-bg); - margin-block: calc(var(--block-space) * -1) var(--block-space); - padding: var(--block-space) var(--inline-space-double); + color: color-mix(in srgb, var(--bubble-color) 40%, var(--color-ink)); + margin-block: calc(var(--block-space) * -1.66) calc(var(--block-space) * 1.66); + padding: calc(var(--block-space) * 0.66) calc(var(--inline-space) * 1.5); position: relative; z-index: 0; @@ -139,8 +142,9 @@ } .card__actions-container--top { - margin: var(--block-space-half) auto calc(var(--block-space) * -2); - padding: var(--block-space) 3ch; + min-inline-size: 36ch; + margin: calc(var(--block-space) * 1) auto calc(var(--block-space) * -0.33); + padding: 0.5em 0.75em; #header:has(&) { position: relative; @@ -150,8 +154,16 @@ .switch__input:checked + .switch__btn { background-color: var(--bubble-color) !important; } - } + strong { + flex: 1 0 42%; + text-align: end; + + &:last-of-type { + text-align: start; + } + } + } .cards .card__assignees:not(:has(.avatar)) { .txt-uppercase { @@ -235,8 +247,8 @@ background-color: color-mix(in srgb, var(--bubble-color) 33%, var(--color-bg)); border-radius: 0.2em; display: inline-flex; - padding-block: var(--padding-block); - padding-inline: var(--padding-inline); + margin-block: calc(var(--block-space) * -1) calc(var(--block-space) * -0.33); + padding: var(--padding-block) var(--padding-inline); &:has(.card__star-input:checked) { .card { diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index ec41a139d..660a334c0 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -21,11 +21,10 @@
@@ -35,10 +35,10 @@
- <%= render "cards/cards/perma/people", card: card %> - <%= render "cards/cards/perma/meta", card: card %> + <%= render "cards/display/perma/people", card: card %> + <%= render "cards/display/perma/meta", card: card %>
- <%= render "cards/cards/common/background", card: card %> + <%= render "cards/display/common/background", card: card %>
<% end %> diff --git a/app/views/cards/cards/_preview.html.erb b/app/views/cards/display/_preview.html.erb similarity index 81% rename from app/views/cards/cards/_preview.html.erb rename to app/views/cards/display/_preview.html.erb index 1eab911ff..d442626d3 100644 --- a/app/views/cards/cards/_preview.html.erb +++ b/app/views/cards/display/_preview.html.erb @@ -4,7 +4,7 @@ id="<%= dom_id(card, :ticket) %>">
<%= card.collection.name %> - <%= render "cards/cards/preview/tags", card: card %> + <%= render "cards/display/preview/tags", card: card %>
@@ -22,10 +22,10 @@
- <%= render "cards/cards/preview/people", card: card %> - <%= render "cards/cards/preview/meta", card: card %> + <%= render "cards/display/preview/people", card: card %> + <%= render "cards/display/preview/meta", card: card %>
- <%= render "cards/cards/common/background", card: card %> + <%= render "cards/display/common/background", card: card %> <% end %> diff --git a/app/views/cards/cards/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb similarity index 100% rename from app/views/cards/cards/common/_assignees.html.erb rename to app/views/cards/display/common/_assignees.html.erb diff --git a/app/views/cards/cards/common/_background.html.erb b/app/views/cards/display/common/_background.html.erb similarity index 100% rename from app/views/cards/cards/common/_background.html.erb rename to app/views/cards/display/common/_background.html.erb diff --git a/app/views/cards/cards/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb similarity index 100% rename from app/views/cards/cards/common/_meta.html.erb rename to app/views/cards/display/common/_meta.html.erb diff --git a/app/views/cards/cards/common/_people.html.erb b/app/views/cards/display/common/_people.html.erb similarity index 100% rename from app/views/cards/cards/common/_people.html.erb rename to app/views/cards/display/common/_people.html.erb diff --git a/app/views/cards/cards/mini/_assignees.html.erb b/app/views/cards/display/mini/_assignees.html.erb similarity index 100% rename from app/views/cards/cards/mini/_assignees.html.erb rename to app/views/cards/display/mini/_assignees.html.erb diff --git a/app/views/cards/display/mini/_tags.html.erb b/app/views/cards/display/mini/_tags.html.erb new file mode 100644 index 000000000..0db55060b --- /dev/null +++ b/app/views/cards/display/mini/_tags.html.erb @@ -0,0 +1 @@ +<%= render "cards/display/preview/tags", card: card %> diff --git a/app/views/cards/cards/perma/_assignees.html.erb b/app/views/cards/display/perma/_assignees.html.erb similarity index 59% rename from app/views/cards/cards/perma/_assignees.html.erb rename to app/views/cards/display/perma/_assignees.html.erb index 8872d66d3..1c530263e 100644 --- a/app/views/cards/cards/perma/_assignees.html.erb +++ b/app/views/cards/display/perma/_assignees.html.erb @@ -1,3 +1,3 @@ -<%= render "cards/cards/common/assignees", card: card do %> +<%= render "cards/display/common/assignees", card: card do %> <%= turbo_frame_tag card, :assignment, src: new_card_assignment_path(card) %> <% end %> diff --git a/app/views/cards/cards/perma/_boosts.html.erb b/app/views/cards/display/perma/_boosts.html.erb similarity index 100% rename from app/views/cards/cards/perma/_boosts.html.erb rename to app/views/cards/display/perma/_boosts.html.erb diff --git a/app/views/cards/display/perma/_meta.html.erb b/app/views/cards/display/perma/_meta.html.erb new file mode 100644 index 000000000..6b68b2233 --- /dev/null +++ b/app/views/cards/display/perma/_meta.html.erb @@ -0,0 +1,3 @@ +<%= render "cards/display/common/meta", card: card do %> + <%= render "cards/display/perma/boosts", card: card %> +<% end %> diff --git a/app/views/cards/display/perma/_people.html.erb b/app/views/cards/display/perma/_people.html.erb new file mode 100644 index 000000000..257e112b5 --- /dev/null +++ b/app/views/cards/display/perma/_people.html.erb @@ -0,0 +1,3 @@ +<%= render "cards/display/common/people", card: card do%> + <%= render "cards/display/perma/assignees", card: card %> +<% end %> diff --git a/app/views/cards/cards/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb similarity index 100% rename from app/views/cards/cards/perma/_tags.html.erb rename to app/views/cards/display/perma/_tags.html.erb diff --git a/app/views/cards/display/preview/_assignees.html.erb b/app/views/cards/display/preview/_assignees.html.erb new file mode 100644 index 000000000..3a4655224 --- /dev/null +++ b/app/views/cards/display/preview/_assignees.html.erb @@ -0,0 +1 @@ +<%= render "cards/display/common/assignees", card: card %> diff --git a/app/views/cards/cards/preview/_boosts.html.erb b/app/views/cards/display/preview/_boosts.html.erb similarity index 100% rename from app/views/cards/cards/preview/_boosts.html.erb rename to app/views/cards/display/preview/_boosts.html.erb diff --git a/app/views/cards/display/preview/_meta.html.erb b/app/views/cards/display/preview/_meta.html.erb new file mode 100644 index 000000000..9fd0ec88a --- /dev/null +++ b/app/views/cards/display/preview/_meta.html.erb @@ -0,0 +1,3 @@ +<%= render "cards/display/common/meta", card: card do %> + <%= render "cards/display/preview/boosts", card: card %> +<% end %> diff --git a/app/views/cards/display/preview/_people.html.erb b/app/views/cards/display/preview/_people.html.erb new file mode 100644 index 000000000..08319d327 --- /dev/null +++ b/app/views/cards/display/preview/_people.html.erb @@ -0,0 +1,3 @@ +<%= render "cards/display/common/people", card: card do%> + <%= render "cards/display/preview/assignees", card: card %> +<% end %> diff --git a/app/views/cards/cards/preview/_stages.html.erb b/app/views/cards/display/preview/_stages.html.erb similarity index 100% rename from app/views/cards/cards/preview/_stages.html.erb rename to app/views/cards/display/preview/_stages.html.erb diff --git a/app/views/cards/cards/preview/_tags.html.erb b/app/views/cards/display/preview/_tags.html.erb similarity index 100% rename from app/views/cards/cards/preview/_tags.html.erb rename to app/views/cards/display/preview/_tags.html.erb diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb index 2b0b035b0..b8c80ab1d 100644 --- a/app/views/cards/index.html.erb +++ b/app/views/cards/index.html.erb @@ -7,8 +7,8 @@ <% end %>
- <%= render "cards/index/cards/considering", cards: @considering_cards %> - <%= render "cards/index/cards/doing", cards: @doing_cards, filter: @filter %> + <%= render "cards/index/engagement/considering", cards: @considering_cards %> + <%= render "cards/index/engagement/doing", cards: @doing_cards, filter: @filter %>
-<%= render "cards/index/cards/closed", cards: @closed_cards, filter: @filter %> +<%= render "cards/index/engagement/closed", cards: @closed_cards, filter: @filter %> diff --git a/app/views/cards/index/cards/_closed.html.erb b/app/views/cards/index/engagement/_closed.html.erb similarity index 75% rename from app/views/cards/index/cards/_closed.html.erb rename to app/views/cards/index/engagement/_closed.html.erb index 7c53916dd..ee86e23b6 100644 --- a/app/views/cards/index/cards/_closed.html.erb +++ b/app/views/cards/index/engagement/_closed.html.erb @@ -5,7 +5,7 @@
<% if cards.any? %> - <%= render partial: "cards/cards/preview", collection: cards, as: :card, cached: true %> + <%= render partial: "cards/display/preview", collection: cards, as: :card, cached: true %> <% else %>

Nothing here

<% end %> diff --git a/app/views/cards/index/cards/_considering.html.erb b/app/views/cards/index/engagement/_considering.html.erb similarity index 79% rename from app/views/cards/index/cards/_considering.html.erb rename to app/views/cards/index/engagement/_considering.html.erb index 9f184eb63..58f02a7f3 100644 --- a/app/views/cards/index/cards/_considering.html.erb +++ b/app/views/cards/index/engagement/_considering.html.erb @@ -4,7 +4,7 @@ <% if cards.any? %> - <%= render partial: "cards/cards/mini", collection: cards, as: :card, cached: true %> + <%= render partial: "cards/display/mini", collection: cards, as: :card, cached: true %> <% else %>

Nothing here

<% end %> diff --git a/app/views/cards/index/cards/_doing.html.erb b/app/views/cards/index/engagement/_doing.html.erb similarity index 86% rename from app/views/cards/index/cards/_doing.html.erb rename to app/views/cards/index/engagement/_doing.html.erb index 644ac5f63..57fc1aff9 100644 --- a/app/views/cards/index/cards/_doing.html.erb +++ b/app/views/cards/index/engagement/_doing.html.erb @@ -8,7 +8,7 @@ <% end %> <% if cards.any? %> - <%= render partial: "cards/cards/preview", collection: cards, as: :card, cached: true %> + <%= render partial: "cards/display/preview", collection: cards, as: :card, cached: true %> <% else %>

Nothing here

<% end %> diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index e00ca579e..3fc163784 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -52,7 +52,7 @@
" style="--card-color: <%= @card.color %>;"> - <%= render "cards/cards/perma", card: @card %> + <%= render "cards/display/perma", card: @card %>