From f45dcd4ae8ceaffbd522663c1f19b262d189ad63 Mon Sep 17 00:00:00 2001
From: James Lyne <jim+github@not-null.co.uk>
Date: Sat, 12 Dec 2020 19:04:51 +0000
Subject: [PATCH] Refactor App component, apply configured page title

---
 src/App.vue          | 79 ++++++++++++++++++--------------------------
 src/store/actions.ts |  4 +--
 2 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4b8c3ce..14f14ce 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,75 +4,60 @@
 </template>
 
 <script lang="ts">
-import {defineComponent, computed, ref} from 'vue';
+import {defineComponent, computed, ref, onMounted, onBeforeUnmount, watch} from 'vue';
 import Map from './components/Map.vue';
 import Sidebar from './components/Sidebar.vue';
 import {useStore} from "./store";
 import {ActionTypes} from "@/store/action-types";
 
 export default defineComponent({
-	name: 'WorldList',
+	name: 'App',
 	components: {
 		Map,
 		Sidebar,
 	},
 
 	setup() {
-		let store = useStore(),
+		const store = useStore(),
 			updateInterval = computed(() => store.state.configuration.updateInterval),
+			title = computed(() => store.state.configuration.title),
 			updatesEnabled = ref(false),
-			updateTimeout = ref(0);
+			updateTimeout = ref(0),
 
-		return {
-			store,
-			updateInterval,
-			updatesEnabled,
-			updateTimeout
-		}
-	},
+			loadConfiguration = () => {
+				store.dispatch(ActionTypes.LOAD_CONFIGURATION, undefined).then(() => {
+					startUpdates();
+					window.hideSplash();
+				});
+			},
 
-	mounted() {
-		this.loadConfiguration();
-	},
+			startUpdates = () => {
+				updatesEnabled.value = true;
+				update();
+			},
 
-	beforeUnmount() {
-		this.stopUpdates();
-	},
+			update = () => {
+				store.dispatch(ActionTypes.GET_UPDATE, undefined).then(() => {
+					if(updatesEnabled.value) {
+						updateTimeout.value = setTimeout(() => update(), updateInterval.value);
+					}
+				});
+			},
 
-	methods: {
-		loadConfiguration() {
-			useStore().dispatch(ActionTypes.LOAD_CONFIGURATION, undefined).then(() => {
-				this.startUpdates();
-				window.hideSplash();
-			});
-		},
+			stopUpdates = () => {
+				updatesEnabled.value = false;
 
-		startUpdates() {
-			this.updatesEnabled = true;
-			this.update();
-		},
-
-		update() {
-			useStore().dispatch(ActionTypes.GET_UPDATE, undefined).then(() => {
-				if(this.updatesEnabled) {
-					this.updateTimeout = setTimeout(() => this.update(), this.updateInterval);
+				if (updateTimeout.value) {
+					clearTimeout(updateTimeout.value);
 				}
-			});
-		},
 
-		stopUpdates() {
-			this.updatesEnabled = false;
+				updateTimeout.value = 0;
+			};
 
-			if (this.updateTimeout) {
-				clearTimeout(this.updateTimeout);
-			}
+		watch(title, (title) => document.title = title);
 
-			this.updateTimeout = 0;
-		}
-	}
+		onMounted(() => loadConfiguration());
+		onBeforeUnmount(() => stopUpdates());
+	},
 });
 </script>
-
-<style lang="scss">
-
-</style>
diff --git a/src/store/actions.ts b/src/store/actions.ts
index 9408885..f02210c 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -9,7 +9,7 @@ import {
 	DynmapConfigurationResponse, DynmapLineUpdate,
 	DynmapMarkerSet,
 	DynmapMarkerUpdate,
-	DynmapPlayer, DynmapTileUpdate,
+	DynmapPlayer, DynmapServerConfig, DynmapTileUpdate,
 	DynmapUpdateResponse
 } from "@/dynmap";
 
@@ -57,7 +57,7 @@ export interface Actions {
 }
 
 export const actions: ActionTree<State, State> & Actions = {
-	[ActionTypes.LOAD_CONFIGURATION]({commit}) {
+	[ActionTypes.LOAD_CONFIGURATION]({commit}): Promise<DynmapConfigurationResponse> {
 		return API.getConfiguration().then(config => {
 			commit(MutationTypes.SET_CONFIGURATION, config.config);
 			commit(MutationTypes.SET_MESSAGES, config.messages);