From 740d2938f55177821faa008d1fd49d8f017e8e53 Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Sun, 5 May 2024 23:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf:=20=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easytier-gui/src/App.vue             | 259 +--------------------------
 easytier-gui/src/layouts/default.vue |   3 +
 easytier-gui/src/pages/index.vue     | 252 ++++++++++++++++++++++++++
 easytier-gui/src/typed-router.d.ts   |  23 +++
 4 files changed, 280 insertions(+), 257 deletions(-)
 create mode 100644 easytier-gui/src/layouts/default.vue
 create mode 100644 easytier-gui/src/pages/index.vue
 create mode 100644 easytier-gui/src/typed-router.d.ts

diff --git a/easytier-gui/src/App.vue b/easytier-gui/src/App.vue
index 4f9a60f..6d11557 100644
--- a/easytier-gui/src/App.vue
+++ b/easytier-gui/src/App.vue
@@ -1,258 +1,3 @@
-<script setup lang="ts">
-import { ref, onMounted, onUnmounted, computed } from 'vue'
-
-import Stepper from 'primevue/stepper';
-import StepperPanel from 'primevue/stepperpanel';
-
-import { useToast } from "primevue/usetoast";
-
-import {
-  i18n, loadLocaleFromLocalStorage, NetworkConfig, parseNetworkConfig,
-  useNetworkStore, runNetworkInstance, retainNetworkInstance, collectNetworkInfos,
-  changeLocale
-} from './main';
-
-import Config from './components/Config.vue';
-import Status from './components/Status.vue';
-
-import { exit } from '@tauri-apps/api/process';
-
-const visible = ref(false);
-const tomlConfig = ref("");
-
-const items = ref([
-  {
-    label: () => i18n.global.t('show_config'),
-    icon: 'pi pi-file-edit',
-    command: async () => {
-      try {
-        const ret = await parseNetworkConfig(networkStore.curNetwork);
-        tomlConfig.value = ret;
-      } catch (e: any) {
-        tomlConfig.value = e;
-      }
-      visible.value = true;
-    }
-  },
-  {
-    label: () => i18n.global.t('del_cur_network'),
-    icon: 'pi pi-times',
-    command: async () => {
-      networkStore.removeNetworkInstance(networkStore.curNetwork.instance_id);
-      await retainNetworkInstance(networkStore.networkInstanceIds);
-      networkStore.delCurNetwork();
-    },
-    disabled: () => networkStore.networkList.length <= 1,
-  },
-])
-
-enum Severity {
-  None = "none",
-  Success = "success",
-  Info = "info",
-  Warn = "warn",
-  Error = "error",
-}
-
-const messageBarSeverity = ref(Severity.None);
-const messageBarContent = ref("");
-
-const toast = useToast();
-
-const networkStore = useNetworkStore();
-
-const addNewNetwork = () => {
-  networkStore.addNewNetwork();
-  networkStore.curNetwork = networkStore.lastNetwork;
-}
-
-const networkMenuName = (network: NetworkConfig) => {
-  return network.network_name + " (" + network.instance_id + ")";
-}
-
-networkStore.$subscribe(async () => {
-  networkStore.saveToLocalStroage();
-  try {
-    await parseNetworkConfig(networkStore.curNetwork);
-    messageBarSeverity.value = Severity.None;
-  } catch (e: any) {
-    messageBarContent.value = e;
-    messageBarSeverity.value = Severity.Error;
-  }
-});
-
-async function runNetworkCb(cfg: NetworkConfig, cb: (e: MouseEvent) => void) {
-  cb({} as MouseEvent);
-  networkStore.removeNetworkInstance(cfg.instance_id);
-  await retainNetworkInstance(networkStore.networkInstanceIds);
-  networkStore.addNetworkInstance(cfg.instance_id);
-
-  try {
-    await runNetworkInstance(cfg);
-  } catch (e: any) {
-    console.error(e);
-    toast.add({ severity: 'info', detail: e });
-  }
-}
-
-async function stopNetworkCb(cfg: NetworkConfig, cb: (e: MouseEvent) => void) {
-  console.log("stopNetworkCb", cfg, cb);
-  cb({} as MouseEvent);
-  networkStore.removeNetworkInstance(cfg.instance_id);
-  await retainNetworkInstance(networkStore.networkInstanceIds);
-}
-
-async function updateNetworkInfos() {
-  networkStore.updateWithNetworkInfos(await collectNetworkInfos());
-}
-
-let intervalId = 0;
-onMounted(() => {
-  intervalId = setInterval(async () => {
-    await updateNetworkInfos();
-  }, 500);
-});
-onUnmounted(() => clearInterval(intervalId))
-
-const curNetworkHasInstance = computed(() => {
-  return networkStore.networkInstanceIds.includes(networkStore.curNetworkId);
-});
-
-const activeStep = computed(() => {
-  return curNetworkHasInstance.value ? 1 : 0;
-});
-
-const setting_menu = ref();
-const setting_menu_items = ref([
-  {
-    label: () => i18n.global.t('settings'),
-    items: [
-      {
-        label: () => i18n.global.t('exchange_language'),
-        icon: 'pi pi-refresh',
-        command: () => {
-          changeLocale((i18n.global.locale.value === 'en' ? 'cn' : 'en'));
-        }
-      },
-      {
-        label: () => i18n.global.t('exit'),
-        icon: 'pi pi-times',
-        command: async () => {
-          await exit(1);
-        }
-      }
-    ]
-  }
-]);
-
-const toggle_setting_menu = (event: any) => {
-  setting_menu.value.toggle(event);
-};
-
-onMounted(async () => {
-  networkStore.loadFromLocalStorage();
-  changeLocale(loadLocaleFromLocalStorage());
-});
-
-</script>
-
 <template>
-  <!-- <n-config-provider :theme="lightTheme"> -->
-  <div id="root" class="flex flex-column">
-    <Dialog v-model:visible="visible" modal header="Config File" :style="{ width: '70%' }">
-      <Panel>
-        <ScrollPanel style="width: 100%; height: 300px">
-          <pre>{{ tomlConfig }}</pre>
-        </ScrollPanel>
-      </Panel>
-      <Divider />
-      <div class="flex justify-content-end gap-2">
-        <Button type="button" :label="$t('close')" @click="visible = false"></Button>
-      </div>
-    </Dialog>
-
-    <div>
-      <Toolbar>
-        <template #start>
-          <div class="flex align-items-center gap-2">
-            <Button icon="pi pi-plus" class="mr-2" severity="primary" :label="$t('add_new_network')"
-              @click="addNewNetwork" />
-          </div>
-        </template>
-
-        <template #center>
-          <div class="min-w-80 mr-20">
-            <Dropdown v-model="networkStore.curNetwork" :options="networkStore.networkList"
-              :optionLabel="networkMenuName" :placeholder="$t('select_network')" :highlightOnSelect="true"
-              :checkmark="true" class="w-full md:w-32rem" />
-          </div>
-        </template>
-
-        <template #end>
-          <Button icon="pi pi-cog" class="mr-2" severity="secondary" aria-haspopup="true" @click="toggle_setting_menu"
-            :label="$t('settings')" aria-controls="overlay_setting_menu" />
-          <Menu ref="setting_menu" id="overlay_setting_menu" :model="setting_menu_items" :popup="true" />
-        </template>
-      </Toolbar>
-    </div>
-
-    <Stepper class="h-full overflow-y-auto" :active-step="activeStep">
-      <StepperPanel :header="$t('config_network')" class="w">
-        <template #content="{ nextCallback }">
-          <Config @run-network="runNetworkCb($event, nextCallback)" :instance-id="networkStore.curNetworkId"
-            :config-invalid="messageBarSeverity != Severity.None" />
-        </template>
-      </StepperPanel>
-      <StepperPanel :header="$t('running')">
-        <template #content="{ prevCallback }">
-          <div class="flex flex-column">
-            <Status :instance-id="networkStore.curNetworkId" />
-          </div>
-          <div class="flex pt-4 justify-content-center">
-            <Button :label="$t('stop_network')" severity="danger" icon="pi pi-arrow-left"
-              @click="stopNetworkCb(networkStore.curNetwork, prevCallback)" />
-          </div>
-        </template>
-      </StepperPanel>
-    </Stepper>
-
-    <div>
-      <Menubar :model="items" breakpoint="300px">
-      </Menubar>
-      <InlineMessage v-if="messageBarSeverity !== Severity.None" class="absolute bottom-0 right-0" severity="error">
-        {{ messageBarContent }}</InlineMessage>
-    </div>
-  </div>
-
-</template>
-
-<style scoped>
-#root {
-  height: 100vh;
-  width: 100vw;
-}
-</style>
-
-<style>
-body {
-  height: 100vh;
-  width: 100vw;
-  padding: 0;
-  margin: 0;
-  overflow: hidden;
-}
-
-.p-menubar .p-menuitem {
-  margin: 0;
-}
-
-/* 
-
-.p-tabview-panel {
-  height: 100%;
-} */
-</style>
-
-
-<script lang="ts">
-</script>
\ No newline at end of file
+  <RouterView />
+</template>
\ No newline at end of file
diff --git a/easytier-gui/src/layouts/default.vue b/easytier-gui/src/layouts/default.vue
new file mode 100644
index 0000000..6d11557
--- /dev/null
+++ b/easytier-gui/src/layouts/default.vue
@@ -0,0 +1,3 @@
+<template>
+  <RouterView />
+</template>
\ No newline at end of file
diff --git a/easytier-gui/src/pages/index.vue b/easytier-gui/src/pages/index.vue
new file mode 100644
index 0000000..1e241a4
--- /dev/null
+++ b/easytier-gui/src/pages/index.vue
@@ -0,0 +1,252 @@
+<script setup lang="ts">
+import Stepper from 'primevue/stepper';
+import StepperPanel from 'primevue/stepperpanel';
+
+import { useToast } from "primevue/usetoast";
+
+
+import Config from '~/components/Config.vue';
+import Status from '~/components/Status.vue';
+
+import { exit } from '@tauri-apps/api/process';
+import { NetworkConfig } from '~/types/network';
+import { loadLanguageAsync } from '~/modules/i18n';
+const { t, locale } = useI18n()
+const visible = ref(false);
+const tomlConfig = ref("");
+
+const items = ref([
+  {
+    label: () => t('show_config'),
+    icon: 'pi pi-file-edit',
+    command: async () => {
+      try {
+        const ret = await parseNetworkConfig(networkStore.curNetwork);
+        tomlConfig.value = ret;
+      } catch (e: any) {
+        tomlConfig.value = e;
+      }
+      visible.value = true;
+    }
+  },
+  {
+    label: () => t('del_cur_network'),
+    icon: 'pi pi-times',
+    command: async () => {
+      networkStore.removeNetworkInstance(networkStore.curNetwork.instance_id);
+      await retainNetworkInstance(networkStore.networkInstanceIds);
+      networkStore.delCurNetwork();
+    },
+    disabled: () => networkStore.networkList.length <= 1,
+  },
+])
+
+enum Severity {
+  None = "none",
+  Success = "success",
+  Info = "info",
+  Warn = "warn",
+  Error = "error",
+}
+
+const messageBarSeverity = ref(Severity.None);
+const messageBarContent = ref("");
+
+const toast = useToast();
+
+const networkStore = useNetworkStore();
+
+const addNewNetwork = () => {
+  networkStore.addNewNetwork();
+  networkStore.curNetwork = networkStore.lastNetwork;
+}
+
+const networkMenuName = (network: NetworkConfig) => {
+  return network.network_name + " (" + network.instance_id + ")";
+}
+
+networkStore.$subscribe(async () => {
+  networkStore.saveToLocalStorage();
+  try {
+    await parseNetworkConfig(networkStore.curNetwork);
+    messageBarSeverity.value = Severity.None;
+  } catch (e: any) {
+    messageBarContent.value = e;
+    messageBarSeverity.value = Severity.Error;
+  }
+});
+
+async function runNetworkCb(cfg: NetworkConfig, cb: (e: MouseEvent) => void) {
+  cb({} as MouseEvent);
+  networkStore.removeNetworkInstance(cfg.instance_id);
+  await retainNetworkInstance(networkStore.networkInstanceIds);
+  networkStore.addNetworkInstance(cfg.instance_id);
+
+  try {
+    await runNetworkInstance(cfg);
+  } catch (e: any) {
+    console.error(e);
+    toast.add({ severity: 'info', detail: e });
+  }
+}
+
+async function stopNetworkCb(cfg: NetworkConfig, cb: (e: MouseEvent) => void) {
+  console.log("stopNetworkCb", cfg, cb);
+  cb({} as MouseEvent);
+  networkStore.removeNetworkInstance(cfg.instance_id);
+  await retainNetworkInstance(networkStore.networkInstanceIds);
+}
+
+async function updateNetworkInfos() {
+  networkStore.updateWithNetworkInfos(await collectNetworkInfos());
+}
+
+let intervalId = 0;
+onMounted(() => {
+  intervalId = window.setInterval(async () => {
+    await updateNetworkInfos();
+  }, 500);
+});
+onUnmounted(() => clearInterval(intervalId))
+
+const curNetworkHasInstance = computed(() => {
+  return networkStore.networkInstanceIds.includes(networkStore.curNetworkId);
+});
+
+const activeStep = computed(() => {
+  return curNetworkHasInstance.value ? 1 : 0;
+});
+
+const setting_menu = ref();
+const setting_menu_items = ref([
+  {
+    label: () => t('settings'),
+    items: [
+      {
+        label: () => t('exchange_language'),
+        icon: 'pi pi-refresh',
+        command: async () => {
+          await loadLanguageAsync((locale.value === 'en' ? 'cn' : 'en'));
+        }
+      },
+      {
+        label: () => t('exit'),
+        icon: 'pi pi-times',
+        command: async () => {
+          await exit(1);
+        }
+      }
+    ]
+  }
+]);
+
+const toggle_setting_menu = (event: any) => {
+  setting_menu.value.toggle(event);
+};
+
+onMounted(async () => {
+  networkStore.loadFromLocalStorage();
+});
+
+</script>
+
+<template>
+  <!-- <n-config-provider :theme="lightTheme"> -->
+  <div id="root" class="flex flex-column">
+    <Dialog v-model:visible="visible" modal header="Config File" :style="{ width: '70%' }">
+      <Panel>
+        <ScrollPanel style="width: 100%; height: 300px">
+          <pre>{{ tomlConfig }}</pre>
+        </ScrollPanel>
+      </Panel>
+      <Divider />
+      <div class="flex justify-content-end gap-2">
+        <Button type="button" :label="$t('close')" @click="visible = false"></Button>
+      </div>
+    </Dialog>
+
+    <div>
+      <Toolbar>
+        <template #start>
+          <div class="flex align-items-center gap-2">
+            <Button icon="pi pi-plus" class="mr-2" severity="primary" :label="$t('add_new_network')"
+              @click="addNewNetwork" />
+          </div>
+        </template>
+
+        <template #center>
+          <div class="min-w-80 mr-20">
+            <Dropdown v-model="networkStore.curNetwork" :options="networkStore.networkList"
+              :optionLabel="networkMenuName" :placeholder="$t('select_network')" :highlightOnSelect="true"
+              :checkmark="true" class="w-full md:w-32rem" />
+          </div>
+        </template>
+
+        <template #end>
+          <Button icon="pi pi-cog" class="mr-2" severity="secondary" aria-haspopup="true" @click="toggle_setting_menu"
+            :label="$t('settings')" aria-controls="overlay_setting_menu" />
+          <Menu ref="setting_menu" id="overlay_setting_menu" :model="setting_menu_items" :popup="true" />
+        </template>
+      </Toolbar>
+    </div>
+
+    <Stepper class="h-full overflow-y-auto" :active-step="activeStep">
+      <StepperPanel :header="$t('config_network')" class="w">
+        <template #content="{ nextCallback }">
+          <Config @run-network="runNetworkCb($event, nextCallback)" :instance-id="networkStore.curNetworkId"
+            :config-invalid="messageBarSeverity != Severity.None" />
+        </template>
+      </StepperPanel>
+      <StepperPanel :header="$t('running')">
+        <template #content="{ prevCallback }">
+          <div class="flex flex-column">
+            <Status :instance-id="networkStore.curNetworkId" />
+          </div>
+          <div class="flex pt-4 justify-content-center">
+            <Button :label="$t('stop_network')" severity="danger" icon="pi pi-arrow-left"
+              @click="stopNetworkCb(networkStore.curNetwork, prevCallback)" />
+          </div>
+        </template>
+      </StepperPanel>
+    </Stepper>
+
+    <div>
+      <Menubar :model="items" breakpoint="300px">
+      </Menubar>
+      <InlineMessage v-if="messageBarSeverity !== Severity.None" class="absolute bottom-0 right-0" severity="error">
+        {{ messageBarContent }}</InlineMessage>
+    </div>
+  </div>
+
+</template>
+
+<style scoped>
+#root {
+  height: 100vh;
+  width: 100vw;
+}
+</style>
+
+<style>
+body {
+  height: 100vh;
+  width: 100vw;
+  padding: 0;
+  margin: 0;
+  overflow: hidden;
+}
+
+.p-menubar .p-menuitem {
+  margin: 0;
+}
+
+/* 
+
+.p-tabview-panel {
+  height: 100%;
+} */
+</style>
+
+
+<script lang="ts">
+</script>
\ No newline at end of file
diff --git a/easytier-gui/src/typed-router.d.ts b/easytier-gui/src/typed-router.d.ts
new file mode 100644
index 0000000..6d6767c
--- /dev/null
+++ b/easytier-gui/src/typed-router.d.ts
@@ -0,0 +1,23 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-router. ‼️ DO NOT MODIFY THIS FILE ‼️
+// It's recommended to commit this file.
+// Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
+
+declare module 'vue-router/auto-routes' {
+  import type {
+    RouteRecordInfo,
+    ParamValue,
+    ParamValueOneOrMore,
+    ParamValueZeroOrMore,
+    ParamValueZeroOrOne,
+  } from 'unplugin-vue-router/types'
+
+  /**
+   * Route name map generated by unplugin-vue-router
+   */
+  export interface RouteNamedMap {
+    '/': RouteRecordInfo<'/', '/', Record<never, never>, Record<never, never>>,
+  }
+}