kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

docs: 🐛 remove spinner causing css issue + add NProgress

Browse Source 
Signed-off-by: jffarge <jf@dagger.io>
This commit is contained in:
jffarge 2021-09-09 11:01:20 +02:00
parent 5ae7ce293c
commit 472750540c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
website/package.json
View File

@ -27,6 +27,7 @@
"docusaurus-plugin-sass": "^0.2.1", "docusaurus-plugin-sass": "^0.2.1",
"docusaurus2-dotenv": "^1.4.0", "docusaurus2-dotenv": "^1.4.0",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"nprogress": "^0.2.0",
"react": "^17.0.1", "react": "^17.0.1",
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
"react-social-login-buttons": "^3.5.1", "react-social-login-buttons": "^3.5.1",

9
website/src/components/DocPageCustom.js
View File

@ -1,8 +1,9 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import qs from 'querystringify'; import qs from 'querystringify';
import isEmpty from 'lodash/isEmpty'; import isEmpty from 'lodash/isEmpty';
import NProgress from "nprogress";
import { checkUserCollaboratorStatus } from '../api/github' import { checkUserCollaboratorStatus } from '../api/github'
import Spinner from './Spinner';
import DocPageAuthentication from './DocPageAuthentication'; import DocPageAuthentication from './DocPageAuthentication';
import DocPageRedirect from './DocPageRedirect'; import DocPageRedirect from './DocPageRedirect';
@ -12,6 +13,7 @@ function DocPageCustom({ location, userAccessStatus, setUserAccessStatus }) {
const authQuery = qs.parse(location.search); const authQuery = qs.parse(location.search);
useEffect(async () => { useEffect(async () => {
NProgress.start()
if (!isEmpty(authQuery) && userAccessStatus === null) { //callback after successful auth with github if (!isEmpty(authQuery) && userAccessStatus === null) { //callback after successful auth with github
const user = await checkUserCollaboratorStatus(authQuery.code); const user = await checkUserCollaboratorStatus(authQuery.code);
setUserAccessStatus(user) setUserAccessStatus(user)
@ -19,10 +21,11 @@ function DocPageCustom({ location, userAccessStatus, setUserAccessStatus }) {
window.localStorage.setItem('user', JSON.stringify(user)); window.localStorage.setItem('user', JSON.stringify(user));
} }
} }
setIsLoading(false) NProgress.done();
setIsLoading(false)
}, []) }, [])
if (isLoading) return <Spinner /> if(isLoading) return <p>...</p>
if (userAccessStatus?.permission === false) { if (userAccessStatus?.permission === false) {
return <DocPageRedirect /> return <DocPageRedirect />