Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GN-110 Life sciences content #137

Merged
merged 113 commits into from
Oct 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
f20c88a
Scrim
emollett Aug 11, 2021
78cbc72
GN-101 Move focus to search when clicked
emollett Sep 14, 2021
c9a3644
GN-101 Close MyAccount Dropdown on meganav click
emollett Sep 14, 2021
f3442d7
GN-101 Close MyAccount Dropdown on meganav click
emollett Sep 14, 2021
473e161
Merge branch 'GN-101-Issues' of https://github.com/nice-digital/globa…
emollett Sep 14, 2021
1fbcdbc
GN-101 Styling issues across applications
emollett Sep 15, 2021
8a11524
GN-101 Use bundled design system css
emollett Sep 15, 2021
6f01a8e
GN-101 Loose grid
emollett Sep 15, 2021
77d2e70
GN-98 Initial guidance content
emollett Sep 15, 2021
7a21c08
GN-95 Now click scrim to close
emollett Sep 16, 2021
16ee7b5
Merge branch 'GN-95-Add-meganav-mechanism' into GN-95-With-scrim
emollett Sep 16, 2021
7893635
GN-101 Fix list styling variation
emollett Sep 17, 2021
98ef54b
GN-102 Add BNF content
emollett Sep 17, 2021
01ee466
Merge branch 'GN-95-With-scrim' into GN-101-Issues
emollett Sep 17, 2021
12d45ae
Merge branch 'GN-101-Issues' into GN-102-BNF-content
emollett Sep 17, 2021
7a6c615
GN-102 BNFc content
emollett Sep 17, 2021
2343357
GN-102 BNF content update
emollett Sep 21, 2021
22c72d8
GN-103 BNFC content
emollett Sep 21, 2021
03b6138
GN-104 CKS content
emollett Sep 21, 2021
c2eea79
GN-104 Revert nav text to abbreviation
emollett Sep 21, 2021
7f627ff
GN-103 Revert nav text to abbreviation
emollett Sep 21, 2021
b36b922
Merge branch 'GN-104-CKS-content' into demo-branch
emollett Sep 21, 2021
13e51aa
GN-101 Code review fixes
emollett Sep 21, 2021
473366d
Merge branch 'GN-101-Issues' into GN-102-BNF-content
emollett Sep 21, 2021
3354639
Merge branch 'GN-95-Add-meganav-mechanism' into GN-102-BNF-content
emollett Sep 21, 2021
d85f709
Merge branch 'GN-95-Add-meganav-mechanism' into GN-103-BNFC-content
emollett Sep 21, 2021
ed21a9b
Merge branch 'GN-95-Add-meganav-mechanism' into GN-104-CKS-content
emollett Sep 21, 2021
6ece64d
GN-102 Nitpicking css
wa-rren-dev Sep 21, 2021
62d9199
GN-104 Rename var
emollett Sep 22, 2021
a5d5fd3
GN-102 Pull url from services
emollett Sep 22, 2021
16a4f74
Merge branch 'GN-102-BNF-content' of https://github.com/nice-digital/…
emollett Sep 22, 2021
03c3068
GN-103 Use var for url
emollett Sep 22, 2021
6ad3292
Merge branch 'GN-95-Add-meganav-mechanism' into GN-98-Guidance-content
emollett Sep 22, 2021
eb416a1
GN-98 Content update
emollett Sep 22, 2021
be97432
Merge branch 'GN-104-CKS-content' into demo-branch
emollett Sep 22, 2021
c0c09d7
Merge branch 'GN-102-BNF-content' into demo-branch
emollett Sep 22, 2021
362ad8a
Merge branch 'GN-103-BNFC-content' into demo-branch
emollett Sep 22, 2021
607a1ab
Merge branch 'GN-98-Guidance-content' into demo-branch
emollett Sep 22, 2021
413b89a
demo stuff
emollett Sep 22, 2021
b8548a9
GN-104 Url var
emollett Sep 22, 2021
9c1cfc0
GN-102 Spacing
emollett Sep 22, 2021
ad770f7
GN-103 Spacing
emollett Sep 22, 2021
d9e1e1b
GN-105 Content for standards and indicators
emollett Sep 22, 2021
dfe7732
GN-106 About us content
emollett Sep 22, 2021
4c29255
GN-105 Update links
emollett Sep 22, 2021
64dd936
GN-105 Remove standards and indicators from more
emollett Sep 23, 2021
ed1511f
GN-101 Fix failing tests
emollett Sep 23, 2021
2fc7fe6
Merge branch 'GN-101-Fix-failing-tests' into GN-102-BNF-content
emollett Sep 23, 2021
d122a5d
GN-102 Update snapshot
emollett Sep 23, 2021
fe6d888
Merge branch 'GN-101-Fix-failing-tests' into GN-103-BNFC-content
emollett Sep 23, 2021
e134710
GN-103 Update snapshot
emollett Sep 23, 2021
e5dc21c
Merge branch 'GN-101-Fix-failing-tests' into GN-105-SandI-content
emollett Sep 23, 2021
9bb8d58
GN-105 Update snapshot
emollett Sep 23, 2021
14b2339
Merge branch 'GN-101-Fix-failing-tests' into GN-106-About-us-content
emollett Sep 23, 2021
1eedcd7
GN-106 Update snapshot
emollett Sep 23, 2021
cac4aa3
Merge branch 'GN-101-Fix-failing-tests' into GN-104-CKS-content
emollett Sep 23, 2021
9ef229a
GN-104 Update snapshot
emollett Sep 23, 2021
001206c
Merge branch 'GN-101-Fix-failing-tests' into GN-98-Guidance-content
emollett Sep 23, 2021
591d8f3
GN-98 Snapshot updated
emollett Sep 23, 2021
e705417
Merge branch 'GN-101-Fix-failing-tests' into GN-000-All-content
emollett Sep 23, 2021
c4def1a
Merge branch 'GN-102-BNF-content' into GN-000-All-content
emollett Sep 23, 2021
001c67e
Merge branch 'GN-103-BNFC-content' into GN-000-All-content
emollett Sep 23, 2021
ea65378
Merge branch 'GN-105-SandI-content' into GN-000-All-content
emollett Sep 23, 2021
32c45d6
Merge branch 'GN-106-About-us-content' into GN-000-All-content
emollett Sep 23, 2021
aaea8e6
Merge branch 'GN-104-CKS-content' into GN-000-All-content
emollett Sep 23, 2021
7011b6e
Merge branch 'GN-98-Guidance-content' into GN-000-All-content
emollett Sep 23, 2021
754ce15
GN-000 Alpha services. May want renaming for UR.
emollett Sep 23, 2021
4e691ea
GN-000 Renamed for UR. DO NOT DEPLOY TO LIVE.
emollett Sep 23, 2021
fe7ec88
GN-000 Snapshot updated
emollett Sep 23, 2021
e1cf782
GN-000 Links for UR. DO NOT DEPLOY TO LIVE
emollett Sep 23, 2021
b946c2d
GN-000 Prettier issue
emollett Sep 23, 2021
d1eacba
GN-102 Fix letters and dancing button
emollett Sep 24, 2021
28c07db
GN-103 Button fix and letter link fix
emollett Sep 24, 2021
8f96f45
GN-103 Button dancing fix
emollett Sep 24, 2021
2e0694d
GN-103 Another dancing button fix attempt
emollett Sep 24, 2021
3a08273
Merge branch 'GN-102-BNF-content' into GN-000-All-content
emollett Sep 24, 2021
74608ee
Merge branch 'GN-103-BNFC-content' into GN-000-All-content
emollett Sep 24, 2021
e00f431
GN-106 Content link issue
wa-rren-dev Sep 27, 2021
b5b992c
GN-105 Amend S&I base link
wa-rren-dev Sep 27, 2021
f0cf202
Start guidance content
wa-rren-dev Sep 27, 2021
bb65207
AW/21 Colour Scheme
wa-rren-dev Sep 27, 2021
cfde4af
GN-98 Guidance content
wa-rren-dev Sep 29, 2021
8e4dac6
Merge branch 'GN-95-Add-meganav-mechanism' into GN-98-Guidance-content
wa-rren-dev Sep 29, 2021
6bbee86
GN-106 About us content update
wa-rren-dev Sep 29, 2021
833d902
GN-109 More content
wa-rren-dev Sep 29, 2021
b7a45ec
Merge branch 'GN-95-Add-meganav-mechanism' into GN-109-More-content
wa-rren-dev Sep 29, 2021
bc42f10
GN-107 Pathways content
wa-rren-dev Sep 29, 2021
34b97ec
Merge branch 'GN-98-Guidance-content' into GN-000-All-content
wa-rren-dev Sep 30, 2021
606bc64
Merge branch 'GN-105-SandI-content' into GN-000-All-content
wa-rren-dev Sep 30, 2021
b71df86
Merge branch 'GN-106-About-us-content' into GN-000-All-content
wa-rren-dev Sep 30, 2021
19dff6d
GN-108 Remove e.preventDefault on mega menu click handler to enable l…
johndavey72 Sep 30, 2021
470d011
GN-108 Fix scrim
wa-rren-dev Sep 30, 2021
0981a0d
GN-108 Add canUseDOM state to control display of dropdown menus in ma…
johndavey72 Sep 30, 2021
f34317e
Merge branch 'GN-107-Pathways-content' into GN-000-All-content
wa-rren-dev Sep 30, 2021
05ccf27
Merge branch 'GN-109-More-content' into GN-000-All-content
wa-rren-dev Sep 30, 2021
e189dca
Merge branch 'GN-108-Snag-list' into GN-000-All-content
wa-rren-dev Sep 30, 2021
659b01f
Merge branch 'GN-95-Add-meganav-mechanism' into GN-000-All-content
wa-rren-dev Oct 11, 2021
183b9b8
Duplicate css removed
wa-rren-dev Oct 11, 2021
a7ebf1c
Merge branch 'GN-95-Add-meganav-mechanism' into GN-104-CKS-content
wa-rren-dev Oct 11, 2021
7ee2d0c
Remove duplicate CSS
wa-rren-dev Oct 11, 2021
02ef435
Merge branch 'GN-95-Add-meganav-mechanism' into GN-107-Pathways-content
wa-rren-dev Oct 11, 2021
a0fee73
Remove duplicate css
wa-rren-dev Oct 11, 2021
1dbf284
Merge branch 'GN-95-Add-meganav-mechanism' into GN-109-More-content
wa-rren-dev Oct 11, 2021
4bdeeb6
Remove duplicate export
wa-rren-dev Oct 11, 2021
f685222
Links to live
wa-rren-dev Oct 11, 2021
657eed0
Merge branch 'GN-109-More-content' into GN-000-All-content
wa-rren-dev Oct 11, 2021
74fb24c
Merge branch 'GN-107-Pathways-content' into GN-000-All-content
wa-rren-dev Oct 11, 2021
dd58cb0
Merge branch 'GN-104-CKS-content' into GN-000-All-content
wa-rren-dev Oct 11, 2021
65468c2
Tidy up
wa-rren-dev Oct 11, 2021
31d8279
GN-110 Life Sciences dropdown content
wa-rren-dev Oct 11, 2021
f45326a
Snapshot update
wa-rren-dev Oct 11, 2021
7a691b0
Merge branch 'GN-000-All-content' into GN-110-Life-Sciences-Content
wa-rren-dev Oct 11, 2021
681f1df
Merge branch 'GN-95-Add-meganav-mechanism' into GN-110-Life-Sciences-…
wa-rren-dev Oct 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions src/Header/Nav/Dropdown/Components/LifeSciences.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import React from "react";
import { Button } from "@nice-digital/nds-button";
import { Grid, GridItem } from "@nice-digital/nds-grid";
import services from "../../../../services.json";

export function LifeSciences() {
const baseUrl = services.external.find(
(service) => service.text == "Life sciences"
).href;

return (
<section aria-label="Life Sciences - dropdown navigation">
<h2 className="mt--0">Life Sciences</h2>
<p>
We provide opportunities for industry to engage with us at all stages of
health technology development. Helping them deliver better and
measurable outcomes.
</p>
<Button variant="cta" to={baseUrl} className="mb--d">
View life sciences
</Button>
<h3 className="mt--d">Engage with us</h3>
<Grid gutter="loose">
<GridItem cols={12} md={6}>
<h4 className="h5 mb--c mt--0">
<a href="http://www.healthtechconnect.org.uk">HealthTech Connect</a>
</h4>
<p className="mt--0">
Register with HealthTech Connect for initial information and support
getting your non-pharmaceutical technology developed and adopted in
the UK.
</p>

<h4 className="h5 mb--c">
<a href="https://www.ukpharmascan.org.uk">UK PharmaScan</a>
</h4>
<p className="mt--0">
UK PharmaScan can help ensure earlier and more effective decision
making. Enabling faster uptake of innovative new medicines.
</p>
</GridItem>
<GridItem cols={12} md={6}>
<h4 className="h5 mb--c mt--0">
<a href="https://www.nice.org.uk/about/what-we-do/life-sciences/office-for-market-access">
Office for Market Access
</a>
</h4>
<p className="mt--0">
The Office for Market Access can help you engage with us and speed
up the development process.
</p>

<h4 className="h5 mb--c">
<a href="https://www.nice.org.uk/about/what-we-do/life-sciences/scientific-advice">
Scientific advice
</a>
</h4>
<p className="mt--0">
By answering your questions, scientific advice can help you design
evidence generation plans and provide key insights through our
advisory services.
</p>
</GridItem>
</Grid>
</section>
);
}
1 change: 1 addition & 0 deletions src/Header/Nav/Dropdown/Components/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export { BNF } from "./BNF";
export { BNFc } from "./BNFc";
export { CKS } from "./CKS";
export { Guidance } from "./Guidance";
export { LifeSciences } from "./LifeSciences";
export { More } from "./More";
export { Pathways } from "./Pathways";
export { StandardsAndIndicators } from "./StandardsAndIndicators";
2 changes: 2 additions & 0 deletions src/Header/Nav/Dropdown/Dropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
BNFc,
CKS,
Guidance,
LifeSciences,
More,
Pathways,
StandardsAndIndicators,
Expand All @@ -28,6 +29,7 @@ export function Dropdown({
BNFc: BNFc,
CKS: CKS,
Guidance: Guidance,
LifeSciences: LifeSciences,
More: More,
Pathways: Pathways,
StandardsAndIndicators: StandardsAndIndicators,
Expand Down
3 changes: 2 additions & 1 deletion src/services.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
"href": "https://www.nice.org.uk/about/what-we-do/life-sciences",
"text": "Life sciences",
"id": "life-sciences",
"dropdown": false
"dropdown": true,
"dropdownComponent": "LifeSciences"
},
{
"href": "https://bnf.nice.org.uk/",
Expand Down