Ver Fonte

prettier

Joystream Stats há 3 anos atrás
pai
commit
be206d2473
3 ficheiros alterados com 245 adições e 169 exclusões
  1. 3 2
      src/App.tsx
  2. 236 161
      src/components/Routes/index.tsx
  3. 6 6
      src/index.css

+ 3 - 2
src/App.tsx

@@ -755,8 +755,9 @@ class App extends React.Component<IProps, IState> {
   }
 
   render() {
-    if (this.state.loading) return <Loading />;
-    const { connected, fetching, hideFooter } = this.state;
+    const { connected, fetching, loading, hideFooter } = this.state;
+    if (loading) return <Loading />;
+
     return (
       <>
         <Routes

+ 236 - 161
src/components/Routes/index.tsx

@@ -1,176 +1,251 @@
-import {Switch, Route, Link} from "react-router-dom";
+import { Switch, Route, Link } from "react-router-dom";
 import {
-    Calendar,
-    Councils,
-    Curation,
-    Dashboard,
-    Forum,
-    Member,
-    Members,
-    Mint,
-    Proposals,
-    Proposal,
-    Timeline,
-    Tokenomics,
-    Validators,
-    Spending,
-    Storage,
-    Transactions,
-    Bounties,
-    Burners,
-    ValidatorReport,
+  Calendar,
+  Councils,
+  Curation,
+  Dashboard,
+  Forum,
+  Member,
+  Members,
+  Mint,
+  Proposals,
+  Proposal,
+  Timeline,
+  Tokenomics,
+  Validators,
+  Spending,
+  Storage,
+  Transactions,
+  Bounties,
+  Burners,
+  ValidatorReport,
 } from "..";
-import React from 'react'
-import {AppBar, Button, makeStyles, Toolbar} from '@material-ui/core'
-import {MemoryRouter} from 'react-router'
-import joystream from '../../joystream.svg'
-import {IState} from "../../types";
+import React from "react";
+import { AppBar, Button, makeStyles, Toolbar } from "@material-ui/core";
+import { MemoryRouter } from "react-router";
+import joystream from "../../joystream.svg";
+import { IState } from "../../types";
 
 interface IProps extends IState {
-    toggleStar: (a: string) => void;
-    toggleFooter: () => void;
+  toggleStar: (a: string) => void;
+  toggleFooter: () => void;
 }
 
 const useStyles = makeStyles({
-    appBar: {
-        flexDirection: 'row',
-        backgroundColor: '#000',
-        color: '#fff',
+  appBar: {
+    flexDirection: "row",
+    backgroundColor: "#000",
+    color: "#fff",
+  },
+  appLogo: {
+    display: "block",
+    width: "150px",
+    color: "#4038ff",
+  },
+  navbar: {
+    "&:hover": {
+      backgroundColor: "#4038ff",
     },
-    appLogo: {
-        display: 'block',
-        width: '150px',
-        color: '#4038ff',
-    },
-    navbar: {
-        '&:hover': {
-            backgroundColor: '#4038ff',
-        },
-    },
-})
+  },
+});
 
 const Routes = (props: IProps) => {
-    const classes = useStyles()
-    const navBarLink = {color: '#fff'}
-    const {reports, tokenomics} = props;
-    return (
+  const classes = useStyles();
+  const navBarLink = { color: "#fff" };
+  const { reports, tokenomics } = props;
+
+  return (
+    <div>
+      <MemoryRouter>
+        <div style={{ flexGrow: 1 }}>
+          <AppBar position="static" className={classes.appBar}>
+            <Toolbar style={{ paddingLeft: "12px", backgroundColor: "#000" }}>
+              <Button color="inherit" component={Link} to="/">
+                <img
+                  src={joystream}
+                  className={classes.appLogo}
+                  alt="Joystream logo"
+                />
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/dashboard"
+              >
+                Dashboard
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/calendar"
+              >
+                Calendar
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/timeline"
+              >
+                Timeline
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/tokenomics"
+              >
+                Reports
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/validators"
+              >
+                Validators
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/validator-report"
+              >
+                Validator Report
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/storage"
+              >
+                Storage
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/spending"
+              >
+                Spending
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/transactions"
+              >
+                Transfers
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/burners"
+              >
+                Top Burners
+              </Button>
+              <Button
+                className={classes.navbar}
+                style={navBarLink}
+                component={Link}
+                to="/mint"
+              >
+                Toolbox
+              </Button>
+            </Toolbar>
+          </AppBar>
+        </div>
         <div>
-            <MemoryRouter>
-                <div style={{flexGrow: 1}}>
-                    <AppBar position='static' className={classes.appBar}>
-                        <Toolbar style={{paddingLeft: '12px', backgroundColor: '#000'}}>
-                            <Button color='inherit' component={Link} to='/'>
-                                <img src={joystream} className={classes.appLogo} alt='Joystream logo'/>
-                            </Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/dashboard'>Dashboard</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/calendar'>Calendar</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/timeline'>Timeline</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/tokenomics'>Reports</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/validators'>Validators</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/validator-report'>Validator Report</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/storage'>Storage</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/spending'>Spending</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/transactions'>Transfers</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/burners'>Top Burners</Button>
-                            <Button className={classes.navbar} style={navBarLink} component={Link}
-                                    to='/mint'>Toolbox</Button>
-                        </Toolbar>
-                    </AppBar>
-                </div>
-                <div>
-                    <Switch>
-                        <Route
-                            path="/tokenomics"
-                            render={(routeprops) => (
-                                <Tokenomics
-                                    {...routeprops}
-                                    reports={reports}
-                                    tokenomics={tokenomics}
-                                />
-                            )}
-                        />
-                        <Route
-                            path="/spending"
-                            render={(routeprops) => <Spending {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/proposals/:id"
-                            render={(routeprops) => <Proposal {...routeprops} {...props} />}
-                        />
-                        <Route path="/proposals" render={() => <Proposals {...props} />}/>
-                        <Route
-                            path="/councils"
-                            render={(routeprops) => <Councils {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/curation"
-                            render={(routeprops) => <Curation {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/forum/threads/:thread"
-                            render={(routeprops) => <Forum {...routeprops} {...props} />}
-                        />
-                        <Route path="/forum" render={() => <Forum {...props} />}/>
-                        <Route
-                            path="/mint"
-                            render={(routeprops) => <Mint {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/members/:handle"
-                            render={(routeprops) => <Member {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/members"
-                            render={(routeprops) => <Members {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/calendar"
-                            render={(routeprops) => <Calendar {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/timeline"
-                            render={(routeprops) => <Timeline {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/validators"
-                            render={(routeprops) => <Validators {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/validator-report"
-                            render={(routeprops) => <ValidatorReport {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/storage"
-                            render={(routeprops) => <Storage {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/transactions"
-                            render={(routeprops) => <Transactions {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/bounties"
-                            render={(routeprops) => <Bounties {...routeprops} {...props} />}
-                        />
-                        <Route
-                            path="/burners"
-                            render={(routeprops) => <Burners {...routeprops} {...props} />}
-                        />
-                        <Route path="/" render={() => <Dashboard {...props} />}/>
-                    </Switch>
-                </div>
-            </MemoryRouter>
+          <Switch>
+            <Route
+              path="/tokenomics"
+              render={(routeprops) => (
+                <Tokenomics
+                  {...routeprops}
+                  reports={reports}
+                  tokenomics={tokenomics}
+                />
+              )}
+            />
+            <Route
+              path="/spending"
+              render={(routeprops) => <Spending {...routeprops} {...props} />}
+            />
+            <Route
+              path="/proposals/:id"
+              render={(routeprops) => <Proposal {...routeprops} {...props} />}
+            />
+            <Route path="/proposals" render={() => <Proposals {...props} />} />
+            <Route
+              path="/councils"
+              render={(routeprops) => <Councils {...routeprops} {...props} />}
+            />
+            <Route
+              path="/curation"
+              render={(routeprops) => <Curation {...routeprops} {...props} />}
+            />
+            <Route
+              path="/forum/threads/:thread"
+              render={(routeprops) => <Forum {...routeprops} {...props} />}
+            />
+            <Route path="/forum" render={() => <Forum {...props} />} />
+            <Route
+              path="/mint"
+              render={(routeprops) => <Mint {...routeprops} {...props} />}
+            />
+            <Route
+              path="/members/:handle"
+              render={(routeprops) => <Member {...routeprops} {...props} />}
+            />
+            <Route
+              path="/members"
+              render={(routeprops) => <Members {...routeprops} {...props} />}
+            />
+            <Route
+              path="/calendar"
+              render={(routeprops) => <Calendar {...routeprops} {...props} />}
+            />
+            <Route
+              path="/timeline"
+              render={(routeprops) => <Timeline {...routeprops} {...props} />}
+            />
+            <Route
+              path="/validators"
+              render={(routeprops) => <Validators {...routeprops} {...props} />}
+            />
+            <Route
+              path="/validator-report"
+              render={(routeprops) => (
+                <ValidatorReport {...routeprops} {...props} />
+              )}
+            />
+            <Route
+              path="/storage"
+              render={(routeprops) => <Storage {...routeprops} {...props} />}
+            />
+            <Route
+              path="/transactions"
+              render={(routeprops) => (
+                <Transactions {...routeprops} {...props} />
+              )}
+            />
+            <Route
+              path="/bounties"
+              render={(routeprops) => <Bounties {...routeprops} {...props} />}
+            />
+            <Route
+              path="/burners"
+              render={(routeprops) => <Burners {...routeprops} {...props} />}
+            />
+            <Route path="/" render={() => <Dashboard {...props} />} />
+          </Switch>
         </div>
-    );
+      </MemoryRouter>
+    </div>
+  );
 };
 
 export default Routes;

+ 6 - 6
src/index.css

@@ -25,7 +25,7 @@ a:visited {
 a:active,
 a:hover {
   -color: #fff !important;
-  -background: #4038FF;
+  -background: #4038ff;
   -padding: 1px;
 }
 
@@ -34,7 +34,7 @@ select {
 }
 
 .select div:hover {
-  background-color: #4038FF !important;
+  background-color: #4038ff !important;
 }
 
 ::-moz-selection,
@@ -42,7 +42,7 @@ select {
 .select-selected,
 .select-items div:hover {
   color: white;
-  background-color: #4038FF !important;
+  background-color: #4038ff !important;
 }
 
 h3 {
@@ -53,13 +53,13 @@ h3 {
   color: white;
   margin: 5px;
   padding: 15px;
-  background-color: #4038FF;
+  background-color: #4038ff;
   text-align: center;
 }
 .box a:hover,
 .box a:active {
   color: #fff !important;
-  -background: #4038FF;
+  -background: #4038ff;
 }
 
 table td {
@@ -256,7 +256,7 @@ table td {
 }
 
 .waiting-validators .list-group-item {
-  background-color: #4038FF !important;
+  background-color: #4038ff !important;
 }
 
 .connecting {