Skip to content

Commit 7d96cea

Browse files
drewngyendrewngyen
authored
Merge pull request #50 from drewngyen/master
tests for state deletion
2 parents 1fb707b + 69d47e2 commit 7d96cea

File tree

15 files changed

+317
-129
lines changed

15 files changed

+317
-129
lines changed

‎src/components/CodeSnippet.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default {
5757
return `<template>\n ${output}${templateTagStr} </div>\n</template>`
5858
},
5959
writeTemplateTag (componentName) {
60-
//console.log('writeTemplateTag invoked!')
60+
// console.log('writeTemplateTag invoked!')
6161
// create reference object
6262
const htmlElementMap = {
6363
div: ['<div>', '</div>'],
@@ -81,7 +81,7 @@ export default {
8181
outputStr += htmlElementMap[el.text][1]
8282
outputStr += ` \n`
8383
}
84-
//console.log(`outputStr from writeTemplateTag: ${outputStr}`)
84+
// console.log(`outputStr from writeTemplateTag: ${outputStr}`)
8585
return outputStr
8686
},
8787
createBoiler (componentName, children) {
@@ -107,7 +107,7 @@ export default {
107107
},
108108
// updates code snippet, but broken cause children undefined, shows `function () { [native code] }`
109109
updated () {
110-
//console.log(`code: ${this.createCodeSnippet(this.activeComponent, this.componentMap[this.activeComponent].children)}`)
110+
// console.log(`code: ${this.createCodeSnippet(this.activeComponent, this.componentMap[this.activeComponent].children)}`)
111111
this.code = `${this.createCodeSnippet(this.activeComponent, this.componentMap[this.activeComponent].children)}`
112112
},
113113
beforeDestroy () {
@@ -122,7 +122,7 @@ export default {
122122
font-size: 12px;
123123
}
124124
.codesnippet-container {
125-
margin-bottom: 1rem;
125+
margin-bottom: 1rem;
126126
}
127127
::-webkit-scrollbar {
128128
display: none;

‎src/components/ComponentDisplay.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default {
9999
},
100100
childList () {
101101
return this.componentMap[componentData.componentName].children
102-
},
102+
},
103103
options () {
104104
// PROBLEM: the objects on childrenmultiselectvalue are applied
105105
const routes = Object.keys(this.routes)

‎src/components/ExportProject.vue‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// import path from "path";
1212
// const ipc = require("electron").ipcRenderer;
1313
export default {
14-
name: "ExportProjectComponent",
14+
name: 'ExportProjectComponent'
1515
// methods: {
1616
// showExportDialog() {
1717
// remote.dialog.showSaveDialog({
@@ -373,9 +373,7 @@ export default {
373373
// computed: {
374374
// ...mapState(["componentMap"])
375375
// }
376-
};
377-
378-
376+
}
379377
380378
</script>
381379

@@ -389,5 +387,3 @@ export default {
389387
}
390388
391389
</style>
392-
393-

‎src/components/Footer.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ i {
130130
background: #11120F;
131131
}
132132
.toolbar-background {
133-
background: black;
133+
background: black;
134134
}
135135
.full-footer {
136136
// height: 100vh;
137-
padding-bottom: 0px;
137+
padding-bottom: 0px;
138138
}
139139
</style>

‎src/components/HomeSideDropDownItems/ComponentList.vue‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,14 @@ export default {
4444
}
4545
},
4646
methods: {
47-
...mapActions(['setActiveComponent','deleteComponent', 'deleteActiveComponent']),
47+
...mapActions(['setActiveComponent', 'deleteComponent', 'deleteActiveComponent']),
4848
onActivated (componentData) {
4949
this.setActiveComponent(componentData.componentName)
5050
this.activeComponentData.isActive = true
5151
},
5252
handleClick (componentData) {
53-
54-
this.setActiveComponent(componentData.componentName)
55-
this.deleteActiveComponent(componentData.componentName)
56-
53+
this.setActiveComponent(componentData.componentName)
54+
this.deleteActiveComponent(componentData.componentName)
5755
}
5856
}
5957
}

‎src/components/OpenProjectComponent.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
// import { mapState, mapActions } from 'vuex'
1212
1313
export default {
14-
name: 'OpenProjectComponent',
14+
name: 'OpenProjectComponent'
1515
// methods: {
1616
// ...mapActions([
1717
// 'setComponentMap',
1818
// 'setRoutes',
1919
// ]),
20-
// parseFileName(file) {
20+
// parseFileName(file) {
2121
// //Obtains json file name from file path
2222
// return file.split('/').pop();
2323
// },
@@ -49,7 +49,7 @@ export default {
4949
// });
5050
// }
5151
}
52-
</script>
52+
</script>
5353

5454
<style scoped>
5555
.mr-sm {

‎src/components/RouteDisplay.vue‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@
1818
</template>
1919

2020
<script>
21-
import Routes from "./Routes";
22-
import { mapState, mapActions } from "vuex";
21+
import Routes from './Routes'
22+
import { mapState, mapActions } from 'vuex'
2323
2424
export default {
25-
name: "RouteDisplay",
25+
name: 'RouteDisplay',
2626
components: {
2727
Routes
2828
},
2929
computed: {
30-
...mapState(["routes"])
30+
...mapState(['routes'])
3131
},
32-
data() {
32+
data () {
3333
return {
34-
newRoute: ""
35-
};
34+
newRoute: ''
35+
}
3636
},
3737
methods: {
38-
...mapActions(["addRouteToRouteMap", "setRoutes"]),
39-
handleEnterKeyPress() {
38+
...mapActions(['addRouteToRouteMap', 'setRoutes']),
39+
handleEnterKeyPress () {
4040
this.addRouteToRouteMap(this.newRoute)
4141
.then(() => {
42-
this.newRoute = "";
42+
this.newRoute = ''
4343
})
4444
45-
.catch(err => console.log(err));
45+
.catch(err => console.log(err))
4646
}
4747
}
48-
};
48+
}
4949
</script>
5050

5151
<style scoped>

‎src/components/SaveProjectComponent.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<!-- <q-btn class=" export-btn" color="secondary" label="Save"/> -->
3-
<q-btn class="export-btn" color="secondary" label="Save" @click="saveProjectJSON"/>
3+
<q-btn class="export-btn" color="secondary" label="Save" @click="saveProjectJSON"/>
44
</template>
55

66
<script>
@@ -10,7 +10,7 @@
1010
// const Mousetrap = require('mousetrap');
1111
1212
export default {
13-
name: 'SaveProjetComponent',
13+
name: 'SaveProjetComponent'
1414
// methods: {
1515
// showSaveJSONDialog(){
1616
// remote.dialog.showSaveDialog({
@@ -125,7 +125,7 @@ export default {
125125
// console.log('result is', result);
126126
// });
127127
// console.log('PROJECT SAVED AS A JSON OBJECT!');
128-
// }
128+
// }
129129
// },
130130
// created(){
131131
// Mousetrap.bind(['command+s', 'ctrl+s'], () => {
@@ -140,4 +140,4 @@ export default {
140140
.mr-sm {
141141
margin-right: 2px
142142
}
143-
</style>
143+
</style>

‎src/layouts/MyLayout.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export default {
8787
}
8888
// styling between input and elements in q-list drawer
8989
.q-field--with-bottom {
90-
// pading-bottom:
90+
// pading-bottom:
9191
}
9292
// css styling for entire drawer
9393
.q-drawer {

‎src/store/actions.js‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as types from './types'
22

33
const actions = {
4-
//
4+
// creates a new component in componentMap
55
[types.registerComponent]: ({ state, commit }, payload) => {
66
const { componentName } = payload
77
if (!state.componentMap[componentName]) {
@@ -21,7 +21,10 @@ const actions = {
2121
})
2222

2323
if (state.parentSelected) {
24-
commit(types.UPDATE_ACTIVE_COMPONENT_CHILDREN_VALUE, [...state.componentMap[state.activeComponent].children, payload.componentName])
24+
commit(types.UPDATE_ACTIVE_COMPONENT_CHILDREN_VALUE, [
25+
...state.componentMap[state.activeComponent].children,
26+
payload.componentName
27+
])
2528
}
2629

2730
commit(types.UPDATE_COMPONENT_CHILDREN_VALUE, { component, value })
@@ -75,6 +78,7 @@ const actions = {
7578
[types.changeActiveTab]: ({ commit }, payload) => {
7679
commit(types.CHANGE_ACTIVE_TAB, payload)
7780
},
81+
// used by OpenProjectComponent.vue
7882
[types.setComponentMap]: ({ commit }, payload) => {
7983
commit(types.SET_COMPONENT_MAP, payload)
8084
},
@@ -91,6 +95,7 @@ const actions = {
9195
[types.setActiveRoute]: ({ commit }, payload) => {
9296
commit(types.SET_ACTIVE_ROUTE, payload)
9397
},
98+
// sets active component when clicked in componentDisplay
9499
[types.setActiveComponent]: ({ commit }, payload) => {
95100
commit(types.SET_ACTIVE_COMPONENT, payload)
96101
},
@@ -123,14 +128,38 @@ const actions = {
123128
console.log('payload in actions:', payload)
124129
commit(types.DELETE_COMPONENT, payload)
125130
},
131+
[types.importImage]: ({ commit }, payload) => {
132+
commit(types.IMPORT_IMAGE, payload)
133+
},
134+
[types.clearImage]: ({ commit }) => {
135+
commit(types.CLEAR_IMAGE)
136+
},
126137
[types.deleteUserActions]: ({ state, commit }, payload) => {
127138
console.log('invoking deleteUserActions')
128-
if(state.activeComponent) commit(types.REMOVE_ACTION_FROM_COMPONENT, payload)
139+
if (state.activeComponent) {
140+
commit(types.REMOVE_ACTION_FROM_COMPONENT, payload)
141+
}
129142
commit(types.DELETE_USER_ACTIONS, payload)
130143
},
131144
[types.removeActionFromComponent]: ({ state, commit }, payload) => {
132145
console.log('invoking removeActionFromComponent')
133146
commit(types.REMOVE_ACTION_FROM_COMPONENT, payload)
147+
},
148+
[types.removeStateFromComponent]: ({ commit }, payload) => {
149+
console.log('removeStateFromComponent invoked')
150+
commit(types.REMOVE_STATE_FROM_COMPONENT, payload)
151+
},
152+
[types.deleteUserState]: ({ state, commit }, payload) => {
153+
console.log('deleteUserState invoked')
154+
if (state.activeComponent) {
155+
commit(types.REMOVE_STATE_FROM_COMPONENT, payload)
156+
}
157+
// loops through component map and deletes all props
158+
Object.keys(state.componentMap).forEach(prop => {
159+
commit(types.SET_ACTIVE_COMPONENT, prop.componentName)
160+
commit(types.REMOVE_ACTION_FROM_COMPONENT, payload)
161+
})
162+
commit(types.DELETE_USER_STATE, payload)
134163
}
135164
}
136165

0 commit comments

Comments
 (0)