diff --git a/src/frontend/src/Components/advisories/EmptyAdvisory.js b/src/frontend/src/Components/advisories/EmptyAdvisory.js index 73706b8a4..f0fd3a1ce 100644 --- a/src/frontend/src/Components/advisories/EmptyAdvisory.js +++ b/src/frontend/src/Components/advisories/EmptyAdvisory.js @@ -1,22 +1,24 @@ // React import React from 'react'; -// Styling -import './AdvisoriesList.scss'; import Container from 'react-bootstrap/Container'; -import parse from 'html-react-parser'; - -export default function EmptyAdvisory(props) { - const { advisory } = props; +export default function EmptyAdvisory() { // Rendering return (
-

{props.advisory.title}

- {advisory && ( - -

{parse(advisory.body)}

-
- )} +

No advisories are active at the moment

+ +
+

+ If there are widespread travel advisories, they will be posted here to give you guidance on: +

+
    +
  • how to navigate safely through the affected area
  • +
  • where to detour if available, and
  • +
  • keep you informed with the most up-to-date information we have.
  • +
+
+
); } diff --git a/src/frontend/src/Components/bulletins/EmptyBulletin.js b/src/frontend/src/Components/bulletins/EmptyBulletin.js index d5d0756b8..ae0db12ae 100644 --- a/src/frontend/src/Components/bulletins/EmptyBulletin.js +++ b/src/frontend/src/Components/bulletins/EmptyBulletin.js @@ -1,22 +1,21 @@ // React import React from 'react'; -// Styling -import './BulletinsList.scss'; import Container from 'react-bootstrap/Container'; -import parse from 'html-react-parser'; - -export default function EmptyBulletin(props) { - const { bulletin } = props; +export default function EmptyBulletin() { // Rendering return (
-

{props.bulletin.title}

- {bulletin && ( - -

{parse(bulletin.body)}

-
- )} +

No bulletins at the moment

+ +
+

+ There are currently no bulletins to display. + As we continue to evolve DriveBC to better meet the needs of British Columbians, + watch this space for updates as they come! +

+
+
); } diff --git a/src/frontend/src/pages/AdvisoriesListPage.js b/src/frontend/src/pages/AdvisoriesListPage.js index 1a57a6634..b86df092f 100644 --- a/src/frontend/src/pages/AdvisoriesListPage.js +++ b/src/frontend/src/pages/AdvisoriesListPage.js @@ -48,8 +48,7 @@ export default function AdvisoriesListPage() { } }); - const filteredAdvisories = advisories?.filter(advisory => !advisory.title.includes('No advisories')); - const isFilteredAdvisoriesEmpty = filteredAdvisories?.length === 0; + const isAdvisoriesEmpty = advisories?.length === 0; return (
@@ -58,10 +57,10 @@ export default function AdvisoriesListPage() { description='Get the latest critical travel status information during major events affecting travel on a highway or region.'> - {isFilteredAdvisoriesEmpty ? ( - + {isAdvisoriesEmpty ? ( + ) : ( - + )}