consolidate settings into single admin page

Merge shop status, payments, products (Printify), account (email/password),
and advanced (dashboard/error tracker links) into /admin/settings. Simplify
Auth.Settings to a redirector for /users/settings and confirm-email tokens.
Remove Providers from sidebar nav. Update all redirects and tests.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

test/simpleshop_theme_web/controllers/user_session_controller_test.exs

@@ -21,7 +21,7 @@ defmodule SimpleshopThemeWeb.UserSessionControllerTest do
       assert redirected_to(conn) == ~p"/"
 
       # Now do a logged in request and assert on the page content
-      conn = get(conn, ~p"/users/settings")
+      conn = get(conn, ~p"/admin/settings")
       response = html_response(conn, 200)
       assert response =~ user.email
     end
@@ -83,7 +83,7 @@ defmodule SimpleshopThemeWeb.UserSessionControllerTest do
       assert redirected_to(conn) == ~p"/"
 
       # Now do a logged in request and assert on the page content
-      conn = get(conn, ~p"/users/settings")
+      conn = get(conn, ~p"/admin/settings")
       response = html_response(conn, 200)
       assert response =~ user.email
     end
@@ -105,7 +105,7 @@ defmodule SimpleshopThemeWeb.UserSessionControllerTest do
       assert Accounts.get_user!(user.id).confirmed_at
 
       # Now do a logged in request and assert on the page content
-      conn = get(conn, ~p"/users/settings")
+      conn = get(conn, ~p"/admin/settings")
       response = html_response(conn, 200)
       assert response =~ user.email
     end

test/simpleshop_theme_web/live/admin/layout_test.exs

@@ -19,7 +19,6 @@ defmodule SimpleshopThemeWeb.Admin.LayoutTest do
 
       assert has_element?(view, ~s(a[href="/admin/orders"]), "Orders")
       assert has_element?(view, ~s(a[href="/admin/theme"]), "Theme")
-      assert has_element?(view, ~s(a[href="/admin/providers"]), "Providers")
       assert has_element?(view, ~s(a[href="/admin/settings"]), "Settings")
     end
 

test/simpleshop_theme_web/live/admin/settings_test.exs

@@ -3,7 +3,9 @@ defmodule SimpleshopThemeWeb.Admin.SettingsTest do
 
   import Phoenix.LiveViewTest
   import SimpleshopTheme.AccountsFixtures
+  import SimpleshopTheme.ProductsFixtures
 
+  alias SimpleshopTheme.Accounts
   alias SimpleshopTheme.Settings
 
   setup do
@@ -77,7 +79,7 @@ defmodule SimpleshopThemeWeb.Admin.SettingsTest do
 
       html =
         view
-        |> form("form", %{stripe: %{api_key: ""}})
+        |> form(~s(form[phx-submit="connect_stripe"]), %{stripe: %{api_key: ""}})
         |> render_submit()
 
       assert html =~ "Please enter your Stripe secret key"
@@ -106,7 +108,9 @@ defmodule SimpleshopThemeWeb.Admin.SettingsTest do
 
       html =
         view
-        |> form("form", %{webhook: %{signing_secret: "whsec_test_manual_456"}})
+        |> form(~s(form[phx-submit="save_signing_secret"]), %{
+          webhook: %{signing_secret: "whsec_test_manual_456"}
+        })
         |> render_submit()
 
       assert html =~ "Webhook signing secret saved"
@@ -118,7 +122,7 @@ defmodule SimpleshopThemeWeb.Admin.SettingsTest do
 
       html =
         view
-        |> form("form", %{webhook: %{signing_secret: ""}})
+        |> form(~s(form[phx-submit="save_signing_secret"]), %{webhook: %{signing_secret: ""}})
         |> render_submit()
 
       assert html =~ "Please enter a signing secret"
@@ -135,4 +139,118 @@ defmodule SimpleshopThemeWeb.Admin.SettingsTest do
       refute Settings.has_secret?("stripe_api_key")
     end
   end
+
+  describe "products section" do
+    setup %{conn: conn, user: user} do
+      conn = log_in_user(conn, user)
+      %{conn: conn}
+    end
+
+    test "shows connect button when no provider connected", %{conn: conn} do
+      {:ok, view, html} = live(conn, ~p"/admin/settings")
+
+      assert html =~ "Products"
+      assert html =~ "Not connected"
+      assert has_element?(view, ~s(a[href="/admin/providers/new"]), "Connect to Printify")
+    end
+
+    test "shows connection info when provider connected", %{conn: conn} do
+      conn_record = provider_connection_fixture(%{name: "Test Shop"})
+      product_fixture(%{provider_connection: conn_record})
+
+      {:ok, _view, html} = live(conn, ~p"/admin/settings")
+
+      assert html =~ "Connected"
+      assert html =~ "Test Shop"
+      assert html =~ "Sync products"
+    end
+  end
+
+  describe "account section" do
+    setup %{conn: conn, user: user} do
+      conn = log_in_user(conn, user)
+      %{conn: conn, user: user}
+    end
+
+    test "renders email and password forms", %{conn: conn, user: user} do
+      {:ok, view, html} = live(conn, ~p"/admin/settings")
+
+      assert html =~ "Account"
+      assert html =~ user.email
+      assert has_element?(view, "#email_form")
+      assert has_element?(view, "#password_form")
+    end
+
+    test "validates email change", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/admin/settings")
+
+      result =
+        view
+        |> element("#email_form")
+        |> render_change(%{"user" => %{"email" => "with spaces"}})
+
+      assert result =~ "must have the @ sign and no spaces"
+    end
+
+    test "submits email change", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/admin/settings")
+
+      result =
+        view
+        |> form("#email_form", %{"user" => %{"email" => unique_user_email()}})
+        |> render_submit()
+
+      assert result =~ "A link to confirm your email"
+    end
+
+    test "validates password", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/admin/settings")
+
+      result =
+        view
+        |> element("#password_form")
+        |> render_change(%{
+          "user" => %{
+            "password" => "short",
+            "password_confirmation" => "mismatch"
+          }
+        })
+
+      assert result =~ "should be at least 12 character(s)"
+    end
+
+    test "submits valid password change", %{conn: conn, user: user} do
+      new_password = valid_user_password()
+      {:ok, view, _html} = live(conn, ~p"/admin/settings")
+
+      form =
+        form(view, "#password_form", %{
+          "user" => %{
+            "email" => user.email,
+            "password" => new_password,
+            "password_confirmation" => new_password
+          }
+        })
+
+      render_submit(form)
+      new_password_conn = follow_trigger_action(form, conn)
+
+      assert redirected_to(new_password_conn) == ~p"/admin/settings"
+      assert Accounts.get_user_by_email_and_password(user.email, new_password)
+    end
+  end
+
+  describe "advanced section" do
+    setup %{conn: conn, user: user} do
+      conn = log_in_user(conn, user)
+      %{conn: conn}
+    end
+
+    test "shows links to system tools", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/admin/settings")
+
+      assert has_element?(view, ~s(a[href="/admin/dashboard"]), "System dashboard")
+      assert has_element?(view, ~s(a[href="/admin/errors"]), "Error tracker")
+    end
+  end
 end

test/simpleshop_theme_web/live/auth/settings_test.exs

@@ -5,159 +5,18 @@ defmodule SimpleshopThemeWeb.Auth.SettingsTest do
   import Phoenix.LiveViewTest
   import SimpleshopTheme.AccountsFixtures
 
-  describe "Settings page" do
-    test "renders settings page", %{conn: conn} do
-      {:ok, _lv, html} =
-        conn
-        |> log_in_user(user_fixture())
-        |> live(~p"/users/settings")
-
-      assert html =~ "Change Email"
-      assert html =~ "Save Password"
+  describe "settings redirect" do
+    test "redirects to admin settings when logged in", %{conn: conn} do
+      conn = log_in_user(conn, user_fixture())
+      assert {:error, {:redirect, %{to: "/admin/settings"}}} = live(conn, ~p"/users/settings")
     end
 
-    test "redirects if user is not logged in", %{conn: conn} do
+    test "redirects to login when not logged in", %{conn: conn} do
       assert {:error, redirect} = live(conn, ~p"/users/settings")
-
       assert {:redirect, %{to: path, flash: flash}} = redirect
       assert path == ~p"/users/log-in"
       assert %{"error" => "You must log in to access this page."} = flash
     end
-
-    test "redirects if user is not in sudo mode", %{conn: conn} do
-      {:ok, conn} =
-        conn
-        |> log_in_user(user_fixture(),
-          token_authenticated_at: DateTime.add(DateTime.utc_now(:second), -11, :minute)
-        )
-        |> live(~p"/users/settings")
-        |> follow_redirect(conn, ~p"/users/log-in")
-
-      assert conn.resp_body =~ "You must re-authenticate to access this page."
-    end
-  end
-
-  describe "update email form" do
-    setup %{conn: conn} do
-      user = user_fixture()
-      %{conn: log_in_user(conn, user), user: user}
-    end
-
-    test "updates the user email", %{conn: conn, user: user} do
-      new_email = unique_user_email()
-
-      {:ok, lv, _html} = live(conn, ~p"/users/settings")
-
-      result =
-        lv
-        |> form("#email_form", %{
-          "user" => %{"email" => new_email}
-        })
-        |> render_submit()
-
-      assert result =~ "A link to confirm your email"
-      assert Accounts.get_user_by_email(user.email)
-    end
-
-    test "renders errors with invalid data (phx-change)", %{conn: conn} do
-      {:ok, lv, _html} = live(conn, ~p"/users/settings")
-
-      result =
-        lv
-        |> element("#email_form")
-        |> render_change(%{
-          "action" => "update_email",
-          "user" => %{"email" => "with spaces"}
-        })
-
-      assert result =~ "Change Email"
-      assert result =~ "must have the @ sign and no spaces"
-    end
-
-    test "renders errors with invalid data (phx-submit)", %{conn: conn, user: user} do
-      {:ok, lv, _html} = live(conn, ~p"/users/settings")
-
-      result =
-        lv
-        |> form("#email_form", %{
-          "user" => %{"email" => user.email}
-        })
-        |> render_submit()
-
-      assert result =~ "Change Email"
-      assert result =~ "did not change"
-    end
-  end
-
-  describe "update password form" do
-    setup %{conn: conn} do
-      user = user_fixture()
-      %{conn: log_in_user(conn, user), user: user}
-    end
-
-    test "updates the user password", %{conn: conn, user: user} do
-      new_password = valid_user_password()
-
-      {:ok, lv, _html} = live(conn, ~p"/users/settings")
-
-      form =
-        form(lv, "#password_form", %{
-          "user" => %{
-            "email" => user.email,
-            "password" => new_password,
-            "password_confirmation" => new_password
-          }
-        })
-
-      render_submit(form)
-
-      new_password_conn = follow_trigger_action(form, conn)
-
-      assert redirected_to(new_password_conn) == ~p"/users/settings"
-
-      assert get_session(new_password_conn, :user_token) != get_session(conn, :user_token)
-
-      assert Phoenix.Flash.get(new_password_conn.assigns.flash, :info) =~
-               "Password updated successfully"
-
-      assert Accounts.get_user_by_email_and_password(user.email, new_password)
-    end
-
-    test "renders errors with invalid data (phx-change)", %{conn: conn} do
-      {:ok, lv, _html} = live(conn, ~p"/users/settings")
-
-      result =
-        lv
-        |> element("#password_form")
-        |> render_change(%{
-          "user" => %{
-            "password" => "too short",
-            "password_confirmation" => "does not match"
-          }
-        })
-
-      assert result =~ "Save Password"
-      assert result =~ "should be at least 12 character(s)"
-      assert result =~ "does not match password"
-    end
-
-    test "renders errors with invalid data (phx-submit)", %{conn: conn} do
-      {:ok, lv, _html} = live(conn, ~p"/users/settings")
-
-      result =
-        lv
-        |> form("#password_form", %{
-          "user" => %{
-            "password" => "too short",
-            "password_confirmation" => "does not match"
-          }
-        })
-        |> render_submit()
-
-      assert result =~ "Save Password"
-      assert result =~ "should be at least 12 character(s)"
-      assert result =~ "does not match password"
-    end
   end
 
   describe "confirm email" do
@@ -176,33 +35,30 @@ defmodule SimpleshopThemeWeb.Auth.SettingsTest do
     test "updates the user email once", %{conn: conn, user: user, token: token, email: email} do
       {:error, redirect} = live(conn, ~p"/users/settings/confirm-email/#{token}")
 
-      assert {:live_redirect, %{to: path, flash: flash}} = redirect
-      assert path == ~p"/users/settings"
-      assert %{"info" => message} = flash
-      assert message == "Email changed successfully."
+      assert {:redirect, %{to: "/admin/settings", flash: flash}} = redirect
+      assert %{"info" => "Email changed successfully."} = flash
       refute Accounts.get_user_by_email(user.email)
       assert Accounts.get_user_by_email(email)
 
       # use confirm token again
       {:error, redirect} = live(conn, ~p"/users/settings/confirm-email/#{token}")
-      assert {:live_redirect, %{to: path, flash: flash}} = redirect
-      assert path == ~p"/users/settings"
-      assert %{"error" => message} = flash
-      assert message == "Email change link is invalid or it has expired."
+
+      assert {:redirect, %{to: "/admin/settings", flash: flash}} = redirect
+      assert %{"error" => "Email change link is invalid or it has expired."} = flash
     end
 
     test "does not update email with invalid token", %{conn: conn, user: user} do
       {:error, redirect} = live(conn, ~p"/users/settings/confirm-email/oops")
-      assert {:live_redirect, %{to: path, flash: flash}} = redirect
-      assert path == ~p"/users/settings"
-      assert %{"error" => message} = flash
-      assert message == "Email change link is invalid or it has expired."
+
+      assert {:redirect, %{to: "/admin/settings", flash: flash}} = redirect
+      assert %{"error" => "Email change link is invalid or it has expired."} = flash
       assert Accounts.get_user_by_email(user.email)
     end
 
     test "redirects if user is not logged in", %{token: token} do
       conn = build_conn()
       {:error, redirect} = live(conn, ~p"/users/settings/confirm-email/#{token}")
+
       assert {:redirect, %{to: path, flash: flash}} = redirect
       assert path == ~p"/users/log-in"
       assert %{"error" => message} = flash

test/simpleshop_theme_web/user_auth_test.exs

@@ -80,7 +80,7 @@ defmodule SimpleshopThemeWeb.UserAuthTest do
         |> assign(:current_scope, Scope.for_user(user))
         |> UserAuth.log_in_user(user)
 
-      assert redirected_to(conn) == ~p"/users/settings"
+      assert redirected_to(conn) == ~p"/admin/settings"
     end
 
     test "writes a cookie if remember_me was set in previous session", %{conn: conn, user: user} do