Modularise timer display in <TopBar> component

Relates #125
fac-14 · Oct 17, 2018 · 28a0f22 · 28a0f22
1 parent 0510870
commit 28a0f22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/components/Pages/Revision/RevisionPage.js b/src/components/Pages/Revision/RevisionPage.js
@@ -99,6 +99,7 @@ export default class RevisionPage extends React.Component {
           stationName={this.state.stationName}
           submitCase={this.submitCase}
           tickDisplayed={this.state.tickDisplayed}
+          timer
           time={this.state.time}
         />
         {this.state.resultsDisplayed ? resultsContainer : revisionContainer}

diff --git a/src/components/TopBar/TopBar.js b/src/components/TopBar/TopBar.js
@@ -15,7 +15,9 @@ export default class TopBar extends React.Component {
         <div id="topbar-container">
           <BackButton link={this.props.backLink} />
           <h3 id="topbar-title">{this.props.stationName}</h3>
-          <h3 id="topbar-timer">{timerFormat(this.props.time)}</h3>
+          {this.props.timer && (
+            <h3 id="topbar-timer">{timerFormat(this.props.time)}</h3>
+          )}
           {this.props.tickDisplayed && (
             <CompleteButton
               exam={this.props.exam}
@@ -31,8 +33,10 @@ export default class TopBar extends React.Component {
 
 TopBar.propTypes = {
   backLink: PropTypes.string,
+  exam: PropTypes.string,
   submitCase: PropTypes.func,
   stationName: PropTypes.string,
   tickDisplayed: PropTypes.bool,
-  time: PropTypes.number
+  time: PropTypes.number,
+  timer: PropTypes.bool
 };