From 5f74212603f1da3bfc42594bc79df88c04f8f4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kip.pe>
Date: Sun, 26 Feb 2023 11:33:11 +0800
Subject: [PATCH] Improve admin donation pages

---
 app/views/admin/donations/_form.html.erb | 48 +++++-----------
 app/views/admin/donations/edit.html.erb  |  7 +--
 app/views/admin/donations/new.html.erb   |  4 +-
 app/views/admin/donations/show.html.erb  | 70 +++++++++++++-----------
 4 files changed, 53 insertions(+), 76 deletions(-)

diff --git a/app/views/admin/donations/_form.html.erb b/app/views/admin/donations/_form.html.erb
index 1405b08..0522cb0 100644
--- a/app/views/admin/donations/_form.html.erb
+++ b/app/views/admin/donations/_form.html.erb
@@ -10,46 +10,24 @@
     </div>
   <% end %>
 
-  <div class="field">
-    <p>
-      <%= form.label :user_id %>
-      <%= form.collection_select :user_id, User.where(ou: "kosmos.org").order(:cn), :id, :cn %>
-    </p>
-  </div>
+  <div class="sm:w-1/2 grid grid-cols-2 items-center gap-y-2">
+    <%= form.label :user_id %>
+    <%= form.collection_select :user_id, User.where(ou: "kosmos.org").order(:cn), :id, :cn, {} %>
 
-  <div class="field">
-    <p>
-      <%= form.label :amount_sats, "Amount BTC (sats)" %>
-      <%= form.number_field :amount_sats %>
-    </p>
-  </div>
+    <%= form.label :amount_sats, "Amount BTC (sats)" %>
+    <%= form.number_field :amount_sats %>
 
-  <div class="field">
-    <p>
-      <%= form.label :amount_eur, "Amount EUR (cents)" %>
-      <%= form.number_field :amount_eur %>
-    </p>
-  </div>
+    <%= form.label :amount_eur, "Amount EUR (cents)" %>
+    <%= form.number_field :amount_eur %>
 
-  <div class="field">
-    <p>
-      <%= form.label :amount_usd, "Amount USD (cents)"%>
-      <%= form.number_field :amount_usd %>
-    </p>
-  </div>
+    <%= form.label :amount_usd, "Amount USD (cents)"%>
+    <%= form.number_field :amount_usd %>
 
-  <div class="field">
-    <p>
-      <%= form.label :public_name %>
-      <%= form.text_field :public_name %>
-    </p>
-  </div>
+    <%= form.label :public_name %>
+    <%= form.text_field :public_name %>
 
-  <div class="field">
-    <p>
-      <%= form.label :paid_at %>
-      <%= form.text_field :paid_at %>
-    </p>
+    <%= form.label :paid_at %>
+    <%= form.text_field :paid_at %>
   </div>
 
   <p class="mt-8">
diff --git a/app/views/admin/donations/edit.html.erb b/app/views/admin/donations/edit.html.erb
index ba590b2..27340f1 100644
--- a/app/views/admin/donations/edit.html.erb
+++ b/app/views/admin/donations/edit.html.erb
@@ -1,12 +1,9 @@
-<%= render HeaderComponent.new(title: "Donations") %>
+<%= render HeaderComponent.new(title: "Donation ##{@donation.id}") %>
 
 <%= render MainSimpleComponent.new do %>
-  <h2>Editing Donation</h2>
-
   <%= render 'form', donation: @donation, url: admin_donation_path(@donation) %>
 
   <p class="mt-8">
-    <%= link_to 'Show', admin_donation_path(@donation), class: 'ks-text-link' %> |
-    <%= link_to 'Back', admin_donations_path, class: 'ks-text-link' %>
+    <%= link_to 'Cancel', admin_donation_path(@donation), class: 'btn-sm btn-gray' %>
   <p>
 <% end %>
diff --git a/app/views/admin/donations/new.html.erb b/app/views/admin/donations/new.html.erb
index d831813..176b659 100644
--- a/app/views/admin/donations/new.html.erb
+++ b/app/views/admin/donations/new.html.erb
@@ -1,8 +1,6 @@
-<%= render HeaderComponent.new(title: "Donations") %>
+<%= render HeaderComponent.new(title: "Add Donation") %>
 
 <%= render MainSimpleComponent.new do %>
-  <h2>New Donation</h2>
-
   <%= render 'form', donation: @donation, url: admin_donations_path %>
 
   <p class="mt-8">
diff --git a/app/views/admin/donations/show.html.erb b/app/views/admin/donations/show.html.erb
index 57b0531..1526789 100644
--- a/app/views/admin/donations/show.html.erb
+++ b/app/views/admin/donations/show.html.erb
@@ -1,37 +1,41 @@
-<%= render HeaderComponent.new(title: "Donations") %>
+<%= render HeaderComponent.new(title: "Donation ##{@donation.id}") %>
 
 <%= render MainSimpleComponent.new do %>
-  <table class="w-1/2">
-    <tbody>
-      <tr>
-        <th>User</th>
-        <td><%= link_to @donation.user.address, admin_user_path(@donation.user.address), class: 'ks-text-link' %></td>
-      </tr>
-      <tr>
-        <th>Amount sats</th>
-        <td><%= @donation.amount_sats %></td>
-      </tr>
-      <tr>
-        <th>Amount EUR</th>
-        <td><%= @donation.amount_eur %></td>
-      </tr>
-      <tr>
-        <th>Amount USD</th>
-        <td><%= @donation.amount_usd %></td>
-      </tr>
-      <tr>
-        <th>Public name</th>
-        <td><%= @donation.public_name %></td>
-      </tr>
-      <tr>
-        <th>Date</th>
-        <td><%= @donation.paid_at.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
-      </tr>
-    </tbody>
-  </table>
+  <section>
+    <table class="w-1/2 divided">
+      <tbody>
+        <tr>
+          <th>User</th>
+          <td><%= link_to @donation.user.address, admin_user_path(@donation.user.address), class: 'ks-text-link' %></td>
+        </tr>
+        <tr>
+          <th>Amount sats</th>
+          <td><%= @donation.amount_sats %></td>
+        </tr>
+        <tr>
+          <th>Amount EUR</th>
+          <td><%= @donation.amount_eur %></td>
+        </tr>
+        <tr>
+          <th>Amount USD</th>
+          <td><%= @donation.amount_usd %></td>
+        </tr>
+        <tr>
+          <th>Public name</th>
+          <td><%= @donation.public_name %></td>
+        </tr>
+        <tr>
+          <th>Date</th>
+          <td><%= @donation.paid_at.strftime("%Y-%m-%d (%H:%M UTC)") %></td>
+        </tr>
+      </tbody>
+    </table>
+  </section>
 
-  <p class="mt-8">
-    <%= link_to 'Edit', edit_admin_donation_path(@donation), class: 'ks-text-link' %> |
-    <%= link_to 'Back', admin_donations_path, class: 'ks-text-link' %>
-  </p>
+  <section>
+    <p>
+      <%= link_to 'Edit', edit_admin_donation_path(@donation), class: 'btn-md btn-blue mr-1' %>
+      <%= link_to 'Back', admin_donations_path, class: 'btn-md btn-gray' %>
+    </p>
+  </section>
 <% end %>