From 95cc1873c35544bbbf57ff53198f25fba4cb3580 Mon Sep 17 00:00:00 2001
From: KatvonRivia <katvonrivia@gmail.com>
Date: Wed, 25 Mar 2020 18:16:13 +0100
Subject: [PATCH 1/2] feat(showcase-title): add title slide in showcase mode

---
 src/scripts/components/app/app.tsx            | 24 ++++++++++-------
 .../showcase-selector/showcase-selector.tsx   |  2 +-
 .../components/story-title/story-title.styl   | 21 +++++++++++++++
 .../components/story-title/story-title.tsx    | 27 +++++++++++++++++++
 src/scripts/hooks/use-story-navigation.ts     |  5 ++--
 5 files changed, 67 insertions(+), 12 deletions(-)
 create mode 100644 src/scripts/components/story-title/story-title.styl
 create mode 100644 src/scripts/components/story-title/story-title.tsx

diff --git a/src/scripts/components/app/app.tsx b/src/scripts/components/app/app.tsx
index 37b85f926..2a4d157f1 100644
--- a/src/scripts/components/app/app.tsx
+++ b/src/scripts/components/app/app.tsx
@@ -20,6 +20,7 @@ import StoriesSelector from '../stories-selector/stories-selector';
 import PresentationSelector from '../presentation-selector/presentation-selector';
 import ShowcaseSelector from '../showcase-selector/showcase-selector';
 import Globes from '../globes/globes';
+import StoryTitle from '../story-title/story-title';
 
 import translations from '../../i18n';
 
@@ -40,14 +41,19 @@ const TranslatedApp: FunctionComponent = () => {
   return (
     <Router>
       <IntlProvider locale={language} messages={translations[language]}>
-        <Route
-          path={[
-            '/stories/:storyId/:slideIndex',
-            '/present/:storyId/:slideIndex',
-            '/showcase/:storyIds/:storyIndex/:slideIndex'
-          ]}>
-          <Story />
-        </Route>
+        <Switch>
+          <Route path={['/showcase/:storyIds/:storyIndex/title']}>
+            <StoryTitle />
+          </Route>
+          <Route
+            path={[
+              '/stories/:storyId/:slideIndex',
+              '/present/:storyId/:slideIndex',
+              '/showcase/:storyIds/:storyIndex/:slideIndex'
+            ]}>
+            <Story />
+          </Route>
+        </Switch>
         <Route
           path={['/present/:storyId', '/stories/:storyId']}
           render={props => <Redirect to={`${props.match.url}/0`} />}></Route>
@@ -69,7 +75,7 @@ const TranslatedApp: FunctionComponent = () => {
           <Route path="/present">
             <PresentationSelector />
           </Route>
-          <Route path={['/showcase/:storyIds', '/showcase']}>
+          <Route path={['/showcase/:storyIds', '/showcase']} exact>
             <ShowcaseSelector />
           </Route>
         </Switch>
diff --git a/src/scripts/components/showcase-selector/showcase-selector.tsx b/src/scripts/components/showcase-selector/showcase-selector.tsx
index 43d79ccfc..174f449c8 100644
--- a/src/scripts/components/showcase-selector/showcase-selector.tsx
+++ b/src/scripts/components/showcase-selector/showcase-selector.tsx
@@ -40,7 +40,7 @@ const ShowcaseSelector: FunctionComponent = () => {
           <Button
             className={styles.button}
             label={'play'}
-            link={`/showcase/${selectedIds.join('&')}/0/0`}
+            link={`/showcase/${selectedIds.join('&')}/0/title`}
             icon={PlayIcon}
           />
         </div>
diff --git a/src/scripts/components/story-title/story-title.styl b/src/scripts/components/story-title/story-title.styl
new file mode 100644
index 000000000..c0b156400
--- /dev/null
+++ b/src/scripts/components/story-title/story-title.styl
@@ -0,0 +1,21 @@
+@require '../../../variables.styl'
+
+.storyTitle
+  display: flex
+  flex-direction: column
+  justify-content: center
+  align-items: center
+  height: 60%
+  font-family: NotesEsa
+
+.title
+  color: $main
+  font-weight: bold
+  font-size: emCalc(36px)
+
+.description
+  margin: 0
+  color: $textDefault
+  font-weight: normal
+  font-size: emCalc(36px)
+  font-family: Arial, Helvetica, sans-serif
diff --git a/src/scripts/components/story-title/story-title.tsx b/src/scripts/components/story-title/story-title.tsx
new file mode 100644
index 000000000..edc66dd98
--- /dev/null
+++ b/src/scripts/components/story-title/story-title.tsx
@@ -0,0 +1,27 @@
+import React, {FunctionComponent} from 'react';
+import {useHistory} from 'react-router-dom';
+
+import {useStoryParams} from '../../hooks/use-story-params';
+import {useInterval} from '../../hooks/use-interval';
+
+import styles from './story-title.styl';
+
+const StoryTitle: FunctionComponent = () => {
+  const {storyIds, storyIndex, storyListItem} = useStoryParams();
+  const history = useHistory();
+  const showcaseStoryIds = storyIds.join('&');
+  const nextLink = `/showcase/${showcaseStoryIds}/${storyIndex}/0`;
+
+  useInterval(() => {
+    history.replace(nextLink);
+  }, 3000);
+
+  return (
+    <div className={styles.storyTitle}>
+      <h1 className={styles.title}>{storyListItem?.title}</h1>
+      <h2 className={styles.description}>{storyListItem?.description}</h2>
+    </div>
+  );
+};
+
+export default StoryTitle;
diff --git a/src/scripts/hooks/use-story-navigation.ts b/src/scripts/hooks/use-story-navigation.ts
index abc5b3489..dcc818cdc 100644
--- a/src/scripts/hooks/use-story-navigation.ts
+++ b/src/scripts/hooks/use-story-navigation.ts
@@ -40,11 +40,12 @@ export const useStoryNavigation = () => {
       autoPlayLink = `/showcase/${showcaseStoryIds}/${storyIndex}/${nextSlideIndex}`;
       // when no slides are left, go to first slide of next story
     } else if (nextStoryIndex < storyIds.length) {
-      autoPlayLink = `/showcase/${showcaseStoryIds}/${nextStoryIndex}/0`;
+      autoPlayLink = `/showcase/${showcaseStoryIds}/${nextStoryIndex}/title`;
       // after the last story, return to the beginning
     } else {
-      autoPlayLink = `/showcase/${showcaseStoryIds}/0/0`;
+      autoPlayLink = `/showcase/${showcaseStoryIds}/0/title`;
     }
   }
+
   return {autoPlayLink, nextSlideLink, previousSlideLink};
 };

From d1a2dfc3449c62958e57811f32f1ff18cd4b866b Mon Sep 17 00:00:00 2001
From: KatvonRivia <katvonrivia@gmail.com>
Date: Thu, 26 Mar 2020 09:43:05 +0100
Subject: [PATCH 2/2] feat(showcase-title): add exact to presenter route

---
 src/scripts/components/app/app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/components/app/app.tsx b/src/scripts/components/app/app.tsx
index 2a4d157f1..ab86d76a4 100644
--- a/src/scripts/components/app/app.tsx
+++ b/src/scripts/components/app/app.tsx
@@ -72,7 +72,7 @@ const TranslatedApp: FunctionComponent = () => {
           <Route path="/stories" exact>
             <StoriesSelector />
           </Route>
-          <Route path="/present">
+          <Route path="/present" exact>
             <PresentationSelector />
           </Route>
           <Route path={['/showcase/:storyIds', '/showcase']} exact>