Merge branch 'master' into feat/jsurl

neherlab · Apr 2, 2020 · fbf1d17 · fbf1d17
2 parents 0374e5e + 7fd256f
commit fbf1d17
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -13,11 +13,13 @@ import { State } from '../state/reducer'
 
 function App() {
   const shouldGoToLandingPage = useSelector(({ ui }: State) => !ui.skipLandingPage)
+  const initialQueryString = window.location.search
+
   return (
     <Switch>
       {shouldGoToLandingPage && <Redirect exact from="/" to="/start" />}
       <Route exact path="/start">
-        <LandingPage />
+        <LandingPage initialQueryString={initialQueryString} />
       </Route>
       <Route>
         <Layout />

diff --git a/src/components/LandingPage/LandingPage.tsx b/src/components/LandingPage/LandingPage.tsx
@@ -10,11 +10,16 @@ import './LandingPage.scss'
 
 import { useTranslation } from 'react-i18next'
 
-function LandingPage() {
+interface LandingPageProps {
+  initialQueryString: string
+}
+
+function LandingPage({ initialQueryString }: LandingPageProps) {
   const { t } = useTranslation()
   const [isSkipLandingChecked, setSkipLandingChecked] = useState(false)
   const showSkipCheckbox = useSelector(({ ui }: State) => !ui.skipLandingPage)
   const dispatch = useDispatch()
+  const redirectUrl = `/${initialQueryString || ''}`
   const onLinkClick = useCallback(() => {
     dispatch(setShouldSkipLandingPage({ shouldSkip: true }))
 
@@ -34,7 +39,7 @@ function LandingPage() {
           <h1 className="landing-page__heading">{t('COVID-19 Scenarios')}</h1>
           <p className="landing-page__sub-heading">{t('Tool that models COVID-19 outbreak and hospital demand')}</p>
         </div>
-        <Link onClick={onLinkClick} to="/" className="landing-page__simulate-link">
+        <Link onClick={onLinkClick} to={redirectUrl} className="landing-page__simulate-link">
           {t('Simulate')}
         </Link>
       </div>