From b4e4ff3028105a7f055837e377e817e4759dd347 Mon Sep 17 00:00:00 2001
From: Casey Oppenheim <casey.oppenheim@yahoo.com>
Date: Thu, 2 Jul 2020 14:42:18 -0400
Subject: [PATCH 1/4] modifications to extension ffor 3 a11y tests

---
 .eslintrc.js                                       |  3 ++-
 .../TutorialVideoView/TutorialVideoView.jsx        |  1 +
 .../components/BuildingBlocks/ToggleSlider.jsx     |  3 ++-
 app/panel/components/CreateAccount.jsx             |  3 ++-
 .../SteppedNavigation/SteppedNavigation.jsx        | 14 +++++++++++++-
 .../SteppedNavigation/SteppedNavigation.scss       |  3 +++
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 5417bdc63..b21bf9ce1 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,6 +11,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+
 module.exports = {
 	env: {
 		browser: true,
@@ -111,6 +112,6 @@ module.exports = {
 		'jsx-a11y/no-static-element-interactions': [0],
 		'jsx-a11y/label-has-associated-control': [0], //ToDo: enable this check. Throws 2 errors, should work.
 		'jsx-a11y/media-has-caption': [0], //ToDo: enable this check. Need Captions to enable.
-		'jsx-a11y/anchor-has-content': [0], //ToDo: enable this check. Need anchor text to enable.
+		'jsx-a11y/anchor-has-content': [1], //ToDo: enable this check. Need anchor text to enable.
 	},
 };
diff --git a/app/hub/Views/TutorialViews/TutorialVideoView/TutorialVideoView.jsx b/app/hub/Views/TutorialViews/TutorialVideoView/TutorialVideoView.jsx
index 954fc51fc..27fe4443c 100644
--- a/app/hub/Views/TutorialViews/TutorialVideoView/TutorialVideoView.jsx
+++ b/app/hub/Views/TutorialViews/TutorialVideoView/TutorialVideoView.jsx
@@ -35,6 +35,7 @@ const TutorialVideoView = () => (
 					<source type="video/mp4" src="https://www.ghostery.com/wp-content/uploads/2018/08/ghostery_promo.mp4?_=1" />
 					<source type="video/webm" src="https://www.ghostery.com/wp-content/uploads/2018/08/ghostery_promo.webm?_=1" />
 					<source type="video/ogg" src="https://www.ghostery.com/wp-content/uploads/2018/08/ghostery_promo.ogv?_=1" />
+					<track kind="captions" />
 				</video>
 			</div>
 			<div className="TutorialView__tagline text-center">
diff --git a/app/panel/components/BuildingBlocks/ToggleSlider.jsx b/app/panel/components/BuildingBlocks/ToggleSlider.jsx
index ccc6a42d3..acc28b88f 100644
--- a/app/panel/components/BuildingBlocks/ToggleSlider.jsx
+++ b/app/panel/components/BuildingBlocks/ToggleSlider.jsx
@@ -69,8 +69,9 @@ class ToggleSlider extends React.Component {
 		});
 		return (
 			<div className={compClassNames}>
-				<label className={labelClassNames}>
+				<label className={labelClassNames} htmlFor="checkboxID">
 					<input
+						id="checkboxID"
 						type="checkbox"
 						onChange={this._handleChange}
 						checked={checked}
diff --git a/app/panel/components/CreateAccount.jsx b/app/panel/components/CreateAccount.jsx
index dbddf2438..2e4ef4acd 100644
--- a/app/panel/components/CreateAccount.jsx
+++ b/app/panel/components/CreateAccount.jsx
@@ -214,9 +214,10 @@ class CreateAccount extends React.Component {
 							<div className="row">
 								<div className="small-12 columns">
 									<div id="create-account-legal-consent-checkbox" className={(legalConsentNotCheckedError ? 'checkbox-error' : '')}>
-										<input id="legalConsentChecked" name="legalConsentChecked" type="checkbox" checked={legalConsentChecked} onChange={this.handleCheckboxChange} />
 										<label htmlFor="legalConsentChecked">
 											<I18nWithLink value="create_account_form_legal_consent_checkbox_label" />
+											<input id="legalConsentChecked" name="legalConsentChecked" type="checkbox" checked={legalConsentChecked} onChange={this.handleCheckboxChange} />
+
 										</label>
 									</div>
 								</div>
diff --git a/app/shared-components/SteppedNavigation/SteppedNavigation.jsx b/app/shared-components/SteppedNavigation/SteppedNavigation.jsx
index 170ff1e56..a412c8252 100644
--- a/app/shared-components/SteppedNavigation/SteppedNavigation.jsx
+++ b/app/shared-components/SteppedNavigation/SteppedNavigation.jsx
@@ -36,9 +36,21 @@ const SteppedNavigation = (props) => {
 	const circles = [];
 	for (let i = 1; i <= totalSteps; i++) {
 		// Use <a> without an href prop to prevent a call to history with the same URL
-		circles.push((i === activeIndex) ? <a className="active" key={`nav-${i}`} /> : <NavLink to={`${i}`} key={`nav-${i}`} />);
+		circles.push((i === activeIndex) ?
+			<a aria-label="Stepped navigation link to current page" className="active" key={`nav-${i}`}><span className="a11y-label"> Active link span text</span></a>
+			: <NavLink aria-label="Stepped naivation link to another page" to={`${i}`} key={`nav-${i}`}><span className="a11y-label">Inactive stepped navigation link span text</span></NavLink>);
 	}
 
+	// ilya's notes:
+	/* for (let i = 1; i <= totalSteps; i++) {
+   // Use <a> without an href prop to prevent a call to history with the same URL
+   circles.push((i === activeIndex) ?
+      // VoiceOver on Mac does NOT read the span text
+      <a aria-label="Stepped navigation link to current page" className="active" key={`nav-${i}`}><span className="a11y-label">Active link span text</span></a>
+      : <NavLink aria-label="Stepped navigation link to another page" to={`${i}`} key={`nav-${i}`}><span className="a11y-label">Inactive stepped navigation link span text</span></NavLink>);
+}
+	*/
+
 	return (
 		<div className="row align-center">
 			<div className="columns small-12">
diff --git a/app/shared-components/SteppedNavigation/SteppedNavigation.scss b/app/shared-components/SteppedNavigation/SteppedNavigation.scss
index 98c8edceb..18f0efb5a 100644
--- a/app/shared-components/SteppedNavigation/SteppedNavigation.scss
+++ b/app/shared-components/SteppedNavigation/SteppedNavigation.scss
@@ -35,6 +35,9 @@
 	border-radius: 50%;
 	background-color: #cccccc;
 	border: 1px solid #a4a4a4;
+	& .a11y-label {
+		visibility: hidden;
+	  }
 }
 .SteppedNavigation__circles a.active::after {
 	content: '';

From fdc6ac1c7d7bbd11c701fc2d4430d352e07efa7c Mon Sep 17 00:00:00 2001
From: Casey Oppenheim <casey.oppenheim@yahoo.com>
Date: Tue, 7 Jul 2020 11:35:38 -0400
Subject: [PATCH 2/4] still need to fix eslintrc.js, this isn't the final
 commit

---
 .eslintrc.js                                           |  6 ++++--
 .../SteppedNavigation/SteppedNavigation.jsx            | 10 ----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index b21bf9ce1..99d61cbfb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -101,6 +101,8 @@ module.exports = {
 				"render"
 			]
 		}],
+	},
+
 
 		// Plugin: JSX-A11y
 		'jsx-a11y/alt-text': [0],
@@ -113,5 +115,5 @@ module.exports = {
 		'jsx-a11y/label-has-associated-control': [0], //ToDo: enable this check. Throws 2 errors, should work.
 		'jsx-a11y/media-has-caption': [0], //ToDo: enable this check. Need Captions to enable.
 		'jsx-a11y/anchor-has-content': [1], //ToDo: enable this check. Need anchor text to enable.
-	},
-};
+
+}
diff --git a/app/shared-components/SteppedNavigation/SteppedNavigation.jsx b/app/shared-components/SteppedNavigation/SteppedNavigation.jsx
index a412c8252..f6704d330 100644
--- a/app/shared-components/SteppedNavigation/SteppedNavigation.jsx
+++ b/app/shared-components/SteppedNavigation/SteppedNavigation.jsx
@@ -41,16 +41,6 @@ const SteppedNavigation = (props) => {
 			: <NavLink aria-label="Stepped naivation link to another page" to={`${i}`} key={`nav-${i}`}><span className="a11y-label">Inactive stepped navigation link span text</span></NavLink>);
 	}
 
-	// ilya's notes:
-	/* for (let i = 1; i <= totalSteps; i++) {
-   // Use <a> without an href prop to prevent a call to history with the same URL
-   circles.push((i === activeIndex) ?
-      // VoiceOver on Mac does NOT read the span text
-      <a aria-label="Stepped navigation link to current page" className="active" key={`nav-${i}`}><span className="a11y-label">Active link span text</span></a>
-      : <NavLink aria-label="Stepped navigation link to another page" to={`${i}`} key={`nav-${i}`}><span className="a11y-label">Inactive stepped navigation link span text</span></NavLink>);
-}
-	*/
-
 	return (
 		<div className="row align-center">
 			<div className="columns small-12">

From d948ca337885f790ca195a02efefb984e3f71afb Mon Sep 17 00:00:00 2001
From: Casey Oppenheim <casey.oppenheim@yahoo.com>
Date: Tue, 7 Jul 2020 12:10:42 -0400
Subject: [PATCH 3/4] fixed eslintrc.js and enabled the three a11y tests

---
 .eslintrc.js | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 99d61cbfb..fa27ac221 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,7 +11,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
 module.exports = {
 	env: {
 		browser: true,
@@ -39,21 +38,21 @@ module.exports = {
 	],
 	// 0 = off, 1 = warn, 2 = error
 	rules: {
-		'arrow-parens': [2, 'as-needed', { 'requireForBlockBody': true }],
-		'camelcase': [0],
+		'arrow-parens': [2, 'as-needed', { requireForBlockBody: true }],
+		camelcase: [0],
 		'comma-dangle': [2, {
-			'arrays': 'only-multiline',
-			'objects': 'only-multiline',
-			'functions': 'ignore'
+			arrays: 'only-multiline',
+			objects: 'only-multiline',
+			functions: 'ignore'
 		}],
 		'func-names': [0],
-		'indent': [1, 'tab', {
-			'SwitchCase': 1,
-			'ignoredNodes': ['TemplateLiteral']
+		indent: [1, 'tab', {
+			SwitchCase: 1,
+			ignoredNodes: ['TemplateLiteral']
 		}],
 		'lines-between-class-members': [1],
 		'max-len': [0],
-		'newline-per-chained-call': [0, { 'ignoreChainWithDepth': 2 }],
+		'newline-per-chained-call': [0, { ignoreChainWithDepth: 2 }],
 		'no-nested-ternary': [0],
 		'no-param-reassign': ['error', {
 			props: true,
@@ -92,17 +91,15 @@ module.exports = {
 		'react/jsx-fragments': [1, 'element'],
 		'react/sort-comp': [1, {
 			order: [
-				"static-variables",
-				"instance-variables",
-				"constructor",
-				"static-methods",
-				"lifecycle",
-				"everything-else",
-				"render"
+				'static-variables',
+				'instance-variables',
+				'constructor',
+				'static-methods',
+				'lifecycle',
+				'everything-else',
+				'render'
 			]
 		}],
-	},
-
 
 		// Plugin: JSX-A11y
 		'jsx-a11y/alt-text': [0],
@@ -112,8 +109,8 @@ module.exports = {
 		'jsx-a11y/mouse-events-have-key-events': [0],
 		'jsx-a11y/no-noninteractive-element-interactions': [0],
 		'jsx-a11y/no-static-element-interactions': [0],
-		'jsx-a11y/label-has-associated-control': [0], //ToDo: enable this check. Throws 2 errors, should work.
-		'jsx-a11y/media-has-caption': [0], //ToDo: enable this check. Need Captions to enable.
-		'jsx-a11y/anchor-has-content': [1], //ToDo: enable this check. Need anchor text to enable.
-
-}
+		'jsx-a11y/label-has-associated-control': [1], // ToDo: enable this check. Throws 2 errors, should work.
+		'jsx-a11y/media-has-caption': [1], // ToDo: enable this check. Need Captions to enable.
+		'jsx-a11y/anchor-has-content': [1], // ToDo: enable this check. Need anchor text to enable.
+	},
+};

From f04b5d3dd306dd86733589349f1805b1971d381b Mon Sep 17 00:00:00 2001
From: Casey Oppenheim <casey.oppenheim@yahoo.com>
Date: Tue, 11 Aug 2020 12:21:33 -0400
Subject: [PATCH 4/4] changed link in PromoModal.jsx

---
 app/shared-components/PromoModal/PromoModal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/shared-components/PromoModal/PromoModal.jsx b/app/shared-components/PromoModal/PromoModal.jsx
index 45ac1bbc5..eadd13e1f 100644
--- a/app/shared-components/PromoModal/PromoModal.jsx
+++ b/app/shared-components/PromoModal/PromoModal.jsx
@@ -76,7 +76,7 @@ class PromoModal extends React.Component {
 				break;
 			case INSIGHTS:
 				sendMessage('ping', 'promo_modals_insights_upgrade_cta');
-				url = `https://checkout.${DOMAIN}.com/insights?utm_source=gbe&utm_campaign=${utm_campaign}`;
+				url = `https://www.ghostery.com/insights/?utm_source=gbe&utm_campaign=in_app_upgrade=${utm_campaign}`;
 				break;
 			default:
 		}