Skip to content

Commit f858846

Browse files
Ji KimJi Kim
authored andcommitted
Merge branch 'pinia' of https://github.com/oslabs-beta/OverVue into ji-pinia
2 parents c4b5bf9 + 490d3dc commit f858846

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

src/components/left-sidebar/ComponentTab/StateSubMenu.vue

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,10 @@
3333
@click="addStateToComp"
3434
/>
3535
</div>
36-
<p v-if="!this.componentMap[this.activeComponent].state.length">
36+
<p v-if="!componentMap[activeComponent].state.length">
3737
No state in component
3838
</p>
39-
<a
40-
v-else
41-
v-for="state in this.componentMap[this.activeComponent].state"
42-
:key="state"
43-
>
39+
<a v-else v-for="state in componentMap[activeComponent].state" :key="state">
4440
<q-list class="list-item" dense bordered separator>
4541
<q-item clickable v-ripple class="list-item">
4642
<q-item-section>

src/components/left-sidebar/ComponentTab/UpdateMenu.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,6 @@ const activeRouteDisplay = computed(() => routes.value[activeRoute.value]);
191191
const activeComponentData = cloneDeep(activeComponentObj.value);
192192
193193
const options = computed(() => {
194-
console.log("activeComponentObj is ", activeComponentObj)
195-
console.log("activeComponentObj.value is ", activeComponentObj.value)
196-
console.log("activeComponentObj.value.componentName is ", activeComponentObj.value.componentName)
197194
if (activeComponent.value !== "") {
198195
newName.value = activeComponentObj.value.componentName;
199196
childrenSelected.value = [];

src/components/right-sidebar/Tree.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ function buildTreeChildren(array) {
156156
}
157157
outputArray.push(outputObj);
158158
});
159-
console.log("outputArray is ", outputArray)
160159
return outputArray;
161160
}
162161
}
@@ -168,10 +167,7 @@ treeData.value = buildTree(componentMap.value);
168167
watch(
169168
componentMap,
170169
() => {
171-
console.log("Inside of watch: Tree componentMap is ", componentMap.value);
172-
console.log("Inside of watch: Tree activeComponent is ", activeComponent.value);
173170
treeData.value = buildTree(componentMap.value);
174-
console.log("Inside of watch: Tree treeData.value is ", treeData.value)
175171
},
176172
177173
{ deep: true }

src/store/actions.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,10 @@ const actions = {
171171
addStateToComponent(payload) {
172172
const active = this.componentMap[this.activeComponent];
173173

174-
if (!this.activeComponentObj.state) this.activeComponentObj.state = payload;
174+
if (!active.state) active.state = payload;
175175
else {
176176
for (const s of payload) {
177-
if (this.activeComponentObj.state.includes(s))
178-
this.activeComponentObj.state.push(s);
177+
if (!active.state.includes(s)) active.state.push(s);
179178
}
180179
}
181180

0 commit comments

Comments
 (0)