Skip to content

Commit

Permalink
ready
Browse files Browse the repository at this point in the history
  • Loading branch information
colinhartigan committed Feb 23, 2022
1 parent cbf2194 commit 22acb77
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
4 changes: 3 additions & 1 deletion client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions client/src/components/errors/WrongVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/CollectionHome.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion server/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion server/src/client_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 22acb77

Please sign in to comment.