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

CCM-5093: static landing page #24

Merged
merged 54 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
208190a
My Signed Commit
bhansell1 Jun 7, 2024
ed0c6ba
My Signed Commit
bhansell1 Jun 7, 2024
98e9498
CCM-5093: Work in process
bhansell1 Jun 7, 2024
dee3ecf
CCM-5093: comments
bhansell1 Jun 10, 2024
3702b94
CCM-5093: update how-it-works section to use an ordered list.
bhansell1 Jun 10, 2024
43e65ee
CCM-5093: finalised stylized page
bhansell1 Jun 10, 2024
8312dd0
CCM-5093: add an example of a action-link, a table and a image with a…
bhansell1 Jun 11, 2024
966412a
CCM-5093: make footer data driven
bhansell1 Jun 11, 2024
4df253b
CCM-5093: make landing page data driven
bhansell1 Jun 11, 2024
b49559c
CCM-5092: fix image path to no longer require assets/images prefix
bhansell1 Jun 11, 2024
9a5c5ce
CCM-5092: add logic to render images that are not from assets/images/**
bhansell1 Jun 11, 2024
db5e130
CCM-5092: fix stlying with price cards
bhansell1 Jun 11, 2024
693d574
merge origin
bhansell1 Jun 11, 2024
cfa854b
CCM-5092: update example pages with custom content
bhansell1 Jun 11, 2024
517c5c8
CCM-5092: accept bundler as an acceptable word
bhansell1 Jun 11, 2024
6cab81d
CCM-5092: formatting
bhansell1 Jun 11, 2024
e79cb1b
CCM-5092: more formatting
bhansell1 Jun 11, 2024
3cd2f4d
CCM-5092: formatting...
bhansell1 Jun 11, 2024
6ce168d
CCM-5092: update description for see how your messages perform
bhansell1 Jun 12, 2024
effd02f
CCM-5092: move js-enabled script to body. Remove /web-cms/ prefix fro…
bhansell1 Jun 12, 2024
846f7cc
CCM-5093: remove just-the-docs
bhansell1 Jun 12, 2024
4d07714
CCM-5093: update wording content
bhansell1 Jun 12, 2024
1ef9331
CCM-5093: remove ID from styled list
bhansell1 Jun 12, 2024
77799a6
CCM-5093: remove card-group component
bhansell1 Jun 12, 2024
6c3343a
CCM-5093: correctly encode characters
bhansell1 Jun 13, 2024
cc83dfc
CCM-5093: make examples page avaliable only in debug mode
bhansell1 Jun 13, 2024
60f579d
CCM-5093: remove nonce until we determine a CSP. The nonce | random s…
bhansell1 Jun 13, 2024
2e8b24d
CCM-5093: use nhsuk-frontend node module css.
bhansell1 Jun 13, 2024
73d9483
CCM-5093: cp over nhsuk.min.js file on make install. Ideally we need …
bhansell1 Jun 13, 2024
ec58b89
CCM-5093: update README.md with install instructions
bhansell1 Jun 13, 2024
4bf53e2
CCM-5093: home.html to include default.html
bhansell1 Jun 13, 2024
0abb535
CCM-5093: make homepage a markdown file. And sort out layouts so all …
bhansell1 Jun 13, 2024
1dbe14d
CCM-5093: add endfor as an accepted word
bhansell1 Jun 14, 2024
ca84f9e
CCM-5093: add ADRs and update README.md
bhansell1 Jun 14, 2024
af42e6c
CCM-5093: fix markdown formatting
bhansell1 Jun 14, 2024
5a6722d
CCM-5093: add npm as an accetped word
bhansell1 Jun 14, 2024
a6510b7
CCM-5093: fix usage of NPM instead of npm
bhansell1 Jun 14, 2024
16ace7a
CCM-5093: add npm install to postcreatecommand.sh to installs deps wh…
bhansell1 Jun 14, 2024
8fc8349
CCM-5093: add additional docs explaining components and disable no-ba…
bhansell1 Jun 14, 2024
d2b9bf8
CCM-5093: fix linting errors
bhansell1 Jun 14, 2024
c355519
CCM-5093: add src as an accepted word
bhansell1 Jun 14, 2024
c375a61
CCM-5093: add url as an accepted word
bhansell1 Jun 14, 2024
dcf7a9c
CCM-5093: add inset element
bhansell1 Jun 14, 2024
1fe7c0b
CCM-5093: fix formatting
bhansell1 Jun 14, 2024
6541953
CCM-5093: fix md051
bhansell1 Jun 14, 2024
f0fc940
CCM-5093: inset regex
bhansell1 Jun 14, 2024
4dbd328
merge origin/main
bhansell1 Jun 14, 2024
53443ba
CCM-5093: line endings
bhansell1 Jun 14, 2024
68c4bca
CCM-5093: remove head.html and just use it on the default.html layout.
bhansell1 Jun 14, 2024
c3d6747
CCM-5093: line endings...
bhansell1 Jun 14, 2024
4e8ff5f
CCM-5093: fix content wording
bhansell1 Jun 17, 2024
2bff51e
CCM-5093: fix heading for the ordered list so it's read out correctly…
bhansell1 Jun 17, 2024
05c3e26
CCM-5093: update margin bottom for ordered list
bhansell1 Jun 17, 2024
49df362
CCM-5093: fix wave alerts for potentional headings
bhansell1 Jun 17, 2024
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
2 changes: 2 additions & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ _site
.jekyll-cache
.jekyll-metadata
vendor
.bundle
node_modules
#Gemfile.lock
6 changes: 6 additions & 0 deletions docs/README.md
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Developer info for Public Website

Document here.

## Setup (Mac)

Mac by default has ruby installed. However the default version is 2.2.x. For this project we need ruby version 3, so we can installed the 2.5.10 gem bundler.

Run through the solution listed on this [StackOverflow](https://stackoverflow.com/questions/38194032/how-can-i-update-ruby-version-2-0-0-to-the-latest-version-in-mac-os-x-v10-10-yo) page
1 change: 0 additions & 1 deletion docs/_config.dev.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

baseurl: "" # the subpath of your site, e.g. /blog
7 changes: 5 additions & 2 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ title: NHS Notify CMS
# email: [email protected]
description: >- # this means to ignore newlines until "baseurl:"
NHS Notify Web CMS
baseurl: "/nhs-notify-web-cms" # the subpath of your site, e.g. /blog
baseurl: "" # the subpath of your site, e.g. /blog
url: "https://nhsdigital.github.io" # the base hostname & protocol for your site, e.g. http://example.com

collections_dir: collections
Expand All @@ -33,7 +33,7 @@ collections:
sort_by: order

# Build settings
theme: just-the-docs
# theme: just-the-docs
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved
plugins:
- jekyll-feed

Expand Down Expand Up @@ -68,6 +68,9 @@ callouts:
title: Warning
color: red

sass:
style: compact # possible values: nested expanded compact compressed

# Exclude from processing.
# The following items will not be processed, by default.
# Any item listed under the `exclude:` key here will be automatically added to
Expand Down
2 changes: 2 additions & 0 deletions docs/_data/footer-navigation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# - title: Accessibility statement
# link: /
11 changes: 11 additions & 0 deletions docs/_data/home/benefits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- heading: Lower your messaging costs
description: |
Pay less for messages with out competitive rates and never pay any service or integration fees.
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved

- heading: Increase your operating efficiency
description: |
Make procuring messages easier by using NHS Notify as a centralised all in one provider.
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved

- heading: Message your audiences more effectively
description: |
Use a range of channels and formats to message people in the ways that works best for them.
5 changes: 5 additions & 0 deletions docs/_data/home/find-out-more.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
heading: Find out how you can start using NHS Notify
description: |
NHS England organisations and services that support direct care can register their interest and get started with NHS Notify.
image: CTA-register-your-interest.svg
image_alt: A graphic of a laptop screen with a draft email open.
7 changes: 7 additions & 0 deletions docs/_data/home/heading.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
heading: Send NHS App messages, emails, tests and letters to patients and the public
description: |
You can use NHS Notify if you work in NHS England and support direct care
image: landing-main-image.svg
image_alt: |
A graphic representation of NHS Notify's message channels:
mark-r-bjss marked this conversation as resolved.
Show resolved Hide resolved
NHS App messages, emails, text messages and letters.
27 changes: 27 additions & 0 deletions docs/_data/home/how-it-works.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- heading: Write your messages
description: |
Create and edit reusable templates for each message channel:
- NHS App messages
- emails
- text messages (SMS)
- letters
image: 1-write-your-message.svg
image_alt: A screenshot showing how you write messages using NHS Notify's user interface.

- heading: Choose your recipients
description: |
Provide the NHS numbers of the people you want to send messages to.
image: 2-choose-your-recipients.svg
image_alt: A screenshot of computer code showing how you choose your message recipients.

- heading: Plan how your messages will be sent
description: |
Set up routing plans to decide how your messages will be sent to your recipients.
image: 3-plan-your-messages.svg
image_alt: A graphic of a phone, laptop and letter (numbered 1,2 and 3 in that order) to show that you can send messages with each message channel in a specific order.
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved

- heading: See how your messages perform
description: |
Track how many messages you've sent and find out which ones are not being delivered.
image: 4-see-message-performance.svg
image_alt: Track how many messages you've sent and find out which ones are not being delivered.
15 changes: 15 additions & 0 deletions docs/_data/home/pricing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- heading: NHS App
description: unlimited messages
pricing: Free

- heading: Emails
description: unlimited emails
pricing: Free

- heading: Texts (SMS)
description: up to 30,000 free texts then
pricing: 2.27p

- heading: Letters
description: A4, two sides, send 2nd class
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved
pricing: 54p
11 changes: 11 additions & 0 deletions docs/_data/primary-navigation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- title: Home
link: /

- title: About
link: /about/

- title: Features
link: /features/

- title: Examples
link: /examples/
12 changes: 12 additions & 0 deletions docs/_includes/components/action-link.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<div class="nhsuk-action-link">
<a class="nhsuk-action-link__link" href="{{ include.url }}">
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
aria-hidden="true" width="36" height="36">
<path d="M0 0h24v24H0z" fill="none"></path>
<path
d="M12 2a10 10 0 0 0-9.95 9h11.64L9.74 7.05a1 1 0 0 1 1.41-1.41l5.66 5.65a1 1 0 0 1 0 1.42l-5.66 5.65a1 1 0 0 1-1.41 0 1 1 0 0 1 0-1.41L13.69 13H2.05A10 10 0 1 0 12 2z">
</path>
</svg>
<span class="nhsuk-action-link__text">{{ include.text }}</span>
</a>
</div>
9 changes: 9 additions & 0 deletions docs/_includes/components/banner.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div class="nhsuk-grid-column-one-half">
<h2>{{ include.data.heading }}</h2>
<p>
{{ include.data.description }}
</p>
</div>
<div class="nhsuk-grid-column-one-half">
{% include components/image.html src=include.data.image alt=include.data.image_alt class="nhsnotify-image" %}
</div>
11 changes: 11 additions & 0 deletions docs/_includes/components/card-group.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<ul class="nhsuk-grid-row nhsuk-card-group">
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved
{% for item in include.data %}
<li class="nhsuk-grid-column-one-quarter nhsuk-card-group__item">
{% if item.pricing %}
{% include components/card-with-price.html heading=item.heading description=item.description pricing=item.pricing %}
{% else %}
{% include components/card.html heading=item.heading description=item.description %}
{% endif %}
</li>
{% endfor %}
</ul>
13 changes: 13 additions & 0 deletions docs/_includes/components/card-with-price.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div class="nhsuk-card">
<div class="nhsuk-card__content">
<h3 class="nhsuk-card__heading">
{{ include.heading }}
</h3>
<div class="nhsuk-card__description">
{{ include.description }}
</div>
<div class="nhsuk-card__pricing">
{{ include.pricing }}
</div>
</div>
</div>
10 changes: 10 additions & 0 deletions docs/_includes/components/card.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div class="nhsuk-card">
<div class="nhsuk-card__content">
<h3 class="nhsuk-card__heading">
{{ include.heading }}
</h3>
<p class="nhsuk-card__description">
{{ include.description }}
</p>
</div>
</div>
13 changes: 13 additions & 0 deletions docs/_includes/components/image.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<figure class="nhsuk-image {{ include.class }}">
{% assign src = 'assets/images/' | append: include.src %}
{% if include.src contains 'https://' %}
<img class="nhsuk-image__img" src='{{ include.src }}' alt='{{ include.alt }}' />
{% else %}
<img class="nhsuk-image__img" src='{{ src | absolute_url }}' alt='{{ include.alt }}' />
{% endif %}
{% if include.caption %}
<figcaption class="nhsuk-image__caption">
{{ include.caption }}
</figcaption>
{% endif %}
</figure>
26 changes: 26 additions & 0 deletions docs/_includes/components/styled-list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<div class="nhsnotify-list">
{% assign i = 1 %}
{% for item in include.data %}
<div id="write-your-messages" class="nhsuk-grid-row nhsnotify-list__item">
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved
<div class="nhsuk-grid-column-one-half">
<div class="nhsnotify-list__item-header">
<span class="nhsnotify-list__item-header-number">
<p>{{ i }}</p>
</span>
<span class="nhsnotify-list__item-header-title">
<h3 class="nhsuk-heading-m">
{{ item.heading }}
</h3>
<div markdown="1">
{{ item.description | markdownify }}
</div>
</span>
</div>
</div>
<div class="nhsuk-grid-column-one-half">
{% include components/image.html src=item.image alt=item.image_alt class="nhsnotify-image" %}
</div>
</div>
{% assign i = i | plus:1 %}
{% endfor %}
</div>
18 changes: 18 additions & 0 deletions docs/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<footer role="contentinfo">
<div class="nhsuk-footer-container">
<div class="nhsuk-width-container">
<h2 class="nhsuk-u-visually-hidden">Support links</h2>
<div class="nhsuk-footer">
<ul class="nhsuk-footer__list">
{% for item in site.data.footer-navigation %}
<li class="nhsuk-footer__list-item nhsuk-footer-default__list-item">
<a class="nhsuk-footer__list-item-link" href="{{ item.link }}">{{ item.title }}</a>
</li>
{% endfor %}
<div>
<p class="nhsuk-footer__copyright">&copy; NHS England</p>
</div>
</div>
</div>
</div>
</footer>
24 changes: 24 additions & 0 deletions docs/_includes/head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="TODO: ENTER DESCRIPTION">
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved
<title>
NHS Notify - {{ page.title | default: site.title }}
</title>
<link href="/assets/css/main.css" rel="stylesheet">
<script src="/assets/js/nhsuk.min.js" defer="" nonce="{{ 'nonce' | random_string }}"></script>
<script src="/assets/js/nhsuk-8.1.1.min.js" defer="" nonce="{{ 'nonce' | random_string }}"></script>

<link rel="shortcut icon" href="/assets/favicons/favicon.ico" type="image/x-icon">
<link rel="apple-touch-icon" href="/assets/favicons/apple-touch-icon-180x180.png">
<link rel="mask-icon" href="{{ 'assets/favicons/favicon.svg }}" color="#005eb8">
<link rel="icon" sizes="192x192" href="{{ 'assets/favicons/favicon-192x192.png }}">

<meta name="msapplication-TileColor" content="#005eb8">
<meta name="msapplication-TileImage" content="/assets/favicons/mediumtile-144x144.png">
<meta name="msapplication-square70x70logo" content="/assets/favicons/smalltile-70x70.png">
<meta name="msapplication-square150x150logo" content="/assets/favicons/mediumtile-150x150.png">
<meta name="msapplication-wide310x150logo" content="/assets/favicons/widetile-310x150.png">
<meta name="msapplication-square310x310logo" content="/assets/favicons/largetile-310x310.png">
</head>
20 changes: 20 additions & 0 deletions docs/_includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<header class="nhsuk-header" role="banner">
<div class="nhsuk-header__container">
<div class="nhsuk-header__logo">
<a class="nhsuk-header__link nhsuk-header__link--service" href="/" aria-label="NHS homepage">
<svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 16" height="40" width="100">
<path class="nhsuk-logo__background" fill="#005eb8" d="M0 0h40v16H0z"></path>
<path class="nhsuk-logo__text" fill="#fff"
d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6">
</path>
</svg>
<span class="nhsuk-header__service-name">
Notify
</span>
</a>
</div>
</div>
<div class="nhsuk-navigation-container">
{%- include primary-navigation.html -%}
</div>
</header>
11 changes: 11 additions & 0 deletions docs/_includes/primary-navigation.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<nav class="nhsuk-navigation" id="header-navigation" role="navigation" aria-label="Primary navigation">
<ul class="nhsuk-header__navigation-list">
{% for p in site.data.primary-navigation -%}
<li class="nhsuk-header__navigation-item">
<a href="{{ p.link }}" class="nhsuk-header__navigation-link">
{{ p.title }}
</a>
</li>
{% endfor -%}
</ul>
</nav>
54 changes: 14 additions & 40 deletions docs/_layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,21 @@
---
layout: table_wrappers
---

<!DOCTYPE html>
<html lang="{{ site.lang | default: 'en' }}">
{%- include head.html -%}

<body class="wrap">
<script src="/assets/js/nhs-frontend-js-check.js" defer="" nonce="{{ 'nonce' | random_string }}"></script>

<html lang="{{ site.lang | default: 'en-US' }}">
{% include head.html %}
<body>
<a class="skip-to-main" href="#main-content">Skip to main content</a>
{% include icons/icons.html %}
{% if page.nav_enabled == true %}
{% include components/sidebar.html %}
{% elsif layout.nav_enabled == true and page.nav_enabled == nil %}
{% include components/sidebar.html %}
{% elsif site.nav_enabled != false and layout.nav_enabled == nil and page.nav_enabled == nil %}
{% include components/sidebar.html %}
{% endif %}
<div class="main" id="top">
{% include components/header.html %}
<div class="main-content-wrap">
{% include components/breadcrumbs.html %}
<div id="main-content" class="main-content">
<main>
{% if site.heading_anchors != false %}
{% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#svg-link\"></use></svg>" anchorClass="anchor-heading" anchorAttrs="aria-labelledby=\"%html_id%\"" %}
{% else %}
{{ content }}
{% endif %}
<a class="nhsuk-skip-link" href="#maincontent">Skip to main content</a>

{% if page.has_children == true and page.has_toc != false %}
{% include components/children_nav.html %}
{% endif %}
</main>
{% include components/footer.html %}
</div>
</div>
{% if site.search_enabled != false %}
{% include components/search_footer.html %}
{% endif %}
{%- include header.html -%}

<div class="nhsuk-width-container">
<main class="nhsuk-main-wrapper" id="maincontent" role="main">
{{- content -}}
</main>
</div>

{% if site.mermaid %}
{% include components/mermaid.html %}
{% endif %}
{%- include footer.html -%}
</body>

</html>
22 changes: 17 additions & 5 deletions docs/_layouts/home.html
bhansell1 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
---
layout: default
---
<!DOCTYPE html>
<html lang="{{ site.lang | default: 'en' }}">
{%- include head.html -%}

<h1>{{page.site_title}}</h1>
<body class="wrap">
<script src="/assets/js/nhs-frontend-js-check.js" defer="" nonce="{{ 'nonce' | random_string }}"></script>

{{ content }}
<a class="nhsuk-skip-link" href="#maincontent">Skip to main content</a>

{%- include header.html -%}

<main id="maincontent" role="main">
{{- content -}}
</main>

{%- include footer.html -%}
</body>

</html>
Loading
Loading