tidy top-level routes, assets, favicon

beneath-hq · Apr 21, 2020 · b6bc68a · b6bc68a
1 parent de42f00
commit b6bc68a
Show file tree

Hide file tree

Showing 40 changed files with 173 additions and 131 deletions.
diff --git a/control/auth/router.go b/control/auth/router.go
@@ -7,9 +7,9 @@ import (
 	"net/url"
 
 	"gitlab.com/beneath-hq/beneath/control/entity"
+	"gitlab.com/beneath-hq/beneath/internal/middleware"
 	"gitlab.com/beneath-hq/beneath/pkg/httputil"
 	"gitlab.com/beneath-hq/beneath/pkg/log"
-	"gitlab.com/beneath-hq/beneath/internal/middleware"
 
 	"github.com/go-chi/chi"
 	"github.com/markbates/goth/gothic"
@@ -88,7 +88,7 @@ func authCallbackHandler(w http.ResponseWriter, r *http.Request) error {
 	}
 
 	// redirect to client, setting token
-	url := fmt.Sprintf("%s/auth/callback/login?token=%s", gothConfig.ClientHost, url.QueryEscape(secret.Token.String()))
+	url := fmt.Sprintf("%s/-/redirects/auth/login/callback?token=%s", gothConfig.ClientHost, url.QueryEscape(secret.Token.String()))
 	http.Redirect(w, r, url, http.StatusTemporaryRedirect)
 
 	// done

diff --git a/web/apollo/client.js b/web/apollo/client.js
@@ -104,9 +104,9 @@ const makeErrorHook = ({ token, res }) => {
     if (networkError?.result?.error?.match(/authentication error.*/)) {
       if (token) {
         if (process.browser) {
-          document.location.href = "/auth/logout";
+          document.location.href = "/-/redirects/auth/logout";
         } else {
-          res.redirect("/auth/logout");
+          res.redirect("/-/redirects/auth/logout");
         }
       }
     }

diff --git a/web/components/Header.tsx b/web/components/Header.tsx
@@ -25,9 +25,9 @@ import {
 } from "@material-ui/icons";
 
 const tabs = [
-  { label: "Terminal", href: "/terminal", selectRegex: "^/(terminal|project|stream|user).*$", external: false },
-  { label: "Docs", href: "https://about.beneath.dev/docs", selectRegex: "^/docs$", external: true },
-  { label: "Blog", href: "https://about.beneath.dev/blog", selectRegex: "^/blog$", external: true },
+  { label: "Terminal", href: "/", selectRegex: "^/.*$", external: false },
+  { label: "Docs", href: "https://about.beneath.dev/docs", selectRegex: "^$", external: true },
+  { label: "Blog", href: "https://about.beneath.dev/blog", selectRegex: "^$", external: true },
 ];
 
 const useStyles = makeStyles((theme) => ({
@@ -108,7 +108,7 @@ const Header: FC<HeaderProps> = ({ toggleMobileDrawer }) => {
             makeButton("Login", {
               color: "inherit",
               size: "small",
-              href: "/auth",
+              href: "/-/auth",
             })}
           {me && (
             <React.Fragment>
@@ -149,13 +149,14 @@ const Header: FC<HeaderProps> = ({ toggleMobileDrawer }) => {
                   as: `/${me.user.username}/-/secrets`,
                   href: `/organization?organization_name=${me.user.username}&tab=secrets`,
                 })}
-                {!me.billingOrganization.personal && makeMenuItem("Organization", {
-                  onClick: closeMenu,
-                  as: `/${me.billingOrganization.name}`,
-                  href: `/organization?organization_name=${me.billingOrganization.name}`,
-                })}
+                {!me.billingOrganization.personal &&
+                  makeMenuItem("Organization", {
+                    onClick: closeMenu,
+                    as: `/${me.billingOrganization.name}`,
+                    href: `/organization?organization_name=${me.billingOrganization.name}`,
+                  })}
                 {makeMenuItem("Logout", {
-                  href: `/auth/logout`,
+                  href: `/-/redirects/auth/logout`,
                 })}
               </Menu>
             </React.Fragment>

diff --git a/web/components/PageTitle.js b/web/components/PageTitle.js
@@ -3,7 +3,7 @@ import Head from "next/head";
 export default (props) => (
   <Head>
     <title>
-      {props.title ? props.title + " | " : ""} Beneath – Data Science for the Decentralised Economy
+      {props.title ? props.title + " | " : ""} Beneath
     </title>
   </Head>
 );
diff --git a/web/components/Subheader.tsx b/web/components/Subheader.tsx
@@ -119,7 +119,7 @@ interface TerminalCrumbProps {
 }
 
 const TerminalCrumb: FC<TerminalCrumbProps> = ({ isCurrent }) => (
-  <Crumb href="/terminal" as="/terminal" label="Terminal" isCurrent={isCurrent} />
+  <Crumb href="/" as="/" label="Terminal" isCurrent={isCurrent} />
 );
 
 interface ProjectCrumbProps {
@@ -131,8 +131,8 @@ interface ProjectCrumbProps {
 const ProjectCrumb: FC<ProjectCrumbProps> = ({ organization, project, isCurrent }) => (
   <Crumb 
     href={`/project?organization_name=${organization}&project_name=${project}`} 
-    as={`/${organization}/${project}`} 
-    label={project} 
+    as={`/${organization}/${project}`}
+    label={project}
     isCurrent={isCurrent} />
 );
 

diff --git a/web/components/stream/StreamAPI.tsx b/web/components/stream/StreamAPI.tsx
@@ -45,7 +45,7 @@ const StreamAPI: FC<StreamAPIProps> = ({ stream }) => {
           )}
           {!me && (
             <>
-              You'll first have to <LinkTypography href="/auth">create a user</LinkTypography> to get a secret for
+              You'll first have to <LinkTypography href="/-/auth">create a user</LinkTypography> to get a secret for
               connecting to Beneath (don't worry, it's free and we won't share your data with anyone)
             </>
           )}

diff --git a/web/components/terminal/Welcome.tsx b/web/components/terminal/Welcome.tsx
@@ -1,15 +1,10 @@
-import React, { FC } from "react";
-import {
-  Button,
-  Container,
-  Grid,
-  makeStyles,
-  Theme,
-  Typography,
-} from "@material-ui/core";
 import clsx from "clsx";
-import NextMuiLinkList from "../NextMuiLinkList";
+import React, { FC } from "react";
+
+import { Button, Container, Grid, makeStyles, Theme, Typography } from "@material-ui/core";
+
 import TopProjects from "../../components/terminal/TopProjects";
+import NextMuiLinkList from "../NextMuiLinkList";
 
 const useStyles = makeStyles((theme: Theme) => ({
   title: {
@@ -32,15 +27,16 @@ const Welcome: FC = () => {
   const classes = useStyles();
 
   return (
-    <React.Fragment>
+    <>
       <Container maxWidth="lg">
         <Typography className={classes.title} component="h1" variant="h1" align="center" gutterBottom>
           Welcome to the Beneath Data Terminal
         </Typography>
       </Container>
       <Container maxWidth="md">
         <Typography className={classes.subtitle} component="h2" variant="subtitle1" align="center" gutterBottom>
-          Discover real-time data streams that have been shared with the world. Consume public data or create your own stream in minutes.
+          Discover real-time data streams that have been shared with the world.
+          Consume public data or create your own stream in minutes.
         </Typography>
         <Grid className={classes.buttons} container spacing={2} justify="center">
           <Grid item>
@@ -60,7 +56,7 @@ const Welcome: FC = () => {
               color="primary"
               variant="outlined"
               className={clsx(classes.button, classes.primaryButton)}
-              href={`/auth`}
+              href={`/-/auth`}
               component={NextMuiLinkList}
             >
               Create Account
@@ -69,7 +65,7 @@ const Welcome: FC = () => {
         </Grid>
       </Container>
       <TopProjects/>
-    </React.Fragment>
+    </>
   )
 }
 

diff --git a/web/pages/auth.tsx → web/pages/-/auth.tsx b/web/pages/auth.tsx → web/pages/-/auth.tsx
@@ -8,11 +8,11 @@ import {
 } from "@material-ui/core";
 import { NextPage } from "next";
 
-import { withApollo } from "../apollo/withApollo";
-import { GithubIcon, GoogleIcon } from "../components/Icons";
-import Page from "../components/Page";
-import VSpace from "../components/VSpace";
-import connection from "../lib/connection";
+import { withApollo } from "../../apollo/withApollo";
+import { GithubIcon, GoogleIcon } from "../../components/Icons";
+import Page from "../../components/Page";
+import VSpace from "../../components/VSpace";
+import connection from "../../lib/connection";
 
 const useStyles = makeStyles((theme: Theme) => ({
   authButton: {

diff --git a/web/pages/_document.js b/web/pages/_document.js
@@ -40,18 +40,31 @@ export default class MyDocument extends Document {
         <Head>
           {/* This shoud really be the only place you make any changes */}
 
-          {/* Meta tags */}
-          <meta name="robots" content="index, follow" />
-          <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" />
-          <meta name="theme-color" content={theme.palette.primary.main} />
-
           {/* Description tag */}
-          <meta
-            name="description"
-            content="Blockchain data science, Ethereum data API, cryptocurrency investigations, dapp analytics"
-          />
+          <meta name="description" content="Beneath is a single platform for building data apps" />
+
+          {/* Blog RSS feed */}
+          <link rel="alternate" href="https://about.beneath.dev/feed.xml" type="application/rss+xml" title="Blog Feed | Beneath" />
 
-          {/* <link href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono:300,300i,600" rel="stylesheet" /> */}
+          {/* Favicon */}
+          <meta name="theme-color" content={theme.palette.background.default} />
+          <meta name="msapplication-TileColor" content="#10182e" />
+          <meta name="msapplication-TileImage" content="/assets/favicon/ms-icon-144x144.png" />
+          <meta name="msapplication-config" content="/assets/favicon/browserconfig.xml" />
+          <link rel="manifest" href="/assets/favicon/manifest.json" />
+          <link rel="apple-touch-icon" sizes="57x57" href="/assets/favicon/apple-icon-57x57.png" />
+          <link rel="apple-touch-icon" sizes="60x60" href="/assets/favicon/apple-icon-60x60.png" />
+          <link rel="apple-touch-icon" sizes="72x72" href="/assets/favicon/apple-icon-72x72.png" />
+          <link rel="apple-touch-icon" sizes="76x76" href="/assets/favicon/apple-icon-76x76.png" />
+          <link rel="apple-touch-icon" sizes="114x114" href="/assets/favicon/apple-icon-114x114.png" />
+          <link rel="apple-touch-icon" sizes="120x120" href="/assets/favicon/apple-icon-120x120.png" />
+          <link rel="apple-touch-icon" sizes="144x144" href="/assets/favicon/apple-icon-144x144.png" />
+          <link rel="apple-touch-icon" sizes="152x152" href="/assets/favicon/apple-icon-152x152.png" />
+          <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-icon-180x180.png" />
+          <link rel="icon" type="image/png" sizes="192x192" href="/assets/favicon/android-icon-192x192.png" />
+          <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon/favicon-32x32.png" />
+          <link rel="icon" type="image/png" sizes="96x96" href="/assets/favicon/favicon-96x96.png" />
+          <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon/favicon-16x16.png" />
 
           {/* Stripe tag */}
           <script src="https://js.stripe.com/v3/"></script>

diff --git a/web/pages/index.tsx b/web/pages/index.tsx
@@ -1,21 +1,22 @@
 import { NextPage } from "next";
-import Router from "next/router";
 import React from "react";
 
-const Index: NextPage = (props) => {
-  return <></>;
-};
+import { withApollo } from "../apollo/withApollo";
+import Page from "../components/Page";
+import Springboard from "../components/terminal/Springboard";
+import Welcome from "../components/terminal/Welcome";
+import useMe from "../hooks/useMe";
+
+const Terminal: NextPage = () => {
+  const me = useMe();
+  const loggedIn = !!me;
 
-Index.getInitialProps = async ({ res }) => {
-  if (res) {
-    res.writeHead(302, {
-      Location: "/terminal",
-    });
-    res.end();
-  } else {
-    Router.replace("/terminal");
-  }
-  return {};
+  return (
+    <Page title="Terminal" contentMarginTop="normal">
+      {loggedIn && <Springboard />}
+      {!loggedIn && <Welcome />}
+    </Page>
+  );
 };
 
-export default Index;
+export default withApollo(Terminal);
diff --git a/web/pages/terminal.tsx b/web/pages/terminal.tsx
diff --git a/web/public/assets/favicon/android-icon-144x144.png b/web/public/assets/favicon/android-icon-144x144.png
diff --git a/web/public/assets/favicon/android-icon-192x192.png b/web/public/assets/favicon/android-icon-192x192.png
diff --git a/web/public/assets/favicon/android-icon-36x36.png b/web/public/assets/favicon/android-icon-36x36.png
diff --git a/web/public/assets/favicon/android-icon-48x48.png b/web/public/assets/favicon/android-icon-48x48.png
diff --git a/web/public/assets/favicon/android-icon-72x72.png b/web/public/assets/favicon/android-icon-72x72.png
diff --git a/web/public/assets/favicon/android-icon-96x96.png b/web/public/assets/favicon/android-icon-96x96.png
diff --git a/web/public/assets/favicon/apple-icon-114x114.png b/web/public/assets/favicon/apple-icon-114x114.png
diff --git a/web/public/assets/favicon/apple-icon-120x120.png b/web/public/assets/favicon/apple-icon-120x120.png
diff --git a/web/public/assets/favicon/apple-icon-144x144.png b/web/public/assets/favicon/apple-icon-144x144.png
diff --git a/web/public/assets/favicon/apple-icon-152x152.png b/web/public/assets/favicon/apple-icon-152x152.png
diff --git a/web/public/assets/favicon/apple-icon-180x180.png b/web/public/assets/favicon/apple-icon-180x180.png
diff --git a/web/public/assets/favicon/apple-icon-57x57.png b/web/public/assets/favicon/apple-icon-57x57.png
diff --git a/web/public/assets/favicon/apple-icon-60x60.png b/web/public/assets/favicon/apple-icon-60x60.png
diff --git a/web/public/assets/favicon/apple-icon-72x72.png b/web/public/assets/favicon/apple-icon-72x72.png
diff --git a/web/public/assets/favicon/apple-icon-76x76.png b/web/public/assets/favicon/apple-icon-76x76.png
diff --git a/web/public/assets/favicon/apple-icon-precomposed.png b/web/public/assets/favicon/apple-icon-precomposed.png
diff --git a/web/public/assets/favicon/apple-icon.png b/web/public/assets/favicon/apple-icon.png
diff --git a/web/public/assets/favicon/browserconfig.xml b/web/public/assets/favicon/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
diff --git a/web/public/assets/favicon/favicon-16x16.png b/web/public/assets/favicon/favicon-16x16.png
diff --git a/web/public/assets/favicon/favicon-32x32.png b/web/public/assets/favicon/favicon-32x32.png
diff --git a/web/public/assets/favicon/favicon-96x96.png b/web/public/assets/favicon/favicon-96x96.png
diff --git a/web/public/assets/favicon/manifest.json b/web/public/assets/favicon/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
diff --git a/web/public/assets/favicon/ms-icon-144x144.png b/web/public/assets/favicon/ms-icon-144x144.png
diff --git a/web/public/assets/favicon/ms-icon-150x150.png b/web/public/assets/favicon/ms-icon-150x150.png
diff --git a/web/public/assets/favicon/ms-icon-310x310.png b/web/public/assets/favicon/ms-icon-310x310.png
diff --git a/web/public/assets/favicon/ms-icon-70x70.png b/web/public/assets/favicon/ms-icon-70x70.png
diff --git a/web/public/favicon.ico b/web/public/favicon.ico
diff --git a/web/public/robots.txt b/web/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /-/auth
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="utf-8"?>
		<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>