From 635dbb90cbe03f6731244242b82795f67ba11196 Mon Sep 17 00:00:00 2001
From: "Stanko K.R." <stanko@stanko.io>
Date: Thu, 29 Jan 2026 15:38:11 +0100
Subject: [PATCH] Rename the Import controller to Account::Import

---
 app/controllers/{ => account}/imports_controller.rb | 4 ++--
 app/views/{ => account}/imports/new.html.erb        | 2 +-
 app/views/{ => account}/imports/show.html.erb       | 2 +-
 app/views/sessions/menus/show.html.erb              | 2 +-
 config/routes.rb                                    | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename app/controllers/{ => account}/imports_controller.rb (84%)
 rename app/views/{ => account}/imports/new.html.erb (87%)
 rename app/views/{ => account}/imports/show.html.erb (90%)

diff --git a/app/controllers/imports_controller.rb b/app/controllers/account/imports_controller.rb
similarity index 84%
rename from app/controllers/imports_controller.rb
rename to app/controllers/account/imports_controller.rb
index b34845b84..05d9f957c 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/account/imports_controller.rb
@@ -1,4 +1,4 @@
-class ImportsController < ApplicationController
+class Account::ImportsController < ApplicationController
   layout "public"
 
   disallow_account_scope only: %i[ new create ]
@@ -33,6 +33,6 @@ class ImportsController < ApplicationController
         import.process_later
       end
 
-      redirect_to import_path(import, script_name: account.slug)
+      redirect_to account_import_path(import, script_name: account.slug)
     end
 end
diff --git a/app/views/imports/new.html.erb b/app/views/account/imports/new.html.erb
similarity index 87%
rename from app/views/imports/new.html.erb
rename to app/views/account/imports/new.html.erb
index 886a0b48f..bd75bbb3b 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/account/imports/new.html.erb
@@ -8,7 +8,7 @@
     <div>Create an account using data from a Fizzy export. Upload the exported .zip file below.</div>
   </header>
 
-  <%= form_with url: imports_path, class: "flex flex-column gap", data: { controller: "form upload-preview" }, multipart: true do |form| %>
+  <%= form_with url: account_imports_path, class: "flex flex-column gap", data: { controller: "form upload-preview" }, multipart: true do |form| %>
     <label class="btn input--upload">
       <div data-upload-preview-target="placeholder">Choose a file…</div>
       <div data-upload-preview-target="fileName" hidden></div>
diff --git a/app/views/imports/show.html.erb b/app/views/account/imports/show.html.erb
similarity index 90%
rename from app/views/imports/show.html.erb
rename to app/views/account/imports/show.html.erb
index a879996e1..26dbf88d5 100644
--- a/app/views/imports/show.html.erb
+++ b/app/views/account/imports/show.html.erb
@@ -14,7 +14,7 @@
   <% when "failed" %>
     <p class="txt-medium txt-negative">Your import failed.</p>
     <p class="txt-small">This may be due to corrupted export data or a conflict with existing data. Please try again with a fresh export.</p>
-    <%= link_to "Try again", new_import_path, class: "btn btn--plain center txt-medium" %>
+    <%= link_to "Try again", new_account_import_path, class: "btn btn--plain center txt-medium" %>
   <% end %>
 </div>
 
diff --git a/app/views/sessions/menus/show.html.erb b/app/views/sessions/menus/show.html.erb
index e3843321e..dd89f37c5 100644
--- a/app/views/sessions/menus/show.html.erb
+++ b/app/views/sessions/menus/show.html.erb
@@ -28,7 +28,7 @@
       <span>Sign up for a new Fizzy account</span>
     <% end %>
 
-    <%= link_to new_import_path, class: "btn btn--plain txt-link center txt-small", data: { turbo_prefetch: false } do %>
+    <%= link_to new_account_import_path, class: "btn btn--plain txt-link center txt-small", data: { turbo_prefetch: false } do %>
       <span>Import an exported account</span>
     <% end %>
   </section>
diff --git a/config/routes.rb b/config/routes.rb
index a7aad9e45..28f8bb1f6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,10 +7,9 @@ Rails.application.routes.draw do
     resource :join_code
     resource :settings
     resources :exports, only: [ :create, :show ]
+    resources :imports, only: [ :new, :create, :show ]
   end
 
-  resources :imports, only: %i[ new create show ]
-
   resources :users do
     scope module: :users do
       resource :avatar