Skip to content

Commit 39b6109

Browse files
committed
full html element functionality
1 parent 25fba43 commit 39b6109

File tree

3 files changed

+26
-15
lines changed

3 files changed

+26
-15
lines changed

src/components/CreateComponent.vue

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="home-sidebar">
33
<!-- <p class="panel-heading">Create a component</p> -->
44
<br />
5-
<form v-on:submit.prevent="handleClick">
5+
<form v-on:submit.prevent="handleClick" v-on:click="resetActiveComponent">
66
<q-input
77
standout="bg-teal text-white"
88
bottom-slots
@@ -14,7 +14,7 @@
1414
</q-input>
1515
</form>
1616
<div class="icon-container">
17-
<Icons @getClickedIcon="addToSelectedElementList" />
17+
<Icons @getClickedIcon="addToSelectedElementList" @activeElement="addToComponentElementList"/>
1818
</div>
1919
<ParentMultiselect />
2020
<br />
@@ -34,7 +34,7 @@ export default {
3434
ParentMultiselect
3535
},
3636
computed: {
37-
...mapState(['componentMap', 'selectedElementList']),
37+
...mapState(['componentMap', 'selectedElementList', 'activeComponent']),
3838
componentNameInputValue: {
3939
get () {
4040
return this.$store.state.componentNameInputValue
@@ -48,7 +48,9 @@ export default {
4848
...mapActions([
4949
'registerComponent',
5050
'addToSelectedElementList',
51-
'updateComponentNameInputValue'
51+
'updateComponentNameInputValue',
52+
'setActiveComponent',
53+
'addToComponentElementList'
5254
]),
5355
handleClick () {
5456
const component = {
@@ -63,6 +65,13 @@ export default {
6365
}
6466
6567
this.registerComponent(component)
68+
},
69+
resetActiveComponent () {
70+
this.setActiveComponent('')
71+
},
72+
handleIconClick () {
73+
if (this.activeComponent === '') this.setClickedElementList()
74+
else this.setComponentHtmlList()
6675
}
6776
}
6877
}

src/components/HomeQueue.vue

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<template>
22
<section class="home-queue">
3-
<p class="panel-heading">Selected Elements</p>
43
<draggable
54
v-model="renderList"
65
group="people"
@@ -57,27 +56,29 @@ export default {
5756
}
5857
</script>
5958

60-
<style scoped>
59+
<style lang="stylus" scoped>
6160
.home-queue {
62-
border: 1px solid white;
63-
background-color: hsl(222, 15%, 26%);
6461
height: 100%;
6562
}
6663
li {
6764
list-style-type: none;
6865
}
6966
.list-group-item {
70-
margin: 2px;
71-
border: 1px solid black;
67+
display: inline-block;
68+
margin: 2px 1.5%;
69+
width: 30%;
7270
border-radius: 0.5cm;
73-
background-color: #e7d5bc;
71+
background-color: $secondary;
7472
height: 35px;
75-
padding-top: 2px;
73+
padding-top: 6px;
7674
text-align: center;
7775
}
78-
7976
.fa-trash:hover {
8077
cursor: pointer;
8178
color: red;
8279
}
80+
.fa-trash {
81+
position: relative;
82+
left: 20px;
83+
}
8384
</style>

src/components/Icons.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ import { mapState } from 'vuex'
1818
export default {
1919
name: 'Icons',
2020
computed: {
21-
...mapState(['icons'])
21+
...mapState(['icons', 'activeComponent'])
2222
},
2323
methods: {
2424
changeState (elementName) {
25-
this.$emit('getClickedIcon', elementName)
25+
if (this.activeComponent === '') this.$emit('getClickedIcon', elementName)
26+
else this.$emit('activeElement', elementName)
2627
}
2728
}
2829
}

0 commit comments

Comments
 (0)