Skip to content

Commit 4cdf38e

Browse files
committed
Add red to timer when > 10 minutes is elapsed
Relates #125
1 parent 309bf6e commit 4cdf38e

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

src/components/Pages/Revision/ResultsContainer.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import React from "react";
44
import PropTypes from "prop-types";
55
import RevisionTitle from "./RevisionTitle";
6+
import timerFormat from "../../../utils/timerFormat";
67

78
export default class ResultsContainer extends React.Component {
89
render() {
@@ -21,7 +22,8 @@ export default class ResultsContainer extends React.Component {
2122
</li>
2223
<li className="result-list-item">
2324
You performed {this.props.markSchemeCompleted} of{" "}
24-
{this.props.markSchemeTotal} tasks.
25+
{this.props.markSchemeTotal} tasks in{" "}
26+
{timerFormat(this.props.timeElapsed)}.
2527
</li>
2628
</ul>
2729
</div>
@@ -34,5 +36,6 @@ ResultsContainer.propTypes = {
3436
markSchemeCompleted: PropTypes.number,
3537
markSchemeTotal: PropTypes.number,
3638
markSchemeElements: PropTypes.arrayOf(PropTypes.object),
37-
caseTitle: PropTypes.string
39+
caseTitle: PropTypes.string,
40+
timeElapsed: PropTypes.number
3841
};

src/components/Pages/Revision/RevisionPage.js

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ export default class RevisionPage extends React.Component {
8989
markSchemeCompleted={this.state.markSchemeCompleted}
9090
markSchemeElements={this.state.markSchemeElements}
9191
caseTitle={this.state.caseTitle}
92+
timeElapsed={this.state.time}
9293
/>
9394
);
9495
const { exam, station } = this.props.match.params;

src/components/Pages/Revision/style.scss

+4
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,7 @@
7373
display: flex;
7474
justify-content: center;
7575
}
76+
77+
.timer-long {
78+
color: $peter-red;
79+
}

src/components/TopBar/TopBar.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ export default class TopBar extends React.Component {
1818
{this.props.stationName && removeHyphens(this.props.stationName)}
1919
</h3>
2020
{this.props.timer && (
21-
<h3 id="topbar-timer">{timerFormat(this.props.time)}</h3>
21+
<h3
22+
className={this.props.time >= 600 ? `timer-long` : ``}
23+
id="topbar-timer"
24+
>
25+
{timerFormat(this.props.time)}
26+
</h3>
2227
)}
2328
{this.props.tickDisplayed && (
2429
<CompleteButton

0 commit comments

Comments
 (0)