Merge pull request #12 from cohstats/master

Fixed signature in updater api and changed public and private key for testing reasons
cohstats · Mar 4, 2023 · 590f946 · 590f946
2 parents 7d5685c + a0415ce
commit 590f946
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 72 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "coh3-stats-desktop-app",
     "private": true,
-    "version": "0.0.6",
+    "version": "0.0.7",
     "type": "module",
     "scripts": {
         "dev": "vite",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "coh3-stats-desktop-app"
-version = "0.0.6"
+version = "0.0.7"
 description = "A Tauri App"
 authors = ["you"]
 license = ""

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
     },
     "package": {
         "productName": "Coh3 Stats Desktop App",
-        "version": "0.0.6"
+        "version": "0.0.7"
     },
     "tauri": {
         "allowlist": {
@@ -57,7 +57,7 @@
         "updater": {
             "active": true,
             "endpoints": ["https://dev.coh3stats.com/api/appUpdateRoute"],
-            "dialog": false,
+            "dialog": true,
             "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IERFNjMzQTcwRjBEQjUwNTUKUldSVlVOdndjRHBqM21pc1BGYndieG03VVZOSGhxdUxPeDNkRkFqaXVpcEMyL2l1WUN6VDNCK1kK"
         },
         "windows": [

diff --git a/src/Game.tsx b/src/Game.tsx
@@ -1,15 +1,12 @@
 import { useGameData } from "./game-data-provider/GameDataProvider"
 import { Title, Grid, Button, Loader, Group } from "@mantine/core"
 import { PlayerCard } from "./components/PlayerCard"
-import { useUpdaterData } from "./updater-provider/UpdaterProvider"
 
 export const Game: React.FC = () => {
     const gameData = useGameData()
-    const updaterData = useUpdaterData()
     console.log("gamedata", gameData)
     return (
         <>
-            {updaterData.status}
             {gameData.logFileFound ? (
                 <>
                     <Button onClick={gameData.reloadLogFile}>Reload</Button>

diff --git a/src/Providers.tsx b/src/Providers.tsx
@@ -6,7 +6,6 @@ import {
 import { useLocalStorage } from "@mantine/hooks"
 import { useState } from "react"
 import { GameDataProvider } from "./game-data-provider/GameDataProvider"
-import { UpdaterProvider } from "./updater-provider/UpdaterProvider"
 
 interface ProvidersProps {
     children?: React.ReactNode
@@ -32,9 +31,7 @@ export const Providers: React.FC<ProvidersProps> = ({ children }) => {
                     withGlobalStyles
                     withNormalizeCSS
                 >
-                    <UpdaterProvider>
-                        <GameDataProvider>{children}</GameDataProvider>
-                    </UpdaterProvider>
+                    <GameDataProvider>{children}</GameDataProvider>
                 </MantineProvider>
             </ColorSchemeProvider>
         </>

diff --git a/src/updater-provider/UpdaterProvider.tsx b/src/updater-provider/UpdaterProvider.tsx