maj interface web

composants/byPanda/porterfid.py

@@ -54,15 +54,11 @@ class SystemePorteRFID:
         GPIO.output(self.pinLed, GPIO.LOW)
 
     def traiterBadge(self, badgeId):
-        """Envoie le numéro du badge à Flask pour vérification dans MariaDB."""
         print(f"Badge détecté : {badgeId}")
-
         try:
-            # Vérifie bien que l'URL correspond à ta route Flask (avec ou sans /api)
+            
             url = "https://127.0.0.1/rfid-scan" 
             donnees = {"badge_id": str(badgeId)}
-
-            # verify=False est nécessaire car le serveur local utilise un certificat auto-signé
             reponse = requests.post(url, json=donnees, timeout=2, verify=False)
             data = reponse.json()
 

fastapi/main.py

@@ -16,7 +16,7 @@ from thermostat import SystemeThermostat
 from etatsystemes import EtatSysteme
 from septsegments import afficher_temperature 
 
-app = FastAPI(title="Loustiques API - Pi 2")
+app = FastAPI(title="L'API des loustiques")
 
 controleur_lumieres = SystemeLumieres()
 controleur_thermostat = SystemeThermostat()

flask/main.sh

@@ -102,7 +102,6 @@ VENV_LIST=()
 
 for dir in "${SEARCH_DIRS[@]}"; do
     if [ -d "$dir" ]; then
-        # Un venv valide contient bin/activate et bin/python
         while IFS= read -r -d '' activate_path; do
             venv_dir=$(dirname "$(dirname "$activate_path")")
             if [ -f "$venv_dir/bin/python" ]; then

flask/run_flask.sh

@@ -50,7 +50,7 @@ bash web_secu/ssl.sh
 
 cat << 'EOF'
 =============================
-Vérification du daemin Avahi
+Vérification du daemon Avahi
 ============================
 EOF
 bash web_secu/avahi.sh

flask/templates/admin.html

@@ -236,7 +236,7 @@
 
 <aside>
     <div class="logo">
-        Loustiques
+        SUPER Loustiques
         <span>Panneau admin</span>
     </div>
     <nav>
@@ -253,7 +253,7 @@
             Système
         </a>
     </nav>
-    <div class="sidebar-footer">v0.1.0 — local</div>
+    <div class="sidebar-footer">Version 1.0</div>
 </aside>
 
 <main>

flask/templates/dashboard.html

@@ -235,17 +235,32 @@
         <div class="card-label">Heure locale</div>
         <div class="card-value" id="clock">--:--</div>
         <div class="card-sub" id="date-display">--</div>
+      </div>
+        <div class="card">
+        <div class="card-label">Température</div>
+        <div class="card-sub" id="date-display">--</div>
+      </div>
+    
+        <div class="card">
+        <div class="card-label">Porte</div>
+        <div class="card-sub" id="date-display">--</div>
       </div>
       <div class="card">
         <svg class="card-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="2" y="3" width="20" height="14" rx="2"/><line x1="8" y1="21" x2="16" y2="21"/><line x1="12" y1="17" x2="12" y2="21"/></svg>
-        <div class="card-label">Raspberry Pi</div>
+        <div class="card-label">Raspberry Pi 1 (actuelle)</div>
-        <div class="card-value" style="color:#2563eb;">Actif</div>
+        <div class="card-value" style="color:green;">Actif</div>
         <div class="card-sub">Flask 3.1</div>
       </div>
+      <div class="card">
+        <svg class="card-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="2" y="3" width="20" height="14" rx="2"/><line x1="8" y1="21" x2="16" y2="21"/><line x1="12" y1="17" x2="12" y2="21"/></svg>
+        <div class="card-label">Raspberry Pi 2 distant </div>
+        <div class="card-value" style="color:green;">Actif</div>
+        <div class="card-sub">FastAPi</div>
+      </div>
       <div class="card">
         <svg class="card-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/></svg>
         <div class="card-label">Session</div>
-        <div class="card-value">Authentifiée</div>
+        <div class="card-value" style="color: green;">Authentifiée</div>
         <div class="card-sub">Accès autorisé</div>
       </div>
     </div>
@@ -259,25 +274,13 @@
         <span class="a-arrow">›</span>
       </button>
        <button class="action-btn" onclick="callAlarm()">
-        <span class="a-label">💡 Alarme</span>
+        <span class="a-label">Alarme</span>
-        <span class="a-sub">Contrôler la alarme</span>
+        <span class="a-sub">Armer l'alarme</span>
-        <span class="a-arrow">›</span>
+        <span class="a-arrow">›</span></button>
-      </button>
+        <button class="action-btn" onclick="callAlarm()">
-       <button class="action-btn" onclick="callBoard1()">
+        <span class="a-label">Alarme</span>
-        <span class="a-label">💡 Board1</span>
+        <span class="a-sub">Désarmer l'alarme</span>
-        <span class="a-sub">Contrôler la board1</span>
+        <span class="a-arrow">›</span></button>
-        <span class="a-arrow">›</span>
-      </button>
-      <button class="action-btn" onclick="showToast('Fonction à venir...')">
-        <span class="a-label">⚙️ Paramètres</span>
-        <span class="a-sub">Configuration système</span>
-        <span class="a-arrow">›</span>
-      </button>
-      <button class="action-btn" onclick="showToast('Fonction à venir...')">
-        <span class="a-label">📡 Réseau</span>
-        <span class="a-sub">État de la connexion</span>
-        <span class="a-arrow">›</span>
-      </button>
       <button class="action-btn" onclick="go_admin()">
         <span class="a-label">Administration</span>
         <span class="a-sub">Administrer les loustiques</span>

flask/templates/index.html

@@ -129,7 +129,7 @@
 
     <div class="champ">
       <label for="password">Mot de passe</label>
-      <input type="password" id="password" placeholder="Wola ouais" autocomplete="current-password" />
+      <input type="password" id="password" placeholder="Mot de passe du loustique" autocomplete="current-password" />
     </div>
 
     <button id="btn" onclick="handleLogin()">Se connecter</button>
@@ -140,14 +140,14 @@
   </div>
 
 <script>
-    // 1. Écoute de la touche Entrée
+   
     ["username", "password"].forEach(id => {
       document.getElementById(id).addEventListener("keydown", e => {
         if (e.key === "Enter") handleLogin();
       });
     });
 
-    // 2. Fonction de connexion manuelle (Mot de passe)
+   -
     async function handleLogin() {
       const username = document.getElementById("username").value.trim();
       const password = document.getElementById("password").value;

flask/templates/log.html

@@ -9,8 +9,8 @@
 
         body {
             font-family: system-ui, sans-serif;
-            background: #1f1f1f;
+            background: rgb(32, 31, 31);
-            color: #f0f0f0;
+            color: white;
             min-height: 100vh;
             display: flex;
         }
@@ -18,7 +18,7 @@
         aside {
             width: 220px;
             min-height: 100vh;
-            background: #1a1a1a;
+            background: rgb(34, 34, 34);
             border-right: 1px solid #2e2e2e;
             display: flex;
             flex-direction: column;
@@ -30,7 +30,7 @@
         .logo {
             font-size: 20px;
             font-weight: 700;
-            color: #f0f0f0;
+            color: white;
             margin-bottom: 2.5rem;
             padding-bottom: 1.5rem;
             border-bottom: 1px solid #2e2e2e;
@@ -39,7 +39,7 @@
         .logo span {
             display: block;
             font-size: 15px;
-            color: #666;
+            color: gray;
             margin-top: 4px;
             font-weight: 400;
         }
@@ -51,7 +51,7 @@
             padding: 8px 10px;
             border-radius: 6px;
             font-size: 13px;
-            color: #888;
+            color: gray;
             text-decoration: none;
             margin-bottom: 2px;
             transition: all 0.15s;
@@ -227,7 +227,7 @@
 
 <aside>
     <div class="logo">
-        Loustiques
+        SUPER Loustiques
         <span>Panneau admin</span>
     </div>
     <nav>
@@ -239,12 +239,9 @@
             <svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="2" y="2" width="12" height="12" rx="2"/><path d="M5 8h6M5 5h6M5 11h4"/></svg>
             Logs
         </a>
-        <a href="#">
+       
-            <svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5"><circle cx="8" cy="8" r="3"/><path d="M8 1v2M8 13v2M1 8h2M13 8h2"/></svg>
-            Système
-        </a>
     </nav>
-    <div class="sidebar-footer">v0.1.0 — local</div>
+    <div class="sidebar-footer">Version 1.0</div>
 </aside>
 
 <main>