From a5016ba854a3070d2e3af7bea8a04353b0add9ac Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@hey.com>
Date: Fri, 31 Oct 2025 12:47:56 +0100
Subject: [PATCH] Reorganize the main menu templates

The filter folder wasn't a good spot for this menu code anymore
---
 app/views/filters/create.turbo_stream.erb        |  2 +-
 app/views/filters/destroy.turbo_stream.erb       |  2 +-
 app/views/filters/menu/_tags.html.erb            |  3 ---
 app/views/filters/menu/_users.html.erb           |  3 ---
 app/views/layouts/application.html.erb           |  2 +-
 .../menu => my/menus}/_accounts.html.erb         |  0
 .../{filters/menu => my/menus}/_button.html.erb  |  4 ++--
 .../menu => my/menus}/_collections.html.erb      |  2 +-
 .../{filters/menu => my/menus}/_custom.html.erb  |  4 ++--
 .../{filters/menu => my/menus}/_hotkeys.html.erb |  0
 app/views/{filters => my/menus}/_menu.html.erb   |  2 +-
 .../{filters/menu => my/menus}/_places.html.erb  |  0
 .../menu => my/menus}/_shortcut_notice.html.erb  |  0
 app/views/my/menus/_tags.html.erb                |  3 +++
 app/views/my/menus/_users.html.erb               |  3 +++
 .../menus}/collections/_collection.html.erb      |  0
 .../menu => my/menus}/custom/_create.html.erb    |  0
 .../menu => my/menus}/custom/_filter.html.erb    |  0
 app/views/my/menus/show.html.erb                 | 16 ++++++++--------
 .../menu => my/menus}/tags/_tag.html.erb         |  0
 .../menu => my/menus}/users/_user.html.erb       |  0
 21 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 app/views/filters/menu/_tags.html.erb
 delete mode 100644 app/views/filters/menu/_users.html.erb
 rename app/views/{filters/menu => my/menus}/_accounts.html.erb (100%)
 rename app/views/{filters/menu => my/menus}/_button.html.erb (55%)
 rename app/views/{filters/menu => my/menus}/_collections.html.erb (64%)
 rename app/views/{filters/menu => my/menus}/_custom.html.erb (56%)
 rename app/views/{filters/menu => my/menus}/_hotkeys.html.erb (100%)
 rename app/views/{filters => my/menus}/_menu.html.erb (95%)
 rename app/views/{filters/menu => my/menus}/_places.html.erb (100%)
 rename app/views/{filters/menu => my/menus}/_shortcut_notice.html.erb (100%)
 create mode 100644 app/views/my/menus/_tags.html.erb
 create mode 100644 app/views/my/menus/_users.html.erb
 rename app/views/{filters/menu => my/menus}/collections/_collection.html.erb (100%)
 rename app/views/{filters/menu => my/menus}/custom/_create.html.erb (100%)
 rename app/views/{filters/menu => my/menus}/custom/_filter.html.erb (100%)
 rename app/views/{filters/menu => my/menus}/tags/_tag.html.erb (100%)
 rename app/views/{filters/menu => my/menus}/users/_user.html.erb (100%)

diff --git a/app/views/filters/create.turbo_stream.erb b/app/views/filters/create.turbo_stream.erb
index a17a53c52..5bd390888 100644
--- a/app/views/filters/create.turbo_stream.erb
+++ b/app/views/filters/create.turbo_stream.erb
@@ -1,2 +1,2 @@
 <%= turbo_stream.replace("filter-settings-save-toggle", partial: "filters/filter_toggle", locals: { filter: @filter }) %>
-<%= turbo_stream.replace("my-filters", partial: "filters/menu/custom", locals: { filters: @filters }) %>
+<%= turbo_stream.replace("my-filters", partial: "my/menus/custom", locals: { filters: @filters }) %>
diff --git a/app/views/filters/destroy.turbo_stream.erb b/app/views/filters/destroy.turbo_stream.erb
index a17a53c52..5bd390888 100644
--- a/app/views/filters/destroy.turbo_stream.erb
+++ b/app/views/filters/destroy.turbo_stream.erb
@@ -1,2 +1,2 @@
 <%= turbo_stream.replace("filter-settings-save-toggle", partial: "filters/filter_toggle", locals: { filter: @filter }) %>
-<%= turbo_stream.replace("my-filters", partial: "filters/menu/custom", locals: { filters: @filters }) %>
+<%= turbo_stream.replace("my-filters", partial: "my/menus/custom", locals: { filters: @filters }) %>
diff --git a/app/views/filters/menu/_tags.html.erb b/app/views/filters/menu/_tags.html.erb
deleted file mode 100644
index 104d6f29f..000000000
--- a/app/views/filters/menu/_tags.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= collapsible_nav_section "Tags" do %>
-  <%= render partial: "filters/menu/tags/tag", collection: user_filtering.tags, as: :tag %>
-<% end %>
diff --git a/app/views/filters/menu/_users.html.erb b/app/views/filters/menu/_users.html.erb
deleted file mode 100644
index fc2dff5ee..000000000
--- a/app/views/filters/menu/_users.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= collapsible_nav_section "People" do %>
-  <%= render partial: "filters/menu/users/user", collection: user_filtering.users, as: :user %>
-<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index a07685f75..31a162329 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,7 +5,7 @@
   <body data-controller="local-time timezone-cookie turbo-navigation" data-action="turbo:morph@window->local-time#refreshAll turbo:before-visit@document->turbo-navigation#rememberLocation">
     <header class="header <%= @header_class %>" id="header">
       <a href="#main" class="header__skip-navigation btn" data-turbo="false">Skip to main content</a>
-      <%= render "filters/menu" if Current.user %>
+      <%= render "my/menus/menu" if Current.user %>
       <%= yield :header %>
     </header>
 
diff --git a/app/views/filters/menu/_accounts.html.erb b/app/views/my/menus/_accounts.html.erb
similarity index 100%
rename from app/views/filters/menu/_accounts.html.erb
rename to app/views/my/menus/_accounts.html.erb
diff --git a/app/views/filters/menu/_button.html.erb b/app/views/my/menus/_button.html.erb
similarity index 55%
rename from app/views/filters/menu/_button.html.erb
rename to app/views/my/menus/_button.html.erb
index b8e316c25..f9682605f 100644
--- a/app/views/filters/menu/_button.html.erb
+++ b/app/views/my/menus/_button.html.erb
@@ -1,7 +1,7 @@
 <%= tag.button class:"fizzy-menu-trigger input input--select center flex-inline align-center txt-normal",
       data: {
-            action: "click->dialog#open:stop keydown.j@document->hotkey#click keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click",
-            controller: "hotkey" } do %>
+        action: "click->dialog#open:stop keydown.j@document->hotkey#click keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click",
+        controller: "hotkey" } do %>
   <span><%= image_tag "logo.png" %></span>
   <strong class="txt-medium overflow-ellipsis margin-none">BOXCAR</strong>
 <% end %>
diff --git a/app/views/filters/menu/_collections.html.erb b/app/views/my/menus/_collections.html.erb
similarity index 64%
rename from app/views/filters/menu/_collections.html.erb
rename to app/views/my/menus/_collections.html.erb
index 808dbc866..6d7a71d66 100644
--- a/app/views/filters/menu/_collections.html.erb
+++ b/app/views/my/menus/_collections.html.erb
@@ -1,6 +1,6 @@
 <% # Using method: :get inside Turbo frame triggers some special Turbo handling where the script_name is lost %>
 <% if user_filtering.collections.any? %>
   <%= collapsible_nav_section "Boards" do %>
-    <%= render partial: "filters/menu/collections/collection", collection: user_filtering.collections, as: :collection %>
+    <%= render partial: "my/menus/collections/collection", collection: user_filtering.collections, as: :collection %>
   <% end %>
 <% end %>
diff --git a/app/views/filters/menu/_custom.html.erb b/app/views/my/menus/_custom.html.erb
similarity index 56%
rename from app/views/filters/menu/_custom.html.erb
rename to app/views/my/menus/_custom.html.erb
index e2ef1d9b7..80e27fe59 100644
--- a/app/views/filters/menu/_custom.html.erb
+++ b/app/views/my/menus/_custom.html.erb
@@ -1,6 +1,6 @@
 <%= collapsible_nav_section "Saved filters", id: "my-filters" do %>
   <%= form_with url: cards_path, method: :get, data: { controller: "form" } do |form| %>
-    <%= render "filters/menu/custom/create" %>
-    <%= render partial: "filters/menu/custom/filter", collection: filters, as: :filter %>
+    <%= render "my/menus/custom/create" %>
+    <%= render partial: "my/menus/custom/filter", collection: filters, as: :filter %>
   <% end %>
 <% end %>
diff --git a/app/views/filters/menu/_hotkeys.html.erb b/app/views/my/menus/_hotkeys.html.erb
similarity index 100%
rename from app/views/filters/menu/_hotkeys.html.erb
rename to app/views/my/menus/_hotkeys.html.erb
diff --git a/app/views/filters/_menu.html.erb b/app/views/my/menus/_menu.html.erb
similarity index 95%
rename from app/views/filters/_menu.html.erb
rename to app/views/my/menus/_menu.html.erb
index ae4a3443b..01d65da94 100644
--- a/app/views/filters/_menu.html.erb
+++ b/app/views/my/menus/_menu.html.erb
@@ -1,5 +1,5 @@
 <nav data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside" data-turbo-permanent>
-  <%= render "filters/menu/button" %>
+  <%= render "my/menus/button" %>
 
   <%= tag.dialog class: "fizzy-menu filter popup popup--animated panel margin-block-start-half",
         data: {
diff --git a/app/views/filters/menu/_places.html.erb b/app/views/my/menus/_places.html.erb
similarity index 100%
rename from app/views/filters/menu/_places.html.erb
rename to app/views/my/menus/_places.html.erb
diff --git a/app/views/filters/menu/_shortcut_notice.html.erb b/app/views/my/menus/_shortcut_notice.html.erb
similarity index 100%
rename from app/views/filters/menu/_shortcut_notice.html.erb
rename to app/views/my/menus/_shortcut_notice.html.erb
diff --git a/app/views/my/menus/_tags.html.erb b/app/views/my/menus/_tags.html.erb
new file mode 100644
index 000000000..9f2d27cf6
--- /dev/null
+++ b/app/views/my/menus/_tags.html.erb
@@ -0,0 +1,3 @@
+<%= collapsible_nav_section "Tags" do %>
+  <%= render partial: "my/menus/tags/tag", collection: user_filtering.tags, as: :tag %>
+<% end %>
diff --git a/app/views/my/menus/_users.html.erb b/app/views/my/menus/_users.html.erb
new file mode 100644
index 000000000..1d3f634cf
--- /dev/null
+++ b/app/views/my/menus/_users.html.erb
@@ -0,0 +1,3 @@
+<%= collapsible_nav_section "People" do %>
+  <%= render partial: "my/menus/users/user", collection: user_filtering.users, as: :user %>
+<% end %>
diff --git a/app/views/filters/menu/collections/_collection.html.erb b/app/views/my/menus/collections/_collection.html.erb
similarity index 100%
rename from app/views/filters/menu/collections/_collection.html.erb
rename to app/views/my/menus/collections/_collection.html.erb
diff --git a/app/views/filters/menu/custom/_create.html.erb b/app/views/my/menus/custom/_create.html.erb
similarity index 100%
rename from app/views/filters/menu/custom/_create.html.erb
rename to app/views/my/menus/custom/_create.html.erb
diff --git a/app/views/filters/menu/custom/_filter.html.erb b/app/views/my/menus/custom/_filter.html.erb
similarity index 100%
rename from app/views/filters/menu/custom/_filter.html.erb
rename to app/views/my/menus/custom/_filter.html.erb
diff --git a/app/views/my/menus/show.html.erb b/app/views/my/menus/show.html.erb
index 3211d6002..fc56de1bb 100644
--- a/app/views/my/menus/show.html.erb
+++ b/app/views/my/menus/show.html.erb
@@ -21,18 +21,18 @@
     </button>
   </div>
 
-  <%= render "filters/menu/hotkeys" %>
+  <%= render "my/menus/hotkeys" %>
 
   <div class="margin-block-start-half txt-x-small txt-align-center txt-subtle">
     BOXCAR is designed, built, and backed by <strong class="txt-nowrap"><%= icon_tag "37signals" %> <a href="https://37signals.com" target="_blank" class="txt-subtle">37signals</a>.</strong>
   </div>
 
-  <%= render "filters/menu/custom", filters: @user_filtering.filters %>
-  <%= render "filters/menu/collections", user_filtering: @user_filtering %>
-  <%= render "filters/menu/tags", user_filtering: @user_filtering %>
-  <%= render "filters/menu/users", user_filtering: @user_filtering %>
-  <%= render "filters/menu/places", user_filtering: @user_filtering %>
-  <%= render "filters/menu/accounts", user_filtering: @user_filtering %>
+  <%= render "my/menus/custom", filters: @user_filtering.filters %>
+  <%= render "my/menus/collections", user_filtering: @user_filtering %>
+  <%= render "my/menus/tags", user_filtering: @user_filtering %>
+  <%= render "my/menus/users", user_filtering: @user_filtering %>
+  <%= render "my/menus/places", user_filtering: @user_filtering %>
+  <%= render "my/menus/accounts", user_filtering: @user_filtering %>
 
-  <%= render "filters/menu/shortcut_notice" %>
+  <%= render "my/menus/shortcut_notice" %>
 <% end %>
diff --git a/app/views/filters/menu/tags/_tag.html.erb b/app/views/my/menus/tags/_tag.html.erb
similarity index 100%
rename from app/views/filters/menu/tags/_tag.html.erb
rename to app/views/my/menus/tags/_tag.html.erb
diff --git a/app/views/filters/menu/users/_user.html.erb b/app/views/my/menus/users/_user.html.erb
similarity index 100%
rename from app/views/filters/menu/users/_user.html.erb
rename to app/views/my/menus/users/_user.html.erb