Merge pull request #93 from 2anki/feat/use-new-loading-bar

feat: use the new loading page
2anki · Jun 26, 2022 · 8a3ba89 · 8a3ba89
2 parents ab37884 + 7b01723
commit 8a3ba89
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 30 deletions.
diff --git a/src/components/LoadingScreen.tsx b/src/components/LoadingScreen.tsx
diff --git 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(
   <React.StrictMode>
-    <Suspense fallback={<LoadingScreen />}>
+    <Suspense fallback={<LoadingPage />}>
       <App />
     </Suspense>
   </React.StrictMode>,

diff --git 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 <LoadingScreen />;
+    return <LoadingPage />;
   }
 
   return (

diff --git 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 <LoadingScreen />;
+  if (isLoading) return <LoadingPage />;
 
   return (
     <PageContainer>

diff --git 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 <LoadingScreen />;
+    return <LoadingPage />;
   }
 
   const { connected, connectionLink } = notionData;