pulled updated components

Author: zoew McGrathe

package-lock.json

@@ -28,8 +28,10 @@
     "lodash.throttle": "^4.1.1",
     "mousetrap": "^1.6.5",
     "node-gyp": "^8.4.1",
+    "prismjs": "^1.25.0",
     "quasar": "^2.0.0",
     "quasar-dotenv": "^1.0.5",
+    "vue-draggable-resizable": "^2.3.0",
     "vue-multiselect": "^3.0.0-alpha.1",
     "vue-prism-editor": "^2.0.0-alpha.2",
     "vue3-tree": "^0.10.0",

package.json

@@ -55,7 +55,11 @@ ipcMain.handle("saveProject", async (event, arg) => {
 ipcMain.handle("openProject", async (event, arg) => {
   const result = await dialog.showOpenDialog(arg);
   return result;
+<<<<<<< HEAD
 });
+=======
+})
+>>>>>>> quasar
 
 // ************** Slack OAuth functions **********************
 // Sends request to Slack for User's information,
@@ -136,12 +140,23 @@ function setOauthListener() {
   // logEverywhere(`process.env.SLACK_CLIENT_ID in electron-main:  ${process.env.SLACK_CLIENT_ID}`);
   // logEverywhere(`process.env.SLACK_CLIENT_SECRET in electron-main:  ${process.env.SLACK_CLIENT_SECRET}`);
 
+<<<<<<< HEAD
   return deeplink.on("received", (link) => {
     // logEverywhere(`auth worked here link: ${link}`);
     // Extracts Slack authorization code from deep link
     authCode = link.split("=")[1];
     sendTokenRequest();
   });
+=======
+  if (process.env.PROD) {
+    return deeplink.on("received", link => {
+      // logEverywhere(`auth worked here link: ${link}`);
+      // Extracts Slack authorization code from deep link
+      authCode = link.split("=")[1];
+      sendTokenRequest();
+    });
+  }
+>>>>>>> quasar
 }
 
 function createWindow() {

src-electron/electron-main.js

@@ -20,7 +20,6 @@
 const {ipcRenderer, shell, contextBridge} = require('electron');
 const path = require('path');
 const fs = require('fs-extra');
-
  // ipcRenderer contextBridge
  // on: used in SlackLoginWindow
  // 
@@ -46,4 +45,3 @@ const fs = require('fs-extra');
  contextBridge.exposeInMainWorld("path", {
     join: (...paths) => path.join(...paths)
 })
-