Skip to content

Commit 59958e2

Browse files
committed
updated small merge bugs
1 parent d7d4d4d commit 59958e2

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default {
6363
data() {
6464
return {
6565
attributeText: "",
66-
attributeSelection: "ID",
66+
attributeSelection: "id",
6767
deleteText:"",
6868
};
6969
},

src/components/right-sidebar/CodeSnippet.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ export default {
8686
},
8787
// Creates <template> boilerplate
8888
writeTemplateTag(componentName) {
89+
console.log(this.activeComponentObj)
8990
// create reference object
9091
const htmlElementMap = {
9192
div: ["<div", "</div>"],
@@ -248,7 +249,7 @@ export default {
248249
styleString += `.${this.activeComponentObj.htmlAttributes.class} {\nbackground-color: ${this.activeComponentObj.color};
249250
width: ${this.activeComponentObj.w}px;
250251
height: ${this.activeComponentObj.h}px;
251-
z-index: ${this.activeComponentObj.z}px;
252+
z-index: ${this.activeComponentObj.z};
252253
}\n`
253254
}
254255

src/components/right-sidebar/HTMLQueue.vue

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@ Description:
3131
<q-dialog v-model="attributeModal">
3232
<!-- @update:model-value="setActiveElement" -->
3333
<div class="AttributeBox">
34-
<p class="title">Added attributes to {{ this.activeComponent }}</p>
34+
<p class="title">Add attributes to: {{ this.activeComponent }}</p>
35+
<!--attribute child-->
3536
<div class="AttributeContainer" v-for="element in this.componentMap[this.activeComponent].htmlList"
3637
:key="element.id + Date.now()">
3738
<p v-if="element.id === this.activeHTML">Your class is - {{ element.class }}</p>
3839
</div>
40+
3941
<div class="formBox">
4042
<q-form autofocus v-on:submit.prevent="submitClass">
4143
<p class="title">Add Class Name:</p>
42-
<q-input label="Add your note here" filled dark autofocus true hide-bottom-space v-model="classText"
44+
<q-input label="Add your class here" filled dark autofocus true hide-bottom-space v-model="classText"
4345
@keyup.enter="submitClass"></q-input>
4446
<q-btn id="comp-btn" class="sidebar-btn" color="secondary" label="Submit Attribute"
4547
:disable="classText.length > 0 ? false : true" @click="submitClass(classText, this.activeHTML)" />
@@ -112,10 +114,14 @@ export default {
112114
else this.$store.dispatch(deleteFromComponentHtmlList, id[1])
113115
},
114116
setActiveElement(element) {
115-
if (this.activeComponent !== '') {
117+
// if (this.activeComponent !== '') {
118+
// }
119+
console.log(this.activeHTML)
116120
this.setActiveHTML(element);
117121
this.openAttributeModal(element);
118-
}
122+
123+
console.log(this.activeHTML)
124+
119125
},
120126
setLayer(element) {
121127
this.setActiveLayer(element)

src/store/mutations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ const mutations = {
636636

637637
updatedComponent.color = payload.color
638638
},
639-
639+
//Attribute updater for parent
640640
[types.EDIT_ATTRIBUTE]: (state, payload) => {
641641
const updatedComponent = state.routes[state.activeRoute].filter(
642642
(element) => element.componentName === payload.activeComponent

0 commit comments

Comments
 (0)