Skip to content

Commit 82b0365

Browse files
authored
Merge pull request #32 from keliphan/mac
Mac build issue fixed and additional comments added
2 parents 742b13d + 940d8bf commit 82b0365

File tree

7 files changed

+1478
-396
lines changed

7 files changed

+1478
-396
lines changed

package-lock.json

Lines changed: 1472 additions & 360 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"lodash.isequal": "^4.5.0",
2828
"lodash.throttle": "^4.1.1",
2929
"mousetrap": "^1.6.3",
30-
"node": "^14.4.0",
3130
"npm": "^6.14.5",
3231
"prismjs": "^1.16.0",
3332
"quasar": "^1.0.0",
@@ -50,7 +49,7 @@
5049
"babel-eslint": "^10.0.1",
5150
"devtron": "^1.4.0",
5251
"electron": "^5.0.6",
53-
"electron-builder": "^20.44.4",
52+
"electron-builder": "^22.7.0",
5453
"electron-debug": "^3.0.1",
5554
"electron-devtools-installer": "^2.2.4",
5655
"eslint": "^5.10.0",
@@ -60,7 +59,7 @@
6059
"vue-cli-plugin-electron-builder": "^1.3.6"
6160
},
6261
"engines": {
63-
"node": ">= 8.9.0",
62+
"node": ">= 10.0.0",
6463
"npm": ">= 5.6.0",
6564
"yarn": ">= 1.6.0"
6665
},

src/components/ComponentDisplay.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ Description:
2929
<div class="component-title">
3030
<p>{{ componentData.componentName }}</p>
3131
</div>
32-
<ul class="component-children">
33-
</ul>
3432
<q-menu context-menu>
3533
<q-list color='black' class="menu">
3634
<q-item clickable v-ripple v-close-popup @click="handleAddChild">
@@ -152,6 +150,7 @@ export default {
152150
153151
userImage () {
154152
const imgSrc = `file://` + this.imagePath[this.activeRoute]
153+
// console.log('imgSrc is: ', imgSrc)
155154
return imgSrc
156155
},
157156

src/components/HomeQueue.vue

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@ import { mapState, mapActions } from 'vuex'
3737
import { setSelectedElementList, deleteSelectedElement, deleteFromComponentHtmlList } from '../store/types'
3838
import { breadthFirstSearch } from '../utils/search.util'
3939
40-
// const breadthFirstSearch = (array, id) => {
41-
// let queue = [...array.filter(el => typeof el === 'object')]
42-
// while (queue.length) {
43-
// let evaluated = queue.shift()
44-
// if (evaluated.id === id) {
45-
// return evaluated
46-
// } else {
47-
// if (evaluated.children.length) {
48-
// queue.push(...evaluated.children)
49-
// }
50-
// }
51-
// }
52-
// // console.log("We shouldn't be ever getting here, how did you even search an id that didn't exist?")
53-
// }
54-
5540
export default {
5641
name: 'HomeQueue',
5742
props: {

src/components/Icons.vue

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,7 @@ Description:
2424
<script>
2525
import { mapState } from 'vuex'
2626
import { breadthFirstSearch } from '../utils/search.util'
27-
// const breadthFirstSearch = (array, id) => {
28-
// let queue = [...array.filter(el => typeof el === 'object')]
29-
// while (queue.length) {
30-
// let evaluated = queue.shift()
31-
// if (evaluated.id === id) {
32-
// return evaluated
33-
// } else {
34-
// if (evaluated.children.length) {
35-
// queue.push(...evaluated.children)
36-
// }
37-
// }
38-
// }
39-
// // console.log("We shouldn't be ever getting here, how did you even search an id that didn't exist?")
40-
// }
27+
4128
export default {
4229
data () {
4330
return {

src/components/OpenProjectComponent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ export default {
1818
name: 'OpenProjectComponent',
1919
methods: {
2020
...mapActions(['openProject']),
21+
// opens project
2122
openJSONFile (data) {
2223
const jsonFile = JSON.parse(fs.readFileSync(data[0], 'utf8'))
2324
// console.log('json file', jsonFile)
24-
// opens project
2525
this.openProject(jsonFile)
2626
},
2727
showOpenJSONDialog () {

src/components/RouteDisplay.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default {
5151
this.newRoute = ''
5252
})
5353
54-
.catch(err => err)
54+
// .catch(err => console.log(err))
5555
},
5656
resetActiveComponent () {
5757
if (this.activeComponent !== '') {

0 commit comments

Comments
 (0)