Merge pull request #1949 from KhalisFoundation/dev

Beta release 9.2.1

.gitignore

@@ -9,7 +9,7 @@ data.db
 *.provisionprofile
 npm-debug.log*
 .idea/
-.DS_Store/
-www/.DS_Store
+.DS_Store
+**/.DS_Store
 www/js/
 .env

CHANGELOG.md

@@ -1,23 +1,22 @@
 ## New Updates
 
-### 9.2.1 - ਊਨਾ Release _May 20, 2024_
+### 9.2.1 - ਊਨਾ Release _May 21, 2024_
 
 #### New Features
-- Add a dropdown to change the content order of viewer
+- Choose the order of the lines that sangat see on screen using quickview dropdowns. 
   ![](./assets/img/help_images/content-order.gif)
-- Add a new Multi-Pane workspace to open multiiple shabads at once
+- New Multi-Pane workspace allows you to open multiple Shabads on one screen to display from.
   ![](./assets/img/help_images/multipane-preview.gif)
-- Add the ability to reset the font sizes.
+- You now have the ability to reset the font sizes.
 
 #### Misc. bug fix and other improvements
-- Change the support link.
-- Update the colors of Floral theme in Bani Overlay.
+- Update of the support link.
+- Improve the colors of Floral theme in Bani Overlay.
 - Preserve formatting (line breaks) in announcement.
-- Update Bani Overlay styles as per standard broadcast standards.
-- Code refactors and Style improvements.
+- Improvements to Bani Overlay margins to adhere to standard broadcast standards.
+- Code refactors and style improvements.
 
 **We would love to hear from you if there a feature that you have been waiting for. Send us your feedback at [sttm.co/feedback](https://www.sttm.co/feedback).**
-
 </br>
 
 ### 9.2.0 - ਊਨਾ Release _January 30, 2024_

analytics.js

@@ -5,23 +5,18 @@ require('dotenv').config();
 
 class Analytics {
   trackEvent({ category, action, label, value }) {
-    if (process.env.NODE_ENV !== 'development') {
-      // TODO: need to add variable that stops statistics collection
-      isOnline().then((online) => {
-        // TODO: for offline users, come up with a way of storing and send when online.
-        if (online) {
-          trackEvent(action, {
-            category,
-            label,
-            value,
-          });
-        }
-      });
-    } else {
-      console.log(
-        `Tracking Event suppressed for development ec: ${category}, ea: ${action}, el: ${label}, ev: ${value}`,
-      );
-    }
+    // TODO: need to add variable that stops statistics collection
+    isOnline().then((online) => {
+      // TODO: for offline users, come up with a way of storing and send when online.
+      if (online) {
+        console.log('action', action, 'options', { category, label, value });
+        trackEvent(action, {
+          category,
+          label,
+          value,
+        });
+      }
+    });
   }
 }
 

www/main/addons/announcement/components/Annoucement.jsx

@@ -27,7 +27,12 @@ const Announcement = ({ isGurmukhi }) => {
   const HandleKeyboardToggle = () => {
     setKeyboardOpenStatus(!keyboardOpenStatus);
 
-    analytics.trackEvent('display', 'announcement-slide', 'announcement-in-gurmukhi', isGurmukhi);
+    analytics.trackEvent({
+      category: 'display',
+      action: 'announcement-slide',
+      label: 'announcement-in-gurmukhi',
+      value: isGurmukhi,
+    });
   };
 
   const addMiscSlide = (givenText) => {

www/main/addons/announcement/components/DhanGuru.jsx

@@ -40,10 +40,20 @@ export const DhanGuru = ({ isGurmukhi }) => {
     }
     if (typeof e === 'object') {
       addMiscSlide(e.target.value);
-      analytics.trackEvent('display', 'dhanguru-slide', e.target.value);
+      analytics.trackEvent({
+        category: 'display',
+        action: 'dhanguru-slide',
+        label: 'Dhan guru slide',
+        value: e.target.value,
+      });
     } else {
       addMiscSlide(e);
-      analytics.trackEvent('display', 'dhanguru-slide', e);
+      analytics.trackEvent({
+        category: 'display',
+        action: 'dhanguru-slide',
+        label: 'Dhan guru slide',
+        value: e,
+      });
     }
   };
 

www/main/addons/bani-controller/utils/get-bani-controller-items.js

@@ -49,7 +49,12 @@ const getBaniControllerItems = ({
                 code,
               });
               setMiscSlideText(syncString);
-              analytics.trackEvent('controller', 'codePresented', true);
+              analytics.trackEvent({
+                category: 'controller',
+                action: 'codePresented',
+                label: 'present code',
+                value: true,
+              });
               analytics.trackEvent({
                 category: 'controller',
                 action: 'codePresented',

www/main/navigator/shabad/ArrowIcon.jsx

@@ -52,6 +52,9 @@ const ArrowIcon = ({ paneId }) => {
           ...pane1,
           content: i18n.t('MULTI_PANE.SHABAD'),
           activeShabad: currentShabad,
+          baniType: 'shabad',
+          versesRead: [],
+          activeVerse: null,
         });
         break;
       case 2:
@@ -63,6 +66,9 @@ const ArrowIcon = ({ paneId }) => {
           ...pane2,
           content: i18n.t('MULTI_PANE.SHABAD'),
           activeShabad: currentShabad,
+          baniType: 'shabad',
+          versesRead: [],
+          activeVerse: null,
         });
         break;
       case 3:
@@ -74,6 +80,9 @@ const ArrowIcon = ({ paneId }) => {
           ...pane3,
           content: i18n.t('MULTI_PANE.SHABAD'),
           activeShabad: currentShabad,
+          baniType: 'shabad',
+          versesRead: [],
+          activeVerse: null,
         });
         break;
       default:
@@ -89,13 +98,14 @@ const ArrowIcon = ({ paneId }) => {
       if (activeVerseId !== null) {
         setActiveVerseId(null);
       }
-      if (initialVerseId !== null) {
-        setInitialVerseId(null);
-      }
       if (homeVerse !== 0) {
         setHomeVerse(0);
       }
     }
+
+    if (initialVerseId !== null) {
+      setInitialVerseId(null);
+    }
   };
 
   const navigateVerseRight = () => {
@@ -106,13 +116,14 @@ const ArrowIcon = ({ paneId }) => {
       if (activeVerseId !== null) {
         setActiveVerseId(null);
       }
-      if (initialVerseId !== null) {
-        setInitialVerseId(null);
-      }
       if (homeVerse !== 0) {
         setHomeVerse(0);
       }
     }
+
+    if (initialVerseId !== null) {
+      setInitialVerseId(null);
+    }
   };
 
   if (currentWorkspace === i18n.t('WORKSPACES.MULTI_PANE')) {

www/main/navigator/shabad/utils/save-to-history.js

@@ -8,7 +8,7 @@ export const saveToHistory = (
   const firstVerse = verses[0];
   let verseId;
   if (initialVerse === null) {
-    verseId = firstVerse.verseId;
+    verseId = firstVerse.ID;
   } else {
     verseId = initialVerse;
   }
@@ -20,7 +20,7 @@ export const saveToHistory = (
       const clickedVerse = verses.filter((verseObj) => verseObj.ID === initialVerse);
       verse = clickedVerse.length && clickedVerse[0].Gurmukhi;
     } else {
-      verse = firstVerse.verse;
+      verse = firstVerse.Gurmukhi;
     }
   } else if (verseType === 'bani') {
     verse = firstVerse.baniName;

www/main/workspace-bar/components/WorkspaceBar.jsx

@@ -27,7 +27,6 @@ const WorkspaceBar = () => {
     if (currentWorkspace !== workspace) {
       setCurrentWorkspace(workspace);
     }
-    analytics.trackEvent('changed workspace', workspace);
     analytics.trackEvent({
       category: 'workspace',
       action: 'changed',