feat: toggle user stats and notifications visibility

alexktzk · Jun 9, 2019 · f788d3f · f788d3f
1 parent 50fef04
commit f788d3f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 36 deletions.
diff --git a/src/js/index.js b/src/js/index.js
@@ -29,52 +29,50 @@ const priorityIcon = {
 TrelloPowerUp.initialize({
   'board-buttons': async t => {
     let buttons;
-    const currentUser = await new Storage(t).getUser();
-
-    const settingsPage = tt =>
-      tt.popup({
-        title: 'Settings',
-        url: './settings.html',
-        height: 270
-      });
-
-    const loginPage = tt =>
-      tt.popup({
-        title: 'Log in Habitica',
-        url: './login.html',
-        height: 340
-      });
+    const storage = new Storage(t);
+    const currentUser = await storage.getUser();
+    const settings = await storage.getSettings();
 
     if (currentUser.loggedIn) {
       buttons = [
-        {
-          condition: 'always',
-          icon: {
-            dark: ICONS.EXP,
-            light: ICONS.EXP
-          },
-          text: currentUser.exp
-            ? `${currentUser.exp} / ${currentUser.expToNextLevel}`
-            : '?'
-        },
-        {
-          condition: 'always',
-          icon: {
-            dark: ICONS.GOLD,
-            light: ICONS.GOLD
-          },
-          text: currentUser.gold ? currentUser.gold.toFixed(2) : '?'
-        },
         {
           condition: 'always',
           icon: {
             dark: ICONS.HABITICA_LOGO,
             light: ICONS.HABITICA_LOGO
           },
           text: currentUser.name,
-          callback: settingsPage
+          callback: tt =>
+            tt.popup({
+              title: 'Settings',
+              url: './settings.html',
+              height: 270
+            })
         }
       ];
+
+      if (settings.showStats) {
+        buttons.unshift(
+          {
+            condition: 'always',
+            icon: {
+              dark: ICONS.EXP,
+              light: ICONS.EXP
+            },
+            text: currentUser.exp
+              ? `${currentUser.exp} / ${currentUser.expToNextLevel}`
+              : '?'
+          },
+          {
+            condition: 'always',
+            icon: {
+              dark: ICONS.GOLD,
+              light: ICONS.GOLD
+            },
+            text: currentUser.gold ? currentUser.gold.toFixed(2) : '?'
+          }
+        );
+      }
     } else {
       buttons = [
         {
@@ -84,7 +82,12 @@ TrelloPowerUp.initialize({
             light: ICONS.HABITICA_LOGO
           },
           text: 'Login',
-          callback: loginPage
+          callback: tt =>
+            tt.popup({
+              title: 'Log in Habitica',
+              url: './login.html',
+              height: 340
+            })
         }
       ];
     }

diff --git a/src/js/user.js b/src/js/user.js
@@ -29,8 +29,10 @@ export default class Task {
   }
 
   async notifyAboutStats({ exp, gold }) {
-    const currentUser = await this.storage.getUser();
+    const settings = await this.storage.getSettings();
+    if (!settings.showStatsNotifications) return undefined;
 
+    const currentUser = await this.storage.getUser();
     const expDiff = currentUser.exp ? exp - currentUser.exp : exp;
     const goldDiff = currentUser.gold ? gold - currentUser.gold : gold;