resolved conficts

bible-technology · Apr 26, 2024 · d1b7193 · d1b7193
2 parents 77b7d4a + be223cc
commit d1b7193
Show file tree

Hide file tree

Showing 18 changed files with 1,253 additions and 333 deletions.
diff --git a/e2e-tests/myFixtures.ts b/e2e-tests/myFixtures.ts
@@ -32,7 +32,8 @@ type myFixture = {
   english: string,
   hindi: string,
   russian: string,
-  farsi: string
+  farsi: string,
+  arabic: string
 }
 const myFixtureTest = myTest.extend<myFixture>({
   userName: "Playwright user",
@@ -60,6 +61,7 @@ const myFixtureTest = myTest.extend<myFixture>({
   hindi: "Hindi",
   russian: "Russian",
   farsi: "Farsi",
+  arabic: "Arabic",
   textUnderscore: "Translation_test_project",
   obsUnderscore: "Obs_test_project",
   syncName: "Sync_Collab_Test",

diff --git a/package.json b/package.json
@@ -147,9 +147,6 @@
     "@supabase/supabase-js": "^2.26.0",
     "@tailwindcss/forms": "^0.5.2",
     "@tailwindcss/typography": "^0.5.9",
-    "@testing-library/jest-dom": "^6.1.3",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^14.5.1",
     "@types/jest": "^29.5.5",
     "@types/node": "^20.8.2",
     "@types/react": "^18.2.25",
@@ -219,8 +216,7 @@
     "usfm-editor": "0.8.7",
     "usfm-grammar": "^2.3.0",
     "uuid": "^8.3.2",
-    "wavesurfer.js": "^6.6.2",
-    "web-vitals": "^3.5.0",
+    "wavesurfer.js": "^6.6.4",
     "webpack-node-externals": "^3.0.0",
     "winston": "^3.7.2",
     "word-aligner": "1.0.0",
@@ -242,7 +238,6 @@
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.6",
-    "react-icons": "4.10.1",
     "scripture-resources-rcl": "5.1.0",
     "utf-8-validate": "^5.0.9"
   },
@@ -254,4 +249,4 @@
     "word-aligner": "$word-aligner",
     "@mui/lab": "$@mui/lab"
   }
-}
+}
diff --git a/renderer/src/components/AudioRecorder/components/Player.js b/renderer/src/components/AudioRecorder/components/Player.js
@@ -40,6 +40,30 @@ const Player = ({
   const [currentSpeed, setCurrentSpeed] = useState(1);
   const speed = [0.5, 1, 1.5, 2];
   const path = require('path');
+  const [time, setTime] = useState(0);
+  const [playTime, setPlayTime] = useState(0);
+  // state to check stopwatch running or not
+  const [isRunning, setIsRunning] = useState(false);
+
+  useEffect(() => {
+    let intervalId;
+    if (isRunning) {
+      // setting time from 0 to 1 every 10 milisecond using javascript setInterval method
+      intervalId = setInterval(() => setTime(time + 1), 10);
+    }
+    return () => clearInterval(intervalId);
+  }, [isRunning, time]);
+
+  // playTime is the total time of audio & time is recording time
+  // Minutes calculation
+  const minutes = playTime > 0 ? Math.floor(playTime / 60) : (time > 0 ? Math.floor((time % 360000) / 6000) : 0);
+
+  // Seconds calculation
+  const seconds = playTime > 0 ? Math.floor(playTime % 60) : (time > 0 ? Math.floor((time % 6000) / 100) : 0);
+
+  // Milliseconds calculation
+  const milliseconds = playTime > 0 ? Math.floor((playTime - Math.floor(playTime)) * 100) : (time > 0 ? time % 100 : 0);
+
   const handleRecord = () => {
     // check whether its a first record or re-recording
     if (url[take]) {
@@ -52,6 +76,8 @@ const Player = ({
     } else {
       // Recording for the first time
       setTrigger('record');
+      setTime(0);
+      setIsRunning(true);
     }
   };
   const handleDelete = () => {
@@ -177,6 +203,20 @@ const Player = ({
               </Listbox.Options>
             </Listbox>
           </div>
+          <div className="flex flex-col px-10 items-center border-r border-r-gray-800">
+            <div className="flex flex-col items-center text-xl">
+              <div className="text-xs text-gray-300 uppercase tracking-wider">
+                m:s:ms
+              </div>
+              <div>
+                {minutes.toString().padStart(2, '0')}
+                :
+                {seconds.toString().padStart(2, '0')}
+                :
+                {milliseconds.toString().padStart(2, '0')}
+              </div>
+            </div>
+          </div>
           <div className="flex flex-row items-center justify-evenly border-r border-r-gray-800">
             <div className="flex flex-col items-center">
               {((trigger === 'record' || trigger === 'recResume') && (
@@ -188,7 +228,7 @@ const Player = ({
                   type="button"
                   title="P"
                   className="p-2 bg-error rounded-md hover:bg-dark"
-                  onClick={() => setTrigger('recPause')}
+                  onClick={() => { setTrigger('recPause'); setIsRunning(false); }}
                 >
                   <PauseIcon
                     fill="currentColor"
@@ -207,7 +247,7 @@ const Player = ({
                   type="button"
                   title="E"
                   className="p-2 bg-dark rounded-md hover:bg-error"
-                  onClick={() => setTrigger('recResume')}
+                  onClick={() => { setTrigger('recResume'); setIsRunning(true); }}
                 >
                   <PlayIcon
                     fill="currentColor"
@@ -244,7 +284,7 @@ const Player = ({
                 type="button"
                 title="S"
                 className="p-2 bg-dark rounded-md hover:bg-primary"
-                onClick={() => setTrigger('recStop')}
+                onClick={() => { setTrigger('recStop'); setIsRunning(false); }}
               >
                 <StopIcon
                   fill="currentColor"
@@ -263,7 +303,7 @@ const Player = ({
                 type="button"
                 title="<"
                 className="p-2 bg-dark rounded-md hover:bg-error"
-                onClick={() => setTrigger('rewind')}
+                onClick={() => { setTrigger('rewind'); setTime(0); setPlayTime(0); }}
               >
                 <ArrowPathIcon
                   className="w-5 h-5"
@@ -343,7 +383,7 @@ const Player = ({
                 </button>
                 <input
                   type="range"
-                  className="md:w-12 w-full xl:w-44"
+                  className="md:w-12 w-full xl:w-44 accent-primary"
                   min={0}
                   max={1}
                   step={0.1}
@@ -385,7 +425,7 @@ const Player = ({
             } text-xs font-bold ${
               url?.take1 ? 'text-white' : 'text-black'
             } uppercase tracking-wider rounded-full`}
-                onClick={() => changeTake('take1')}
+                onClick={() => { changeTake('take1'); setTime(0); setPlayTime(0); }}
                 title="select : A"
                 onDoubleClick={() => changeDefault(1)}
               >
@@ -406,7 +446,7 @@ const Player = ({
             } text-xs font-bold ${
               url?.take2 ? 'text-white' : 'text-black'
             } uppercase tracking-wider rounded-full`}
-                onClick={() => changeTake('take2')}
+                onClick={() => { changeTake('take2'); setTime(0); setPlayTime(0); }}
                 title="select : B"
                 onDoubleClick={() => changeDefault(2)}
               >
@@ -427,7 +467,7 @@ const Player = ({
             } text-xs font-bold ${
               url?.take3 ? 'text-white' : 'text-black'
             } uppercase tracking-wider rounded-full`}
-                onClick={() => changeTake('take3')}
+                onClick={() => { changeTake('take3'); setTime(0); setPlayTime(0); }}
                 title="select : C"
                 onDoubleClick={() => changeDefault(3)}
               >
@@ -474,6 +514,7 @@ const Player = ({
             speed={currentSpeed}
             show={false}
             setTrigger={setTrigger}
+            setAudioPlayBack={setPlayTime}
           />
         </div>
       </div>

diff --git a/renderer/src/components/AudioRecorder/components/WaveForm.js b/renderer/src/components/AudioRecorder/components/WaveForm.js
@@ -29,6 +29,7 @@ const AudioWaveForm = (props) => {
     barGap,
     barWidth,
     barRadius,
+    setAudioPlayBack,
   } = props;
 
   const waveformRef = useRef(null);
@@ -65,6 +66,22 @@ const AudioWaveForm = (props) => {
     wavesurfer.current?.load(currentUrl);
     // wavesurfer.current?.setVolume(volume);
     wavesurfer.current?.setPlaybackRate(speed);
+    wavesurfer.current.on('ready', () => {
+      const duration = wavesurfer?.current?.getDuration();
+      if (duration && duration !== Infinity) {
+        setAudioPlayBack(duration);
+      } else {
+        setAudioPlayBack(0);
+      }
+    });
+
+    wavesurfer.current.on('audioprocess', (time) => {
+      setAudioPlayBack(time);
+    });
+
+    wavesurfer.current.on('seeking', (time) => {
+      setAudioPlayBack(time);
+    });
   };
 
   const createRecForm = async () => {
@@ -88,6 +105,7 @@ const AudioWaveForm = (props) => {
         if (wavesurfer.current) {
           wavesurfer.current.destroy();
           wavesurfer.current.microphone.destroy();
+          setAudioPlayBack(0);
         }
       };
     }
@@ -236,4 +254,5 @@ AudioWaveForm.propTypes = {
   resumeRecording: PropTypes.func,
   setTrigger: PropTypes.func,
   interaction: PropTypes.bool,
+  setAudioPlayBack: PropTypes.any,
 };
diff --git a/renderer/src/components/Login/LeftLogin.js b/renderer/src/components/Login/LeftLogin.js
@@ -138,12 +138,14 @@ const LeftLogin = () => {
   };
   function formSubmit(event) {
     event.preventDefault();
-    if (values.username.length < 3 || values.username.length > 15) {
+    const newValue = values;
+    newValue.username = newValue.username.trim();
+    if (newValue.username.length < 3 || newValue.username.length > 15) {
       displayError('The input has to be between 3 and 15 characters long');
-    } else if (users.length > 0 && users.find((item) => (item.username.toLowerCase() === values.username.toLowerCase().trim()))) {
+    } else if (users.length > 0 && users.find((item) => (item.username.toLowerCase() === newValue.username.toLowerCase()))) {
       displayError('User exists, Check archived and active tab by click on view more.');
     } else {
-      handleSubmit(values);
+      handleSubmit(newValue);
       setValues({});
     }
   }

diff --git a/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js b/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js
@@ -109,7 +109,8 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
       // initial load
       switch (selectResource) {
         case 'bible':
-          url = `${baseUrl}&subject=Bible&lang=en`;
+          url = `${baseUrl}&lang=en&subject=${subjectTypeArray.bible[0].name}`;
+          // setSelectedTypeFilter([subjectTypeArray.bible[0]]);
           break;
         case 'obs':
           url = `${baseUrl}&subject=${subjectTypeArray.obs[0].name}&lang=en`;
@@ -284,6 +285,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
 
   useEffect(() => {
     logger.debug('DownloadResourcePopUp.js', 'in useEffect initial load of resource');
+    setSelectedTypeFilter([]);
     fetchResource(false);
     // setLoading(true)
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -322,7 +324,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
             />
           </button>
           <div className="flex flex-wrap gap-2 mt-2 mb-2">
-            {selectedLangFilter.map((language, idx) => (
+            {selectedLangFilter?.map((language, idx) => (
               <div
                 key={idx}
                 className="flex items-center justify-center gap-2 px-3 py-1 bg-gray-200 rounded-full"
@@ -341,13 +343,13 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
           <CustomMultiComboBox
             selectedList={selectedTypeFilter}
             setSelectedList={setSelectedTypeFilter}
-            customData={selectResource === 'bible' ? subjectTypeArray.bible : subjectTypeArray.obs}
+            customData={selectResource === 'bible' ? subjectTypeArray.bible : [subjectTypeArray.obs]}
             placeholder="Select Types"
             dropArrow
             multiSelect
           />
           <div className="flex flex-wrap gap-2 mt-2 mb-2">
-            { selectResource === 'bible' && selectedTypeFilter?.map((type, idx) => (
+            { selectResource === 'bible' && Array.isArray(selectedTypeFilter) && selectedTypeFilter?.map((type, idx) => (
               <div
                 key={idx}
                 className="flex items-center justify-center gap-2 px-3 py-1 bg-gray-200 rounded-full"
@@ -385,7 +387,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
             className="bg-success leading-loose rounded shadow text-xs px-2 font-base text-white tracking-wide uppercase"
             onClick={handleSaveFilter}
           >
-            {t('label-save-filter')}
+            {t('label-filter')}
           </button>
         </div>
       </div>

diff --git a/renderer/src/modules/projects/Profile.js b/renderer/src/modules/projects/Profile.js
@@ -21,6 +21,7 @@ const languages = [
   { title: 'Farsi', code: 'fa' },
   { title: 'French', code: 'fr' },
   { title: 'Nepali', code: 'ne' },
+  { title: 'Arabic', code: 'ar' },
 ];
 
 function ProgressCircle({ isFilled, count, text }) {