Skip to content

Commit

Permalink
Feature/203 links and branding (#642)
Browse files Browse the repository at this point in the history
* website title and replan journey URL updated

* updated description and short name

* added new header and footer link to index page

* amend header and update social media link on share-button

* update feedback link and key

* updated feedback link id

* updated feedback link id

* reinstall package-lock

* remove feedback link and reinstall package-lock

* reinstall package-lock

* remove unused vars

Co-authored-by: Sudheer Kotha <[email protected]>
Co-authored-by: Sudheer Kotha <sudheer.kotha@[email protected]>
  • Loading branch information
3 people authored Aug 11, 2022
1 parent 1cda38e commit 4baf6db
Show file tree
Hide file tree
Showing 6 changed files with 3,326 additions and 3,143 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ REACT_APP_WMNDS_VERSION = 1.7.3

# Variables that control the site title and meta descriptions
REACT_APP_TITLE = "Disruptions"
REACT_APP_HEADER_TITLE = "Find live and planned disruptions"
REACT_APP_DESCRIPTION= "Find live and planned disruptions for public transport in the West Midlands."
6,358 changes: 3,302 additions & 3,056 deletions package-lock.json

Large diffs are not rendered by default.

94 changes: 15 additions & 79 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />

<!-- CHANGE ME -->
<title>%REACT_APP_TITLE% - West Midlands Network</title>
<title>%REACT_APP_TITLE% - Transport for West Midlands</title>
<meta name="description" content="%REACT_APP_DESCRIPTION%" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

Expand Down Expand Up @@ -92,6 +92,13 @@
<!-- End Google Tag Manager -->
</head>
<body>
<!-- Style for template -->
<style>
.wmnds-header--mega-menu {
display: none;
}
</style>

<!-- Google Tag Manager (noscript) -->
<noscript
><iframe
Expand All @@ -113,82 +120,25 @@
class="wmnds-link wmnds-header__skip-link"
>Skip to main content</a
>
<!-- Main header section -->
<header class="wmnds-header wmnds-header--mobile-app">
<!-- Header -->
<header class="wmnds-header">
<div class="wmnds-container wmnds-grid wmnds-grid--align-center wmnds-grid--justify-between">
<div class="wmnds-header__vertical-align wmnds-col-auto">
<!-- Logo -->
<a
class="wmnds-header__logo-link"
href="//wmnetwork.co.uk"
title="West Midlands Network Home"
href="//tfwm.org.uk"
title="Transport for West Midlands Home"
>
<img
class="wmnds-header__logo"
alt="West Midlands Network logo"
alt="Transport for West Midlands logo"
src="//wmnetwork.netlify.com/img/logo.svg"
/>
</a>
</div>
<!-- Nav items -->
<nav class="wmnds-header__vertical-align wmnds-col-auto">
<ul class="wmnds-header__links wmnds-header__main-links">
<li class="wmnds-header__link">
<a
href="//wmnetwork.co.uk/plan-your-journey/"
title="Plan your journey page"
target="_self"
class="wmnds-link"
>
Plan your journey
</a>
</li>
<li class="wmnds-header__link">
<a
href="//wmnetwork.co.uk/ways-to-travel/"
title="Ways to travel page"
target="_self"
class="wmnds-link"
>
Ways to travel
</a>
</li>
<li class="wmnds-header__link">
<a
href="//www.networkwestmidlands.com/tickets-and-passes/"
title="Tickets and passes page"
target="_self"
class="wmnds-link"
>
Tickets and passes
</a>
</li>
</ul>

<!-- Back button -->
<ul class="wmnds-header__links wmnds-header__back-btn">
<li class="wmnds-header__link">
<a
href="#"
title="Go back to previous page"
target="_self"
class="wmnds-link"
onClick="goBack(event);"
>
Back
</a>
</li>
</ul>
<script>
// Function that sends user to previous page they were on,
// This can be included in your local javascript file
function goBack(e) {
e.preventDefault();
window.history.back();
}
</script>
<!-- End back button -->
</nav>
<h1 class="wmnds-header__title wmnds-col-1 wmnds-col-sm-auto">%REACT_APP_HEADER_TITLE%</h1>
</div>
</header>
<!-- End header -->
Expand All @@ -197,21 +147,7 @@
<div id="disruptionsApp"></div>

<!-- Footer -->
<footer class="wmnds-footer wmnds-footer--mobile-app">
<div class="wmnds-container wmnds-grid">
<div class="wmnds-col-1 wmnds-col-md-1-2">Copyright West Midlands Network &copy; 2021</div>
<div class="wmnds-col-1 wmnds-col-md-1-2">
<a
href="https://www.wmnetwork.co.uk/privacy-cookies-policy/"
title="Privacy and cookies policy"
target="_blank"
rel="noopener noreferrer"
class="wmnds-footer__link wmnds-link"
>Privacy &amp; Cookies Policy</a
>
</div>
</div>
</footer>
<script src="https://cloudcdn.wmca.org.uk/tfwmassets/js/header-footer.min.js"></script>
<!-- End footer -->

<!-- Ajax SVG in, SVGS are referenced in app (Icon component) -->
Expand Down
6 changes: 3 additions & 3 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"short_name": "WMN Disruptions",
"name": "Disruptions - West Midlands Network ",
"description": "Disruptions section of the West Midlands Network website",
"short_name": "TfWM Disruptions",
"name": "Disruptions - Transport for West Midlands ",
"description": "Disruptions section of the Transport for West Midlands website",
"icons": [
{
"src": "favicon.ico",
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/DisruptionInfo/DisruptionInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const DisruptionInfo = ({ disruption }) => {
<span className={`wmnds-col-1 ${isMapVisible ? s.mapBtn : `${s.listBtn} wmnds-col-sm-1-2`}`}>
<a
className="wmnds-btn wmnds-btn--start wmnds-col-1"
href="https://journeyplanner.networkwestmidlands.com/"
href="https://journeyplanner.tfwm.org.uk"
target="_blank"
rel="noopener noreferrer"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const ShareButtons = ({ isMapVisible, disruption }) => {
resetButtonStyle={false}
className="wmnds-m-r-md wmnds-m-b-sm"
url={window.location.href}
hashtag="#WMNDisruption"
hashtag="#TfWMDisruption"
>
<FacebookIcon size={45} />
</FacebookShareButton>
Expand All @@ -63,10 +63,10 @@ const ShareButtons = ({ isMapVisible, disruption }) => {
resetButtonStyle={false}
className="wmnds-m-r-md wmnds-m-b-sm"
url={`\n${window.location.href}\n\n`}
title={`WMNetwork - Disruption: ${disruption.title} at ${disruption.subtitle} \n`}
title={`TransportForWM - Disruption: ${disruption.title} at ${disruption.subtitle} \n`}
hashtags={['WMNDisruption ']}
via="WMNetwork"
related={['WMNetwork']}
via="TransportForWM"
related={['TransportForWM']}
>
<TwitterIcon size={45} />
</TwitterShareButton>
Expand Down

0 comments on commit 4baf6db

Please sign in to comment.