Skip to content

Removed text from rules banner. #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stephenbit wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Removed text from rules banner. #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
623867d
Removed text from rules banner. See notes.
stephenbit Sep 5, 2021
569a00b
fixed the functional tests and removed a CSS class
stephenbit Sep 5, 2021
4619664
Updated file names and directories
stephenbit Sep 5, 2021
94ec963
Updated chromedriver
stephenbit Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8,111 changes: 97 additions & 8,014 deletions functionalTest/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion functionalTest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@wdio/mocha-framework": "^6.4.7",
"@wdio/spec-reporter": "^6.4.7",
"@wdio/sync": "^6.4.7",
"chromedriver": "^89.0.0",
"chromedriver": "^92.0.0",
"wdio-chromedriver-service": "^6.0.4"
},
"dependencies": {
Expand Down
3 changes: 0 additions & 3 deletions functionalTest/test/pageobjects/dashboardPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ class DashboardPage extends Page {
get headingTitle() {
return $(".navbar").$(".heading");
}
get headlineBanner() {
return $(".headline-banner");

@stephenbit stephenbit Sep 5, 2021

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is now no selector .headline-banner

}
get dailyCases() {
return $("#dailyCases");
}
Expand Down
3 changes: 0 additions & 3 deletions functionalTest/test/specs/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ describe("Covid-19 Dashboard", () => {
expect(browser).toHaveTitle(title);
expect(dashboard.imgLogo).toBeDisplayed();
expect(dashboard.headingTitle).toHaveText("Scottish COVID-19 Statistics");
expect(dashboard.headlineBanner).toHaveTextContaining(
"Regional Restrictions to help fight the pandemic"
);
});
});

Expand Down
3 changes: 0 additions & 3 deletions functionalTest/test/specs/regional.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,5 @@ describe("Regional Insights", () => {
expect(browser).toHaveTitle(title);
expect(dashboard.imgLogo).toBeDisplayed();
expect(dashboard.headingTitle).toHaveText("Scottish COVID-19 Statistics");
expect(dashboard.headlineBanner).toHaveTextContaining(
"Regional Restrictions to help fight the pandemic"
);
});
});
24 changes: 24 additions & 0 deletions reactDashboard/src/components/HeadlineBanner/HeadlineBanner.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from "react";
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";

const HeadlineBanner = () => {

@donal-s donal-s Sep 7, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only thing I'd suggest is that if a component doesn't do anything, it would be better to inline the static formatting and bin the component.

return (
<Container fluid className="d-flex flex-column">
<Row>
<Col className="hr-container" style={{ padding: 0 }}>
<hr aria-hidden={true} className="full-width-hr" />
</Col>
</Row>
<Row>
<Col
xs="12"
style={{ backgroundColor: "#133a53", padding: "1rem" }}
></Col>
</Row>
</Container>
);
};

export default HeadlineBanner;
47 changes: 0 additions & 47 deletions reactDashboard/src/components/RouteMapRules/RouteMapRules.css
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions reactDashboard/src/components/RouteMapRules/RouteMapRules.jsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion reactDashboard/src/pages/Overview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import GeoHeatMap from "../components/GeoHeatMap/GeoHeatMap";
import DataCharts from "../components/DataCharts/DataCharts";
import Facts from "../components/Facts/Facts";
import DataDefinitions from "../components/DataDefinitions/DataDefinitions";
import RouteMapRules from "../components/RouteMapRules/RouteMapRules";
import RouteMapRules from "../components/HeadlineBanner/HeadlineBanner";
import {
AREATYPE_HEALTH_BOARDS,
VALUETYPE_CASES,
Expand Down
2 changes: 1 addition & 1 deletion reactDashboard/src/pages/Regional.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
} from "../components/Utils/CsvUtils";
import { stopAudio } from "../components/Utils/Sonification";
import { useLocation, useHistory, useRouteMatch } from "react-router-dom";
import RouteMapRules from "../components/RouteMapRules/RouteMapRules";
import RouteMapRules from "../components/HeadlineBanner/HeadlineBanner";

// Exported for unit tests
export function getRegionCodeFromUrl(location) {
Expand Down