update testing keys

0LNetworkCommunity · Jan 3, 2024 · d7f5047 · d7f5047
1 parent fa4c5b4
commit d7f5047
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 34 deletions.
diff --git a/dist/assets/index-09e9c7c6.js b/dist/assets/index-09e9c7c6.js
diff --git a/dist/assets/index-09e9c7c6.js.map b/dist/assets/index-09e9c7c6.js.map
diff --git a/dist/assets/index-b18c0291.css b/dist/assets/index-b18c0291.css
diff --git a/dist/assets/index-d5120c7d.js b/dist/assets/index-d5120c7d.js
diff --git a/dist/assets/index-d5120c7d.js.map b/dist/assets/index-d5120c7d.js.map
diff --git a/dist/assets/index-e225b5d2.css b/dist/assets/index-e225b5d2.css
diff --git a/dist/index.html b/dist/index.html
@@ -3,8 +3,8 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <script type="module" crossorigin src="/assets/index-09e9c7c6.js"></script>
-    <link rel="stylesheet" href="/assets/index-b18c0291.css">
+    <script type="module" crossorigin src="/assets/index-d5120c7d.js"></script>
+    <link rel="stylesheet" href="/assets/index-e225b5d2.css">
   </head>
   <body>
 

diff --git a/src-tauri/tauri.conf.canary.json b/src-tauri/tauri.conf.canary.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "carpe-canary",
-    "version": "1.0.0-12"
+    "version": "0.0.0-12"
   },
   "build": {
     "distDir": "../dist",
@@ -16,7 +16,7 @@
         "https://gist.githubusercontent.com/0o-de-lally/06315efd195d1e99ba517d6a7ecd380f/raw/updater.json"
       ],
       "dialog": false,
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQ5MDAwOTM0Q0FBQjQxQ0YKUldUUFFhdktOQWtBMlp3RzQvd0JwTXREQVpjUFNoWFBMS0FrOGZVbVBjWFFBQ2d5elZDSUVteSsK"
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3NzUyQUY4QzY0QUE0NDkKUldSSnBFckcrQ3AxNTdJOXBkSkVpaXYyczBhNm9GTDZqWFc5SzJteXU4Sm5idGV0SThLdWpMQ1cK"
     },
     "bundle": {
       "active": true,

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -16,7 +16,7 @@
         "https://gist.githubusercontent.com/0o-de-lally/06315efd195d1e99ba517d6a7ecd380f/raw/updater.json"
       ],
       "dialog": false,
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQ5MDAwOTM0Q0FBQjQxQ0YKUldUUFFhdktOQWtBMlp3RzQvd0JwTXREQVpjUFNoWFBMS0FrOGZVbVBjWFFBQ2d5elZDSUVteSsK"
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3NzUyQUY4QzY0QUE0NDkKUldSSnBFckcrQ3AxNTdJOXBkSkVpaXYyczBhNm9GTDZqWFc5SzJteXU4Sm5idGV0SThLdWpMQ1cK"
     },
     "bundle": {
       "active": true,

diff --git a/src/components/about/About.svelte b/src/components/about/About.svelte
@@ -15,18 +15,23 @@
   <div class="uk-flex uk-flex-center">
     <h2 class="uk-text-light uk-text-muted uk-text-uppercase">{$_('about.about')}</h2>
   </div>
-  <div class="uk-card uk-card-default uk-card-body uk-width-1-2@m">
-    <h3 class="uk-card-title uk-text-muted">{$_('about.release')}</h3>
-    <p class="uk-text-muted">
-      <span class="uk-text-bold">{$_('about.version')}: </span>v{release.version}
-    </p>
-    <p class="uk-text-muted">
-      <span class="uk-text-bold">{$_('about.commit')}: </span>{release.hash}
-    </p>
-    <p class="uk-text-muted">
-      <span class="uk-text-bold">{$_('about.branch')}: </span>{release.head}
-    </p>
+  <div class="uk-flex uk-flex-center">
+    <div class="uk-card uk-card-default uk-card-body uk-width-1-2@m">
+      <h3 class="uk-card-title uk-text-muted">{$_('about.release')}</h3>
+      <p class="uk-text-muted">
+        <span class="uk-text-bold">{$_('about.version')}: </span>v{release.version}
+        <UpgradeButtonManual />
+      </p>
+      {#if release.hash}
+        <p class="uk-text-muted">
+          <span class="uk-text-bold">{$_('about.commit')}: </span>{release.hash}
+        </p>
+      {/if}
+      {#if release.head}
+        <p class="uk-text-muted">
+          <span class="uk-text-bold">{$_('about.branch')}: </span>{release.head}
+        </p>
+      {/if}
+    </div>
   </div>
-
-  <UpgradeButtonManual />
 </main>
diff --git a/src/components/about/UpgradeApp.svelte b/src/components/about/UpgradeApp.svelte
@@ -8,17 +8,18 @@
 
   let unlisten
 
-  onMount(async () => {
-    unlisten = await onUpdaterEvent(({ error, status }) => {
+  // onMount(async () => {
+  //   unlisten = await
+  // })
+  onUpdaterEvent(({ error, status }) => {
       // This will log all updater events, including status updates and errors.
       updateStatus.update((u) => {
         u.error = error ?? null
         u.status = status
         return u
       })
-      console.log('Updater event', error, status)
+      console.log('onMount Updater event', error, status)
     })
-  })
 
   onDestroy(() => {
     // don't duplicate listener next time we navigate here
@@ -27,6 +28,9 @@
 </script>
 
 <main class="uk-padding">
+  Upgrade App
+  {JSON.stringify($updateStatus)}
+
   {#if $updateStatus?.manifest}
     <CardAlert>
       <div slot="title">

diff --git a/src/components/about/UpgradeButtonManual.svelte b/src/components/about/UpgradeButtonManual.svelte
@@ -1,8 +1,21 @@
 <script lang="ts">
-  import { tryUpdate } from '../../modules/updater'
+  import { tryUpdate, updateStatus } from '../../modules/updater'
+  import { _ } from 'svelte-i18n'
+
+  let checking = $updateStatus.refreshing ?? false
+
+  let upToDate = $updateStatus.status == 'UPTODATE'
 </script>
 
-<main>
-  <button class="uk-button uk-button-default" on:click={tryUpdate}>Check For
-  Update</button>
+<main class="uk-margin">
+  <div>
+    <p>
+      {#if upToDate}
+        {$_('about.upgrade_uptodate')}
+      {:else}
+        {$_('about.upgrade_available')}
+      {/if}
+    </p>
+    <button class="uk-button uk-button-default" on:click={tryUpdate} disabled={checking}>{$_('about.upgrade_checkagain')}</button>
+  </div>
 </main>
diff --git a/src/lang/locales/en.json b/src/lang/locales/en.json
@@ -94,7 +94,10 @@
     "release": "Release",
     "version": "Version",
     "branch": "Branch",
-    "commit": "Commit"
+    "commit": "Commit",
+    "upgrade_uptodate": "You are on the current version",
+    "upgrade_available": "There is an upgrade available",
+    "upgrade_checkagain": "Check Upgrade"
   },
   "settings": {
     "title": "SETTINGS",

diff --git a/src/modules/updater.ts b/src/modules/updater.ts
@@ -28,9 +28,9 @@ export const tryUpdate = async () => {
   updateStatus.set({ refreshing: true })
   try {
     const { shouldUpdate, manifest } = await checkUpdate()
-
+    const u = get(updateStatus)
     if (shouldUpdate) {
-      const u = get(updateStatus)
+
       u.msg = 'upgrade is available'
       u.manifest = manifest
 
@@ -49,8 +49,12 @@ export const tryUpdate = async () => {
       // You could use this step to display another confirmation dialog.
       await relaunch()
       u.refreshing = false
-      updateStatus.set(u)
+
+    } else {
+      u.msg = 'You are on the latest version'
+      u.refreshing = false
     }
+    updateStatus.set(u)
   } catch (e) {
     updateStatus.update((u) => {
       u.error = e