deps: update some deps and conditionally render beta alert

open-goal · Oct 10, 2023 · 8af738c · 8af738c
1 parent 1fa54a4
commit 8af738c
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 52 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -12,7 +12,7 @@ rust-version = "1.61"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.4.0", features = [] }
+tauri-build = { version = "1.5.0", features = [] }
 
 [dependencies]
 backtrace = "0.3.69"
@@ -32,7 +32,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.107"
 sysinfo = "0.29.10"
 tar = "0.4.40"
-tauri = { version = "1.4.1", features = ["api-all", "devtools", "reqwest-client"] }
+tauri = { version = "1.5.1", features = ["api-all", "devtools", "reqwest-client"] }
 thiserror = "1.0.49"
 tokio = { version = "1", features = ["full"] }
 walkdir = "2.4.0"

diff --git a/src/routes/Game.svelte b/src/routes/Game.svelte
@@ -135,33 +135,35 @@
       on:job={runGameJob}
     />
   {:else}
-    <Alert color="red" rounded={false} class="border-t-4">
-      <span class="font-bold">{$_("gameControls_beta_headerA")}</span>
-      <em>{$_("gameControls_beta_headerB")}</em>
-      <br />
-      <ul>
-        <li>
-          {$_("gameControls_beta_issueTracker_linkPreText")}
-          <a
-            class="text-blue-400"
-            href="https://github.com/orgs/open-goal/projects/3/views/8?query=is%3Aopen+sort%3Aupdated-desc"
-            target="_blank"
-            rel="noopener noreferrer"
-            >{$_("gameControls_beta_issueTracker_linkText")}</a
-          >
-        </li>
-        <li>
-          {$_("gameControls_beta_bugReport_linkPreText")}
-          <a
-            class="text-blue-400"
-            href="https://github.com/open-goal/jak-project/issues/new?assignees=&labels=bug%2Cjak2&projects=&template=jak2-bug-report.yml"
-            target="_blank"
-            rel="noopener noreferrer"
-            >{$_("gameControls_beta_bugReport_linkText")}</a
-          >
-        </li>
-      </ul>
-    </Alert>
+    {#if gameInBeta}
+      <Alert color="red" rounded={false} class="border-t-4">
+        <span class="font-bold">{$_("gameControls_beta_headerA")}</span>
+        <em>{$_("gameControls_beta_headerB")}</em>
+        <br />
+        <ul>
+          <li>
+            {$_("gameControls_beta_issueTracker_linkPreText")}
+            <a
+              class="text-blue-400"
+              href="https://github.com/orgs/open-goal/projects/3/views/8?query=is%3Aopen+sort%3Aupdated-desc"
+              target="_blank"
+              rel="noopener noreferrer"
+              >{$_("gameControls_beta_issueTracker_linkText")}</a
+            >
+          </li>
+          <li>
+            {$_("gameControls_beta_bugReport_linkPreText")}
+            <a
+              class="text-blue-400"
+              href="https://github.com/open-goal/jak-project/issues/new?assignees=&labels=bug%2Cjak2&projects=&template=jak2-bug-report.yml"
+              target="_blank"
+              rel="noopener noreferrer"
+              >{$_("gameControls_beta_bugReport_linkText")}</a
+            >
+          </li>
+        </ul>
+      </Alert>
+    {/if}
     <GameControls
       {activeGame}
       on:change={updateGameState}