Fixed up loader screen

Wapikoni-Technique · May 4, 2020 · 4a4e4ed · 4a4e4ed
1 parent 0fe0fee
commit 4a4e4ed
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/app/Routes.js b/app/Routes.js
@@ -10,6 +10,7 @@ import LoginPage from './containers/LoginPage';
 import AccountPage from './containers/AccountPage';
 import ProjectViewPage from './containers/ProjectViewPage';
 import NewProjectContainer from './containers/NewProjectContainer';
+import LoaderPage from './components/LoaderPage';
 
 export default () => (
   <App>
@@ -18,6 +19,7 @@ export default () => (
       <Route path={routes.ACCOUNT} component={AccountPage} />
       <Route path={routes.PROJECT} component={ProjectViewPage} />
       <Route path={routes.LOGIN} component={LoginPage} />
+      <Route path="/loading" component={LoaderPage} />
       <Route path={routes.HOME} component={HomePage} />
     </Switch>
   </App>

diff --git a/app/components/Account.js b/app/components/Account.js
@@ -19,7 +19,7 @@ export default function Account({
   onGoCreate,
   onGoAccount
 }) {
-  const { name, image } = accountInfo;
+  const { name, image, writable } = accountInfo;
 
   const gossipedAccounts = gossiped.map(({ key, name: foundName }) => (
     <Button
@@ -30,9 +30,9 @@ export default function Account({
       {foundName}
     </Button>
   ));
-  const newProjectButton = (
+  const newProjectButton = writable ? (
     <Button onClick={onGoCreate}>{localization.account_new_project}</Button>
-  );
+  ) : null;
   const headerContent = (
     <div>
       {newProjectButton}

diff --git a/app/components/Loader.js b/app/components/Loader.js
@@ -1,5 +1,5 @@
 import React from 'react';
 
 export default function Loader() {
-  return <i className="fas fa-spinner fa-pulse" />;
+  return <i className="fas fa-spinner fa-pulse fa-10x" />;
 }
diff --git a/app/components/LoaderPage.js b/app/components/LoaderPage.js
@@ -3,9 +3,15 @@ import React from 'react';
 import Loader from './Loader';
 import PageContainer from './PageContainer';
 
+import styles from './LoaderPage.css';
+
 export default function LoaderPage(props) {
   return (
-    <PageContainer {...props}>
+    <PageContainer
+      contentClass={styles.container}
+      backgroundClass={styles.background}
+      {...props}
+    >
       <Loader />
     </PageContainer>
   );

diff --git a/app/core/Account.js b/app/core/Account.js
@@ -112,13 +112,14 @@ export default class Account {
 
   async getInfo() {
     const key = this.key.toString('hex');
+    const { writable } = this;
     try {
       const raw = await this.archive.readFile(ACCOUNT_INFO_FILE, 'utf8');
       const parsed = JSON.parse(raw);
-      return { name: key, ...parsed, key };
+      return { name: key, ...parsed, key, writable };
     } catch (e) {
       console.error(e);
-      return { name: key, key };
+      return { name: key, key, writable };
     }
   }