start using routes for team

theopensystemslab · Jun 18, 2020 · 76b0bb2 · 76b0bb2
1 parent 42164b2
commit 76b0bb2
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 28 deletions.
diff --git a/public/index.html b/public/index.html
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Hampton Council Planning</title>
+    <title>RIPA</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/index.tsx b/src/index.tsx
@@ -79,7 +79,8 @@ const InnerApp = () => {
 
 const App = () => {
   const currentUser = useStore(state => state.data.currentUser);
-  const team = getTeam("southwark");
+  localStorage.setItem("team", window.location.pathname.split("/")[1]);
+  const team = getTeam(localStorage.getItem("team"));
 
   return (
     <ApolloProvider client={gqlClient}>

diff --git a/src/pages/Dashboard.tsx b/src/pages/Dashboard.tsx
@@ -149,7 +149,10 @@ const Dashboard = ({ applications = [] }) => {
           ))}
           <Grid item xs={12} sm={"auto"}>
             <Box height={"100%"}>
-              <ButtonBase href="/start" className={classes.start}>
+              <ButtonBase
+                href={`/${localStorage.getItem("team")}/start`}
+                className={classes.start}
+              >
                 <Plus size={40} />
                 <Box pt={2} fontSize="h6.fontSize" px={3}>
                   Start a new application

diff --git a/src/pages/MyApplication.tsx b/src/pages/MyApplication.tsx
@@ -121,7 +121,7 @@ const MyApplication = ({ sections = [] }) => {
             py={1.5}
           >
             <Link
-              href={`/start/${id}`}
+              href={`/${localStorage.getItem("team")}/start/${id}`}
               prefetch={false}
               className={classes.link}
             >

diff --git a/src/pages/Section.tsx b/src/pages/Section.tsx
@@ -294,7 +294,10 @@ const Section = ({ id }) => {
 
   return (
     <HVCenterContainer light disableScroll>
-      <Link href="/start" className={classes.backLink}>
+      <Link
+        href={`${localStorage.getItem("team")}/start`}
+        className={classes.backLink}
+      >
         <ArrowLeft /> Back
       </Link>
       <Typography variant="h3" component="h1" gutterBottom>

diff --git a/src/routes/index.tsx b/src/routes/index.tsx
@@ -1,4 +1,13 @@
-import { compose, lazy, map, mount, redirect, route, withView } from "navi";
+import {
+  compose,
+  lazy,
+  map,
+  mount,
+  redirect,
+  route,
+  withData,
+  withView
+} from "navi";
 import * as React from "react";
 import { NotFoundBoundary, View } from "react-navi";
 
@@ -33,40 +42,53 @@ const Layout = ({ currentUser, team }) => {
 };
 
 export default compose(
-  withView((req, context: IContext) => (
+  withView((_req, context: IContext) => (
     <Layout currentUser={context.currentUser} team={context.team} />
   )),
 
   mount({
-    "/login": map(async (req, context: IContext) =>
-      context.currentUser
-        ? redirect(
-            req.params.redirectTo
-              ? decodeURIComponent(req.params.redirectTo)
-              : "/"
-          )
-        : route({
-            title: "Login",
-            view: <Login />
-          })
-    ),
+    "/": redirect(`/${localStorage.getItem("team") || "opensystemslab"}`),
 
-    "/logout": map(async (req, context: IContext) => {
+    "/logout": map(() => {
       // context.gqlClient.resetStore();
       // localStorage.removeItem("token");
       api.getState().set(state => {
         state.data = {};
       });
-      return redirect("/login");
+      return redirect(`/${localStorage.getItem("team")}/login`);
     }),
 
-    "*": map(async (req, context: IContext) =>
-      context.currentUser
-        ? lazy(() => import("./authenticated"))
-        : redirect(
-            `/login/?redirectTo=${encodeURIComponent(req.originalUrl)}`,
-            { exact: false }
-          )
+    "/:team": compose(
+      withData(req => ({
+        team: req.params.team
+      })),
+
+      mount({
+        "/login": map(async (req, context: IContext) =>
+          context.currentUser
+            ? redirect(
+                req.params.redirectTo
+                  ? decodeURIComponent(req.params.redirectTo)
+                  : `/${req.params.team}`
+              )
+            : route({
+                title: "Login",
+                view: <Login />
+              })
+        ),
+
+        "*": map(async (req, context: IContext) => {
+          console.log({ req });
+          return context.currentUser
+            ? lazy(() => import("./authenticated"))
+            : (redirect(
+                `/${req.params.team}/login/?redirectTo=${encodeURIComponent(
+                  req.originalUrl
+                )}`,
+                { exact: false }
+              ) as any);
+        })
+      })
     )
   })
 );
diff --git a/src/themes/teams.ts b/src/themes/teams.ts
@@ -8,6 +8,13 @@ import ScotlandLogo from "./logos/Scotland.svg";
 import SouthwarkLogo from "./logos/Southwark.svg";
 
 const teams = {
+  opensystemslab: {
+    name: "Open Systems Lab",
+    logo: SouthwarkLogo,
+    theme: {
+      primary: "#000"
+    }
+  },
   southwark: {
     name: "Southwark",
     logo: SouthwarkLogo,