diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index e37fde5a..0ad9c4c4 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -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?? - 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 + - TODO: CODE THIS FOR THIS MENU ISSUE + - Just added ability to send info to store that is picked up by nav menu iPad diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue index d18b6701..a5210149 100644 --- a/ayanova/src/App.vue +++ b/ayanova/src/App.vue @@ -12,19 +12,20 @@ - + - + {{ contextAppBar.icon }} + - + diff --git a/ayanova/src/store.js b/ayanova/src/store.js index 6acd00a2..94b278fa 100644 --- a/ayanova/src/store.js +++ b/ayanova/src/store.js @@ -20,7 +20,7 @@ export default new Vuex.Store({ navItems: [], logArray: [], contextAppBar: { - isContextual: false, + isMain: true, icon: "", title: "" } @@ -67,8 +67,8 @@ export default new Vuex.Store({ setContextAppBar(state, data) { state.contextAppBar = data; }, - setNonContextAppBar(state) { - state.contextAppBar = { isContextual: false }; + setAppBarMainState(state) { + state.contextAppBar = { isMain: true }; } }, actions: {} diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue index 8013afc9..aa700299 100644 --- a/ayanova/src/views/About.vue +++ b/ayanova/src/views/About.vue @@ -127,7 +127,7 @@ export default { ]); }, created() { - this.$store.commit("setNonContextAppBar"); + this.$store.commit("setAppBarMainState"); this.clientInfo.version = aboutInfo.version; this.$gzapi .get("ServerInfo") diff --git a/ayanova/src/views/Home.vue b/ayanova/src/views/Home.vue index 8cfc6dbd..5b87b696 100644 --- a/ayanova/src/views/Home.vue +++ b/ayanova/src/views/Home.vue @@ -10,7 +10,7 @@ export default { HelloWorld }, created() { - this.$store.commit("setNonContextAppBar"); + this.$store.commit("setAppBarMainState"); } }; diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index a938afe2..96fac0e7 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -172,7 +172,7 @@ export default { }, created() { this.$store.commit("setContextAppBar", { - isContextual: true + isMain: false }); this.getDataFromApi(); }, diff --git a/ayanova/src/views/inventory.vue b/ayanova/src/views/inventory.vue index 676ea6bd..c0cf437d 100644 --- a/ayanova/src/views/inventory.vue +++ b/ayanova/src/views/inventory.vue @@ -48,7 +48,7 @@ export default { }); }, created() { - this.$store.commit("setNonContextAppBar"); + this.$store.commit("setAppBarMainState"); }, components: { WidgetList, diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue index 2be8bb76..053ceafa 100644 --- a/ayanova/src/views/login.vue +++ b/ayanova/src/views/login.vue @@ -65,7 +65,7 @@ export default { }; }, created() { - this.$store.commit("setNonContextAppBar"); + this.$store.commit("setAppBarMainState"); }, methods: { login() {