This commit is contained in:
2020-10-30 14:18:28 +00:00
parent c96ab2c895
commit ac749f91fc
2 changed files with 13 additions and 6 deletions

View File

@@ -1,9 +1,20 @@
<template> <template>
<v-sheet color="white" elevation="4" height="300" style="overflow: hidden;"> <v-sheet color="white" elevation="4" height="300" style="overflow: hidden;">
<!-- todo: need type icon and badge with count options in title bar (badge is icon?) -->
<slot name="dash-title"> <slot name="dash-title">
<v-toolbar flat dense> <v-toolbar flat dense>
<v-toolbar-title> {{ title }}</v-toolbar-title> <v-toolbar-title> {{ title }}</v-toolbar-title>
<v-spacer></v-spacer>
<v-btn text icon to="/home-notifications" data-cy="notification">
<v-badge :value="23 > 0">
<template v-slot:badge>
23
</template>
<v-icon>$ayiSplotch</v-icon>
</v-badge>
</v-btn>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<!-- <v-btn icon> <!-- <v-btn icon>

View File

@@ -2,7 +2,7 @@
<v-row v-if="formState.ready"> <v-row v-if="formState.ready">
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-col <v-col
v-for="(item, i) in availableItems" v-for="(item, i) in effectiveView"
:key="i" :key="i"
class="d-flex child-flex" class="d-flex child-flex"
cols="12" cols="12"
@@ -122,9 +122,7 @@ export default {
let allowedView = savedView.filter(z => let allowedView = savedView.filter(z =>
availableItems.find(m => m.id == z.id) availableItems.find(m => m.id == z.id)
); );
//TODO: Vet the view, ensure only items that match availableItems are allowed through
//TODO: set effectiveView based on savedView, availableItems
// vm.obj = JSON.parse(res.data.view);
vm.effectiveView = allowedView; vm.effectiveView = allowedView;
//modify the menu as necessary //modify the menu as necessary
generateMenu(vm); generateMenu(vm);
@@ -148,8 +146,6 @@ export default {
}, },
data() { data() {
return { return {
savedView: [],
availableItems: [],
effectiveView: [], effectiveView: [],
formState: { formState: {
ready: false, ready: false,