From 2180e2f6497f2c2804159587e2322d4679ddff19 Mon Sep 17 00:00:00 2001 From: jmt-gh Date: Thu, 9 Jun 2022 11:57:44 -0700 Subject: [PATCH 1/3] Add server version to drawer This commit adds the server version next to the URL. It also adds a new style to ensure that the text wraps properly if the URL is too long. Trying text-wrap didn't work. --- components/app/SideDrawer.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/app/SideDrawer.vue b/components/app/SideDrawer.vue index 0a36040d..6739788c 100644 --- a/components/app/SideDrawer.vue +++ b/components/app/SideDrawer.vue @@ -19,7 +19,7 @@
-

{{ serverConnectionConfig.address }}

+

{{ serverConnectionConfig.address }} (v{{serverVersion}})

{{ $config.version }}

@@ -71,6 +71,9 @@ export default { serverConnectionConfig() { return this.$store.state.user.serverConnectionConfig }, + serverVersion() { + return this.$store.state.serverSettings.version || 'Version Unavailable' + }, username() { return this.user ? this.user.username : '' }, From a391db5dc231dcf04f6e3477eedbceb8e8699ca4 Mon Sep 17 00:00:00 2001 From: jmt-gh Date: Thu, 9 Jun 2022 12:08:04 -0700 Subject: [PATCH 2/3] Change what is being called for version If I tried to grab version directly in the computed section, it would throw a null error on reload in browser (didn't see any issue on an actual device). Doing it this way fixes that --- components/app/SideDrawer.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/app/SideDrawer.vue b/components/app/SideDrawer.vue index 6739788c..56ee7a56 100644 --- a/components/app/SideDrawer.vue +++ b/components/app/SideDrawer.vue @@ -19,7 +19,7 @@
-

{{ serverConnectionConfig.address }} (v{{serverVersion}})

+

{{ serverConnectionConfig.address }} (v{{serverSettings.version}})

{{ $config.version }}

@@ -71,8 +71,8 @@ export default { serverConnectionConfig() { return this.$store.state.user.serverConnectionConfig }, - serverVersion() { - return this.$store.state.serverSettings.version || 'Version Unavailable' + serverSettings() { + return this.$store.state.serverSettings || 'Version Unavailable' }, username() { return this.user ? this.user.username : '' From c457c8eaf761f1843d963295bab7592137363c4c Mon Sep 17 00:00:00 2001 From: jmt-gh <13617455+jmt-gh@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:28:49 -0700 Subject: [PATCH 3/3] Update components/app/SideDrawer.vue Co-authored-by: advplyr <67830747+advplyr@users.noreply.github.com> --- components/app/SideDrawer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/app/SideDrawer.vue b/components/app/SideDrawer.vue index 56ee7a56..3e61005a 100644 --- a/components/app/SideDrawer.vue +++ b/components/app/SideDrawer.vue @@ -72,7 +72,7 @@ export default { return this.$store.state.user.serverConnectionConfig }, serverSettings() { - return this.$store.state.serverSettings || 'Version Unavailable' + return this.$store.state.serverSettings || {} }, username() { return this.user ? this.user.username : ''