From 04d3ac50b21c811ef9dc41f079af64480380e164 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Wed, 10 Dec 2025 16:46:58 -0600
Subject: [PATCH] Clean-up post merge and rework layout to accomodate API and
 Appearance blocks

---
 app/views/users/_access_tokens.html.erb |  4 ++++
 app/views/users/_transfer.html.erb      |  7 +------
 app/views/users/show.html.erb           | 28 ++++++++-----------------
 3 files changed, 14 insertions(+), 25 deletions(-)
 create mode 100644 app/views/users/_access_tokens.html.erb

diff --git a/app/views/users/_access_tokens.html.erb b/app/views/users/_access_tokens.html.erb
new file mode 100644
index 000000000..285f87149
--- /dev/null
+++ b/app/views/users/_access_tokens.html.erb
@@ -0,0 +1,4 @@
+<div class="flex flex-column align-center">
+  <h2 class="divider txt-large margin-none-block full-width">Developer</h2>
+  <p class="margin-none">Manage <%= link_to "personal access tokens", my_access_tokens_path, class: "btn btn--plain txt-link" %> used with the Fizzy developer API.</p>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_transfer.html.erb b/app/views/users/_transfer.html.erb
index 533693ea8..13f895ebc 100644
--- a/app/views/users/_transfer.html.erb
+++ b/app/views/users/_transfer.html.erb
@@ -1,15 +1,10 @@
 <div class="flex flex-column gap align-center margin-block-double">
   <% url = session_transfer_url(user.identity.transfer_id, script_name: nil) %>
 
-  <header class="full-width">
-    <h2 class="divider txt-large">Link a device</h2>
-    <p class="margin-none-block" id="session_transfer_label">Use this link to sign-in on another device</p>
-  </header>
-
   <label class="flex flex-column gap full-width">
     <header>
       <strong class="divider txt-large">Devices</strong>
-      <p class="margin-none" id="session_transfer_label">Link to automatically log in on another device</strong>
+      <p class="margin-none" id="session_transfer_label">Link to automatically log in on another device.</p>
     </header>
     <span class="flex align-center gap margin-inline">
       <input type="text" class="input fill-white" id="session_transfer_url" value="<%= url %>" aria-labelledby="session_transfer_label" readonly>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 2bd0bb516..7cf5bdf7c 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -37,6 +37,14 @@
                 cards_path(creator_ids: [ @user.id ], sorted_by: "newest"), class: "btn btn--link", data: { turbo_frame: "_top" } %>
         </div>
       <% end %>
+
+      <% if Current.user == @user %>
+        <hr class="separator--horizontal full-width flex-item-grow margin-block-start-double" style="--border-color: var(--color-ink-light);" aria-hidden="true">
+
+        <%= button_to session_url(script_name: nil), method: :delete, class: "btn txt-x-small center", data: { turbo: false } do %>
+          <span>Sign out of Fizzy on this device</span>
+        <% end %>
+      <% end %>
     </div>
   </section>
 
@@ -44,25 +52,7 @@
     <section class="panel shadow" style="--panel-size: 45ch;">
       <%= render "users/theme" %>
       <%= render "users/transfer", user: @user %>
-
-      <hr class="separator--horizontal flex-item-grow margin-block" style="--border-color: var(--color-ink-light);" aria-hidden="true">
-
-      <%= button_to session_url(script_name: nil), method: :delete, class: "btn txt-x-small center", data: { turbo: false } do %>
-        <span>Sign out of Fizzy on this device</span>
-      <div class="flex flex-column align-center gap margin-block-start-double">
-        <header class="full-width">
-          <h2 class="divider txt-large margin-none-block">API</h2>
-        </header>
-
-        <div class="flex align-center gap txt-normal">
-          <%= link_to "Personal access tokens", my_access_tokens_path, class: "btn" %>
-        </div>
-      </div>
-
-      <div class="center margin-block-start-double">
-        <%= button_to session_url(script_name: nil), method: :delete, class: "btn btn--plain txt-link txt-small", data: { turbo: false } do %>
-        <span>Sign out of Fizzy</span>
-      <% end %>
+      <%= render "users/access_tokens" %>
     </section>
   <% end %>
 </div>