humenius/ts-onlinetime-ranks
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Database Connection Update #4

Merged
humenius merged 49 commits from feature/database-connection into master 2021-02-08 03:16:51 +01:00
Conversation 0 Commits 49 Files Changed 55 +8 -12
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d96bb2674 - Show all commits

12
frontend/src/pages/MainPage/MainPage.scss
View File

@@ -6,14 +6,4 @@
.blurred { .blurred {
@include blurred(); @include blurred();
} }
}
.UserList-container {
.ClipLoader {
top: -10px;
z-index: 2;
}
.blurred {
z-index: 1;
}
}
}

8
frontend/src/pages/MainPage/MainPage.tsx
View File

@@ -105,6 +105,12 @@ const MainPage: FC<IMainPageProps> = (props: IMainPageProps) => {
.catch(err => setError(err)) .catch(err => setError(err))
}, [seasonId, setLoadingState]) }, [seasonId, setLoadingState])
const spinnerCss = `
margin: 0;
z-index: 2;
position: absolute;
`
return ( return (
<div className="MainPage"> <div className="MainPage">
<Header /> <Header />
@@ -121,7 +127,7 @@ const MainPage: FC<IMainPageProps> = (props: IMainPageProps) => {
} }
{/*<div className="UserList-container">*/} {/*<div className="UserList-container">*/}
{/* <ClipLoader color={spinnerColor} loading={true} size={150} />*/} <ClipLoader color={spinnerColor} loading={loading} size={150} css={spinnerCss} />
<div className={loading ? "blurred" : ""}> <div className={loading ? "blurred" : ""}>
<UserList onSeasonIdChange={setSeasonId} userStats={seasonStats} /> <UserList onSeasonIdChange={setSeasonId} userStats={seasonStats} />
</div> </div>