This commit is contained in:
2019-04-15 22:56:51 +00:00
parent 1f150b7561
commit 184c06ee5f
8 changed files with 16 additions and 13 deletions

View File

@@ -68,6 +68,8 @@ All platforms and browsers
- Make a 3 dots menu item that is contextual and appears at the top of any form in the shell interface?? - Make a 3 dots menu item that is contextual and appears at the top of any form in the shell interface??
- Put the help option there since it's contextutal to whatever form is being displayed - Put the help option there since it's contextutal to whatever form is being displayed
- Move help menu item in shell into menu as bottom item instead - Move help menu item in shell into menu as bottom item instead
- TODO: CODE THIS FOR THIS MENU ISSUE
- Just added ability to send info to store that is picked up by nav menu
iPad iPad

View File

@@ -12,19 +12,20 @@
</v-list-tile> </v-list-tile>
</v-list> </v-list>
</v-navigation-drawer> </v-navigation-drawer>
<v-toolbar v-if="isAuthenticated" :color="contextAppBar.isContextual?'secondary':'primary'" dark fixed app> <v-toolbar v-if="isAuthenticated" :color="contextAppBar.isMain?'primary':'secondary'" dark fixed app>
<v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon> <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
<v-toolbar-title style="width: 300px" class="ml-0 pl-3"> <v-toolbar-title style="width: 300px" class="ml-0 pl-3">
<v-avatar size="32px" tile> <v-icon>{{ contextAppBar.icon }}</v-icon>
<!-- <v-avatar size="32px" tile>
<img :src="require('./assets/logo.svg')" alt="AyaNova"> <img :src="require('./assets/logo.svg')" alt="AyaNova">
</v-avatar> </v-avatar>
<span class="hidden-sm-and-down">AyaNova</span> <span class="hidden-sm-and-down">AyaNova</span> -->
</v-toolbar-title> </v-toolbar-title>
<v-text-field flat solo-inverted hide-details prepend-inner-icon="fa-search" label="Search"></v-text-field> <!-- <v-text-field flat solo-inverted hide-details prepend-inner-icon="fa-search" label="Search"></v-text-field>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn icon v-bind:href="helpUrl" target="blank;"> <v-btn icon v-bind:href="helpUrl" target="blank;">
<v-icon>fa-question-circle</v-icon> <v-icon>fa-question-circle</v-icon>
</v-btn> </v-btn> -->
</v-toolbar> </v-toolbar>
<v-content> <v-content>
<v-container fluid fill-height> <v-container fluid fill-height>

View File

@@ -20,7 +20,7 @@ export default new Vuex.Store({
navItems: [], navItems: [],
logArray: [], logArray: [],
contextAppBar: { contextAppBar: {
isContextual: false, isMain: true,
icon: "", icon: "",
title: "" title: ""
} }
@@ -67,8 +67,8 @@ export default new Vuex.Store({
setContextAppBar(state, data) { setContextAppBar(state, data) {
state.contextAppBar = data; state.contextAppBar = data;
}, },
setNonContextAppBar(state) { setAppBarMainState(state) {
state.contextAppBar = { isContextual: false }; state.contextAppBar = { isMain: true };
} }
}, },
actions: {} actions: {}

View File

@@ -127,7 +127,7 @@ export default {
]); ]);
}, },
created() { created() {
this.$store.commit("setNonContextAppBar"); this.$store.commit("setAppBarMainState");
this.clientInfo.version = aboutInfo.version; this.clientInfo.version = aboutInfo.version;
this.$gzapi this.$gzapi
.get("ServerInfo") .get("ServerInfo")

View File

@@ -10,7 +10,7 @@ export default {
HelloWorld HelloWorld
}, },
created() { created() {
this.$store.commit("setNonContextAppBar"); this.$store.commit("setAppBarMainState");
} }
}; };
</script> </script>

View File

@@ -172,7 +172,7 @@ export default {
}, },
created() { created() {
this.$store.commit("setContextAppBar", { this.$store.commit("setContextAppBar", {
isContextual: true isMain: false
}); });
this.getDataFromApi(); this.getDataFromApi();
}, },

View File

@@ -48,7 +48,7 @@ export default {
}); });
}, },
created() { created() {
this.$store.commit("setNonContextAppBar"); this.$store.commit("setAppBarMainState");
}, },
components: { components: {
WidgetList, WidgetList,

View File

@@ -65,7 +65,7 @@ export default {
}; };
}, },
created() { created() {
this.$store.commit("setNonContextAppBar"); this.$store.commit("setAppBarMainState");
}, },
methods: { methods: {
login() { login() {