Merge remote-tracking branch 'origin/develop' into feature/ui-test

electron/main/preload.js

@@ -4,20 +4,24 @@ try {
     contextBridge.exposeInMainWorld("explorer", {
         onFileDrop: (file) => webUtils.getPathForFile(file)
     })
-    contextBridge.exposeInMainWorld("extractor", {
-        extract: (file) => ipcRenderer.send("extract", file)
+    contextBridge.exposeInMainWorld("submit", {
+        submit: (meeting_specifications) => {ipcRenderer.send("file_submit", meeting_specifications)}
     })
     contextBridge.exposeInMainWorld("electronAPI", {
         getFilePath: (file) => {return webUtils.getPathForFile(file)}
     })
+
     contextBridge.exposeInMainWorld("onStartup", {
         getModuleNames: () => ipcRenderer.invoke('get-module-names')
     })
 
-   // ipcRenderer.on("modules", (event, resp) => {
-   //     loadAiOptions(resp.ai_modules);
-   //     loadTranscriptionOptions(resp.transcription_modules);
-   // })
+
+
+    ipcRenderer.on("progress", (event, resp) => {
+        alert(`Finished step ${resp.curstep} of ${resp.totalsteps}`)
+    })
+
+    ipcRenderer.on("error", (event, err) => {alert(err)})
 } catch (error) {
     console.log("Error in preload.js");
 }

electron/main/script.js

@@ -12,7 +12,7 @@ function checkBoxes() {
       }
     });
 
-    if(isChecked){
+    if (isChecked) {
       //Code to submit the video
       var selectedCheckboxes = {};
       checkboxes.forEach(function(checkbox){
@@ -55,10 +55,12 @@ function checkBoxes() {
             "styles": selectedStyles
           }
         };
-        ipcRenderer.send("file_submit", sendingPackage)
+        window.submit.submit(sendingPackage)
       }else{
         alert('The given file is not compatible. These are the available types: [".mp4", ".mov", ".avi", ".mkv"].');
       }
+
+
     } else {
       //language only english at the moment
       alert('Please select at least one document type.');
@@ -113,11 +115,11 @@ function handleFiles(files) {
     console.log("Error in script.js handleFiles function");
     console.log(error);
   }
-  
+
 }
 
 //function to regulate the progress on the progressbar
-function updateProgressBar(bar, value){
+function updateProgressBar(bar, value) {
   try {
     value = Math.round(value);
     bar.querySelector(".progress_fill").style.width = `${value}%`;