More formatting for annual report

cheeaun · Dec 6, 2024 · 2304b05 · 2304b05
1 parent 4e1572f
commit 2304b05
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 10 deletions.
diff --git a/src/locales/en.po b/src/locales/en.po
diff --git a/src/pages/annual-report.css b/src/pages/annual-report.css
@@ -31,8 +31,13 @@
     table {
       width: 100%;
 
-      td, th {
+      td,
+      th {
         vertical-align: top;
+
+        &.number {
+          text-align: end;
+        }
       }
 
       th {
@@ -44,6 +49,10 @@
 
       tr > * {
         border-top: 1px dashed var(--outline-color);
+
+        ~ * {
+          padding-inline-start: 1ch;
+        }
       }
     }
 
@@ -68,10 +77,9 @@
 
         .status {
           pointer-events: none;
-          font-size: calc(var(--text-size) * .8);
+          font-size: calc(var(--text-size) * 0.8);
         }
       }
-
     }
   }
-}
+}
diff --git a/src/pages/annual-report.jsx b/src/pages/annual-report.jsx
@@ -35,6 +35,8 @@ export default function AnnualReport() {
   const { accounts, annualReports, statuses } = results || {};
   const report = annualReports?.find((report) => report.year == year)?.data;
 
+  const datePlaceholder = new Date();
+
   return (
     <div id="annual-report-page" class="deck-container" tabIndex="-1">
       <div class="report">
@@ -54,16 +56,30 @@ export default function AnnualReport() {
                     <table>
                       <thead>
                         <tr>
-                          {Object.keys(value[0]).map((key) => (
-                            <th>{key}</th>
+                          {Object.entries(value[0]).map(([key, value]) => (
+                            <th
+                              class={
+                                key !== 'month' && typeof value === 'number'
+                                  ? 'number'
+                                  : ''
+                              }
+                            >
+                              {key}
+                            </th>
                           ))}
                         </tr>
                       </thead>
                       <tbody>
                         {value.map((item) => (
                           <tr>
                             {Object.entries(item).map(([k, value]) => (
-                              <td>
+                              <td
+                                class={
+                                  k !== 'month' && typeof value === 'number'
+                                    ? 'number'
+                                    : ''
+                                }
+                              >
                                 {value &&
                                 /(accountId)/i.test(k) &&
                                 /^(mostRebloggedAccounts|commonlyInteractedWithAccounts)$/i.test(
@@ -75,6 +91,13 @@ export default function AnnualReport() {
                                     )}
                                     showAvatar
                                   />
+                                ) : k === 'month' ? (
+                                  datePlaceholder.setMonth(value - 1) &&
+                                  datePlaceholder.toLocaleString(undefined, {
+                                    month: 'long',
+                                  })
+                                ) : typeof value === 'number' ? (
+                                  value.toLocaleString()
                                 ) : (
                                   value
                                 )}
@@ -112,7 +135,13 @@ export default function AnnualReport() {
                           {Object.entries(value).map(([k, value]) => (
                             <tr>
                               <th>{k}</th>
-                              <td>{value}</td>
+                              <td
+                                class={
+                                  typeof value === 'number' ? 'number' : ''
+                                }
+                              >
+                                {value}
+                              </td>
                             </tr>
                           ))}
                         </tbody>