GN-108 Snag list (#138)

* Scrim * GN-101 Move focus to search when clicked * GN-101 Close MyAccount Dropdown on meganav click * GN-101 Close MyAccount Dropdown on meganav click * GN-101 Styling issues across applications * GN-101 Use bundled design system css * GN-101 Loose grid * GN-98 Initial guidance content * GN-95 Now click scrim to close * GN-101 Fix list styling variation * GN-102 Add BNF content * GN-102 BNFc content * GN-102 BNF content update * GN-103 BNFC content * GN-104 CKS content * GN-104 Revert nav text to abbreviation * GN-103 Revert nav text to abbreviation * GN-101 Code review fixes Co-authored-by: w@rren <w@rren.dev> * GN-102 Nitpicking css * GN-104 Rename var * GN-102 Pull url from services * GN-103 Use var for url * GN-98 Content update * demo stuff * GN-104 Url var * GN-102 Spacing * GN-103 Spacing * GN-105 Content for standards and indicators * GN-106 About us content * GN-105 Update links * GN-105 Remove standards and indicators from more * GN-101 Fix failing tests * GN-102 Update snapshot * GN-103 Update snapshot * GN-105 Update snapshot * GN-106 Update snapshot * GN-104 Update snapshot * GN-98 Snapshot updated * GN-000 Alpha services. May want renaming for UR. * GN-000 Renamed for UR. DO NOT DEPLOY TO LIVE. * GN-000 Snapshot updated * GN-000 Links for UR. DO NOT DEPLOY TO LIVE * GN-000 Prettier issue * GN-102 Fix letters and dancing button * GN-103 Button fix and letter link fix * GN-103 Button dancing fix * GN-103 Another dancing button fix attempt * GN-106 Content link issue * GN-105 Amend S&I base link * Start guidance content * AW/21 Colour Scheme * GN-98 Guidance content * GN-106 About us content update * GN-109 More content * GN-107 Pathways content * GN-108 Remove e.preventDefault on mega menu click handler to enable links to work * GN-108 Fix scrim * GN-108 Add canUseDOM state to control display of dropdown menus in main nav * Duplicate css removed * Remove duplicate CSS * Remove duplicate css * Remove duplicate export * Links to live * Tidy up * GN-108 Primary to CTA buttons * GN-108 Add column gap * GN-108 Consistent URLs Co-authored-by: Eleanor Mollett <eleanor.mollett@gmail.com> Co-authored-by: John Davey <john.davey@nice.org.uk>
nice-digital · Oct 19, 2021 · c4876cd · c4876cd
1 parent 239c5fc
commit c4876cd
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 93 deletions.
diff --git a/src/Footer/Services/__snapshots__/Services.test.jsx.snap b/src/Footer/Services/__snapshots__/Services.test.jsx.snap
@@ -31,7 +31,7 @@ exports[`Services Matches snapshot 1`] = `
         eventAction="Footer click"
         eventCategory="TopHat and footer"
         eventLabel="NICE Pathways"
-        href="https://pathways.nice.org.uk/"
+        href="https://pathways.nice.org.uk"
       >
         NICE Pathways
       </TrackedLink>
@@ -73,7 +73,7 @@ exports[`Services Matches snapshot 1`] = `
         eventAction="Footer click"
         eventCategory="TopHat and footer"
         eventLabel="BNF"
-        href="https://bnf.nice.org.uk/"
+        href="https://bnf.nice.org.uk"
       >
         <abbr
           title="British National Formulary"
@@ -103,7 +103,7 @@ exports[`Services Matches snapshot 1`] = `
         eventAction="Footer click"
         eventCategory="TopHat and footer"
         eventLabel="BNFC"
-        href="https://bnfc.nice.org.uk/"
+        href="https://bnfc.nice.org.uk"
       >
         <abbr
           title="British National Formulary for Children"
@@ -133,7 +133,7 @@ exports[`Services Matches snapshot 1`] = `
         eventAction="Footer click"
         eventCategory="TopHat and footer"
         eventLabel="CKS"
-        href="https://cks.nice.org.uk/"
+        href="https://cks.nice.org.uk"
       >
         <abbr
           title="Clinical Knowledge Summaries"

diff --git a/src/Header/Nav/Dropdown/Components/AboutUs.jsx b/src/Header/Nav/Dropdown/Components/AboutUs.jsx
@@ -10,7 +10,8 @@ export function AboutUs() {
 		(service) => service.text == "About us"
 	).href;
 
-	const alphaNICEorg = "http://alpha.nice.org.uk/";
+	const rootUrl = services.rootUrl;
+
 	return (
 		<section aria-label="About us - dropdown navigation">
 			<h2 className="mt--0">About us</h2>
@@ -133,28 +134,28 @@ export function AboutUs() {
 					<h3 className="mt--d">Get involved</h3>
 					<ol className={classnames(styles.listUnstyled, "mt--d")}>
 						<li>
-							<a href={`${alphaNICEorg}Get-Involved/stakeholder-registration`}>
+							<a href={`${rootUrl}/Get-Involved/stakeholder-registration`}>
 								Register as a stakeholder
 							</a>
 						</li>
 						<li>
-							<a href={`${alphaNICEorg}Get-Involved/Consultations`}>
+							<a href={`${rootUrl}/Get-Involved/Consultations`}>
 								Comment on a consultation
 							</a>
 						</li>
 						<li>
-							<a href={`${alphaNICEorg}Get-Involved/our-committees`}>
+							<a href={`${rootUrl}/Get-Involved/our-committees`}>
 								Join a committee
 							</a>
 						</li>
 						<li>
-							<a href={`${alphaNICEorg}Get-Involved/Meetings-in-public`}>
+							<a href={`${rootUrl}/Get-Involved/Meetings-in-public`}>
 								Come to a meeting
 							</a>
 						</li>
 						<li>
-							<a href={`${alphaNICEorg}Get-Involved/jobs`}>Work with us</a>
-							<a href={`${baseUrl}nice-communities/public-involvement`}>
+							<a href={`${rootUrl}/Get-Involved/jobs`}>Work with us</a>
+							<a href={`${rootUrl}/nice-communities/public-involvement`}>
 								Public involvement
 							</a>
 						</li>

diff --git a/src/Header/Nav/Dropdown/Components/BNF.jsx b/src/Header/Nav/Dropdown/Components/BNF.jsx
@@ -9,7 +9,7 @@ export function BNF() {
 		(service) => service.text == "BNF"
 	).href;
 
-	const drugsAtoZurl = baseUrl + "drug/#";
+	const drugsAtoZurl = baseUrl + "/drug/#";
 
 	const drugsAtoZ = [
 		{ letter: "A", link: true },
@@ -48,7 +48,7 @@ export function BNF() {
 				professionals with sound up-to-date information about the use of
 				medicines.
 			</p>
-			<Button variant="primary" to={baseUrl}>
+			<Button variant="cta" to={baseUrl}>
 				View BNF
 			</Button>
 
@@ -75,37 +75,37 @@ export function BNF() {
 					<h3 className="mt--0">Browse A to Z by</h3>
 					<ul className={styles.listUnstyled}>
 						<li>
-							<a href={`${baseUrl}interaction/`}>Interactions</a>
+							<a href={`${baseUrl}/interaction/`}>Interactions</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}treatment-summary/`}>Treatment summaries</a>
+							<a href={`${baseUrl}/treatment-summary/`}>Treatment summaries</a>
 						</li>
 					</ul>
 				</GridItem>
 				<GridItem cols={12} md={6}>
 					<h3 className="mt--0">Browse by type</h3>
 					<ul className={styles.listUnstyled} style={{ columnCount: 2 }}>
 						<li>
-							<a href={`${baseUrl}dental-practitioners-formulary/`}>
-								Dental practitioners' formulary
+							<a href={`${baseUrl}/dental-practitioners-formulary/`}>
+								Dental practitioners&apos; formulary
 							</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}nurse-prescribers-formulary/`}>
-								Nurse prescribers' formulary
+							<a href={`${baseUrl}/nurse-prescribers-formulary/`}>
+								Nurse prescribers&apos; formulary
 							</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}guidance/`}>Medicines guidance</a>
+							<a href={`${baseUrl}/guidance/`}>Medicines guidance</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}wound-management/`}>Wound management</a>
+							<a href={`${baseUrl}/wound-management/`}>Wound management</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}medical-devices/`}>Medical devices</a>
+							<a href={`${baseUrl}/medical-devices/`}>Medical devices</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}borderline-substance-taxonomy/`}>
+							<a href={`${baseUrl}/borderline-substance-taxonomy/`}>
 								Borderline substances
 							</a>
 						</li>
@@ -115,13 +115,13 @@ export function BNF() {
 					<h3 className="mt--0">What’s new</h3>
 					<ul className={styles.listUnstyled}>
 						<li>
-							<a href={`${baseUrl}about/changes.html`}>Latest BNF</a>
+							<a href={`${baseUrl}/about/changes.html`}>Latest BNF</a>
 						</li>
 					</ul>
 				</GridItem>
 			</Grid>
 			<hr />
-			<a href={`${baseUrl}about/`}>About BNF</a>
+			<a href={`${baseUrl}/about/`}>About BNF</a>
 		</section>
 	);
 }
diff --git a/src/Header/Nav/Dropdown/Components/BNFc.jsx b/src/Header/Nav/Dropdown/Components/BNFc.jsx
@@ -9,7 +9,7 @@ export function BNFc() {
 		(service) => service.text == "BNFC"
 	).href;
 
-	const drugsAtoZurl = baseUrl + "drug/#";
+	const drugsAtoZurl = baseUrl + "/drug/#";
 
 	const drugsAtoZ = [
 		{ letter: "A", link: true },
@@ -48,7 +48,7 @@ export function BNFc() {
 				healthcare professionals with sound up-to-date information on the use of
 				medicines for treating children.
 			</p>
-			<Button variant="primary" to={baseUrl}>
+			<Button variant="cta" to={baseUrl}>
 				View BNFC
 			</Button>
 
@@ -75,50 +75,50 @@ export function BNFc() {
 					<h3 className="mt--0">Browse A to Z by</h3>
 					<ul className={styles.listUnstyled}>
 						<li>
-							<a href={`${baseUrl}interaction/`}>Interactions</a>
+							<a href={`${baseUrl}/interaction/`}>Interactions</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}treatment-summary/`}>Treatment summaries</a>
+							<a href={`${baseUrl}/treatment-summary/`}>Treatment summaries</a>
 						</li>
 					</ul>
 				</GridItem>
 				<GridItem cols={12} md={6}>
 					<h3 className="mt--0">Browse by type</h3>
 					<ul className={styles.listUnstyled} style={{ columnCount: 2 }}>
 						<li>
-							<a href={`${baseUrl}medical-devices/`}>Medical devices</a>
+							<a href={`${baseUrl}/medical-devices/`}>Medical devices</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}borderline-substance-taxonomy/`}>
+							<a href={`${baseUrl}/borderline-substance-taxonomy/`}>
 								Borderline substances
 							</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}dental-practitioners-formulary/`}>
-								Dental practitioners' formulary
+							<a href={`${baseUrl}/dental-practitioners-formulary/`}>
+								Dental practitioners&apos; formulary
 							</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}nurse-prescribers-formulary/`}>
-								Nurse prescribers' formulary
+							<a href={`${baseUrl}/nurse-prescribers-formulary/`}>
+								Nurse prescribers&apos; formulary
 							</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}guidance/`}>Medicines guidance</a>
+							<a href={`${baseUrl}/guidance/`}>Medicines guidance</a>
 						</li>
 					</ul>
 				</GridItem>
 				<GridItem cols={12} md={3}>
 					<h3 className="mt--0">What’s new</h3>
 					<ul className={styles.listUnstyled}>
 						<li>
-							<a href={`${baseUrl}about/changes.html`}>Latest BNFC</a>
+							<a href={`${baseUrl}/about/changes.html`}>Latest BNFC</a>
 						</li>
 					</ul>
 				</GridItem>
 			</Grid>
 			<hr />
-			<a href={`${baseUrl}about/`}>About BNFC</a>
+			<a href={`${baseUrl}/about/`}>About BNFC</a>
 		</section>
 	);
 }
diff --git a/src/Header/Nav/Dropdown/Components/CKS.jsx b/src/Header/Nav/Dropdown/Components/CKS.jsx
@@ -9,7 +9,7 @@ export function CKS() {
 		(service) => service.text == "CKS"
 	).href;
 
-	const topicsAtoZurl = baseUrl + "topics/#";
+	const topicsAtoZurl = baseUrl + "/topics/#";
 
 	const topicsAtoZ = [
 		{ letter: "A", link: true },
@@ -47,7 +47,7 @@ export function CKS() {
 				Providing primary care practitioners with a readily accessible summary
 				of the current evidence base and practical guidance on best practice
 			</p>
-			<Button variant="primary" to={baseUrl}>
+			<Button variant="cta" to={baseUrl}>
 				View CKS
 			</Button>
 
@@ -74,48 +74,48 @@ export function CKS() {
 					<h3 className="mt--0">Topics most frequently visited</h3>
 					<ul className={styles.listUnstyled} style={{ columnCount: 2 }}>
 						<li>
-							<a href={`${baseUrl}topics/hypertension/`}>Hypertension</a>
+							<a href={`${baseUrl}/topics/hypertension/`}>Hypertension</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}topics/diabetes-type-2/`}>
+							<a href={`${baseUrl}/topics/diabetes-type-2/`}>
 								Diabetes - type 2
 							</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}topics/gout/`}>Gout</a>
+							<a href={`${baseUrl}/topics/gout/`}>Gout</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}topics/migraine/`}>Migraine</a>
+							<a href={`${baseUrl}/topics/migraine/`}>Migraine</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}topics/allergic-rhinitis/`}>
+							<a href={`${baseUrl}/topics/allergic-rhinitis/`}>
 								Allergic rhinitis
 							</a>
 						</li>
 						<li>
-							<a href={`${baseUrl}topics/asthma/`}>Asthma</a>
+							<a href={`${baseUrl}/topics/asthma/`}>Asthma</a>
 						</li>
 					</ul>
 				</GridItem>
 				<GridItem cols={12} md={3}>
 					<h3 className="mt--0">Browse by</h3>
 					<ul className={styles.listUnstyled}>
 						<li>
-							<a href={`${baseUrl}specialities/`}>Specialities</a>
+							<a href={`${baseUrl}/specialities/`}>Specialities</a>
 						</li>
 					</ul>
 				</GridItem>
 				<GridItem cols={12} md={3}>
 					<h3 className="mt--0">What’s new</h3>
 					<ul className={styles.listUnstyled}>
 						<li>
-							<a href={`${baseUrl}whats-new/`}>Latest CKS</a>
+							<a href={`${baseUrl}/whats-new/`}>Latest CKS</a>
 						</li>
 					</ul>
 				</GridItem>
 			</Grid>
 			<hr />
-			<a href={`${baseUrl}about/`}>About CKS</a>
+			<a href={`${baseUrl}/about/`}>About CKS</a>
 		</section>
 	);
 }