From 5f6cc046b72d875c0802f3b9bb86cd295c63f6ee Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 19 Nov 2024 12:30:23 -0600 Subject: [PATCH 1/8] No need for inline svg here anymore --- app/views/buckets/_bucket.html.erb | 5 +---- app/views/filters/_filter.html.erb | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/views/buckets/_bucket.html.erb b/app/views/buckets/_bucket.html.erb index fc270bc8d..79ce36bc9 100644 --- a/app/views/buckets/_bucket.html.erb +++ b/app/views/buckets/_bucket.html.erb @@ -4,10 +4,7 @@
<% bucket.bubbles.ordered_by_activity.limit(10).each do |bubble| %>
- - - - +
<% end %>
diff --git a/app/views/filters/_filter.html.erb b/app/views/filters/_filter.html.erb index fbf32087e..3656c5a16 100644 --- a/app/views/filters/_filter.html.erb +++ b/app/views/filters/_filter.html.erb @@ -4,10 +4,7 @@
<% filter.bubbles.ordered_by_activity.limit(10).each do |bubble| %>
- - - - +
<% end %>
From dcd819d1ecba3336ba175e07ccf24d289aa900ae Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 19 Nov 2024 12:32:20 -0600 Subject: [PATCH 2/8] Restore bucket settings link, adjust styles for filters --- app/views/buckets/_bucket.html.erb | 5 +++++ app/views/filters/_filter.html.erb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/buckets/_bucket.html.erb b/app/views/buckets/_bucket.html.erb index 79ce36bc9..a82a067bd 100644 --- a/app/views/buckets/_bucket.html.erb +++ b/app/views/buckets/_bucket.html.erb @@ -14,6 +14,11 @@ <%= link_to bubbles_path(bucket_ids: [ bucket ]), class: "txt-ink flex flex-column" do %> In <%= bucket.name %> <% end %> + + <%= link_to edit_bucket_path(bucket), class: "btn txt-small" do %> + <%= image_tag "settings.svg", aria: { hidden: true }, size: 24 %> + Settings for <%= bucket.name %> + <% end %> <% end %> diff --git a/app/views/filters/_filter.html.erb b/app/views/filters/_filter.html.erb index 3656c5a16..0fac6a8a8 100644 --- a/app/views/filters/_filter.html.erb +++ b/app/views/filters/_filter.html.erb @@ -14,7 +14,7 @@ <%= link_to bubbles_path(**filter.to_params), class: "txt-ink flex flex-column" do %> <%= filter.summary.html_safe %> <% end %> - <%= button_to filter_path(filter), method: :delete, class: "btn btn--negative", data: { turbo_confirm: "Are you sure you want to delete this filter?" } do %> + <%= button_to filter_path(filter), method: :delete, class: "btn txt-small btn--negative", data: { turbo_confirm: "Are you sure you want to delete this filter?" } do %> <%= image_tag "minus.svg", aria: { hidden: true }, size: 24 %> Delete <% end %> From c645e593142581ae2e1afd88573ed2004013ff0d Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 19 Nov 2024 12:34:58 -0600 Subject: [PATCH 3/8] Adjust form --- app/views/buckets/edit.html.erb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/buckets/edit.html.erb b/app/views/buckets/edit.html.erb index 760044536..f37c0330d 100644 --- a/app/views/buckets/edit.html.erb +++ b/app/views/buckets/edit.html.erb @@ -7,8 +7,8 @@ Go back <% end %> - <%= form_with model: @bucket, class: "flex align-center gap-half", method: :delete do |form| %> - <%= form.button class: "btn btn--negative txt-small min-width", data: { turbo_confirm: "Are you sure you want to delete this?" } do %> + <%= form_with model: @bucket, class: "flex-item-justify-end", method: :delete do |form| %> + <%= form.button class: "btn btn--negative", data: { turbo_confirm: "Are you sure you want to delete this?" } do %> <%= image_tag "minus.svg", aria: { hidden: true }, size: 24 %> Delete <%= @bucket.name %> <% end %> @@ -18,8 +18,6 @@
<%= form_with model: @bucket, class: "flex flex-column gap txt-large", controller: "form" do |form| %> - <%= image_tag "bubbles.svg", aria: { hidden: "true" }, size: 150, class: "colorize--black center" %> -
<%= translation_button(:bucket_name) %> From ca7cccdb7c2369edd0cd2c0e2e90358681d5ab78 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 19 Nov 2024 12:45:16 -0600 Subject: [PATCH 4/8] Add some structure to buckets index --- app/models/filter/summarized.rb | 14 +++++++------- app/views/buckets/_bucket.html.erb | 4 ++-- app/views/buckets/index.html.erb | 9 ++++++--- app/views/filters/_filter.html.erb | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/models/filter/summarized.rb b/app/models/filter/summarized.rb index 2d406dceb..b17937c9a 100644 --- a/app/models/filter/summarized.rb +++ b/app/models/filter/summarized.rb @@ -9,18 +9,18 @@ module Filter::Summarized private def index_summary - "#{indexed_by.humanize}" + indexed_by.humanize end def tag_summary if tags.any? - "tagged #{tags.map(&:hashtag).to_choice_sentence}" + "tagged #{tags.map(&:hashtag).to_choice_sentence}" end end def assignee_summary if assignees.any? - "assigned to #{assignees.pluck(:name).to_choice_sentence}" + "assigned to #{assignees.pluck(:name).to_choice_sentence}" elsif assignments.unassigned? "assigned to no one" end @@ -28,21 +28,21 @@ module Filter::Summarized def assigner_summary if assigners.any? - "assigned by #{assigners.pluck(:name).to_choice_sentence}" + "assigned by #{assigners.pluck(:name).to_choice_sentence}" end end def bucket_summary if buckets.any? - "in #{buckets.pluck(:name).to_choice_sentence}" + "in #{buckets.pluck(:name).to_choice_sentence}" else - "in all projects" + "in all projects" end end def terms_summary if terms.any? - "matching #{terms.map { |term| %Q("#{term}") }.to_sentence}" + "matching #{terms.map { |term| %Q("#{term}") }.to_sentence}" end end end diff --git a/app/views/buckets/_bucket.html.erb b/app/views/buckets/_bucket.html.erb index a82a067bd..ac6c37231 100644 --- a/app/views/buckets/_bucket.html.erb +++ b/app/views/buckets/_bucket.html.erb @@ -1,6 +1,6 @@ <% cache bucket do %>
  • - <%= link_to bubbles_path(bucket_ids: [ bucket ]), class: "windshield__container flex justify-center align-center position-relative" do %> + <%= link_to bubbles_path(bucket_ids: [ bucket ]), class: "border border-radius margin-block-end-half windshield__container flex justify-center align-center position-relative" do %>
    <% bucket.bubbles.ordered_by_activity.limit(10).each do |bubble| %>
    @@ -12,7 +12,7 @@
    <%= link_to bubbles_path(bucket_ids: [ bucket ]), class: "txt-ink flex flex-column" do %> - In <%= bucket.name %> + <%= bucket.name %> <% end %> <%= link_to edit_bucket_path(bucket), class: "btn txt-small" do %> diff --git a/app/views/buckets/index.html.erb b/app/views/buckets/index.html.erb index dc5ae2ad1..9da1c9fd1 100644 --- a/app/views/buckets/index.html.erb +++ b/app/views/buckets/index.html.erb @@ -14,7 +14,10 @@ <% end %> - - <%= render @filters %> +
    <%= render @buckets, cached: true %> -
     +
    +
    +
    + <%= render @filters %> +
    diff --git a/app/views/filters/_filter.html.erb b/app/views/filters/_filter.html.erb index 0fac6a8a8..cc2f782a6 100644 --- a/app/views/filters/_filter.html.erb +++ b/app/views/filters/_filter.html.erb @@ -1,6 +1,6 @@ <% cache_if filter.cacheable?, filter do %>
  • - <%= link_to bubbles_path(**filter.to_params), class: "windshield__container flex justify-center align-center position-relative" do %> + <%= link_to bubbles_path(**filter.to_params), class: "border border-radius margin-block-end-half windshield__container flex justify-center align-center position-relative" do %>
    <% filter.bubbles.ordered_by_activity.limit(10).each do |bubble| %>
    @@ -12,7 +12,7 @@
    <%= link_to bubbles_path(**filter.to_params), class: "txt-ink flex flex-column" do %> - <%= filter.summary.html_safe %> + <%= filter.summary %> <% end %> <%= button_to filter_path(filter), method: :delete, class: "btn txt-small btn--negative", data: { turbo_confirm: "Are you sure you want to delete this filter?" } do %> <%= image_tag "minus.svg", aria: { hidden: true }, size: 24 %> From b19ca07aeec683387fdfa5e9e6fa2f70d54ce739 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 19 Nov 2024 12:48:18 -0600 Subject: [PATCH 5/8] Forget about the dividing line for now --- app/views/buckets/index.html.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/buckets/index.html.erb b/app/views/buckets/index.html.erb index 9da1c9fd1..9d831262b 100644 --- a/app/views/buckets/index.html.erb +++ b/app/views/buckets/index.html.erb @@ -14,10 +14,9 @@ <% end %> -
    +
    <%= render @buckets, cached: true %>
    -
    -
    +
    <%= render @filters %>
    From fada5fef594458dedae3119938b6f267572a0548 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 19 Nov 2024 12:52:39 -0600 Subject: [PATCH 6/8] Fix test --- test/models/filter_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb index 4933f003b..6c07e27a4 100644 --- a/test/models/filter_test.rb +++ b/test/models/filter_test.rb @@ -93,7 +93,7 @@ class FilterTest < ActiveSupport::TestCase end test "summary" do - assert_equal "Most discussed, tagged #Mobile, and assigned to JZ in all projects", filters(:jz_assignments).summary + assert_equal "Most discussed, tagged #Mobile, and assigned to JZ in all projects", filters(:jz_assignments).summary end test "plain summary" do From 71d98d9eaa93a0a0238caace81712184eb37645d Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 19 Nov 2024 12:59:37 -0600 Subject: [PATCH 7/8] Tighten up workflow panel --- app/assets/images/menu-dots-horizontal.svg | 1 + app/helpers/workflows_helper.rb | 2 +- app/views/bubbles/stage_pickers/new.html.erb | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 app/assets/images/menu-dots-horizontal.svg diff --git a/app/assets/images/menu-dots-horizontal.svg b/app/assets/images/menu-dots-horizontal.svg new file mode 100644 index 000000000..4e60fdd40 --- /dev/null +++ b/app/assets/images/menu-dots-horizontal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb index ef88e828b..1a0cf432a 100644 --- a/app/helpers/workflows_helper.rb +++ b/app/helpers/workflows_helper.rb @@ -1,6 +1,6 @@ module WorkflowsHelper def link_to_stage_picker(bubble, workflow) - link_to workflow.name, new_bucket_bubble_stage_picker_path(bubble.bucket, bubble, workflow_id: workflow), class: "filter__button" + link_to workflow.name, new_bucket_bubble_stage_picker_path(bubble.bucket, bubble, workflow_id: workflow), class: "btn full-width justify-start borderless workflow-stage" end def button_to_set_stage(bubble, stage) diff --git a/app/views/bubbles/stage_pickers/new.html.erb b/app/views/bubbles/stage_pickers/new.html.erb index 35f89a37d..2783bc6aa 100644 --- a/app/views/bubbles/stage_pickers/new.html.erb +++ b/app/views/bubbles/stage_pickers/new.html.erb @@ -1,14 +1,13 @@ <%= turbo_frame_tag dom_id(@bubble, :stage_picker) do %> <% if @selected_workflow %> -