Add more fixtures

nationalarchives · Nov 30, 2023 · 0c94359 · 0c94359
1 parent 54e0be0
commit 0c94359
Show file tree

Hide file tree

Showing 24 changed files with 781 additions and 53 deletions.
diff --git a/.htmlvalidate.json b/.htmlvalidate.json
@@ -5,6 +5,7 @@
     "close-order": "error",
     "form-dup-name": 0,
     "no-inline-style": 0,
+    "no-redundant-role": 0,
     "no-trailing-whitespace": 0,
     "void-style": 0
   }

diff --git a/src/nationalarchives/components/cookie-banner/fixtures.json b/src/nationalarchives/components/cookie-banner/fixtures.json
diff --git a/src/nationalarchives/components/cookie-banner/template.njk b/src/nationalarchives/components/cookie-banner/template.njk
@@ -1,7 +1,7 @@
 {% from "nationalarchives/components/button/macro.njk" import tnaButton %}
 
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<section class="tna-cookie-banner {{ containerClasses | join(' ') }}" data-module="tna-cookie-banner" data-policies="{{ params.policies if params.policies }}" data-preferenceskey="{{ params.preferencesSetKey if params.preferencesSetKey else 'cookie_preferences_set' }}" data-policies-key="{{ params.policiesKey if params.policiesKey }}" data-domain="{{ params.cookiesDomain if params.cookiesDomain }}" data-path="{{ params.cookiesPath if params.cookiesPath }}" data-insecure="{{ true if params.allowInsecure else 'false' }}" aria-label="Cookies on {{ params.serviceName }}" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %} hidden>
+<section class="tna-cookie-banner {{ containerClasses | join(' ') }}" data-module="tna-cookie-banner" role="region" data-policies="{{ params.policies if params.policies }}" data-preferenceskey="{{ params.preferencesSetKey if params.preferencesSetKey else 'cookie_preferences_set' }}" data-policies-key="{{ params.policiesKey if params.policiesKey }}" data-domain="{{ params.cookiesDomain if params.cookiesDomain }}" data-path="{{ params.cookiesPath if params.cookiesPath }}" data-insecure="{{ true if params.allowInsecure else 'false' }}" aria-label="Cookies on {{ params.serviceName }}" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %} hidden>
   <div class="tna-container">
     <div class="tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt">
       <h2 class="tna-heading-m">This website uses cookies</h2>

diff --git a/src/nationalarchives/components/date-search/template.njk b/src/nationalarchives/components/date-search/template.njk
@@ -3,7 +3,7 @@
 {%- if params.inline -%}
   {%- set containerClasses = containerClasses.concat('tna-form__group--inline') -%}
 {%- endif -%}
-<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ containerClasses | join(' ') }} {%- for attribute, value in params.formGroupAttributes %} {{ attribute }}="{{ value }}"{% endfor %}">
+<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ containerClasses | join(' ') }}" {%- for attribute, value in params.formGroupAttributes %} {{ attribute }}="{{ value }}"{% endfor %}>
   <div class="tna-form__group-contents">
     <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
       <label class="tna-form__label" for="tna-form__{{ params.id }}">

diff --git a/src/nationalarchives/components/featured-records/fixtures.json b/src/nationalarchives/components/featured-records/fixtures.json
@@ -1,4 +1,44 @@
 {
   "component": "featured-records",
-  "fixtures": []
+  "fixtures": [
+    {
+      "name": "basic featured records",
+      "options": {
+        "items": [
+          {
+            "collection": "TS 11/45/167",
+            "title": "Court records relating to Robert Wedderburn's trial",
+            "href": "#",
+            "date": "1819–1820"
+          },
+          {
+            "collection": "HO 42/191",
+            "title": "Home office letters",
+            "href": "#",
+            "date": "1819"
+          }
+        ]
+      },
+      "html": "<ul class=\"tna-featured-records \"><li class=\"tna-featured-records__item\"><dl class=\"tna-featured-records__details\"><dt class=\"tna-featured-records__collection-label tna-chip tna-chip--plain\">From our collection</dt><dd class=\"tna-featured-records__collection-description tna-chip tna-chip--plain\">TS 11/45/167</dd><dt class=\"tna-featured-records__title-label\">Title</dt><dd class=\"tna-featured-records__title-description\"><a href=\"#\">Court records relating to Robert Wedderburn&#39;s trial</a></dd><dt class=\"tna-featured-records__date-label\">Date</dt><dd class=\"tna-featured-records__date-description\">1819–1820</dd></dl></li><li class=\"tna-featured-records__item\"><dl class=\"tna-featured-records__details\"><dt class=\"tna-featured-records__collection-label tna-chip tna-chip--plain\">From our collection</dt><dd class=\"tna-featured-records__collection-description tna-chip tna-chip--plain\">HO 42/191</dd><dt class=\"tna-featured-records__title-label\">Title</dt><dd class=\"tna-featured-records__title-description\"><a href=\"#\">Home office letters</a></dd><dt class=\"tna-featured-records__date-label\">Date</dt><dd class=\"tna-featured-records__date-description\">1819</dd></dl></li></ul>",
+      "hidden": false
+    },
+    {
+      "name": "featured records with images",
+      "options": {
+        "items": [
+          {
+            "imageSrc": "https://beta.nationalarchives.gov.uk/media/images/wedderburn-trial.max-832x591.format-webp_i3c9pUH.webp",
+            "imageWidth": 576,
+            "imageHeight": 591,
+            "collection": "TS 11/45/167",
+            "title": "Court records relating to Robert Wedderburn's trial",
+            "href": "#",
+            "date": "1819–1820"
+          }
+        ]
+      },
+      "html": "<ul class=\"tna-featured-records \"><li class=\"tna-featured-records__item\"><img src=\"https://beta.nationalarchives.gov.uk/media/images/wedderburn-trial.max-832x591.format-webp_i3c9pUH.webp\" width=\"576\" height=\"591\" class=\"tna-featured-records__image\" alt=\"\"><dl class=\"tna-featured-records__details\"><dt class=\"tna-featured-records__collection-label tna-chip tna-chip--plain\">From our collection</dt><dd class=\"tna-featured-records__collection-description tna-chip tna-chip--plain\">TS 11/45/167</dd><dt class=\"tna-featured-records__title-label\">Title</dt><dd class=\"tna-featured-records__title-description\"><a href=\"#\">Court records relating to Robert Wedderburn&#39;s trial</a></dd><dt class=\"tna-featured-records__date-label\">Date</dt><dd class=\"tna-featured-records__date-description\">1819–1820</dd></dl></li></ul>",
+      "hidden": false
+    }
+  ]
 }
diff --git a/src/nationalarchives/components/filters/filters.scss b/src/nationalarchives/components/filters/filters.scss
@@ -1,45 +1,43 @@
+@use "../../tools/colour";
 @use "../../tools/spacing";
 @use "../../utilities";
 
 .tna-filters {
+  @include spacing.space-above;
+
   display: flex;
   flex-wrap: wrap;
   gap: 0.75rem 1rem;
 
-  @include spacing.space-above;
-
   &__item {
   }
 
   &__item--selected #{&}__link {
-    background-color: #004c7e;
-
     &,
     &:link,
-    &:visited {
-      color: #fff;
-    }
+    &:visited,
+    &:hover {
+    @include colour.accent;
+  }
   }
 
   &__link {
     padding: 0.125rem 0.75rem;
 
     text-decoration: none;
 
-    background-color: #d4e5ef;
-
-    border-radius: 99rem;
+    @include colour.tint;
 
     &,
     &:link,
     &:visited {
-      color: #000;
+    @include colour.colour-font("font-base");
     }
 
-    &:hover {
-      color: #fff;
+    border-radius: 99rem;
 
-      background-color: #004c7e;
+    &:hover {
+      @include colour.accent-light;
     }
   }
 }
diff --git a/src/nationalarchives/components/filters/fixtures.json b/src/nationalarchives/components/filters/fixtures.json
@@ -1,4 +1,51 @@
 {
   "component": "filters",
-  "fixtures": []
+  "fixtures": [
+    {
+      "name": "plain filters",
+      "options": {
+        "items": [
+          {
+            "label": "All",
+            "href": "#?filter=all",
+            "selected": true
+          },
+          {
+            "label": "Medieval (974—1485)",
+            "href": "#?filter=alpha"
+          },
+          {
+            "label": "Early Modern (1485—1714)",
+            "href": "#?filter=beta"
+          },
+          {
+            "label": "Georgians (1714—1837)",
+            "href": "#?filter=gamma"
+          },
+          {
+            "label": "Victorians (1837—1901)",
+            "href": "#?filter=delta"
+          },
+          {
+            "label": "Early 20th century (1901—1918)",
+            "href": "#?filter=epsilon"
+          },
+          {
+            "label": "Interwar (1918—1939)",
+            "href": "#?filter=zeta"
+          },
+          {
+            "label": "Second World War (1939—1945)",
+            "href": "#?filter=eta"
+          },
+          {
+            "label": "Postwar (1945—2000)",
+            "href": "#?filter=theta"
+          }
+        ]
+      },
+      "html": "<ul class=\"tna-filters tna-ul tna-ul--plain \"><li class=\"tna-filters__item tna-filters__item--selected\"><a href=\"#?filter=all\" class=\"tna-filters__link\">All</a></li><li class=\"tna-filters__item\"><a href=\"#?filter=alpha\" class=\"tna-filters__link\">Medieval (974—1485)</a></li><li class=\"tna-filters__item\"><a href=\"#?filter=beta\" class=\"tna-filters__link\">Early Modern (1485—1714)</a></li><li class=\"tna-filters__item\"><a href=\"#?filter=gamma\" class=\"tna-filters__link\">Georgians (1714—1837)</a></li><li class=\"tna-filters__item\"><a href=\"#?filter=delta\" class=\"tna-filters__link\">Victorians (1837—1901)</a></li><li class=\"tna-filters__item\"><a href=\"#?filter=epsilon\" class=\"tna-filters__link\">Early 20th century (1901—1918)</a></li><li class=\"tna-filters__item\"><a href=\"#?filter=zeta\" class=\"tna-filters__link\">Interwar (1918—1939)</a></li><li class=\"tna-filters__item\"><a href=\"#?filter=eta\" class=\"tna-filters__link\">Second World War (1939—1945)</a></li><li class=\"tna-filters__item\"><a href=\"#?filter=theta\" class=\"tna-filters__link\">Postwar (1945—2000)</a></li></ul>",
+      "hidden": false
+    }
+  ]
 }
diff --git a/src/nationalarchives/components/footer/fixtures.json b/src/nationalarchives/components/footer/fixtures.json
diff --git a/src/nationalarchives/components/header/fixtures.json b/src/nationalarchives/components/header/fixtures.json
@@ -1,4 +1,52 @@
 {
   "component": "header",
-  "fixtures": []
+  "fixtures": [
+    {
+      "name": "default",
+      "options": {
+        "logo": {
+          "strapline": "Beta",
+          "href": "#/"
+        },
+        "topNavigation": [
+          {
+            "text": "Top item 1",
+            "href": "#/top-1"
+          },
+          {
+            "text": "Top item 2",
+            "href": "#/top-2",
+            "icon": "phone"
+          },
+          {
+            "text": "Top item 3",
+            "href": "#/top-3",
+            "brandIcon": "github"
+          }
+        ],
+        "navigation": [
+          {
+            "text": "Alpha",
+            "href": "#/alpha",
+            "selected": true
+          },
+          {
+            "text": "Beta",
+            "href": "#/beta"
+          },
+          {
+            "text": "Gamma",
+            "href": "#/gamma"
+          }
+        ],
+        "exit": {
+          "text": "Go to the current National Archives website",
+          "href": "#",
+          "target": "_blank"
+        }
+      },
+      "html": "<header class=\"tna-header \" data-module=\"tna-header\"><div class=\"tna-header__exit\"><div class=\"tna-container\"><div class=\"tna-column tna-column--full\"><a href=\"#\" class=\"tna-header__exit-link\" target=\"_blank\">Go to the current National Archives website<i class=\"fa-solid fa-arrow-up-right-from-square\"></i></a></div></div></div><div class=\"tna-container tna-header__contents\"><div class=\"tna-column tna-header__logo\"><a href=\"#/\" class=\"tna-header__logo-link tna-header__logo-link--href\" title=\"The National Archives - Beta\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><path fill=\"#fff\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\"/><g class=\"tna-logo__foreground\" fill=\"#000\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\"/><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\"/></g></svg><span class=\"tna-header__logo-strapline\">Beta</span></a></div><div class=\"tna-column tna-column--flex-1- tna-header__navigation-toggle\"><!-- POPULATED BY JAVASCRIPT IF ENABLED --></div><nav class=\"tna-column tna-column--flex-1 tna-column--full-small tna-column--full-tiny tna-header__navigation\" aria-label=\"Main site navigation\"><ul class=\"tna-header__navigation-items\"><li class=\"tna-header__navigation-item\"><a href=\"#/alpha\" class=\"tna-header__navigation-item-link tna-header__navigation-item-link--selected\" tabindex=\"0\" aria-current=\"true\">Alpha</a></li><li class=\"tna-header__navigation-item\"><a href=\"#/beta\" class=\"tna-header__navigation-item-link\" tabindex=\"0\">Beta</a></li><li class=\"tna-header__navigation-item\"><a href=\"#/gamma\" class=\"tna-header__navigation-item-link\" tabindex=\"0\">Gamma</a></li></ul><ul class=\"tna-header__top-navigation-items\"><li class=\"tna-header__top-navigation-item\"><a href=\"#/top-1\" class=\"tna-header__top-navigation-item-link\" tabindex=\"0\">Top item 1</a></li><li class=\"tna-header__top-navigation-item\"><a href=\"#/top-2\" class=\"tna-header__top-navigation-item-link\" tabindex=\"0\"><i class=\"fa-solid fa-fw fa-phone\"></i>Top item 2</a></li><li class=\"tna-header__top-navigation-item\"><a href=\"#/top-3\" class=\"tna-header__top-navigation-item-link\" tabindex=\"0\"><i class=\"fa-brands fa-fw fa-github\"></i>Top item 3</a></li></ul></nav></div></header>",
+      "hidden": false
+    }
+  ]
 }
diff --git a/src/nationalarchives/components/header/template.njk b/src/nationalarchives/components/header/template.njk
@@ -7,7 +7,7 @@
   <div class="tna-header__exit">
     <div class="tna-container">
       <div class="tna-column tna-column--full">
-        <a href="{{ params.exit.href }}" class="tna-header__exit-link"{%- if params.exit.target -%} target="{{ params.exit.target }}"{%- endif -%}>
+        <a href="{{ params.exit.href }}" class="tna-header__exit-link"{%- if params.exit.target %} target="{{ params.exit.target }}"{%- endif -%}>
           {{ params.exit.text }}
           {%- if params.exit.target == "_blank" -%}
           <i class="fa-solid fa-arrow-up-right-from-square"></i>

diff --git a/src/nationalarchives/components/message/fixtures.json b/src/nationalarchives/components/message/fixtures.json
@@ -1,4 +1,13 @@
 {
   "component": "message",
-  "fixtures": []
+  "fixtures": [
+    {
+      "name": "default",
+      "options": {
+        "message": "Please note this page references hunger strikes and force feeding, which some people may find upsetting."
+      },
+      "html": "<div class=\"tna-message \"><svg class=\"tna-message__icon\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 34 34\" width=\"40\" height=\"40\"><path fill=\"currentColor\" d=\"M15.33 8.67h3.34V12h-3.34V8.67Zm0 6.66h3.34v10h-3.34v-10ZM17 .33a16.67 16.67 0 1 0 .01 33.35A16.67 16.67 0 0 0 17 .33Zm0 30A13.35 13.35 0 0 1 3.67 17C3.67 9.65 9.65 3.67 17 3.67S30.33 9.65 30.33 17 24.35 30.33 17 30.33Z\"></path></svg><p class=\"tna-message__message\">Please note this page references hunger strikes and force feeding, which some people may find upsetting.</p></div>",
+      "hidden": false
+    }
+  ]
 }
diff --git a/src/nationalarchives/components/pagination/fixtures.json b/src/nationalarchives/components/pagination/fixtures.json
@@ -1,4 +1,47 @@
 {
   "component": "pagination",
-  "fixtures": []
+  "fixtures": [
+    {
+      "name": "default",
+      "options": {
+        "previous": {
+          "href": "#"
+        },
+        "items": [
+          {
+            "number": 1,
+            "href": "#"
+          },
+          {
+            "ellipsis": true
+          },
+          {
+            "number": 6,
+            "href": "#"
+          },
+          {
+            "number": 7,
+            "current": true,
+            "href": "#"
+          },
+          {
+            "number": 8,
+            "href": "#"
+          },
+          {
+            "ellipsis": true
+          },
+          {
+            "number": 42,
+            "href": "#"
+          }
+        ],
+        "next": {
+          "href": "#"
+        }
+      },
+      "html": "<nav class=\"tna-pagination \" role=\"navigation\" aria-label=\"Pagination\"><div class=\"tna-pagination__prev\"><a href=\"#\" class=\"tna-button tna-button--icon-only-mobile\" rel=\"prev\"><i class=\"fa-solid fa-fw fa-arrow-left\" aria-hidden=\"true\"></i>Previous</a></div><ul class=\"tna-pagination__list\"><li class=\"tna-pagination__item\"><a href=\"#\" class=\"tna-button tna-pagination__link\" aria-label=\"\">1</a></li><li class=\"tna-pagination__item tna-pagination__item--ellipses\">&ctdot;</li><li class=\"tna-pagination__item\"><a href=\"#\" class=\"tna-button tna-pagination__link\" aria-label=\"\">6</a></li><li class=\"tna-pagination__item tna-pagination__item--current\"><a href=\"#\" class=\"tna-button tna-pagination__link tna-button--accent\" aria-label=\"\">7</a></li><li class=\"tna-pagination__item\"><a href=\"#\" class=\"tna-button tna-pagination__link\" aria-label=\"\">8</a></li><li class=\"tna-pagination__item tna-pagination__item--ellipses\">&ctdot;</li><li class=\"tna-pagination__item\"><a href=\"#\" class=\"tna-button tna-pagination__link\" aria-label=\"\">42</a></li></ul><div class=\"tna-pagination__next\"><a href=\"#\" class=\"tna-button tna-button--icon-right tna-button--icon-only-mobile\" rel=\"next\"><i class=\"fa-solid fa-fw fa-arrow-right\" aria-hidden=\"true\"></i>Next</a></div></nav>",
+      "hidden": false
+    }
+  ]
 }