From 472750540c52b07cdcbb0970f9925b053be0fb33 Mon Sep 17 00:00:00 2001 From: jffarge Date: Thu, 9 Sep 2021 11:01:20 +0200 Subject: [PATCH] docs: :bug: remove spinner causing css issue + add NProgress Signed-off-by: jffarge --- website/package.json | 1 + website/src/components/DocPageCustom.js | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/website/package.json b/website/package.json index 2e007643..ae0a55ab 100644 --- a/website/package.json +++ b/website/package.json @@ -27,6 +27,7 @@ "docusaurus-plugin-sass": "^0.2.1", "docusaurus2-dotenv": "^1.4.0", "file-loader": "^6.2.0", + "nprogress": "^0.2.0", "react": "^17.0.1", "react-dom": "^17.0.1", "react-social-login-buttons": "^3.5.1", diff --git a/website/src/components/DocPageCustom.js b/website/src/components/DocPageCustom.js index a7ac4ebb..46bf35ac 100644 --- a/website/src/components/DocPageCustom.js +++ b/website/src/components/DocPageCustom.js @@ -1,8 +1,9 @@ import React, { useState, useEffect } from 'react'; import qs from 'querystringify'; import isEmpty from 'lodash/isEmpty'; +import NProgress from "nprogress"; + import { checkUserCollaboratorStatus } from '../api/github' -import Spinner from './Spinner'; import DocPageAuthentication from './DocPageAuthentication'; import DocPageRedirect from './DocPageRedirect'; @@ -12,6 +13,7 @@ function DocPageCustom({ location, userAccessStatus, setUserAccessStatus }) { const authQuery = qs.parse(location.search); useEffect(async () => { + NProgress.start() if (!isEmpty(authQuery) && userAccessStatus === null) { //callback after successful auth with github const user = await checkUserCollaboratorStatus(authQuery.code); setUserAccessStatus(user) @@ -19,10 +21,11 @@ function DocPageCustom({ location, userAccessStatus, setUserAccessStatus }) { window.localStorage.setItem('user', JSON.stringify(user)); } } - setIsLoading(false) + NProgress.done(); + setIsLoading(false) }, []) - if (isLoading) return + if(isLoading) return

...

if (userAccessStatus?.permission === false) { return