From 13491d95fe6b3479d143073256988138af0bdff1 Mon Sep 17 00:00:00 2001
From: accius <chris@cjhlighting.com>
Date: Mon, 2 Feb 2026 12:41:36 -0500
Subject: [PATCH] fix so local storage has priority

---
 src/App.jsx         | 22 ++++++++--------
 src/utils/config.js | 61 +++++++++++++++++++++++++++++++--------------
 2 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 5b27dd2..4cdf42b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -52,16 +52,21 @@ const App = () => {
   const [startTime] = useState(Date.now());
   const [uptime, setUptime] = useState('0d 0h 0m');
   
-  // Load server configuration on startup
+  // Load server configuration on startup (only matters for first-time users)
   useEffect(() => {
     const initConfig = async () => {
+      // Fetch server config (provides defaults for new users without localStorage)
       await fetchServerConfig();
-      const serverConfig = loadConfig();
-      setConfig(serverConfig);
+      
+      // Load config - localStorage takes priority over server config
+      const loadedConfig = loadConfig();
+      setConfig(loadedConfig);
       setConfigLoaded(true);
       
-      // Auto-show settings if config is incomplete
-      if (serverConfig.configIncomplete || serverConfig.callsign === 'N0CALL') {
+      // Only show settings if user has no saved config AND no valid callsign
+      // This prevents the popup from appearing every refresh
+      const hasLocalStorage = localStorage.getItem('openhamclock_config');
+      if (!hasLocalStorage && loadedConfig.callsign === 'N0CALL') {
         setShowSettings(true);
       }
     };
@@ -147,15 +152,12 @@ const App = () => {
     applyTheme(config.theme || 'dark');
   }, []);
 
-  useEffect(() => {
-    const saved = localStorage.getItem('openhamclock_config');
-    if (!saved) setShowSettings(true);
-  }, []);
-
+  // Config save handler - persists to localStorage
   const handleSaveConfig = (newConfig) => {
     setConfig(newConfig);
     saveConfig(newConfig);
     applyTheme(newConfig.theme || 'dark');
+    console.log('[Config] Saved to localStorage:', newConfig.callsign);
   };
 
   // Data hooks
diff --git a/src/utils/config.js b/src/utils/config.js
index a408d17..7e18af5 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -41,26 +41,57 @@ export const fetchServerConfig = async () => {
     const response = await fetch('/api/config');
     if (response.ok) {
       serverConfig = await response.json();
-      console.log('[Config] Loaded from server:', serverConfig.callsign, '@', serverConfig.locator);
+      // Only log if server has real config (not defaults)
+      if (serverConfig.callsign && serverConfig.callsign !== 'N0CALL') {
+        console.log('[Config] Server config:', serverConfig.callsign, '@', serverConfig.locator);
+      }
       return serverConfig;
     }
   } catch (e) {
-    console.warn('[Config] Could not fetch server config, using defaults');
+    console.warn('[Config] Could not fetch server config');
   }
   return null;
 };
 
 /**
- * Load config from localStorage, merged with server config
+ * Load config - localStorage is the primary source of truth
+ * Server config only provides defaults for first-time users
  */
 export const loadConfig = () => {
+  // Start with defaults
   let config = { ...DEFAULT_CONFIG };
   
-  // First, apply server config if available
-  if (serverConfig) {
+  // Try to load from localStorage FIRST (user's saved settings)
+  let localConfig = null;
+  try {
+    const saved = localStorage.getItem('openhamclock_config');
+    if (saved) {
+      localConfig = JSON.parse(saved);
+      console.log('[Config] Loaded from localStorage:', localConfig.callsign);
+    }
+  } catch (e) {
+    console.error('Error loading config from localStorage:', e);
+  }
+  
+  // If user has localStorage config, use it (this is the priority)
+  if (localConfig) {
+    config = {
+      ...config,
+      ...localConfig,
+      // Ensure nested objects are properly merged
+      location: localConfig.location || config.location,
+      defaultDX: localConfig.defaultDX || config.defaultDX,
+      refreshIntervals: { ...config.refreshIntervals, ...localConfig.refreshIntervals }
+    };
+  } 
+  // Only use server config if NO localStorage exists (first-time user)
+  else if (serverConfig) {
+    // Server config provides initial defaults for new users
+    // But only if they have real values (not N0CALL)
     config = {
       ...config,
-      callsign: serverConfig.callsign || config.callsign,
+      callsign: (serverConfig.callsign && serverConfig.callsign !== 'N0CALL') 
+        ? serverConfig.callsign : config.callsign,
       locator: serverConfig.locator || config.locator,
       location: {
         lat: serverConfig.latitude || config.location.lat,
@@ -76,21 +107,12 @@ export const loadConfig = () => {
       use12Hour: serverConfig.timeFormat === '12',
       showSatellites: serverConfig.showSatellites ?? config.showSatellites,
       showPota: serverConfig.showPota ?? config.showPota,
-      showDxPaths: serverConfig.showDxPaths ?? config.showDxPaths,
-      configIncomplete: serverConfig.configIncomplete
+      showDxPaths: serverConfig.showDxPaths ?? config.showDxPaths
     };
   }
   
-  // Then, override with localStorage (user's local changes)
-  try {
-    const saved = localStorage.getItem('openhamclock_config');
-    if (saved) {
-      const parsed = JSON.parse(saved);
-      config = { ...config, ...parsed };
-    }
-  } catch (e) {
-    console.error('Error loading config from localStorage:', e);
-  }
+  // Mark if config needs setup (no callsign set anywhere)
+  config.configIncomplete = (config.callsign === 'N0CALL' || !config.locator);
   
   return config;
 };
@@ -101,8 +123,9 @@ export const loadConfig = () => {
 export const saveConfig = (config) => {
   try {
     localStorage.setItem('openhamclock_config', JSON.stringify(config));
+    console.log('[Config] Saved to localStorage');
   } catch (e) {
-    console.error('Error saving config:', e);
+    console.error('[Config] Error saving to localStorage:', e);
   }
 };