Merge pull request #214 from hussaino03/dev

preserve badge unlocks in server
hussaino03 · Jan 1, 2025 · 7a34a07 · 7a34a07
2 parents c8c7fd3 + b85a1d6
commit 7a34a07
Show file tree

Hide file tree

Showing 4 changed files with 262 additions and 109 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -83,8 +83,7 @@ const AppContent = () => {
     calculateXP,
     setTasks,
     setCompletedTasks,
-    setError,
-    badgeManager 
+    setError
   );
 
   const themeManager = useMemo(() => new ThemeManager(setIsDark), []);
@@ -134,8 +133,7 @@ const AppContent = () => {
     if (updatedBadges.length !== unlockedBadges.length) {
       setUnlockedBadges(updatedBadges);
     }
-    // eslint-disable-next-line
-  }, [level, currentStreak]); 
+  }, [level, currentStreak, completedTasks, badgeManager, unlockedBadges]); 
 
   useEffect(() => {
     const newStreakData = streakManager.calculateStreak(completedTasks);

diff --git a/client/src/services/badge/BadgeManager.js b/client/src/services/badge/BadgeManager.js
@@ -5,9 +5,15 @@ class BadgeManager {
   constructor(setUnlockedBadges, addNotification) {
     this.setUnlockedBadges = setUnlockedBadges;
     this.addNotification = addNotification;
-    this.notifiedBadges = new Set(
-      JSON.parse(localStorage.getItem('notifiedBadges') || '[]')
-    );
+
+    try {
+      this.notifiedBadges = new Set(
+        JSON.parse(localStorage.getItem('notifiedBadges') || '[]')
+      );
+    } catch (error) {
+      console.error('Failed to parse notified badges:', error);
+      this.notifiedBadges = new Set();
+    }
 
     this.notifyNewBadge = this.notifyNewBadge.bind(this);
   }