Fascinated/beatsaber-overlay
Fascinated/beatsaber-overlay
Archived
1
1
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Wiki Activity

Fixed loading issue

Browse Source
This commit is contained in:
Liam 2022-10-19 11:03:42 +01:00
parent 22bd73c142
commit d052178da0
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pages/overlay.js
View File

@ -14,6 +14,7 @@ export default class Overlay extends Component {
super(props);
this.state = {
loading: true,
loadingPlayerData: true,
isConnectedToSocket: false,
id: undefined,
isValidSteamId: false,
@ -136,6 +137,8 @@ export default class Overlay extends Component {
if (this.state.isConnectedToSocket) return;
this.connectSocket(params.socketaddress);
}
this.setState({ loading: false });
}
/**
@ -158,10 +161,15 @@ export default class Overlay extends Component {
const json = await data.json();
if (json.errorMessage) {
// Invalid account
this.setState({ loading: false, isValidSteamId: false });
this.setState({ loadingPlayerData: false, isValidSteamId: false });
return;
}
this.setState({ loading: false, id: id, data: json, isValidSteamId: true });
this.setState({
loadingPlayerData: false,
id: id,
data: json,
isValidSteamId: true,
});
}
/**
@ -356,7 +364,14 @@ export default class Overlay extends Component {
};
render() {
const { loading, isValidSteamId, data, websiteType } = this.state;
const {
loading,
isValidSteamId,
data,
websiteType,
showPlayerStats,
loadingPlayerData,
} = this.state;
if (this.state.textColor !== undefined) {
const element = document.querySelector("." + styles.main);
@ -378,7 +393,7 @@ export default class Overlay extends Component {
</div>
) : (
<div className={styles.overlay}>
{this.state.showPlayerStats ? (
{showPlayerStats && !loadingPlayerData ? (
<PlayerStats
pp={data.pp.toLocaleString()}
globalPos={data.rank.toLocaleString()}