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 +6 -1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 834276f651 - Show all commits

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

@@ -6,4 +6,9 @@
.blurred { .blurred {
@include blurred(); @include blurred();
} }
.ErrorContainer {
margin: 0;
z-index: 2;
position: absolute;
}
} }

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

@@ -38,7 +38,7 @@ const MainPage: FC<IMainPageProps> = (props: IMainPageProps) => {
<div className="MainPage"> <div className="MainPage">
<Header /> <Header />
{ {
error && <ErrorContainer message={error.message} /> error && <ErrorContainer message={error.response} />
} }
<ClipLoader color={spinnerColor} loading={loading} size={150} css={spinnerCss} /> <ClipLoader color={spinnerColor} loading={loading} size={150} css={spinnerCss} />
<div className={loading ? "blurred" : ""}> <div className={loading ? "blurred" : ""}>