Merge pull request #60 from GalaxyPay/dev

feat: showMachineName

Author: acfunk

.github/workflows/go.yml

@@ -266,5 +266,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          tag: v3.2.5
+          tag: v3.3.0
           artifacts: "Output/*"

FUNC.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "FUNC"
-#define MyAppVersion "3.2.5"
+#define MyAppVersion "3.3.0"
 #define MyAppPublisher "Galaxy Pay, LLC"
 #define MyAppPublisherURL "https://galaxy-pay.com"
 #define MyPublishPath "publish"

FUNC/Models/NodeStatus.cs

@@ -2,6 +2,7 @@
 {
     public class NodeStatus
     {
+        public required string MachineName { get; set; }
         public required string ServiceStatus { get; set; }
         public required int Port { get; set; }
         public required string Token { get; set; }

FUNC/Node.cs

@@ -15,6 +15,7 @@ private static async Task ExtractTemplate(string name)
 
         public static async Task<NodeStatus> Get(string name)
         {
+            string machineName = Environment.MachineName;
             int port = 0;
             string token = string.Empty;
             try { token = File.ReadAllText(Path.Combine(Utils.NodeDataParent(name), name, "algod.admin.token")); } catch { }
@@ -47,6 +48,7 @@ public static async Task<NodeStatus> Get(string name)
 
             NodeStatus nodeStatus = new()
             {
+                MachineName = machineName,
                 ServiceStatus = serviceStatus,
                 Port = port,
                 Token = token,

create-package-deb.sh

@@ -1,6 +1,6 @@
 rm -r Output
 
-PKG=Output/func_3.2.5_linux-$1
+PKG=Output/func_3.3.0_linux-$1
 
 mkdir -p $PKG/lib/systemd/system
 mkdir -p $PKG/opt/func

create-package-pkg.sh

@@ -5,4 +5,4 @@ pkgbuild --root publish \
     --install-location /opt/func \
     --scripts pkg/scripts \
     --identifier func.app \
-    Output/func_3.2.5_darwin-$1.pkg
+    Output/func_3.3.0_darwin-$1.pkg

deb/amd64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.2.5
+Version: 3.3.0
 Section: base
 Priority: optional
 Architecture: amd64

deb/arm64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.2.5
+Version: 3.3.0
 Section: base
 Priority: optional
 Architecture: arm64

webui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "func-webui",
-  "version": "3.2.5",
+  "version": "3.3.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

webui/src/components/AppBar.vue

@@ -3,6 +3,11 @@
     <NodeIcon color="currentColor" :width="30" class="ml-3 text-primary" />
     <div class="ml-2 text-subtitle-1 text-blu">
       FUNC
+      {{
+        store.showMachineName && store.machineName
+          ? `(${store.machineName})`
+          : ""
+      }}
       <div class="ml-1 app-version text-grey">{{ appVersion }}</div>
     </div>
     <v-spacer />
@@ -18,8 +23,18 @@
       />
       <v-tooltip text="Settings" activator="parent" location="bottom" />
     </v-btn>
-    <v-btn color="primary" variant="tonal" class="mr-3">
-      {{ formatAddr(activeAccount?.address) || "Connect Wallet" }}
+    <v-btn
+      color="primary"
+      variant="tonal"
+      :icon="store.showMachineName && xs"
+      class="mr-3"
+    >
+      <template v-if="!store.showMachineName || !xs">
+        {{ formatAddr(activeAccount?.address) || "Connect Wallet" }}
+      </template>
+      <template v-else>
+        <v-icon :icon="mdiWallet" />
+      </template>
       <v-menu activator="parent" v-model="store.connectMenu" scrim>
         <v-list>
           <v-container :min-width="350">
@@ -131,13 +146,16 @@ import {
   mdiLightningBoltOutline,
   mdiMinusCircleOutline,
   mdiPlusCircleOutline,
+  mdiWallet,
 } from "@mdi/js";
 import { Wallet, WalletAccount, useWallet } from "@txnlab/use-wallet-vue";
 import { modelsv2 } from "algosdk";
+import { useDisplay } from "vuetify";
 
 const store = useAppStore();
 const { activeAccount, activeNetwork, activeWallet, algodClient, wallets } =
   useWallet();
+const { xs } = useDisplay();
 
 const appVersion = __APP_VERSION__;
 const account = ref<modelsv2.Account>();

webui/src/components/Node.vue

@@ -323,6 +323,7 @@ async function getNodeStatus() {
       : undefined;
     const resp = await FuncApi.get(props.name);
     nodeStatus.value = resp.data;
+    store.machineName = nodeStatus.value?.machineName;
     if (nodeStatus.value?.serviceStatus !== "Running") {
       refreshing = false;
     }

webui/src/components/Settings.vue

@@ -55,6 +55,21 @@
             </v-btn>
           </v-col>
         </v-row>
+        <v-row align="center">
+          <v-col>
+            <div>Show Machine Name</div>
+            <div class="text-caption text-grey">In App Bar</div>
+          </v-col>
+          <v-col>
+            <v-switch
+              v-model="store.showMachineName"
+              class="d-flex"
+              style="justify-content: right"
+              color="primary"
+              @click.prevent="setShowMachineName(!store.showMachineName)"
+            />
+          </v-col>
+        </v-row>
         <v-row align="center">
           <v-col>
             <div>Show Alternative Networks</div>
@@ -161,4 +176,9 @@ async function setShowNetworks(val: boolean) {
   localStorage.setItem("showNetworks", val.toString());
   if (!val) setActiveNetwork("mainnet" as NetworkId);
 }
+
+async function setShowMachineName(val: boolean) {
+  store.showMachineName = val;
+  localStorage.setItem("showMachineName", val.toString());
+}
 </script>

webui/src/stores/app.ts

@@ -20,6 +20,8 @@ export const useAppStore = defineStore("app", {
     stoppingReti: false,
     goalVersion: undefined as GoalVersion | undefined,
     showNetworks: localStorage.getItem("showNetworks") === "true",
+    showMachineName: localStorage.getItem("showMachineName") === "true",
+    machineName: undefined as string | undefined,
   }),
   actions: {
     async setSnackbar(text: string, color = "info", timeout = 4000) {

webui/src/types.d.ts

@@ -1,6 +1,7 @@
 import { modelsv2 } from "algosdk";
 
 export interface NodeStatus {
+  machineName: string;
   serviceStatus: string;
   port: number;
   token: string;