Skip to content

Commit

Permalink
Merge pull request #745: Check redirects
Browse files Browse the repository at this point in the history
  • Loading branch information
victorlin authored Nov 2, 2023
2 parents baa9c0a + 6c85422 commit d153955
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 0 additions & 4 deletions src/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ const setup = (app) => {
return next('route');
});

/* We redirect /ncov/zh -> /ncov/global/zh here rather than the manifest file as the URL structure currently
conflates a language part ("zh") with a region ("europe") so we want to keep zh out of the manifest JSON */
app.route("/ncov/zh").get((req, res) => res.redirect("/ncov/global/zh"));

/**
* DOCS & HELP Redirects
* In November 2020 we shifted the docs from being hosted by this server
Expand Down
9 changes: 7 additions & 2 deletions static-site/src/components/splash/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import Footer from "../Footer";
import { createGroupCards } from "./userGroups";
import { UserContext } from "../../layouts/userDataWrapper";

const Section = ({title, abstract, cards, buttonText, buttonLink}) => (
<div className="col-md-6" style={{paddingBottom: "40px"}}>
const Section = ({id, title, abstract, cards, buttonText, buttonLink}) => (
<div id={id} className="col-md-6" style={{paddingBottom: "40px"}}>
<div style={{display: "flex", flexDirection: "column", alignItems: "center", height: "100%"}}>
<Styles.H1>{title}</Styles.H1>
<Styles.CenteredFocusParagraph style={{flexGrow: 1}}>
Expand Down Expand Up @@ -80,6 +80,7 @@ class Splash extends React.Component {

<div style={{display: "flex", justifyContent: "space-evenly", flexWrap: "wrap"}}>
<Section
id="sars-cov-2"
title="SARS-CoV-2 (COVID-19)"
abstract="We are incorporating SARS-CoV-2 genomes as soon as they are shared and providing analyses and situation reports.
In addition we have developed a number of resources and tools, and are facilitating independent groups to run their own analyses."
Expand All @@ -88,20 +89,23 @@ class Splash extends React.Component {
buttonLink="/sars-cov-2"
/>
<Section
id="groups"
title="Nextstrain Groups"
abstract="We want to enable research labs, public health entities and others to share their datasets and narratives through Nextstrain with complete control of their data and audience."
cards={createGroupCards([{name: "neherlab"}, {name: "spheres"}])}
buttonText="See all groups"
buttonLink="/groups"
/>
<Section
id="pathogens"
title="Explore pathogens"
abstract="Genomic analyses of specific pathogens kept up-to-date by the Nextstrain team."
cards={coreCards}
buttonText="See all pathogens"
buttonLink="/pathogens"
/>
<Section
id="community"
title="From the community"
abstract={(<>
Analyses by independent groups <a href="https://docs.nextstrain.org/en/latest/guides/share/community-builds.html">stored and
Expand All @@ -112,6 +116,7 @@ class Splash extends React.Component {
buttonLink="/community"
/>
<Section
id="narratives"
title="Narratives"
abstract="Narratives are a method of data-driven storytelling. They allow authoring of content which is displayed alongside a view into the data."
cards={narrativeCards}
Expand Down

0 comments on commit d153955

Please sign in to comment.