4sp-dv 1.1.8 → 1.1.10

package/4simpleproblems_v5.html

@@ -1116,8 +1116,12 @@
 
                 const docRef = doc(db, 'analytics', sessionId);
                 
+                // --- FIX: Determine userId before writing ---
+                const currentUid = (auth.currentUser && auth.currentUser.uid) ? auth.currentUser.uid : 'anonymous';
+
                 // Using Firestore functions imported at top
                 setDoc(docRef, {
+                    userId: currentUid, // <--- ADDED THIS FIELD
                     sessionId: sessionId,
                     userAgent: navigator.userAgent,
                     lastActive: serverTimestamp(),
@@ -1274,7 +1278,66 @@
                 // Initial fetch to check admin status (less frequent change)
                  const adminDoc = await getDoc(doc(db, "admins", ownerUid));
 
-                 userDataUnsubscribe = onSnapshot(doc(db, "users", ownerUid), (docSnap) => {
+                 userDataUnsubscribe = onSnapshot(doc(db, "users", ownerUid), async (docSnap) => {
+                     // --- INTEGRITY CHECK START ---
+                     let needsRepair = false;
+                     let missingFields = [];
+                     
+                     if (!docSnap.exists()) {
+                         console.warn("User document missing. Attempting repair...");
+                         needsRepair = true;
+                         missingFields = ['document_missing'];
+                     } else {
+                         const d = docSnap.data();
+                         // Required fields based on connection.html schema
+                         if (!d.email) missingFields.push('email');
+                         if (!d.username) missingFields.push('username');
+                         if (!d.authMethod) missingFields.push('authMethod');
+                         if (!d.createdAt) missingFields.push('createdAt');
+                         // emailVerified is boolean, check for undefined
+                         if (d.emailVerified === undefined) missingFields.push('emailVerified');
+                         
+                         if (missingFields.length > 0) {
+                             console.warn("User document incomplete:", missingFields);
+                             needsRepair = true;
+                         }
+                     }
+
+                     if (needsRepair) {
+                         const user = auth.currentUser;
+                         if (user && user.uid === ownerUid) {
+                             try {
+                                 const repairData = {
+                                     email: user.email,
+                                     // Guess auth method or default to unknown if complex
+                                     authMethod: user.providerData.length > 0 ? user.providerData[0].providerId : 'unknown',
+                                     username: user.displayName || user.email.split('@')[0].replace(/[^a-zA-Z0-9]/g, '').slice(0,16),
+                                     emailVerified: user.emailVerified,
+                                     photoURL: user.photoURL || null
+                                 };
+                                 
+                                 // Add createdAt only if missing to avoid overwriting existing timestamp (if any)
+                                 // If doc missing, we need it.
+                                 if (!docSnap.exists() || !docSnap.data().createdAt) {
+                                     repairData.createdAt = serverTimestamp();
+                                 }
+
+                                 await setDoc(doc(db, "users", ownerUid), repairData, { merge: true });
+                                 console.log("User document auto-repaired.");
+                                 // The snapshot listener will fire again with the fix, so we return here to avoid double processing UI
+                                 return; 
+                             } catch (err) {
+                                 console.error("Auto-repair failed:", err);
+                                 showIntegrityAlert(missingFields);
+                             }
+                         } else {
+                             showIntegrityAlert(missingFields);
+                         }
+                     } else {
+                         hideIntegrityAlert();
+                     }
+                     // --- INTEGRITY CHECK END ---
+
                      if (docSnap.exists()) {
                          const data = docSnap.data();
                          // Merge with existing local data to preserve properties not in basic user doc if any
@@ -1325,6 +1388,40 @@
                 initAnalytics(db, ownerUid);
             }
         }
+
+        function showIntegrityAlert(issues) {
+            let alertBox = document.getElementById('integrity-alert-box');
+            if (!alertBox) {
+                alertBox = document.createElement('div');
+                alertBox.id = 'integrity-alert-box';
+                alertBox.className = 'fixed bottom-4 right-4 bg-red-900/90 border border-red-500/50 text-white px-4 py-3 rounded-xl shadow-2xl flex items-center gap-4 z-[10000] backdrop-blur-md transition-all duration-300 transform translate-y-20 opacity-0';
+                alertBox.innerHTML = `
+                    <div class="flex items-center gap-3">
+                        <i class="fa-solid fa-triangle-exclamation text-red-400 text-xl"></i>
+                        <div class="flex flex-col">
+                            <span class="font-bold text-sm">Account Sync Error</span>
+                            <span class="text-xs text-gray-300">Your account data is incomplete.</span>
+                        </div>
+                    </div>
+                    <a href="https://4sp-organization.github.io/connection.html" target="_blank" class="bg-white/10 hover:bg-white/20 text-white text-xs font-medium py-2 px-4 rounded-lg transition border border-white/10 whitespace-nowrap">
+                        Redirect <i class="fa-solid fa-arrow-right ml-1"></i>
+                    </a>
+                `;
+                document.body.appendChild(alertBox);
+                // Animate in
+                setTimeout(() => {
+                    alertBox.classList.remove('translate-y-20', 'opacity-0');
+                }, 100);
+            }
+        }
+
+        function hideIntegrityAlert() {
+            const alertBox = document.getElementById('integrity-alert-box');
+            if (alertBox) {
+                alertBox.classList.add('translate-y-20', 'opacity-0');
+                setTimeout(() => alertBox.remove(), 300);
+            }
+        }
         
         // Helper to update the settings panel preview if open
         function updateSettingsPfpPreview(user, previewEl) {

package/logged-in/dashboard.html

@@ -369,38 +369,7 @@ body:not(.no-animations) .btn-toolbar-style:active, body:not(.no-animations) .bt
             </div>
     </div>
 
-    <button id="stats-btn" class="fixed bottom-8 left-8 w-10 h-10 rounded-xl bg-black border border-[#333] text-gray-400 flex items-center justify-center hover:bg-[#111] hover:text-white hover:scale-110 transition-all duration-300 z-50">
-        <i class="fa-solid fa-chart-simple"></i>
-    </button>
 
-    <div id="stats-dropdown" class="fixed bottom-20 left-8 bg-black border border-[#333] rounded-[18px] p-4 min-w-[240px] opacity-0 pointer-events-none transform translate-y-4 transition-all duration-300 z-50 shadow-2xl">
-        <div class="flex items-center gap-3 mb-4 pb-3 border-b border-[#222]">
-            <div class="w-10 h-10 rounded-full bg-[#111] flex items-center justify-center text-white font-bold text-lg" id="stat-avatar">
-                ?
-            </div>
-            <div>
-                <div class="text-white text-sm font-medium" id="stat-email">Loading...</div>
-                <div class="text-xs text-gray-500 font-mono" id="stat-uid">...</div>
-            </div>
-        </div>
-        
-        <div class="space-y-3">
-            <div>
-                <div class="text-[10px] uppercase tracking-wider text-gray-600 font-semibold mb-1">Member Since</div>
-                <div class="text-gray-300 text-sm" id="stat-created">...</div>
-            </div>
-            <div>
-                <div class="text-[10px] uppercase tracking-wider text-gray-600 font-semibold mb-1">Last Sign In</div>
-                <div class="text-gray-300 text-sm" id="stat-last-login">...</div>
-            </div>
-             <div>
-                <div class="text-[10px] uppercase tracking-wider text-gray-600 font-semibold mb-1">Provider</div>
-                <div class="text-gray-300 text-sm flex items-center gap-2" id="stat-provider">
-                    ...
-                </div>
-            </div>
-        </div>
-    </div>
 
     <button id="retry-weather-btn" onclick="retryWeather()" title="Retry Weather">
         <i class="fa-solid fa-cloud-sun"></i>
@@ -410,57 +379,8 @@ body:not(.no-animations) .btn-toolbar-style:active, body:not(.no-animations) .bt
         import { firebaseConfig } from '../firebase-config.js';
 
         // --- STATS DROPDOWN LOGIC ---
-        const statsBtn = document.getElementById('stats-btn');
-        const statsDropdown = document.getElementById('stats-dropdown');
-        
-        if(statsBtn && statsDropdown) {
-            statsBtn.addEventListener('click', (e) => {
-                e.stopPropagation();
-                const isVisible = statsDropdown.classList.contains('opacity-100');
-                if (isVisible) {
-                    statsDropdown.classList.remove('opacity-100', 'translate-y-0', 'pointer-events-auto');
-                    statsDropdown.classList.add('opacity-0', 'translate-y-4', 'pointer-events-none');
-                } else {
-                    statsDropdown.classList.add('opacity-100', 'translate-y-0', 'pointer-events-auto');
-                    statsDropdown.classList.remove('opacity-0', 'translate-y-4', 'pointer-events-none');
-                }
-            });
-
-            // Close when clicking outside
-            document.addEventListener('click', (e) => {
-                if (!statsDropdown.contains(e.target) && !statsBtn.contains(e.target)) {
-                    statsDropdown.classList.remove('opacity-100', 'translate-y-0', 'pointer-events-auto');
-                    statsDropdown.classList.add('opacity-0', 'translate-y-4', 'pointer-events-none');
-                }
-            });
-        }
+        // Removed as per request.
 
-        function populateStats(user) {
-            if (!user) return;
-            
-            // Email & UID
-            document.getElementById('stat-email').textContent = user.email || 'Anonymous';
-            document.getElementById('stat-uid').textContent = user.uid.substring(0, 12) + '...';
-            document.getElementById('stat-avatar').textContent = (user.email || 'A').charAt(0).toUpperCase();
-
-            // Dates
-            const created = new Date(user.metadata.creationTime);
-            const lastLogin = new Date(user.metadata.lastSignInTime);
-            
-            document.getElementById('stat-created').textContent = created.toLocaleDateString(undefined, { year: 'numeric', month: 'long', day: 'numeric' });
-            document.getElementById('stat-last-login').textContent = lastLogin.toLocaleDateString(undefined, { month: 'short', day: 'numeric' }) + ' at ' + lastLogin.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit' });
-
-            // Provider
-            const providerId = user.providerData[0]?.providerId || 'password';
-            let providerIcon = 'fa-envelope';
-            let providerName = 'Email';
-
-            if (providerId.includes('google')) { providerIcon = 'fa-google'; providerName = 'Google'; }
-            else if (providerId.includes('github')) { providerIcon = 'fa-github'; providerName = 'GitHub'; }
-            else if (providerId.includes('microsoft')) { providerIcon = 'fa-microsoft'; providerName = 'Microsoft'; }
-            
-            document.getElementById('stat-provider').innerHTML = `<i class="fa-brands ${providerIcon}"></i> ${providerName}`;
-        }
 
         // --- GLOBAL STATE ---
         let CURRENT_LAT = null;
@@ -802,7 +722,7 @@ body:not(.no-animations) .btn-toolbar-style:active, body:not(.no-animations) .bt
                  if (firebase.auth) {
                     firebase.auth().onAuthStateChanged((user) => {
                         if (user) {
-                            populateStats(user);
+                            // Stats removed
                         } else if (!window._LOCAL_MODE) {
                             window.location.replace(redirectPath);
                         }

package/navigation.js

@@ -603,8 +603,8 @@ let db;
         const container = document.getElementById('navbar-container');
         if (!container) return; 
 
-        const navElement = container.querySelector('nav');
-        const tabWrapper = navElement.querySelector('.tab-wrapper');
+        // Fix for navigation.js:607 crash
+        const tabWrapper = container.querySelector('.tab-wrapper');
         const authControlsWrapper = document.getElementById('auth-controls-wrapper');
         const navbarLogo = document.getElementById('navbar-logo');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "4sp-dv",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "",
   "keywords": [],
   "homepage": "https://github.com/v5-4simpleproblems/v5-4simpleproblems-dv#readme",