From 317442b8ea56a1a6775c04b88523fd98a9dd78e7 Mon Sep 17 00:00:00 2001
From: jerick <jerick00201@gmail.com>
Date: Thu, 27 Nov 2025 00:58:39 -0500
Subject: [PATCH] Formatted webpage with correct faction member calls

---
 services/__pycache__/torn_api.cpython-311.pyc | Bin 6504 -> 6636 bytes
 services/torn_api.py                          |   1 +
 static/styles.css                             |  72 +++++++++++++-----
 templates/dashboard.html                      |  41 ++++++----
 4 files changed, 82 insertions(+), 32 deletions(-)

diff --git a/services/__pycache__/torn_api.cpython-311.pyc b/services/__pycache__/torn_api.cpython-311.pyc
index 29c497b20accdd6b35bf42d8802ecb4fdb9be290..37a6746c50c9f179cdc761251539fa6154033327 100644
GIT binary patch
delta 706
zcmaE1^v0NXIWI340}$+ete&}hBkxg0E)F2C8Hhj6*?fmFg^6+BWJi|ollfRB7zHLT
zXHgdyOyOO|#K5o`h#{bcCq-xu>ttJ2UB>;Bvssljg;Rvrh@h%rWGIn@sb^rQVN4NC
z5nCfZc{{5vv&0(7$<JBsS%rfcG^I9cv&Aqe-C`>)Nh~QXzQqcnQ#DzO1b~{0KqeGP
zg9w?)Q#o>2i)4W8$()>bxvYT<5g;x$+Wdj@CKDSktI7uk-pS{AvJJ(gre{pbm{GAp
z=%Sd;6)~ObVg{GQ3^s`G(7Y(-az)JLhJ^G7ZZ;vV4-7z}gY5&~VlQ4s!4t9)o{Y>V
z8Cg78*-vsXda`bg=96V)w3%GVugdBKw8?w(Vt!dBJ&?t>I9)4}QwvHm^Ye<-f&3x|
zkRWSuPHJj_CQA_~NC*_hMb4Ao2`aOC0GT11#e^i89KotVrrqL7%}dR#j4w$n&W32`
zPA*CXdL1GH(sGN-)z8&8GTzP8$8{xBktf8!0ueRVKp-<^^K6mTj3M4YrY6TN;pEby
zqSU;S__U(T)V!3O%J|F_h||E9@xq1S_7(Yo%mdrQ>lWnc>gVDEv8pIw@+>h;)-a%S
z@#GU?{oJY`g&H8jVRDkVrHem^844nNK|~0M@BtCQK;jm2W?soHmZbdroFZ^gv4ntp
y2yzA3vLcY%i^3+~7nfp;oBT_Bg{A?cz>44x3_xl}2$(vM0;bT3yve5}<^ljOHn(2@

delta 601
zcmaE3{KANLIWI340}v?Wsb`jK<UPvB#SY{(1Mz3C&3716m>8!{c4Ya^%9A26hh=g<
zt1jcT$$MFqSp`!B*9c91$|}z)oFcMDbTTKKF0<Gg@yV8K_N;=z44M*~YuRF$_%vCH
z1b}80NrDLJ$-g;rIBu~Omn4>y7EjLMyvt<;6c+*FV!_S9TsN86cvw|FFz`$^;>{M2
zkp95QD#Z1H0Z4SPec)Mqj+asJxQT>^1oH_A77rQr6Y`86GMn%7$ucrpPyWlV%IXL-
z$ZNB@fGm?9$lP0;t`*6t1tppJc|~eKevv&$khM4`HMIcfE>4gT$nQl?lZ%9uS>1um
z;LWpyB$*t+szIjR;!4d+&8>_tNi5EWXy;BYN=+<Dg@}N(+~RWebM=jkck}ddUCC7B
z0Wt84h#G4EkeR$$UUW4hqu1oqV$v1}V|mkxGE?(Xa*#|e@&)Mxo5<@H<mu|?;sY_X
z$bYh&xF%~TNP4o5ct5u?h@}o9>?c1Hw~Y4#F+)Iv4~Pf`5#Aso2uR#w&de*h#gdet
zpHl=56qXQ>UqGG%TUG>eWf92ml?+8<AT}sEesS33=BJeAq}mn5POg(!p{dU(up;;a
V1CZJg0;Ue6fGKn$XR^QKTmaR*nVSFr

diff --git a/services/torn_api.py b/services/torn_api.py
index e38fd8c..5e85db1 100644
--- a/services/torn_api.py
+++ b/services/torn_api.py
@@ -55,6 +55,7 @@ async def fetch_and_save_faction(faction_id: int, file_path: Path) -> bool:
             "id": pid,
             "name": info.get("name", "Unknown"),
             "level": info.get("level", 0),
+            "status": info.get("status", {}).get("state", "Unknown"),
             "estimate": est
         }
         faction_data.append(member)
diff --git a/static/styles.css b/static/styles.css
index edf5e25..abd8908 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -4,43 +4,77 @@ body {
     color: #f0f0f0;
     margin: 0;
     padding: 0;
+    min-height: 100vh;
 }
 
 .container {
-    max-width: 800px;
+    width: 95%;
+    max-width: 1300px;
     margin: 2rem auto;
-    padding: 2rem;
+}
+
+/* Top Bar with Title + Interval Box */
+.top-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 2rem;
+}
+
+.interval-box {
+    background-color: #3a3a4d;
+    padding: 0.75rem 1rem;
+    border-radius: 10px;
+    display: flex;
+    flex-direction: column;
+    gap: 0.4rem;
+}
+
+.interval-box label {
+    font-size: 0.9rem;
+    color: #ffcc66;
+}
+
+.interval-box input {
+    padding: 0.5rem;
+    border-radius: 6px;
+    border: none;
+}
+
+/* Horizontal Faction Row */
+.faction-row {
+    display: flex;
+    flex-direction: row !important;
+    justify-content: space-between;
+    gap: 2rem;
+}
+
+/* Each Faction Card */
+.faction-card {
+    flex: 1;
     background-color: #2c2c3e;
+    padding: 1.5rem;
     border-radius: 12px;
     box-shadow: 0 0 20px rgba(0,0,0,0.5);
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    width: 100%;
+    max-width: 600px;
 }
 
-h1 {
-    text-align: center;
-    color: #ffcc00;
-}
-
-.faction-section {
-    background-color: #3a3a4d;
-    margin: 1.5rem 0;
-    padding: 1rem 1.5rem;
-    border-radius: 8px;
-}
-
-.faction-section h2 {
+.faction-card h2 {
     color: #66ccff;
 }
 
 input[type="number"] {
-    padding: 0.5rem;
-    margin-right: 0.5rem;
+    padding: 0.7rem;
     border-radius: 6px;
     border: none;
-    width: 150px;
 }
 
 button {
-    padding: 0.5rem 1rem;
+    padding: 0.7rem 1rem;
     border-radius: 6px;
     border: none;
     background-color: #66ccff;
diff --git a/templates/dashboard.html b/templates/dashboard.html
index b254326..78f0f70 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -6,23 +6,38 @@
     <link rel="stylesheet" href="/static/styles.css">
 </head>
 <body>
-    <div class="container">
+
+<div class="container">
+
+    <div class="top-bar">
         <h1>War Dashboard</h1>
 
-        <div class="faction-section">
-            <h2>Enemy Faction</h2>
-            <input type="number" id="enemyId" placeholder="Enemy Faction ID">
-            <input type="number" id="refreshInterval" placeholder="Refresh Interval (sec)">
-            <button onclick="updateEnemy()">Refresh Enemy</button>
-        </div>
-
-        <div class="faction-section">
-            <h2>Friendly Faction</h2>
-            <input type="number" id="friendlyId" placeholder="Friendly Faction ID">
-            <button onclick="updateFriendly()">Refresh Friendly</button>
+        <div class="interval-box">
+            <label for="refreshInterval">Refresh Interval (sec)</label>
+            <input type="number" id="refreshInterval" placeholder="e.g., 30">
         </div>
     </div>
 
-    <script src="/static/dashboard.js"></script>
+    <div class="faction-row">
+
+        <!-- Enemy -->
+        <div class="faction-card">
+            <h2>Enemy Faction</h2>
+            <input type="number" id="enemyId" placeholder="Enemy Faction ID">
+            <button onclick="updateEnemy()">Start Enemy Refresh</button>
+        </div>
+
+        <!-- Friendly -->
+        <div class="faction-card">
+            <h2>Friendly Faction</h2>
+            <input type="number" id="friendlyId" placeholder="Friendly Faction ID">
+            <button onclick="updateFriendly()">Start Friendly Refresh</button>
+        </div>
+
+    </div>
+
+</div>
+
+<script src="/static/dashboard.js"></script>
 </body>
 </html>