Fix user routing issues #111

Gemfile.lock

@@ -93,11 +93,11 @@ GEM
     aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.1.1)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
-    builder (3.2.4)
+    builder (3.3.0)
     capybara (3.39.2)
       addressable
       matrix
@@ -110,7 +110,7 @@ GEM
     chartkick (5.0.4)
     cmdstan (0.2.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     convenient_grouper (0.1.6)
     crass (1.0.6)
@@ -124,13 +124,13 @@ GEM
     debug (1.8.0)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
-    devise (4.9.2)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    erubi (1.12.0)
+    erubi (1.13.0)
     ffi (1.15.5)
     foreman (0.87.2)
     globalid (1.2.1)
@@ -145,7 +145,7 @@ GEM
       listen (>= 3.0.0)
       rails (>= 6.0.0)
     http_logger (0.7.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.6.0)
     irb (1.7.4)
@@ -173,9 +173,9 @@ GEM
       net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.22.2)
+    minitest (5.25.0)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.2)
@@ -189,11 +189,11 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.2-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     numo-narray (0.9.2.1)
     orm_adapter (0.5.0)
@@ -217,8 +217,8 @@ GEM
     public_suffix (5.0.3)
     puma (6.3.1)
       nio4r (~> 2.0)
-    racc (1.7.3)
-    rack (2.2.8.1)
+    racc (1.8.1)
+    rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
@@ -251,7 +251,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -262,7 +262,7 @@ GEM
     regexp_parser (2.8.1)
     reline (0.3.8)
       io-console (~> 0.5)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
@@ -372,7 +372,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   arm64-darwin-21

app/views/devise/passwords/edit.html.erb

@@ -8,7 +8,7 @@
 
   <%= polaris_card do %>
     <%= turbo_frame_tag resource, target: "_top" do %>
-      <%= form_with(model: resource, url: password_path(resource), builder: Polaris::FormBuilder, method: :put, data: {turbo: false}) do |form| %>
+      <%= form_with(model: resource, as: resource_name, url: password_path(resource), builder: Polaris::FormBuilder, method: :put, data: {turbo: false}) do |form| %>
 
         <%= form.hidden_field :reset_password_token %>
 

app/views/devise/passwords/new.html.erb

@@ -6,7 +6,7 @@
 
   <%= polaris_card do %>
     <%= turbo_frame_tag resource, target: "_top" do %>
-      <%= form_with(model: resource, as: resource_name, url: user_password_path(resource_name), builder: Polaris::FormBuilder, data: {turbo: false}, format: :html) do |form| %>
+      <%= form_with(model: resource, as: resource_name, url: password_path(resource_name), builder: Polaris::FormBuilder, data: {turbo: false}, format: :html) do |form| %>
         <%= polaris_form_layout do |form_layout| %>
 
           <% if resource.errors.any? %>