ready

colinhartigan · Feb 23, 2022 · 22acb77 · 22acb77
1 parent cbf2194
commit 22acb77
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/client/public/index.html b/client/public/index.html
@@ -5,11 +5,13 @@
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <link href="https://fonts.googleapis.com/css2?family=Chivo&display=swap" rel="stylesheet">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#fa7581" />
+    <meta name="theme-color" content="#ff7d7d" />
     <meta
       name="VIM"
       content="valorant inventory manager"
     />
+    <meta name="author" content="Colin Hartigan" />
+    <meta name="description" content="a better valorant inventory manager" />
     <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a

diff --git a/client/src/components/errors/WrongVersion.js b/client/src/components/errors/WrongVersion.js
@@ -63,21 +63,22 @@ function WrongVersion(props) {
     const [newVersion, setNewVersion] = useState("");
 
     useEffect(() => {
-        fetch("https://api.github.com/repos/colinhartigan/valorant-inventory-manager/releases/latest")
+        fetch("https://api.github.com/repos/colinhartigan/valorant-inventory-manager/releases")
             .then(res => res.json())
-            .then((data) => {
+            .then((dat) => {
+                var data = dat[0]; 
                 console.log(data)
                 setNewVersion(data.tag_name);
-            }) 
+            })
     }, [])
 
     return (
         <Backdrop open className={classes.root}>
             <Grow in>
                 <div className={classes.main}>
                     <div className={classes.content}>
-                        <Typography variant="h4">Outdated client</Typography>
-                        <Typography variant="body1" style={{textAlign: "center", marginTop: "10px",}}>The VIM client companion is outdated ({ServerVersion} {'->'} {newVersion})</Typography>
+                        <Typography variant="h4" style={{textAlign: "center"}}>Client Companion version mismatch</Typography>
+                        <Typography variant="body1" style={{textAlign: "center", marginTop: "10px", marginBottom: "10px"}}>Your VIM client companion version is no longer supported. ({ServerVersion} {'→'} {newVersion})</Typography>
 
                         <div className={classes.buttons}> 
                             <Button target="_blank" href="https://github.com/colinhartigan/valorant-inventory-manager/releases/latest" variant="outlined" color="primary" className={classes.retryButton}>

diff --git a/client/src/pages/CollectionHome.js b/client/src/pages/CollectionHome.js
@@ -88,7 +88,7 @@ function CollectionHome(props) {
 
             function putCallback(response) {
                 console.log("put")
-                setLoadout(response);
+                setLoadout(response.loadout);
             }
 
             socket.request({ "request": "update_inventory", "args": { "payload": payload } }, inventoryCallback);

diff --git a/server/requirements.txt b/server/requirements.txt
@@ -1,5 +1,5 @@
-websockets==9.1
 psutil==5.8.0
 valclient==2.28
+websockets==9.1
 requests==2.26.0
 python-dotenv==0.19.2
diff --git a/server/src/client_config.py b/server/src/client_config.py
@@ -4,7 +4,7 @@
 SERVER_VERSION = "1.0.0b2"
 
 # debug settings
-IS_TEST_BUILD = True # directs to the test client
+IS_TEST_BUILD = False # directs to the test client
 
 DEBUG = False # prints all log messages to console
 UNLOCK_ALL_SKINS = False # just for testing purposes, doesn't actually unlock anything