Merge pull request #13 from GalaxyPay/dev

chore: release v1.2.1
GalaxyPay · Nov 2, 2024 · d1f8dbe · d1f8dbe
2 parents 4898644 + 3cce5f3
commit d1f8dbe
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 51 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -58,5 +58,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          tag: v1.2.0
+          tag: v1.2.1
           artifacts: "Output\\AvmWinNode_Setup.exe"
diff --git a/AvmWinNode.iss b/AvmWinNode.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "AvmWinNode"
-#define MyAppVersion "1.2.0"
+#define MyAppVersion "1.2.1"
 #define MyAppPublisher "Galaxy Pay, LLC"
 #define MyAppPublisherURL "https://galaxy-pay.com"
 #define MyPublishPath "publish"

diff --git a/webui/package.json b/webui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "avm-win-node-webui",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",

diff --git a/webui/src/components/Node.vue b/webui/src/components/Node.vue
@@ -115,24 +115,41 @@
         </template>
       </v-row>
     </v-container>
-    <template v-if="algodStatus?.['catchpoint']">
-      <v-data-table
-        :headers="headers"
-        :items="catchupData"
-        density="comfortable"
-      >
-        <template #[`item.total`]="{ value }">
-          {{ value.toLocaleString() }}
-        </template>
-        <template #[`item.processed`]="{ value }">
-          {{ value.toLocaleString() }}
-        </template>
-        <template #[`item.verified`]="{ value }">
-          {{ value.toLocaleString() }}
-        </template>
-        <template #bottom />
-      </v-data-table>
-    </template>
+    <v-container v-if="algodStatus?.catchpoint" fluid>
+      <v-divider />
+      <v-card-title>Fast Catchup</v-card-title>
+      <v-card-text class="pb-0">
+        Block:
+        {{
+          algodStatus.catchpoint.substring(
+            0,
+            algodStatus.catchpoint.indexOf("#")
+          )
+        }}
+      </v-card-text>
+      <v-container :max-width="500">
+        <div class="pb-4" v-for="prog in catchupProgress">
+          {{ prog.name }}
+          {{
+            prog.verified > 0
+              ? "(Verifying)"
+              : prog.processed > 0 && prog.processed < 100
+              ? "(Processing)"
+              : ""
+          }}
+          <v-progress-linear
+            v-show="prog.processed != 100"
+            :model-value="prog.processed"
+            color="warning"
+          />
+          <v-progress-linear
+            v-show="prog.processed == 100"
+            :model-value="prog.verified"
+            color="primary"
+          />
+        </div>
+      </v-container>
+    </v-container>
     <Participation
       v-if="algodClient && algodStatus?.['last-round'] > 100"
       :name="name"
@@ -276,35 +293,40 @@ async function getNodeStatus() {
   }
 }
 
-const headers: any[] = [
-  { key: "entity", sortable: false },
-  { title: "Total", key: "total", sortable: false },
-  { title: "Processed", key: "processed", sortable: false },
-  { title: "Verified", key: "verified", sortable: false },
-];
-
-const catchupData = computed(() => {
-  const val: any[] = [];
-  if (!algodStatus.value?.["catchpoint"]) return val;
-  val.push({
-    entity: "Accounts",
-    total: algodStatus.value["catchpoint-total-accounts"],
-    processed: algodStatus.value["catchpoint-processed-accounts"],
-    verified: algodStatus.value["catchpoint-verified-accounts"],
-  });
-  val.push({
-    entity: "KVs",
-    total: algodStatus.value["catchpoint-total-kvs"],
-    processed: algodStatus.value["catchpoint-processed-kvs"],
-    verified: algodStatus.value["catchpoint-verified-kvs"],
-  });
-  val.push({
-    entity: "Blocks",
-    total: algodStatus.value["catchpoint-total-blocks"],
-    processed: "",
-    verified: algodStatus.value["catchpoint-acquired-blocks"],
-  });
-  return val;
+const catchupProgress = computed(() => {
+  if (!algodStatus.value?.catchpoint) return undefined;
+  return [
+    {
+      name: "Accounts",
+      processed:
+        (algodStatus.value["catchpoint-processed-accounts"] /
+          algodStatus.value["catchpoint-total-accounts"]) *
+        100,
+      verified:
+        (algodStatus.value["catchpoint-verified-accounts"] /
+          algodStatus.value["catchpoint-total-accounts"]) *
+        100,
+    },
+    {
+      name: "KVs",
+      processed:
+        (algodStatus.value["catchpoint-processed-kvs"] /
+          algodStatus.value["catchpoint-total-kvs"]) *
+        100,
+      verified:
+        (algodStatus.value["catchpoint-verified-kvs"] /
+          algodStatus.value["catchpoint-total-kvs"]) *
+        100,
+    },
+    {
+      name: "Blocks",
+      processed: 100,
+      verified:
+        (algodStatus.value["catchpoint-total-blocks"] /
+          algodStatus.value["catchpoint-acquired-blocks"]) *
+        100,
+    },
+  ];
 });
 
 async function updateReti() {

diff --git a/webui/src/components/NodeTabs.vue b/webui/src/components/NodeTabs.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container v-show="store.ready" fluid>
+  <v-container v-show="store.ready" fluid :max-width="1200">
     <v-card>
       <v-tabs
         :model-value="tab"