From 638bc16b4b0401f56d4fa013055f7ece8b68c4ef Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 4 Jun 2025 15:16:24 -0500
Subject: [PATCH] Display users and invite on `account/settings`

---
 .gitignore                                    |  1 +
 .../accounts/settings_controller.rb           |  1 +
 app/controllers/users_controller.rb           |  4 ----
 .../{users => accounts}/_invite.html.erb      |  2 +-
 app/views/{users => accounts}/_user.html.erb  |  0
 app/views/accounts/settings/show.html.erb     |  5 ++++
 app/views/users/index.html.erb                | 24 -------------------
 7 files changed, 8 insertions(+), 29 deletions(-)
 rename app/views/{users => accounts}/_invite.html.erb (95%)
 rename app/views/{users => accounts}/_user.html.erb (100%)
 delete mode 100644 app/views/users/index.html.erb

diff --git a/.gitignore b/.gitignore
index 05d3d1dc0..ab6207c8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /config/master.key
 
 /config/credentials/*.key
+.DS_Store
diff --git a/app/controllers/accounts/settings_controller.rb b/app/controllers/accounts/settings_controller.rb
index 6727ead6a..60e60ceaf 100644
--- a/app/controllers/accounts/settings_controller.rb
+++ b/app/controllers/accounts/settings_controller.rb
@@ -1,5 +1,6 @@
 class Accounts::SettingsController < ApplicationController
   def show
     @account = Account.sole
+    @users = User.active
   end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f144f5be7..92839b3e5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -6,10 +6,6 @@ class UsersController < ApplicationController
   before_action :ensure_join_code_is_valid, only: %i[ new create ]
   before_action :ensure_permission_to_change_user, only:  %i[ update destroy ]
 
-  def index
-    @users = User.active
-  end
-
   def new
     @user = User.new
   end
diff --git a/app/views/users/_invite.html.erb b/app/views/accounts/_invite.html.erb
similarity index 95%
rename from app/views/users/_invite.html.erb
rename to app/views/accounts/_invite.html.erb
index d6e99af78..4bc7562f0 100644
--- a/app/views/users/_invite.html.erb
+++ b/app/views/accounts/_invite.html.erb
@@ -1,4 +1,4 @@
-<div class="flex flex-column align-center gap">
+<div class="flex flex-column align-center fill-shade pad border-radius gap">
   <% url = join_url(Account.sole.join_code) %>
 
   <label class="flex flex-column gap full-width txt-align-center">
diff --git a/app/views/users/_user.html.erb b/app/views/accounts/_user.html.erb
similarity index 100%
rename from app/views/users/_user.html.erb
rename to app/views/accounts/_user.html.erb
diff --git a/app/views/accounts/settings/show.html.erb b/app/views/accounts/settings/show.html.erb
index 292abb84d..efc2b70fa 100644
--- a/app/views/accounts/settings/show.html.erb
+++ b/app/views/accounts/settings/show.html.erb
@@ -17,6 +17,11 @@
 
 <section class="panels--two-up margin-block">
   <div class="panel shadow center flex flex-column">
+    <strong class="divider txt-large margin-block-end">People on the account</strong>
+    <%= render "accounts/invite" %>
+    <div class="flex flex-column gap margin-block-start">
+      <%= render partial: "accounts/user", collection: @users %>
+    </div>
   </div>
 
   <div class="panel shadow center flex flex-column">
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
deleted file mode 100644
index 2041accd4..000000000
--- a/app/views/users/index.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% @page_title = "People on the account" %>
-
-<% content_for :header do %>
-  <nav class="align-start">
-    <%= link_to_home icon: "arrow-left", label: "Go back", class: "flex-item-justify-start" %>
-
-    <header class="flex flex-column center">
-      <h1 class="txt-x-large"><%= @page_title %></h1>
-    </header>
-
-    <%= link_to workflows_path, class: "btn flex-item-justify-end" do %>
-      <%= icon_tag "bolt" %>
-      <span class="for-screen-reader">Workflows</span>
-    <% end %>
-  </nav>
-<% end %>
-
-<div class="panel borderless center pad fill-shade flex flex-column margin-block">
-  <%= render "users/invite" %>
-</div>
-
-<div class="panel borderless center pad fill-none flex flex-column gap">
-  <%= render @users %>
-</div>