diff --git a/src/components/LoadingScreen.tsx b/src/components/LoadingScreen.tsx deleted file mode 100644 index 18139505..00000000 --- a/src/components/LoadingScreen.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import styled from "styled-components"; - -const StyledLoader = styled.div` - display: flex; - justify-content: center; - align-items: center; - font-size: 2rem; - height: 100vh; - width: 60vw; - margin: 0 auto; -`; -function LoadingScreen() { - return ( - - - 60% - - - ); -} - -export default LoadingScreen; diff --git a/src/index.tsx b/src/index.tsx index d7f6bf8e..1dba9b2e 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -6,7 +6,7 @@ import { Integrations } from '@sentry/tracing'; import App from './App'; -import LoadingScreen from './components/LoadingScreen'; +import LoadingPage from './pages/Loading'; if (window.location.hostname !== 'localhost') { Sentry.init({ @@ -22,7 +22,7 @@ if (window.location.hostname !== 'localhost') { ReactDOM.render( - }> + }> , diff --git a/src/pages/MyUploads/index.tsx b/src/pages/MyUploads/index.tsx index 1442b2c7..c3c75231 100644 --- a/src/pages/MyUploads/index.tsx +++ b/src/pages/MyUploads/index.tsx @@ -1,6 +1,5 @@ import BecomeAPatron from '../../components/BecomeAPatron'; import UploadObjectEntry from './components/UploadObjectEntry'; -import LoadingScreen from '../../components/LoadingScreen'; import Backend from '../../lib/Backend'; import ActiveJobs from './components/ActiveJobs'; @@ -9,6 +8,7 @@ import usePatreon from './hooks/usePatreon'; import useQuota from './hooks/useQuota'; import useActiveJobs from './hooks/useActiveJobs'; import { Container, PageContainer } from '../../components/styled'; +import LoadingPage from '../Loading'; const backend = new Backend(); @@ -29,7 +29,7 @@ function MyUploadsPage({ setError }: MyUploadsPageProps) { const [quota] = useQuota(uploads); if (loading) { - return ; + return ; } return ( diff --git a/src/pages/Search/components/SearchContainer.tsx b/src/pages/Search/components/SearchContainer.tsx index 051d8739..5c987daa 100644 --- a/src/pages/Search/components/SearchContainer.tsx +++ b/src/pages/Search/components/SearchContainer.tsx @@ -1,6 +1,6 @@ -import LoadingScreen from '../../../components/LoadingScreen'; import { PageContainer } from '../../../components/styled'; import Backend from '../../../lib/Backend'; +import LoadingPage from '../../Loading'; import { NotionData } from '../helpers/useNotionData'; import useSearchQuery from '../helpers/useSearchQuery'; @@ -22,7 +22,7 @@ export default function SearchContainer(props: SearchContentProps) { setSearchQuery, } = useSearchQuery(backend); - if (isLoading) return ; + if (isLoading) return ; return ( diff --git a/src/pages/Search/index.tsx b/src/pages/Search/index.tsx index 613734c6..388059c5 100644 --- a/src/pages/Search/index.tsx +++ b/src/pages/Search/index.tsx @@ -1,9 +1,9 @@ import NavigationBar from '../../components/NavigationBar/NavigationBar'; -import LoadingScreen from '../../components/LoadingScreen'; import SearchContainer from './components/SearchContainer'; import useNotionData from './helpers/useNotionData'; import Backend from '../../lib/Backend'; import ConnectNotion from './components/ConnectNotion'; +import LoadingPage from '../Loading'; interface SearchPageProps { isPatron: boolean; @@ -13,7 +13,7 @@ const backend = new Backend(); function SearchPage({ isPatron }: SearchPageProps) { const notionData = useNotionData(backend); if (notionData.loading) { - return ; + return ; } const { connected, connectionLink } = notionData;