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 @@ 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 %> <%= image_tag "logo.png" %> BOXCAR <% 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 @@