From 49892589f6d1a90c60afb9f96d667fc8684fd87e Mon Sep 17 00:00:00 2001
From: ramzcaca <ramzcaca@localhost.localdomain>
Date: Thu, 22 Jan 2026 11:56:44 +0100
Subject: [PATCH] wip website

---
 __pycache__/app.cpython-313.pyc     | Bin 2710 -> 2728 bytes
 __pycache__/grabber.cpython-313.pyc | Bin 1487 -> 1508 bytes
 app.py                              |  20 ++++++++++----------
 grabber.py                          |   3 ++-
 grabber.sh                          |   1 -
 templates/item.html                 |   1 +
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/__pycache__/app.cpython-313.pyc b/__pycache__/app.cpython-313.pyc
index aa4832a872f6b19c94993858e427b79ecc2b7ae3..8b50d5f2e74b516c31f21d982ae31b17821f78e3 100644
GIT binary patch
delta 544
zcmbOxx<ZuqGcPX}0}xDLD9Y5^$or0w@y_NyjDHzLLRo@^S%DJKJRoTh$Pt<Rky&`M
z4GRyW++;x(ZAQ__tSmZw!D7MU28=2U91QM^euk6FSv(mfCLd&R;Ni~AFUd$PO3F_x
zN}0^Xn##$MkzZVrmzbM6IgfRgWRVEa%py?`AqFDEL4*X5m~6);DO)55;>v>v1rVVK
zBs5uz_&{ux$+c{LTzWtzFAx_8O}@(JX(b^w!}g+tW{c|;7SS7G5;LSH=C`=E_}>r~
zoscon2FUb57DZM)Ih<Xq{(-3Y46ccBKy`jM_ys4ZbXEYF9ybJqC%8?N0y4dBAZxiH
zEqg&u@1nFm$T|rmJD#v`cKFN@oi8_2?t+BI1uo4iELwM1I4|%hEit{WY;sZA<bsmv
z1unBIEane*L?)zM;Fi9?BK^sJ@+WpfB^}0TjIQh~)A?O>7?+E=axv_6;RZ5~a>=`D
zG9T4scGa2e$}vY-6BHDT;GigG1hN&1bb;h8&f<*x^7zcWwEQBY$t;{R8Pz7w<5V^T
zslLTh01WveP>9`PPERc<G6J$zGJFP-3=qv6Ho5sJr8%i~MRt=vaV}u71<C*bL*tdD

delta 555
zcmZ1>I!%=KGcPX}0}$~4EzFeO$or0w@xbOkjDHz<qM1R$AP_7(Ig&+ZvM&oauShfx
zM2vwUNMo`tivnM;Xt0<8qY48DgFB<2^5n@Zo{Zv?@3J^>a%AKem*geprcTymO`SZ0
zb!Po77Ld>_=H!CXA~B#bw*-K!_~iVe)Z+NO(%hufqFX{Bk&=v})Wj5+Sdk=9X^|9&
zkOmPlAVL;M++t5jEzT~<FSx~2o?D~<65-5EiZ4zr%1q4BWG&(YDO3gtv!o=JB;K0b
z#pc3g0_5`oak2B{8*HAIg2EHLCd#$Aws_qT5Sm~;ksrwPydf+)A!DKqkm++nR(=8Z
z%=i}9D=bns<P{g_UX(WgabzY(vuhcCU}FI4Qt7M!D)qPlG|O$G6xb{gu?e*oMO1-o
z-y8gb7lf29@+*VXOg_jitROX0Y6i~*F4Ze6YIj&TFYqWWF<oxI(Efsw@dYlED=emy
zzq8vZ$uUl2bg^Wa&hIM6xLnM|hGDO>Es%M{M&4DL`KUCrtK8&pjycL2K(A;rg1uVI
z2xKc183V~%oW&XW<?)$$Y57GKlf^h^GOAAAz^QBqQhkf102m2Hpm4awoSs@zWC3KY
fWcUmu86cWDY;yBcN^?@}id-hMa4leQ2Fd^cF~^^1

diff --git a/__pycache__/grabber.cpython-313.pyc b/__pycache__/grabber.cpython-313.pyc
index 80c97c2cf6d9143d313a10c6ca2d6e18d9d0dd42..215b08e485c327fe21eb9bb42147f364b6435567 100644
GIT binary patch
delta 235
zcmX@l{e+wMGcPX}0}y;=EXrIvkvEyKW@2HGHdB#EFtZdxk!UarkQ57M1(M>yY(P>X
zm>oz;26F&OsbJ0`>4~qVFiK9YXG~?3o~*;{Hd&iVoKbeNGgA?xJedE7NuN;>$VwGc
z23k|Z4<ZCW1SgR2)0COKoY{<rJ2$^1Bef_gKd~rf@^j`kPL7QH;*z|?+|<cAEKS@M
zK&5RAH-tnRyeI!;F=OQyYVf!*S)a91-4ZCn2*kyrK;i>4BO~Ku2I1Qb{NGvR8Tmgk
I012>V0ABz&g#Z8m

delta 192
zcmaFDeV&{5GcPX}0}!bHEX<rSkvEyKVq#&CI<pi*kw`ELkQ5DO1(IUHY(P>xm>oz;
z1akmM$zaYRsfq8VFiK2rW=v(2nry)AHd&uZoKa@7J5v#(9Ed-OS)Wk>$Ve4a0@_f-
z4<ZCW1SgR2)0CdPn%RttGdC%|IJGD<F=z5y=C;YTEREd7K<PGy8v?=&o|8FQ%_h6B
WRx(;l-p4A*E62$Hi2+D}jR627b1c&U

diff --git a/app.py b/app.py
index 38c48f3..3d55b50 100644
--- a/app.py
+++ b/app.py
@@ -25,28 +25,28 @@ async def receive_info(request: Request):
     hw = data["HARDWARE"]
     sw = data["SOFTWARE"]
 
-    ordi1.host = hw["hostname"]
-    ordi1.cpu = hw["cpu_model"]
+    ordi1.motherboard = hw["motherboard"]
+    ordi1.cpu_model = hw["cpu_model"]
     ordi1.cpu_id = hw["cpu_id"]
-    ordi1.cpu_cores_number = hw["cpu_cores"]
-    ordi1.cpu_threads_number = hw["cpu_threads"]
+    ordi1.cpu_cores = hw["cpu_cores"]
+    ordi1.cpu_threads = hw["cpu_threads"]
     ordi1.cpu_frequency_min = hw["cpu_frequency_min"]
     ordi1.cpu_frequency_cur = hw["cpu_frequency_cur"]
     ordi1.cpu_frequency_max = hw["cpu_frequency_max"]
-    
 
+    ordi1.hostname = sw["hostname"]
     ordi1.os = sw["os"]
     ordi1.arch = sw["arch"]
-    ordi1.desktop = sw["desktop_env"]
-    ordi1.wm = sw["window_manager"]
+    ordi1.desktop_env = sw["desktop_env"]
+    ordi1.window_manager = sw["window_manager"]
     ordi1.kernel = sw["kernel"]
 
-    print(f"Hostname is {ordi1.host}")
-    print(f"Motherboard serial is {ordi1.mb_serial}")
+    print(f"Hostname is {ordi1.hostname}")
+    print(f"Motherboard serial is {ordi1.motherboard}")
 
     return {"status": "ok"}
 
 
-@app.get("/ordi1") #page affichant les infos de l'ordi
+@app.get("/ordi1")
 async def show_info(request: Request):
     return templates.TemplateResponse("item.html", {"request": request, "ordi": ordi1})
\ No newline at end of file
diff --git a/grabber.py b/grabber.py
index 41fa646..960618d 100644
--- a/grabber.py
+++ b/grabber.py
@@ -3,7 +3,7 @@ import configparser
 import requests
 
 class Grabber():
-    mb_serial = " "
+    motherboard = " "
     cpu_model = " "
     cpu_id = " "
     cpu_cores = " "
@@ -15,6 +15,7 @@ class Grabber():
     ram_slots = " "
     ram_number = " "
 
+    hostname = " "
     os = " "
     arch = " "
     desktop_env = " "
diff --git a/grabber.sh b/grabber.sh
index f13939e..eb0a28a 100755
--- a/grabber.sh
+++ b/grabber.sh
@@ -345,7 +345,6 @@ json_file() {
         }
         }'
     )
-    echo $json_data
     #SIMPLE LOCAL
     curl	-X POST http://localhost:8000/endpoint \
             -H "Content-Type: application/json" \
diff --git a/templates/item.html b/templates/item.html
index e8d119f..c56ca9f 100644
--- a/templates/item.html
+++ b/templates/item.html
@@ -37,6 +37,7 @@
         <h2>[SOFTWARE]</h2>
         <table>
             <tr><th>Propriété</th><th>Valeur</th></tr>
+            <tr><td>Hostname</td><td>{{ ordi.hostname }}</td></tr>
             <tr><td>OS</td><td>{{ ordi.os }}</td></tr>
             <tr><td>Architecture</td><td>{{ ordi.arch }}</td></tr>
             <tr><td>Desktop</td><td>{{ ordi.desktop_env }}</td></tr>