working state before tweaking webpack to get dev server working

aleckslu · aleckslu · commit 43d6d1eff973 · 2021-11-11T03:34:06.000-08:00
diff --git a/.env.example b/.env.example
@@ -2,8 +2,9 @@
 # Required for Slack Oauth features
 # Create a file named .env in this directory, and give it the following variables
 # Any variable you create in .env, you MUST create an example for here in .env.example
-SLACK_CLIENT_SECRET = "ENTER_CLIENT_SECRET_HERE",
+SLACK_CLIENT_SECRET = "ENTER_CLIENT_SECRET_HERE"
 SLACK_CLIENT_ID = "ENTER_CLIENT_ID_HERE"
+SLACK_WEBHOOK_URL = "ENTER WEBHOOK URL HERE"
 
 # https://www.npmjs.com/package/dotenv
 # https://www.npmjs.com/package/quasar-dotenv 
diff --git a/quasar.conf.js b/quasar.conf.js
@@ -1,17 +1,14 @@
 // Configuration for your app
 // https://quasar.dev/quasar-cli/quasar-conf-js
 
-module.exports = function (ctx) {
-  const env = require('quasar-dotenv').config()
+module.exports = function(ctx) {
+  const env = require("quasar-dotenv").config();
   return {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
-    boot: [
-    ],
+    boot: [],
 
-    css: [
-      'app.styl'
-    ],
+    css: ["app.styl"],
 
     extras: [
       // 'ionicons-v4',
@@ -21,8 +18,8 @@ module.exports = function (ctx) {
       // 'themify',
       // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
 
-      'roboto-font', // optional, you are not bound to it
-      'material-icons' // optional, you are not bound to it
+      "roboto-font", // optional, you are not bound to it
+      "material-icons" // optional, you are not bound to it
     ],
 
     framework: {
@@ -32,49 +29,44 @@ module.exports = function (ctx) {
       // all: true, // --- includes everything; for dev only!
 
       components: [
-        'QLayout',
-        'QHeader',
-        'QDrawer',
-        'QPageContainer',
-        'QPage',
-        'QToolbar',
-        'QToolbarTitle',
-        'QBtn',
-        'QIcon',
-        'QList',
-        'QItem',
-        'QItemSection',
-        'QItemLabel',
-        'QExpansionItem',
-        'QInput',
-        'QBar',
-        'QFooter',
-        'QAvatar',
-        'QTabs',
-        'QTab',
-        'QRouteTab',
-        'QTabPanels',
-        'QDialog',
-        'QSelect',
-        'QTabPanel',
-        'QFab',
-        'QFabAction',
-        'QMenu',
-        'QUploader',
-        'QEditor',
-        'QCard',
-        'QChip'
+        "QLayout",
+        "QHeader",
+        "QDrawer",
+        "QPageContainer",
+        "QPage",
+        "QToolbar",
+        "QToolbarTitle",
+        "QBtn",
+        "QIcon",
+        "QList",
+        "QItem",
+        "QItemSection",
+        "QItemLabel",
+        "QExpansionItem",
+        "QInput",
+        "QBar",
+        "QFooter",
+        "QAvatar",
+        "QTabs",
+        "QTab",
+        "QRouteTab",
+        "QTabPanels",
+        "QDialog",
+        "QSelect",
+        "QTabPanel",
+        "QFab",
+        "QFabAction",
+        "QMenu",
+        "QUploader",
+        "QEditor",
+        "QCard",
+        "QChip"
       ],
 
-      directives: [
-        'Ripple',
-        'ClosePopup'
-      ],
+      directives: ["Ripple", "ClosePopup"],
 
       // Quasar plugins
-      plugins: [
-        'Notify'
-      ]
+      plugins: ["Notify"]
     },
 
     supportIE: false,
@@ -86,7 +78,7 @@ module.exports = function (ctx) {
       // gzip: true,
       // analyze: true,
       // extractCSS: false,
-      extendWebpack (cfg) {
+      extendWebpack(cfg) {
         // cfg.module.rules.push({
         //   enforce: 'pre',
         //   test: /\.(js|vue)$/,
@@ -97,13 +89,16 @@ module.exports = function (ctx) {
         //   }
         // })
       },
-      env: env,
+      env: env
     },
 
     devServer: {
-      // https: true,
+      https: true,
       // port: 8080,
+      // public: 'overvuedev',
+      // host: 'overvuedev',
       open: true // opens browser window automatically
+
     },
 
     // animations: 'all', // --- includes all animations
@@ -120,35 +115,35 @@ module.exports = function (ctx) {
         // name: 'Quasar App',
         // short_name: 'Quasar App',
         // description: 'A Quasar Framework app',
-        display: 'standalone',
-        orientation: 'portrait',
-        background_color: '#ffffff',
-        theme_color: '#027be3',
+        display: "standalone",
+        orientation: "portrait",
+        background_color: "#ffffff",
+        theme_color: "#027be3",
         icons: [
           {
-            'src': 'statics/icons/icon-128x128.png',
-            'sizes': '128x128',
-            'type': 'image/png'
+            src: "statics/icons/icon-128x128.png",
+            sizes: "128x128",
+            type: "image/png"
           },
           {
-            'src': 'statics/icons/icon-192x192.png',
-            'sizes': '192x192',
-            'type': 'image/png'
+            src: "statics/icons/icon-192x192.png",
+            sizes: "192x192",
+            type: "image/png"
           },
           {
-            'src': 'statics/icons/icon-256x256.png',
-            'sizes': '256x256',
-            'type': 'image/png'
+            src: "statics/icons/icon-256x256.png",
+            sizes: "256x256",
+            type: "image/png"
           },
           {
-            'src': 'statics/icons/icon-384x384.png',
-            'sizes': '384x384',
-            'type': 'image/png'
+            src: "statics/icons/icon-384x384.png",
+            sizes: "384x384",
+            type: "image/png"
           },
           {
-            'src': 'statics/icons/icon-512x512.png',
-            'sizes': '512x512',
-            'type': 'image/png'
+            src: "statics/icons/icon-512x512.png",
+            sizes: "512x512",
+            type: "image/png"
           }
         ]
       }
@@ -160,10 +155,10 @@ module.exports = function (ctx) {
     },
 
     electron: {
-      bundler: 'packager',
+      bundler: "packager",
       // bundler: 'builder', // or 'packager'
 
-      extendWebpack (cfg) {
+      extendWebpack(cfg) {
         // do something with Electron main process Webpack cfg
         // chainWebpack also available besides this extendWebpack
       },
@@ -172,10 +167,10 @@ module.exports = function (ctx) {
         // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
 
         // OS X / Mac App Store
-        appBundleId: 'overvue',
+        appBundleId: "overvue",
         // appCategoryType: '',
         // osxSign: '',
-        protocol: 'overvue'
+        protocol: "overvue"
 
         // Windows only
         // win32metadata: { ... }
@@ -184,17 +179,17 @@ module.exports = function (ctx) {
       builder: {
         // https://www.electron.build/configuration/configuration
 
-        appId: 'com.electron.OverVue',
+        appId: "com.electron.OverVue",
         win: {
-          target: 'nsis'
+          target: "nsis"
         },
         protocols: [
           {
-            name: 'overvue',
-            schemes: ['overvue']
+            name: "overvue",
+            schemes: ["overvue"]
           }
         ]
       }
     }
-  }
-}
+  };
+};
diff --git a/src-electron/main-process/electron-main.js b/src-electron/main-process/electron-main.js
@@ -36,9 +36,10 @@ const deeplink = new Deeplink({
   mainWindow,
   protocol,
   isDev,
-  debugLogging: true
+  debugLogging: true,
+  // electronPath: '../../node_modules/electron/dist/electron.app'
 });
-
+// logEverywhere(`electron path:  ${require('path').join(__dirname, '../../node_modules/electron/dist/electron.exe')}`);
 // Sends request to Slack for User's information,
 // then sends user information back to renderer process
 function sendTokenRequest() {
@@ -101,6 +102,7 @@ function sendTokenRequest() {
 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}`);
+
   return deeplink.on("received", link => {
     logEverywhere(`auth worked here link: ${link}`);
     // Extracts Slack authorization code from deep link
diff --git a/src/components/file_system_interface/SaveProjectComponent.vue b/src/components/file_system_interface/SaveProjectComponent.vue
@@ -17,8 +17,6 @@ const { remote } = require('electron')
 const Mousetrap = require('mousetrap')
 
 // might not be optimal to import like this, since entire slackApiStuff object is imported while only one of its properties is used
-import slackApiStuff from '../../../secretStuff/slackApiStuff.js'
-const slackWebhookURL = slackApiStuff.slackWebhookURL
 
 export default {
   name: 'SaveProjetComponent',
@@ -122,6 +120,8 @@ export default {
     // creates a popup dialog box, where if you click on yes, it will send a message to our test Slack workspace
     // still must refactor to dynamically work with user's Slack
     notifySlack () {
+      const slackWebhookURL = process.env.SLACK_WEBHOOK_URL
+      console.log(slackWebhookURL)
       remote.dialog.showMessageBox({
         title: 'Notify Slack?',
         message: 'Save successful. Would you like to notify your team on Slack?',
