diff --git a/public/index.html b/public/index.html index d6dabdc..fce3da5 100644 --- a/public/index.html +++ b/public/index.html @@ -196,27 +196,6 @@

Your privacy settings

- - - diff --git a/src/components/RailZoneFinder/ListView/ListView.js b/src/components/RailZoneFinder/ListView/ListView.js index 6314d3c..8a8375a 100644 --- a/src/components/RailZoneFinder/ListView/ListView.js +++ b/src/components/RailZoneFinder/ListView/ListView.js @@ -1,11 +1,10 @@ import React, { useState } from 'react'; - import Button from '../../shared/Button/Button'; import AccessIcon from '../../shared/Icon/AccessIcon'; import Icon from '../../shared/Icon/Icon'; import AccessibilityKey from '../../shared/AccessibilityKey/AccessibilityKey'; import Accordion from '../../shared/Accordion/Accordion'; -import TrayComponents from '../../shared/SearchComponents/SearchComponents'; +import AutoComplete from '../../shared/AutoComplete/AutoComplete'; import s from './ListView.module.scss'; import railData from '../RailData.json'; @@ -39,7 +38,7 @@ const ListView = () => {
- +
diff --git a/src/components/RailZoneFinder/MapView/MapView.js b/src/components/RailZoneFinder/MapView/MapView.js index 4dba1b6..a258da8 100644 --- a/src/components/RailZoneFinder/MapView/MapView.js +++ b/src/components/RailZoneFinder/MapView/MapView.js @@ -1,7 +1,7 @@ import React from 'react'; // Rail zone svg component import Map from '../Map/Map'; -import TrayComponents from '../../shared/SearchComponents/SearchComponents'; +import AutoComplete from '../../shared/AutoComplete/AutoComplete'; import s from './MapView.module.scss'; const MapView = () => { @@ -10,7 +10,7 @@ const MapView = () => {
- +
diff --git a/src/components/RailZoneFinder/RailZoneFinder.js b/src/components/RailZoneFinder/RailZoneFinder.js index 142d575..e49b7c5 100644 --- a/src/components/RailZoneFinder/RailZoneFinder.js +++ b/src/components/RailZoneFinder/RailZoneFinder.js @@ -1,12 +1,15 @@ import React, { useContext } from 'react'; -import { MapContext } from 'globalState'; +import { MapContext, AutoCompleteContext } from 'globalState'; // Rail zone svg component import Button from '../shared/Button/Button'; +import Icon from '../shared/Icon/Icon'; +import Breadcrumbs from '../shared/Breadcrumbs/Breadcrumbs'; import MapView from './MapView/MapView'; import ListView from './ListView/ListView'; import s from './RailZoneFinder.module.scss'; function RailZoneFinder() { + const [autoCompleteState] = useContext(AutoCompleteContext); const [mapState, mapDispatch] = useContext(MapContext); const { mapView } = mapState; // Toggle between map and list view @@ -16,9 +19,22 @@ function RailZoneFinder() { payload: !mapView, }); }; + return ( <>
+ {autoCompleteState.ticketMode ? ( +
+ + Back to ticket finder + +
+ ) : ( + + )}

Find my rail zones

diff --git a/src/components/RailZoneFinder/RailZoneFinder.module.scss b/src/components/RailZoneFinder/RailZoneFinder.module.scss index 674b71c..3975d2d 100644 --- a/src/components/RailZoneFinder/RailZoneFinder.module.scss +++ b/src/components/RailZoneFinder/RailZoneFinder.module.scss @@ -21,3 +21,14 @@ white-space: nowrap; } } + +.backLink { + display: inline-flex; + align-items: center; + + svg { + margin-right: $size-xsm; + transform: rotate(180deg); + fill: currentColor; + } +} diff --git a/src/components/shared/AccessibilityKey/AccessibilityKey.js b/src/components/shared/AccessibilityKey/AccessibilityKey.js index c3cab16..28ca6bd 100644 --- a/src/components/shared/AccessibilityKey/AccessibilityKey.js +++ b/src/components/shared/AccessibilityKey/AccessibilityKey.js @@ -87,7 +87,7 @@ const AccessibilityKey = ({ mapView }) => { /> ) : (
-
+

Show parking and accessibility