Merge pull request #25 from oslabs-beta/dev2021

Final Pull Request of OSLabs Beta.

Author: ziggrace

.eslintrc.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 module.exports = {
   root: true,
 
@@ -18,15 +19,13 @@ module.exports = {
   ],
 
   // required to lint *.vue files
-  plugins: [
-    'vue'
-  ],
+  plugins: ['vue'],
 
   globals: {
-    'ga': true, // Google Analytics
-    'cordova': true,
-    '__statics': true,
-    'process': true
+    ga: true, // Google Analytics
+    cordova: true,
+    __statics: true,
+    process: true
   },
 
   // add your custom rules here

.gitignore

@@ -13,6 +13,7 @@ yarn-debug.log*
 yarn-error.log*
 /coverage
 package-lock.json
+vetur.config.js
 
 # Editor directories and files
 .idea

package-lock.json

@@ -1,10 +1,10 @@
 {
   "name": "overvue",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Vue Prototype DevTool",
   "productName": "OverVue",
   "cordovaId": "org.cordova.quasar.app",
-  "author": "Team OverVue, Team Vuetiful",
+  "author": "Team OverVue, Team Vuetiful, Team Vuelociraptors",
   "private": true,
   "bugs": {
     "url": "https://github.com/TeamOverVue/OverVue/issues"
@@ -39,6 +39,7 @@
     "vue-drag-resize": "^1.3.2",
     "vue-draggable-nested-tree": "^2.2.17",
     "vue-draggable-resizable": "^2.0.0-rc2",
+    "vue-js-toggle-button": "^1.3.3",
     "vue-loader": "^15.7.0",
     "vue-multiselect": "^2.1.6",
     "vue-prism-editor": "^0.2.1",
@@ -50,14 +51,15 @@
     "@quasar/app": "^1.0.0",
     "@quasar/quasar-app-extension-testing": "^1.0.0",
     "@quasar/quasar-app-extension-testing-unit-jest": "^1.0.0",
+    "@vue/devtools": "^5.3.4",
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.1",
     "devtron": "^1.4.0",
     "electron": "^5.0.6",
     "electron-builder": "^22.11.10",
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^2.2.4",
-    "eslint": "^5.10.0",
+    "eslint": "^7.32.0",
     "eslint-loader": "^2.1.1",
     "eslint-plugin-vue": "^5.0.0",
     "strip-ansi": "^3.0.1",

package.json

@@ -0,0 +1,9 @@
+// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
+//  REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
+import "quasar/dist/types/feature-flag";
+
+declare module "quasar/dist/types/feature-flag" {
+  interface QuasarFeatureFlags {
+    electron: true;
+  }
+}

src-electron/electron-flag.d.ts

@@ -5,6 +5,8 @@
  *  environment.
  */
 
+// NOTE Aug 2021 - VUEJS DevTools not loading, need to debug why is does not in Dev mode
+
 // Install `electron-debug` with `devtron`
 require('electron-debug')({ showDevTools: true })
 

src-electron/main-process/electron-main.dev.js

@@ -1,5 +1,5 @@
 /*
- * This file (which will be your service worker)
- * is picked up by the build system ONLY if
- * quasar.conf > pwa > workboxPluginMode is set to "InjectManifest"
+ This file (which will be your service worker)
+ is picked up by the build system ONLY if
+ quasar.conf > pwa > workboxPluginMode is set to "InjectManifest"
  */

src-pwa/custom-service-worker.js

@@ -0,0 +1,9 @@
+// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
+//  REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
+import "quasar/dist/types/feature-flag";
+
+declare module "quasar/dist/types/feature-flag" {
+  interface QuasarFeatureFlags {
+    pwa: true;
+  }
+}

src-pwa/pwa-flag.d.ts

@@ -32,7 +32,9 @@ register(process.env.SERVICE_WORKER_FILE, {
   },
 
   offline () {
-    console.log('No internet connection found. App is running in offline mode.')
+    console.log(
+      'No internet connection found. App is running in offline mode.'
+    )
   },
 
   error (err) {

src-pwa/register-service-worker.js

@@ -40,8 +40,14 @@ let redoMixin = {
       // console.log("Are these equal to each other?", action == this.undoneAction[this.undoneAction.length-1])
       if (!this.isTimetraveling) {
         if (this.undoneAction[this.undoneAction.length - 1]) {
-          if (action.type === this.undoneAction[this.undoneAction.length - 1].type &&
-            deepEqual(action.payload, this.undoneAction[this.undoneAction.length - 1].payload)) {
+          if (
+            action.type ===
+              this.undoneAction[this.undoneAction.length - 1].type &&
+            deepEqual(
+              action.payload,
+              this.undoneAction[this.undoneAction.length - 1].payload
+            )
+          ) {
             this.undoneAction.pop()
           } else {
             this.undoneAction = []
@@ -50,19 +56,21 @@ let redoMixin = {
       }
     })
   },
-
+  // undo + redo function calling
+  // metaKey accounts for Command Key on Mac
   mounted () {
     const throttledUndo = throttle(this.undo, 300)
     const throttledRedo = throttle(this.redo, 300)
-
+    // undo function calling
     window.addEventListener('keydown', event => {
-      if (event.ctrlKey && event.key === 'z') {
+      if ((event.ctrlKey || event.metaKey) && event.key === 'z') {
         event.preventDefault()
         throttledUndo()
       }
     })
+    // redo function calling
     window.addEventListener('keydown', event => {
-      if (event.ctrlKey && event.key === 'y') {
+      if ((event.ctrlKey || event.metaKey) && event.key === 'y') {
         event.preventDefault()
         throttledRedo()
       }
@@ -90,8 +98,10 @@ let redoMixin = {
         this.undoneAction.push(undone)
         if (ignoredActions.has(undone.type)) {
           // console.log('We undid an ignored action!')
-          while (this.doneAction[this.doneAction.length - 1] &&
-          ignoredActions.has(this.doneAction[this.doneAction.length - 1].type)) {
+          while (
+            this.doneAction[this.doneAction.length - 1] &&
+            ignoredActions.has(this.doneAction[this.doneAction.length - 1].type)
+          ) {
             this.undoneAction.push(this.doneAction.pop())
           }
           /* if we get here, that means we have undone all "useless" actions
@@ -130,7 +140,6 @@ let redoMixin = {
         this.redo()
       }
     }
-
   }
 }
 
@@ -140,5 +149,4 @@ export default {
 }
 </script>
 
-<style>
-</style>
+<style></style>