diff --git a/.env b/.env
index 8c0f329a..0f7ac73b 100644
--- a/.env
+++ b/.env
@@ -5,5 +5,5 @@
REACT_APP_WMNDS_VERSION = 1.7.3
# Variables that control the site title and meta descriptions
-REACT_APP_TITLE = "Sign up to email alerts about disruption"
-REACT_APP_DESCRIPTION= "Sign up to email alerts about disruption - West Midlands Network"
\ No newline at end of file
+REACT_APP_TITLE = "Sign up to alerts about disruptions"
+REACT_APP_DESCRIPTION= "Sign up to alerts about disruption - Transport for West Midlands"
\ No newline at end of file
diff --git a/.env.development b/.env.development
index e7ae49e5..0c951510 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
# developemnt API and keys
-REACT_APP_API_HOST='https://rtccdisruptions6zqwajo6s.azurewebsites.net'
+REACT_APP_API_HOST='https://rtccdisruptionsbfasldoiz.azurewebsites.net'
# Autocomplete API
REACT_APP_AUTOCOMPLETE_API='https://wmca-api-portal-staging.azure-api.net'
REACT_APP_AUTOCOMPLETE_API_KEY='0d4cca4a2c5d40c3bfbbfe45d1bbf294'
diff --git a/netlify.toml b/netlify.toml
index 62a52584..64a779ff 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -14,13 +14,13 @@ package = "@sentry/netlify-build-plugin"
# Use staging for branch deploys for next-release
# So that dummy data from testing does not enter live DB
[context."next-release".environment]
- REACT_APP_API_HOST="https://rtccdisruptions6zqwajo6s.azurewebsites.net"
+ REACT_APP_API_HOST="https://rtccdisruptionsbfasldoiz.azurewebsites.net"
REACT_APP_AUTOCOMPLETE_API="https://wmca-api-portal-staging.azure-api.net"
REACT_APP_AUTOCOMPLETE_API_KEY="0d4cca4a2c5d40c3bfbbfe45d1bbf294"
REACT_APP_ROADS_AUTOCOMPLETE_KEY="e0c1216f818a41be8d528ac1d4f7ebfd"
[context.deploy-preview.environment]
- REACT_APP_API_HOST="https://rtccdisruptions6zqwajo6s.azurewebsites.net"
+ REACT_APP_API_HOST="https://rtccdisruptionsbfasldoiz.azurewebsites.net"
REACT_APP_AUTOCOMPLETE_API="https://wmca-api-portal-staging.azure-api.net"
REACT_APP_AUTOCOMPLETE_API_KEY="0d4cca4a2c5d40c3bfbbfe45d1bbf294"
REACT_APP_ROADS_AUTOCOMPLETE_KEY="e0c1216f818a41be8d528ac1d4f7ebfd"
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 9b561f7c..84041a60 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,7 @@
- %REACT_APP_TITLE% - West Midlands Network
+ %REACT_APP_TITLE% - Transport West Midlands
@@ -102,6 +102,7 @@
padding: 0;
background-color: #f3f2f1;
}
+ .wmnds-header--mega-menu {display: none}
@@ -130,21 +131,8 @@
-
+
+
diff --git a/public/manifest.json b/public/manifest.json
index 96956941..82f09954 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,7 +1,7 @@
{
- "short_name": "WMN - Sign up to email alerts about disruption",
- "name": "Sign up to email alerts about disruption - West Midlands Network ",
- "description": "Sign up to email alerts about disruption section of the West Midlands Network website",
+ "short_name": "WMN - Sign up to alerts about disruption",
+ "name": "Sign up to alerts about disruption - West Midlands Network ",
+ "description": "Sign up to alerts about disruption section of the West Midlands Network website",
"icons": [
{
"src": "favicon.ico",
diff --git a/src/assets/styles/_vars.scss b/src/assets/styles/_vars.scss
index 1dc53b86..b0ecce07 100644
--- a/src/assets/styles/_vars.scss
+++ b/src/assets/styles/_vars.scss
@@ -18,7 +18,8 @@ $palettes: (
information: #84329b,
disable: #676869,
plannedDisruption: #ffdd00,
- background: #f3f2f1
+ background: #f3f2f1,
+ hover: #e2cee7
);
$white: #ffffff;
diff --git a/src/components/Breadcrumb.js b/src/components/Breadcrumb.js
index 2466d4b6..a9eef4fa 100644
--- a/src/components/Breadcrumb.js
+++ b/src/components/Breadcrumb.js
@@ -26,7 +26,7 @@ function Breadcrumb() {
className="wmnds-breadcrumb__link wmnds-breadcrumb__link--current"
aria-current="page"
>
- Sign up to email alerts about disruption
+ Sign up to alerts about disruption
diff --git a/src/components/Form/Form.js b/src/components/Form/Form.js
index e1f4c580..adda9751 100644
--- a/src/components/Form/Form.js
+++ b/src/components/Form/Form.js
@@ -16,6 +16,8 @@ import Step6EmailAlert from './Step6EmailAlert/Step6EmailAlert';
import Step7AddService from './Step7AddService/Step7AddService';
import Step8SearchForService from './Step8SearchForService/Step8SearchForService';
import Step9Confirm from './Step9Confirm/Step9Confirm';
+import StepDisruptionAlert from './StepDisruptionAlert/StepDisruptionAlert';
+import StepQuietHours from './StepQuietHours/StepQuietHours';
import SubmitSuccess from './Step10SubmitConfirmation/Success';
import SubmitError from './Step10SubmitConfirmation/Error';
// Custom Hooks
@@ -49,15 +51,15 @@ const Form = ({
useTrackFormAbandonment(currentStep, formSubmitStatus);
// Show debug options for below (this should be deleted on release)
- const debugStepOptions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+ const debugStepOptions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
let stepToGoTo;
if (!ExistingUser) {
- // NEW USERS: Show back button if the step is between 1 or 9
+ // NEW USERS: Show back button if the step is between 1 or 11
if (
currentStep > 1 &&
- currentStep < 9 &&
+ currentStep < 11 &&
!(currentStep === 5 && SMSAlert === 'no') &&
!(currentStep === 7 && SMSAlert === 'no')
) {
@@ -67,13 +69,18 @@ const Form = ({
if (currentStep === 5 && SMSAlert === 'no') {
stepToGoTo = 2;
}
-
+ if (currentStep === 4) {
+ stepToGoTo = 2;
+ }
+ if (currentStep === 2 && SMSAlert === 'yes') {
+ stepToGoTo = 4;
+ }
if (currentStep === 7 && SMSAlert === 'no') {
stepToGoTo = 5;
}
} else {
/* EXISTING USERS: Show back button if the step is 4 or 6. Step 3 has no back button */
- if (currentStep > 3 && currentStep < 9 && currentStep !== 6) {
+ if (currentStep > 3 && currentStep < 11 && currentStep !== 6) {
stepToGoTo = currentStep - 1;
}
@@ -100,7 +107,7 @@ const Form = ({
}, []);
useEffect(() => {
- if (currentStep === 9) scrollToTopOfSummary();
+ if (currentStep === 11) scrollToTopOfSummary();
}, [currentStep, scrollToTopOfSummary]);
// Run! Like go get some data from an API.
@@ -118,7 +125,7 @@ const Form = ({
onClick={() =>
formDataDispatch({
type: 'UPDATE_STEP',
- payload: hasReachedConfirmation ? 9 : stepToGoTo,
+ payload: hasReachedConfirmation ? 11 : stepToGoTo,
})
}
>
@@ -152,10 +159,12 @@ const Form = ({
{currentStep === 6 && }
{currentStep === 7 && }
{currentStep === 8 && }
- {currentStep === 9 && }
+ {currentStep === 9 && }
+ {currentStep === 10 && }
+ {currentStep === 11 && }
{/* for testing only */}
- {currentStep === 10 && }
- {currentStep === 11 && }
+ {currentStep === 12 && }
+ {currentStep === 13 && }
{/* If in development based on envs then show form debugging */}
diff --git a/src/components/Form/Step10SubmitConfirmation/Success.js b/src/components/Form/Step10SubmitConfirmation/Success.js
index 636abc7d..fb99a0b1 100644
--- a/src/components/Form/Step10SubmitConfirmation/Success.js
+++ b/src/components/Form/Step10SubmitConfirmation/Success.js
@@ -7,7 +7,7 @@ function Success() {
// eslint-disable-next-line no-unused-vars
const [formDataState, formDataDispatch] = useContext(FormDataContext);
const { isRequestingRecovery } = formDataState;
- const { Phone, SMSAlert, EmailAlert, SMSTerms } = formDataState.formData;
+ const { Phone, SMSAlert, EmailAlert } = formDataState.formData;
const alignCenter = {
textAlign: 'center',
@@ -25,7 +25,7 @@ function Success() {
'Visit the link in the email to manage your disruption alerts.',
'You can now manage your services and communication preferences. You can access the page at any time by visiting the link in your email.',
];
- } else if (Phone && (SMSAlert === 'yes' || SMSTerms) && EmailAlert === 'yes') {
+ } else if (Phone && SMSAlert === 'yes' && EmailAlert === 'yes') {
/* Text messages AND Email */
message = 'You have successfully signed up to text message and email alerts';
steps = [
@@ -34,7 +34,7 @@ function Success() {
'Visit the link in the confirmation email to access your disruption alert dashboard. Enter the PIN code sent to you via text message.',
'Once you have confirmed your mobile phone number, you’ll receive disruption alerts to your mobile phone.',
];
- } else if (Phone && (SMSAlert === 'yes' || SMSTerms)) {
+ } else if (Phone && SMSAlert === 'yes') {
/* Text messages */
message = 'You have successfully signed up to text message alerts';
steps = [
@@ -81,7 +81,7 @@ function Success() {