From 6eaeab2d0751a7664d39b5c6cc5ed459de9f4fef Mon Sep 17 00:00:00 2001 From: Sidney Bell Date: Thu, 7 Nov 2024 09:50:06 -0800 Subject: [PATCH] Add debranding to main build (#216) * Pack layout (#30) * Experiment with a proper pack layout instead of the scatterplot * Replace clade selector with static caption * Replace slider with "go up" buttons * Formatting tweaks - footer * ts ignore * Set min size for epi curve * Swap in the pack layout for the scatterplot * Remove unrooted tree view for now * More footer tweaks * Remove incongruous location colorby in epi curve * footer * Color and shape per samples of interest and distance from mrca * cleanup * Add a legend * Update banner * Update main page footer * Logo links to landing page * remove feedback soliciation * update little footer * update tooltip * alignment * Update issue templates * Update banner * Update main page footer * Logo links to landing page * remove feedback soliciation * update little footer * update tooltip * alignment --- src/components/bigFoot.tsx | 154 ++++++++++++-------------- src/components/header/betaBanner.tsx | 25 +++-- src/components/header/index.tsx | 12 +- src/components/landingPage/demo.tsx | 2 +- src/components/landingPage/index.tsx | 4 - src/components/landingPage/upload.tsx | 8 +- src/components/littleFoot.tsx | 44 ++++---- 7 files changed, 121 insertions(+), 128 deletions(-) diff --git a/src/components/bigFoot.tsx b/src/components/bigFoot.tsx index 9db3d5a..f4e5741 100644 --- a/src/components/bigFoot.tsx +++ b/src/components/bigFoot.tsx @@ -4,88 +4,69 @@ import { ROUTES } from "src/routes"; const BigFoot = () => { return ( -
-
-
- - - -

Galago

+ > + Galago +
-
- a little tree explorer made with ♥ by the CZ GEN EPI team -
-
-
-
FAQs @@ -93,7 +74,11 @@ const BigFoot = () => { Methods @@ -101,54 +86,51 @@ const BigFoot = () => { - Learning Center - - - Discussion Board - - - Contact Us + Contact Github - +
+
+
+ - - + a little tree explorer made with ♥ by Sidney Bell & Colin + Megill +
-
License: MIT (code) & CC0 (content) diff --git a/src/components/header/betaBanner.tsx b/src/components/header/betaBanner.tsx index ed99d65..f46577d 100644 --- a/src/components/header/betaBanner.tsx +++ b/src/components/header/betaBanner.tsx @@ -1,6 +1,8 @@ import { Collapse, Alert, AlertTitle } from "@mui/material"; import { useState } from "react"; import { Theme } from "../../theme"; +import { Link } from "react-router-dom"; +import { ROUTES } from "../../routes"; export const BetaBanner = () => { const [showAlert, setShowAlert] = useState(true); @@ -8,7 +10,7 @@ export const BetaBanner = () => { return ( { sx={{ backgroundColor: Theme.palette.secondary.lighter }} > - Galago is in beta - please share your feedback! + Galago is no longer regularly updated. - We'd love to hear from you via{" "} - - discussion board - {" "} - or{" "} - - email - - . + For usage instructions, see the{" "} + + FAQs + {" "} + and{" "} + + Methods + {" "} + pages. For questions, contact{" "} + Sidney Bell. diff --git a/src/components/header/index.tsx b/src/components/header/index.tsx index 0973f34..fd043c0 100644 --- a/src/components/header/index.tsx +++ b/src/components/header/index.tsx @@ -5,6 +5,8 @@ import StagingBanner from "./stagingBanner"; import { isAppRunningInStaging } from "src/utils/staging"; import { useSelector } from "react-redux"; import { GenericErrorBanner } from "./genericErrorBanner"; +import { Link } from "react-router-dom"; +import { ROUTES } from "src/routes"; type HeaderProps = { sectionHeight?: number; @@ -67,10 +69,12 @@ const Header = (props: HeaderProps) => { margin: 0, }} > - + + +
diff --git a/src/components/landingPage/demo.tsx b/src/components/landingPage/demo.tsx index 1482a78..d64c456 100644 --- a/src/components/landingPage/demo.tsx +++ b/src/components/landingPage/demo.tsx @@ -38,7 +38,7 @@ export const Demo = (props: DemoProps) => { .

-

+

- -
- -
diff --git a/src/components/landingPage/upload.tsx b/src/components/landingPage/upload.tsx index f843afb..397aa20 100644 --- a/src/components/landingPage/upload.tsx +++ b/src/components/landingPage/upload.tsx @@ -97,8 +97,12 @@ export const Upload = (props: UploadProps) => { title={ <> If you need help generating a phylogenetic tree, head over to{" "} - - CZ GEN EPI + + TheiaGenEpi + {" "} + or{" "} + + Nextstrain } diff --git a/src/components/littleFoot.tsx b/src/components/littleFoot.tsx index 50645d7..fbd89ae 100644 --- a/src/components/littleFoot.tsx +++ b/src/components/littleFoot.tsx @@ -1,5 +1,7 @@ import Divider from "@mui/material/Divider"; import Theme from "../theme"; +import { Link } from "react-router-dom"; +import { ROUTES } from "src/routes"; const LittleFoot = () => { return ( @@ -17,32 +19,40 @@ const LittleFoot = () => { }} >
- Galago | a little tree explorer made with ♥ by the CZ GEN - EPI team ⸱ Free and open: MIT & CC0 licenses + Galago | a little tree explorer made with ♥ by Sidney Bell + & Colin Megill ⸱ Free and open: MIT & CC0 licenses
- - Learning Center - - + - Discussion Board - + Methods + Contact Us @@ -53,12 +63,6 @@ const LittleFoot = () => { > Github - - -
);