Merge branch 'master' into exceptionsHTML

Author: JojuOlaode

package-lock.json

@@ -27,7 +27,6 @@
     "lodash.isequal": "^4.5.0",
     "lodash.throttle": "^4.1.1",
     "mousetrap": "^1.6.3",
-    "node": "^14.4.0",
     "npm": "^6.14.5",
     "prismjs": "^1.16.0",
     "quasar": "^1.0.0",
@@ -50,7 +49,7 @@
     "babel-eslint": "^10.0.1",
     "devtron": "^1.4.0",
     "electron": "^5.0.6",
-    "electron-builder": "^20.44.4",
+    "electron-builder": "^22.7.0",
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^2.2.4",
     "eslint": "^5.10.0",
@@ -60,7 +59,7 @@
     "vue-cli-plugin-electron-builder": "^1.3.6"
   },
   "engines": {
-    "node": ">= 8.9.0",
+    "node": ">= 10.0.0",
     "npm": ">= 5.6.0",
     "yarn": ">= 1.6.0"
   },

package.json

@@ -29,8 +29,6 @@ Description:
       <div class="component-title">
         <p>{{ componentData.componentName }}</p>
       </div>
-      <ul class="component-children">
-      </ul>
       <q-menu context-menu>
         <q-list color='black' class="menu">
           <q-item clickable v-ripple v-close-popup @click="handleAddChild">
@@ -152,6 +150,7 @@ export default {
 
     userImage () {
       const imgSrc = `file://` + this.imagePath[this.activeRoute]
+      // console.log('imgSrc is: ', imgSrc)
       return imgSrc
     },
 

src/components/ComponentDisplay.vue

@@ -37,21 +37,6 @@ import { mapState, mapActions } from 'vuex'
 import { setSelectedElementList, deleteSelectedElement, deleteFromComponentHtmlList } from '../store/types'
 import { breadthFirstSearch } from '../utils/search.util'
 
-// const breadthFirstSearch = (array, id) => {
-//   let queue = [...array.filter(el => typeof el === 'object')]
-//   while (queue.length) {
-//     let evaluated = queue.shift()
-//     if (evaluated.id === id) {
-//       return evaluated
-//     } else {
-//       if (evaluated.children.length) {
-//         queue.push(...evaluated.children)
-//       }
-//     }
-//   }
-//   // console.log("We shouldn't be ever getting here, how did you even search an id that didn't exist?")
-// }
-
 export default {
   name: 'HomeQueue',
   props: {

src/components/HomeQueue.vue

@@ -24,20 +24,7 @@ Description:
 <script>
 import { mapState } from 'vuex'
 import { breadthFirstSearch } from '../utils/search.util'
-// const breadthFirstSearch = (array, id) => {
-//   let queue = [...array.filter(el => typeof el === 'object')]
-//   while (queue.length) {
-//     let evaluated = queue.shift()
-//     if (evaluated.id === id) {
-//       return evaluated
-//     } else {
-//       if (evaluated.children.length) {
-//         queue.push(...evaluated.children)
-//       }
-//     }
-//   }
-//   // console.log("We shouldn't be ever getting here, how did you even search an id that didn't exist?")
-// }
+
 export default {
   data () {
     return {

src/components/Icons.vue

@@ -18,10 +18,10 @@ export default {
   name: 'OpenProjectComponent',
   methods: {
     ...mapActions(['openProject']),
+    // opens project
     openJSONFile (data) {
       const jsonFile = JSON.parse(fs.readFileSync(data[0], 'utf8'))
       // console.log('json file', jsonFile)
-      // opens project
       this.openProject(jsonFile)
     },
     showOpenJSONDialog () {

src/components/OpenProjectComponent.vue

@@ -51,7 +51,7 @@ export default {
           this.newRoute = ''
         })
 
-        .catch(err => err)
+      // .catch(err => console.log(err))
     },
     resetActiveComponent () {
       if (this.activeComponent !== '') {

src/components/RouteDisplay.vue

@@ -1,49 +1,9 @@
 import * as types from './types'
-// import icons from './state/icons.js'
-// import htmlElementMap from './state/htmlElementMap.js'
 const cloneDeep = require('lodash.clonedeep')
-// import VuexStore from './index'
-// import { getDefault, defaultState } from './state/index.js'
 import { breadthFirstSearch, breadthFirstSearchParent } from '../utils/search.util'
 
 import localforage from 'localforage'
 
-// we have to do a search because undo/redo saves payloads as deep clones so passing a memory ref would be detrimental
-// This will find you the actual object by ID
-// const breadthFirstSearch = (array, id) => {
-//   let queue = [...array.filter(el => typeof el === 'object')]
-//   while (queue.length) {
-//     let evaluated = queue.shift()
-//     if (evaluated.id === id) {
-//       return evaluated
-//     } else {
-//       if (evaluated.children.length) {
-//         queue.push(...evaluated.children)
-//       }
-//     }
-//   }
-//   // console.log("We shouldn't be ever getting here, how did you even search an id that didn't exist?")
-// }
-
-// // this would find you the parent of a given id
-// const breadthFirstSearchParent = (array, id) => {
-//   let queue = [...array.filter(el => typeof el === 'object')]
-//   while (queue.length) {
-//     let evaluated = queue.shift()
-//     for (let i = 0; i < evaluated.children.length; i++) {
-//       if (evaluated.children[i].id === id) {
-//         return {
-//           evaluated: evaluated,
-//           index: i
-//         }
-//       }
-//       if (evaluated.children.length) {
-//         queue.push(...evaluated.children)
-//       }
-//     }
-//     // console.log("We shouldn't be ever getting here, how did you even search an id that didn't exist?")
-//   }
-// }
 const mutations = {
   // invoked on undo, resetsstate to a cdeep clone of the initial state
   [types.EMPTY_STATE]: (state, payload) => {

src/store/mutations.js

@@ -2,36 +2,10 @@ import icons from './icons'
 import htmlElementMap from './htmlElementMap'
 const cloneDeep = require('lodash.clonedeep')
 
-// let hardA = {
-//   componentName: "a",
-//   x: 0,
-//   y: 20,
-//   z: 0,
-//   w: 200,
-//   h: 200,
-//   htmlList: [{
-//     children:[{
-//       children:[{
-//         text: 'button',
-//         children:[],
-//         id:0
-//       }],
-//       text:'form',
-//       id:2
-//     }],
-//     text: "div",
-//     id:1
-//   }],
-//   children: [],
-//   parent: {},
-//   isActive: false
-// }
-
 const newState = {
   icons,
   htmlElementMap,
-  // every single time we create a component
-  // sent to export project component
+  // state below is what is used when exporting a project
   componentMap: {
     App: {
       componentName: 'App',
@@ -40,53 +14,46 @@ const newState = {
     },
     HomeView: {
       componentName: 'HomeView',
-      // children: ['a'],
       children: [],
       htmlList: []
     }
-    // NewView: {}
-    // a: hardA
   },
   routes: {
-    // HomeView: [hardA]
     HomeView: []
-    // NewView: []
   },
   userActions: [],
   userState: {},
-  /**
-   *
-   */
+  imagePath: {
+    HomeView: ''
+  },
+  // state below is not used when exporting a project
   componentNameInputValue: '',
   projects: [{ filename: 'Untitled-1', lastSavedLocation: '' }],
 
   activeRoute: 'HomeView',
   activeComponent: '',
   activeHTML: '',
   activeLayer: {
-    id:'',
-    lineage:[]
+    id: '',
+    lineage: []
   },
 
   selectedElementList: [],
   projectNumber: 2,
   activeTab: 0,
   componentChildrenMultiselectValue: [],
   modalOpen: false,
-  parentSelected: false,
-  imagePath: {
-    HomeView: ''
-  }
+  parentSelected: false
 }
 
-//closured method to ensure we only ever write the default state ONCE
+// closured method to ensure we only ever write the default state ONCE
 const writeTheDefault = () => {
   let initial = {}
-  let needsToRun = true;
-  function onced(payload){
-    if(needsToRun){
+  let needsToRun = true
+  function onced (payload) {
+    if (needsToRun) {
       initial = cloneDeep(payload)
-      needsToRun = false;
+      needsToRun = false
     }
     return initial
   }
@@ -95,52 +62,5 @@ const writeTheDefault = () => {
 
 const defaultState = writeTheDefault()
 
-// const defaultState = 
-// {
-//   icons,
-//   htmlElementMap,
-//   // every single time we create a component
-//   // sent to export project component
-//   componentMap: {
-//     App: {
-//       componentName: 'App',
-//       children: ['HomeView'],
-//       htmlList: []
-//     },
-//     HomeView: {
-//       componentName: 'HomeView',
-//       children: [],
-//       htmlList: []
-//     }
-//     // NewView: {}
-//   },
-//   routes: {
-//     HomeView: []
-//     // NewView: []
-//   },
-//   userActions: [],
-//   userState: {},
-//   /**
-//    *
-//    */
-//   componentNameInputValue: '',
-//   projects: [{ filename: 'Untitled-1', lastSavedLocation: '' }],
-//   activeRoute: 'HomeView',
-//   activeComponent: '',
-//   selectedElementList: [],
-//   projectNumber: 2,
-//   activeTab: 0,
-//   componentChildrenMultiselectValue: [],
-//   modalOpen: false,
-//   parentSelected: false,
-//   imagePath: ''
-// }
-
-// const getDefault = ()=>{
-//   return {...defaultState}
-// }
-
-
-
 export default newState
-export {defaultState}
+export { defaultState }