fix: rq

Author: FedoseevSM

src/components/ColorPicker.tsx

@@ -23,10 +23,13 @@ export function ColorPicker({ username, onColorChange }: ColorPickerProps) {
   useEffect(() => {
     const loadUserColor = async () => {
       try {
+        console.log(`Loading accent color for ${username}`);
         const userColor = await getUserAccentColor(username);
+        console.log(`Loaded accent color: ${userColor}`);
         setAccentColor(userColor);
         setCustomColor(userColor);
       } catch (error) {
+        console.error('Error loading user color:', error);
         // Keep default color on error
       } finally {
         setIsLoading(false);
@@ -35,19 +38,36 @@ export function ColorPicker({ username, onColorChange }: ColorPickerProps) {
     loadUserColor();
   }, [username, setAccentColor]);
 
-  // Keep customColor in sync with accentColor
+  // Keep customColor in sync with accentColor but don't override if it was just changed
   useEffect(() => {
-    setCustomColor(accentColor);
-  }, [accentColor]);
+    if (!isSaving) {
+      setCustomColor(accentColor);
+    }
+  }, [accentColor, isSaving]);
 
   const handleColorSelect = async (color: string) => {
+    console.log(`Selected color: ${color}`);
     // Apply color immediately for instant feedback
     setAccentColor(color);
+    setCustomColor(color);
     onColorChange?.(color);
 
     setIsSaving(true);
     try {
       await updateUserAccentColor(username, color);
+      console.log(`Successfully saved accent color: ${color}`);
+    } catch (error) {
+      safeLogError('Error saving accent color:', error);
+      // Revert color back to previous if save failed
+      const previousColor = await getUserAccentColor(username);
+      setAccentColor(previousColor);
+      setCustomColor(previousColor);
+      onColorChange?.(previousColor);
+      alert(t('colorSaveError'));
+    } finally {
+      setIsSaving(false);
+    }
+  };
     } catch (error) {
       safeLogError('Error saving accent color:', error);
       // Revert color back to previous if save failed
@@ -61,10 +81,12 @@ export function ColorPicker({ username, onColorChange }: ColorPickerProps) {
   };
 
   const handleCustomColorChange = (color: string) => {
+    console.log(`Custom color input changed to: ${color}`);
     setCustomColor(color);
   };
 
   const handleCustomColorApply = () => {
+    console.log(`Applying custom color: ${customColor}`);
     handleColorSelect(customColor);
   };
 

src/lib/github.ts

@@ -77,25 +77,35 @@ async function createGitHubError(res: Response): Promise<Error> {
 }
 
 export async function getFile(path: string) {
-  const cached = fileCache.get(path);
-  if (cached) {
-    return { content: cached.content, sha: cached.sha };
+  // Don't use cache for user settings files to ensure fresh data
+  const isSetting = path.includes('users/') && path.endsWith('-settings.md');
+  
+  if (!isSetting) {
+    const cached = fileCache.get(path);
+    if (cached) {
+      return { content: cached.content, sha: cached.sha };
+    }
   }
 
   try {
     const res = await fetch(
       `${BASE}/repos/${owner}/${repo}/contents/${path}?ref=${branch}`,
       { headers }
     );
-    if (res.status === 404) return null;
+    if (res.status === 404) {
+      console.log(`File not found: ${path}`);
+      return null;
+    }
     if (!res.ok) {
       throw await createGitHubError(res);
     }
     const data = await res.json();
     if (data.content && !Array.isArray(data)) {
       const content = b64_to_utf8(data.content.replace(/\n/g, ''));
       const fileData = { content, sha: data.sha as string };
-      fileCache.set(path, fileData);
+      if (!isSetting) {
+        fileCache.set(path, fileData);
+      }
       return fileData;
     }
     return null;

src/lib/theme.ts

@@ -26,25 +26,30 @@ export function ThemeProvider({ children, username }: { children: React.ReactNod
   useEffect(() => {
     if (username) {
       setIsLoadingColor(true);
+      console.log(`ThemeProvider: Loading accent color for ${username}`);
       getUserAccentColor(username)
         .then(color => {
+          console.log(`ThemeProvider: Got accent color: ${color}`);
           setAccentColorState(color);
           applyAccentColor(color);
         })
-        .catch(() => {
+        .catch((err) => {
+          console.error('ThemeProvider: Error loading accent color:', err);
           // Keep default color on error
           applyAccentColor(DEFAULT_ACCENT_COLOR);
         })
         .finally(() => {
           setIsLoadingColor(false);
         });
     } else {
+      console.log('ThemeProvider: No username provided, using default color');
       setIsLoadingColor(false);
       applyAccentColor(DEFAULT_ACCENT_COLOR);
     }
   }, [username]);
 
   const setAccentColor = (color: string) => {
+    console.log(`ThemeProvider: Setting accent color to ${color}`);
     setAccentColorState(color);
     // Apply color immediately to CSS variables
     applyAccentColor(color);

src/lib/userSettings.ts

@@ -31,10 +31,12 @@ export async function loadUserSettings(username: string): Promise<UserSettings |
     const file = await getFile(path);
 
     if (!file) {
+      console.log(`User settings file not found for ${username}`);
       return null;
     }
 
     const { data } = parseFrontmatter<UserSettings>(file.content);
+    console.log(`Loaded user settings for ${username}:`, data);
     return data;
   } catch (error) {
     safeLogError('Error loading user settings:', error);
@@ -77,13 +79,16 @@ export async function getUserAccentColor(username: string): Promise<string> {
 // Update accent color for user
 export async function updateUserAccentColor(username: string, color: string): Promise<void> {
   try {
+    console.log(`Updating accent color for ${username} to ${color}`);
     const existingSettings = await loadUserSettings(username);
     const settings: UserSettings = {
       accentColor: color,
       updatedAt: new Date().toISOString(),
       ...existingSettings,
     };
+    console.log(`Settings to save:`, settings);
     await saveUserSettings(username, settings);
+    console.log(`Successfully updated accent color for ${username}`);
   } catch (error) {
     safeLogError('Error updating user accent color:', error);
     throw error;