Skip to content

Commit a36b22d

Browse files
authored
Merge pull request #3 from deanfchung/dean
routes MENUUU FFFFFFf
2 parents f913177 + 6cad4e0 commit a36b22d

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

src/components/ParentMultiselect.vue

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@ export default {
2727
...mapState([
2828
'routes',
2929
'componentMap',
30-
'activeComponent'
30+
'activeComponent',
31+
'activeRoute',
32+
'routes'
3133
]),
3234
options () {
33-
const routes = Object.keys(this.routes)
34-
const exceptions = new Set(['App', ...routes])
35-
return Object.keys(this.componentMap).filter(component => {
36-
if (!exceptions.has(component)) return component
37-
})
35+
return this.routes[this.activeRoute].map(component => component.componentName)
3836
}
3937
},
4038
methods: {

src/components/RouteDisplay.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<div class="route-display">
3-
<q-input
2+
<div>
3+
<q-input
44
@keyup.enter.native="handleEnterKeyPress"
55
standout="bg-teal text-white"
66
bottom-slots
@@ -10,6 +10,10 @@
1010
class="input-add"
1111
>
1212
</q-input>
13+
<!--<div class="route-display">-->
14+
<!--
15+
16+
-->
1317
<Routes></Routes>
1418
</div>
1519
</template>

src/components/Routes.vue

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
<template>
2-
<div class="route-view">
2+
<div>
3+
<!--<div class="route-view">-->
34
<a
45
:class="route === activeRoute ? 'panel-block is-active' : 'panel-block'"
56
v-for="route in Object.keys(routes)"
67
:key="route"
78
@click="handleClick(route)"
89
>
10+
<!--
911
<span class="panel-icon">
1012
<i class="fas fa-location-arrow" aria-hidden="true"></i>
1113
</span>
12-
{{ route }}
14+
-->
15+
<q-list bordered separator>
16+
<q-item clickable v-ripple>
17+
<q-item-section>{{route}}</q-item-section>
18+
19+
</q-item>
20+
21+
</q-list>
22+
1323
</a>
1424
</div>
25+
1526
</template>
1627

1728
<script>

0 commit comments

Comments
 (0)