From 4677400b4f579390c55e352fbba36a8a07385bec Mon Sep 17 00:00:00 2001
From: James Collins <james.collins@outlook.com.au>
Date: Tue, 28 Feb 2023 08:56:34 +1000
Subject: [PATCH] fixed template and logic

---
 .../js/views/dashboard/DiscordBotLogs.vue     | 79 +++++++++----------
 1 file changed, 36 insertions(+), 43 deletions(-)

diff --git a/resources/js/views/dashboard/DiscordBotLogs.vue b/resources/js/views/dashboard/DiscordBotLogs.vue
index f1194bd..0d570d2 100644
--- a/resources/js/views/dashboard/DiscordBotLogs.vue
+++ b/resources/js/views/dashboard/DiscordBotLogs.vue
@@ -1,70 +1,63 @@
 <template>
     <SMPage :loading="formLoading" permission="logs/discord">
-        <h1>Discord Bot Logs</h1>
-        <SMMessage
-            v-if="message.message"
-            :icon="message.icon"
-            :type="message.type"
-            :message="message.message" />
-        <SMTabGroup v-if="!message.message">
-            <SMTab label="Output">
-                <code v-if="logOutputContent.length > 0">{{
-                    logOutputContent
-                }}</code>
-            </SMTab>
-            <SMTab label="Errors">
-                <code v-if="logErrorContent.length > 0">{{
-                    logErrorContent
-                }}</code>
-            </SMTab>
-        </SMTabGroup>
-        <SMButton
-            v-if="!message.message"
-            label="Reload Logs"
-            @click="loadData" />
+        <template #container>
+            <h1>Discord Bot Logs</h1>
+            <SMMessage v-if="message" type="error" :message="message" />
+            <SMTabGroup v-if="!message">
+                <SMTab label="Output">
+                    <code v-if="logOutputContent.length > 0">{{
+                        logOutputContent
+                    }}</code>
+                </SMTab>
+                <SMTab label="Errors">
+                    <code v-if="logErrorContent.length > 0">{{
+                        logErrorContent
+                    }}</code>
+                </SMTab>
+            </SMTabGroup>
+            <SMButton v-if="!message" label="Reload Logs" @click="loadData" />
+        </template>
     </SMPage>
 </template>
 
 <script setup lang="ts">
-import { reactive, ref } from "vue";
+import { ref } from "vue";
 import SMButton from "../../components/SMButton.vue";
 import SMMessage from "../../components/SMMessage.vue";
 import SMTab from "../../components/SMTab.vue";
 import SMTabGroup from "../../components/SMTabGroup.vue";
 import { api } from "../../helpers/api";
+import { LogsDiscordResponse } from "../../helpers/api.types";
 
 let formLoading = ref(false);
 let logOutputContent = ref("");
 let logErrorContent = ref("");
-const message = reactive({
-    icon: "",
-    type: "",
-    message: "",
-});
+let message = ref("");
 
 const loadData = async () => {
-    message.icon = "";
-    message.type = "error";
-    message.message = "";
+    message.value = "";
 
     try {
         formLoading.value = true;
-        let res = await api.get(`logs/discord`);
+        const result = await api.get({ url: "/logs/discord" });
 
-        logOutputContent.value = res.data.log.output;
-        if (logOutputContent.value.length === 0) {
-            logOutputContent.value = "Log file is empty";
-        }
+        const data = result.data as LogsDiscordResponse;
+        if (data) {
+            logOutputContent.value = data.log.output || "";
+            if (logOutputContent.value.length === 0) {
+                logOutputContent.value = "Log file is empty";
+            }
 
-        logErrorContent.value = res.data.log.error;
-        if (logErrorContent.value.length === 0) {
-            logErrorContent.value = "Log file is empty";
+            logErrorContent.value = data.log.error || "";
+            if (logErrorContent.value.length === 0) {
+                logErrorContent.value = "Log file is empty";
+            }
         }
-    } catch (err) {
-        message.message = "Could not load logs from server";
+    } catch (error) {
+        message.value = "Could not load logs from server";
+    } finally {
+        formLoading.value = false;
     }
-
-    formLoading.value = false;
 };
 
 loadData();