From a6c52de45fdf82085d6a14d861aabf18492334e3 Mon Sep 17 00:00:00 2001
From: samwisekind <samuel.kindler@icloud.com>
Date: Sun, 10 Nov 2024 19:47:46 +0000
Subject: [PATCH 1/2] Update headings

---
 src/components/Hero/Hero.module.scss          | 12 +++++-----
 src/components/Hero/Hero.tsx                  |  4 ++--
 src/components/SEO/SEO.spec.tsx               |  1 +
 src/components/SEO/SEO.tsx                    |  3 +++
 src/layout/Footer.tsx                         |  6 ++---
 src/layout/Header.tsx                         | 24 +++++++++----------
 src/pages/404.tsx                             |  2 +-
 src/pages/500.tsx                             |  2 +-
 src/pages/index.module.scss                   |  4 ++--
 src/pages/index.tsx                           |  4 ++--
 src/pages/news/[slug].tsx                     |  1 +
 .../catalogues/bottlenose-dolphin/[slug].tsx  |  2 +-
 src/scss/layout/header.scss                   | 13 +++-------
 13 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/components/Hero/Hero.module.scss b/src/components/Hero/Hero.module.scss
index ed3956e..6bcf8f2 100644
--- a/src/components/Hero/Hero.module.scss
+++ b/src/components/Hero/Hero.module.scss
@@ -71,19 +71,19 @@
   max-width: variables.$global-max-width-wide;
 }
 
-.hero-container > h2,
-.hero-container > h3 {
+.hero-container > h1,
+.hero-container > h2 {
   margin: 0;
   padding: 0;
   color: variables.$global-color-background;
 }
 
-.hero-plain > .hero-container > h2,
-.hero-plain > .hero-container > h3 {
+.hero-plain > .hero-container > h1,
+.hero-plain > .hero-container > h2 {
   color: variables.$global-color-body;
 }
 
-.hero-container > h2 {
+.hero-container > h1 {
   font-size: 28px;
   line-height: 28px;
 
@@ -94,7 +94,7 @@
   }
 }
 
-.hero-container > h3 {
+.hero-container > h2 {
   font-size: 60px;
   line-height: 72px;
 
diff --git a/src/components/Hero/Hero.tsx b/src/components/Hero/Hero.tsx
index c034390..f9ff7f1 100644
--- a/src/components/Hero/Hero.tsx
+++ b/src/components/Hero/Hero.tsx
@@ -19,8 +19,8 @@ const Hero = ({
 }: Props) => (
   <div className={`${styles.hero} ${!background && styles['hero-no-image']} ${plain && styles['hero-plain']}`}>
     <div className={`${styles['hero-container']} ${wide ? styles.wide : ''}`}>
-      <h2>{subtitle}</h2>
-      {title && <h3>{title}</h3>}
+      <h1>{subtitle}</h1>
+      {title && <h2>{title}</h2>}
     </div>
     {background && (
       <Image
diff --git a/src/components/SEO/SEO.spec.tsx b/src/components/SEO/SEO.spec.tsx
index 5ffd83d..fe508aa 100644
--- a/src/components/SEO/SEO.spec.tsx
+++ b/src/components/SEO/SEO.spec.tsx
@@ -39,6 +39,7 @@ it('Renders SEO tags with optional props', async () => {
         title: 'Foo',
         path: '/hello/world',
       }}
+      type='article'
       images={[{
         url: 'foo.jpg',
         width: 100,
diff --git a/src/components/SEO/SEO.tsx b/src/components/SEO/SEO.tsx
index 3b832b6..7e1cfa1 100644
--- a/src/components/SEO/SEO.tsx
+++ b/src/components/SEO/SEO.tsx
@@ -17,6 +17,7 @@ import {
 
 interface Props {
   page: SitemapItem,
+  type?: 'website' | 'article',
   images?: Array<{
     url: string,
     width?: number,
@@ -28,6 +29,7 @@ interface Props {
 
 const SEO = ({
   page,
+  type = 'website',
   images = DEFAULT_SEO_IMAGE,
   breadcrumbs,
 }: Props) => {
@@ -49,6 +51,7 @@ const SEO = ({
         canonical={pageCanonicalURL}
         themeColor="#000000"
         openGraph={{
+          type,
           url: pageCanonicalURL,
           title,
           description,
diff --git a/src/layout/Footer.tsx b/src/layout/Footer.tsx
index e5c4add..bf5ea93 100644
--- a/src/layout/Footer.tsx
+++ b/src/layout/Footer.tsx
@@ -64,7 +64,7 @@ const Footer = () => (
                 <Link href="https://www.johnlewispartnership.co.uk/foundation0.html" rel="noopener noreferrer" target="_blank">
                   <Image
                     src="/images/footer/logo-jlp-foundation.svg"
-                    alt="John Lewis Partnership Foundation"
+                    alt="John Lewis Partnership Foundation logo"
                     width={144}
                     height={50}
                   />
@@ -74,7 +74,7 @@ const Footer = () => (
                 <Link href="https://www.bornfree.org.uk" rel="noopener noreferrer" target="_blank">
                   <Image
                     src="/images/footer/logo-born-free.svg"
-                    alt="Born Free UK"
+                    alt="Born Free UK logo"
                     width={142}
                     height={50}
                   />
@@ -84,7 +84,7 @@ const Footer = () => (
                 <Link href="https://www.landrover.com/explore-land-rover/responsibility/born-free-foundation.html" rel="noopener noreferrer" target="_blank">
                   <Image
                     src="/images/footer/logo-land-rover.svg"
-                    alt="Land Rover"
+                    alt="Land Rover logo"
                     width={95}
                     height={50}
                   />
diff --git a/src/layout/Header.tsx b/src/layout/Header.tsx
index 4e16e36..327623d 100644
--- a/src/layout/Header.tsx
+++ b/src/layout/Header.tsx
@@ -166,19 +166,17 @@ const Header = () => {
         <Link href={sitemap.stranded.path} className="stranding">Report A <br /> Stranding</Link>
       </div>
 
-      <h1>
-        <Link href={sitemap.home.path}>
-          <Image
-            src="/images/header/logo-header.png"
-            width={200}
-            height={200}
-            title="CRRU"
-            alt="CRRU"
-            priority
-            quality={100}
-          />
-        </Link>
-      </h1>
+      <Link href={sitemap.home.path} className="logo">
+        <Image
+          src="/images/header/logo-header.png"
+          width={200}
+          height={200}
+          title="CRRU"
+          alt="CRRU logo"
+          priority
+          quality={100}
+        />
+      </Link>
 
       <nav>
         <ul className="menu">
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index d7d9053..f5a7865 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -9,7 +9,7 @@ const Page: NextPage = () => (
     </Head>
 
     <article className="content">
-      <h3>Not Found</h3>
+      <h2>Not Found</h2>
       <p>The requested resource cannot be found (404).</p>
     </article>
   </>
diff --git a/src/pages/500.tsx b/src/pages/500.tsx
index 1f43a68..af9a908 100644
--- a/src/pages/500.tsx
+++ b/src/pages/500.tsx
@@ -9,7 +9,7 @@ const Page: NextPage = () => (
     </Head>
 
     <article className="content">
-      <h3>Error</h3>
+      <h2>Error</h2>
       <p>Internal Server Error (500).</p>
     </article>
   </>
diff --git a/src/pages/index.module.scss b/src/pages/index.module.scss
index 3a74ecc..a2bf1d5 100644
--- a/src/pages/index.module.scss
+++ b/src/pages/index.module.scss
@@ -39,7 +39,7 @@
     padding: 0 variables.$global-padding-small;
   }
 
-  h2 {
+  h1 {
     margin-bottom: variables.$global-spacing-large;
     font-family: variables.$global-font-primary;
     font-size: 48px;
@@ -359,7 +359,7 @@
   }
 }
 
-.news > h3 {
+.news > h2 {
   display: flex;
   margin-top: 0;
   align-items: center;
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 0e314aa..537d382 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -122,7 +122,7 @@ const Page: NextPage<PageProps> = ({
 
       <section className={styles.banner}>
         <div className={styles['banner-text']}>
-          <h2>Dedicated to the understanding, conservation and protection of cetaceans in Scottish waters</h2>
+          <h1>Dedicated to the understanding, conservation and protection of cetaceans in Scottish waters</h1>
           <Link href={sitemap.about.path} className={styles['banner-cta']}>
             Learn more
             <svg fill="none" width="64" height="64" viewBox="0 0 64 64">
@@ -180,7 +180,7 @@ const Page: NextPage<PageProps> = ({
       </section>
 
       <section className={styles.news}>
-        <h3>Latest News</h3>
+        <h2>Latest News</h2>
 
         <div className={styles['news-container']}>
           {newsArticles.map((item) => (
diff --git a/src/pages/news/[slug].tsx b/src/pages/news/[slug].tsx
index 031a4fe..6980b65 100644
--- a/src/pages/news/[slug].tsx
+++ b/src/pages/news/[slug].tsx
@@ -64,6 +64,7 @@ const Page: NextPage<PageProps> = ({
           description,
           path: pagePath,
         }}
+        type='article'
         images={[{
           url: image.url,
           width: image.width,
diff --git a/src/pages/research/catalogues/bottlenose-dolphin/[slug].tsx b/src/pages/research/catalogues/bottlenose-dolphin/[slug].tsx
index 2f15852..9180085 100644
--- a/src/pages/research/catalogues/bottlenose-dolphin/[slug].tsx
+++ b/src/pages/research/catalogues/bottlenose-dolphin/[slug].tsx
@@ -188,7 +188,7 @@ const Page: NextPage<PageProps> = ({
                           src={item.url}
                           width={item.width}
                           height={item.height}
-                          alt=""
+                          alt={`General photo of ${name}`}
                           className={styles.image}
                         />
                       </li>
diff --git a/src/scss/layout/header.scss b/src/scss/layout/header.scss
index d33c649..598d262 100644
--- a/src/scss/layout/header.scss
+++ b/src/scss/layout/header.scss
@@ -42,25 +42,18 @@ header {
 
 // Logo
 
-header > h1 {
+header > .logo {
   @extend %flex-center;
 
   z-index: 10;
   position: relative;
   margin-left: -10px;
+  padding: 10px;
   height: 100%;
 
   @include variables.breakpoint('small') {
     margin: 0 auto;
-  }
-
-  a {
-    padding: 10px;
-    height: 100%;
-
-    @include variables.breakpoint('small') {
-      padding: 5px;
-    }
+    padding: 5px;
   }
 
   img {

From c9fae37dc7c7f23f80f0c1361854a7eba25cd4a3 Mon Sep 17 00:00:00 2001
From: samwisekind <samuel.kindler@icloud.com>
Date: Sun, 10 Nov 2024 20:20:48 +0000
Subject: [PATCH 2/2] Update news

---
 src/helpers/getNews.spec.ts | 2 +-
 src/helpers/getNews.ts      | 6 +++---
 src/pages/news/index.tsx    | 2 +-
 src/pages/sitemap.xml.tsx   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/helpers/getNews.spec.ts b/src/helpers/getNews.spec.ts
index 7fe0027..62109f7 100644
--- a/src/helpers/getNews.spec.ts
+++ b/src/helpers/getNews.spec.ts
@@ -32,7 +32,7 @@ afterEach(() => {
   jest.clearAllMocks();
 });
 
-it('Queries new articlesit', async () => {
+it('Queries news articles', async () => {
   const result = await getNews({ limit: 12 });
 
   expect(contentfulDeliveryClient.getEntries).toHaveBeenCalledTimes(1);
diff --git a/src/helpers/getNews.ts b/src/helpers/getNews.ts
index b0c7fb9..2a92279 100644
--- a/src/helpers/getNews.ts
+++ b/src/helpers/getNews.ts
@@ -8,17 +8,17 @@ import { contentfulDeliveryClient } from './contentful';
 import { flattenImageAssetFields } from './flattenAssetFields';
 
 interface Options {
-  limit: number,
+  limit?: number,
 }
 
 /**
  * Queries and returns news articles entries from Contentful.
  * @param options Options.
- * @param options.limit Number of entries to query.
+ * @param [options.limit] Number of entries to query.
  * @returns News article entries.
  */
 const getNews = async ({
-  limit,
+  limit = 1000,
 }: Options): Promise<Array<NewsArticle>> => {
   const { items } = await contentfulDeliveryClient.getEntries<ContentTypeNews>({
     content_type: ContentTypes.NewsArticle,
diff --git a/src/pages/news/index.tsx b/src/pages/news/index.tsx
index 25eb3be..050e9e5 100644
--- a/src/pages/news/index.tsx
+++ b/src/pages/news/index.tsx
@@ -56,7 +56,7 @@ const Page: NextPage<PageProps> = ({
 );
 
 export const getServerSideProps: GetServerSideProps<PageProps> = async () => {
-  const data = await getNews({ limit: 12 });
+  const data = await getNews({ limit: 1000 });
 
   return {
     props: {
diff --git a/src/pages/sitemap.xml.tsx b/src/pages/sitemap.xml.tsx
index 81c0f01..8c1efe2 100644
--- a/src/pages/sitemap.xml.tsx
+++ b/src/pages/sitemap.xml.tsx
@@ -37,7 +37,7 @@ export const getServerSideProps: GetServerSideProps = async ({ res }) => {
   const additionalPages = [];
 
   if (species) {
-    additionalPages.push(...species.map(({ slug }) => `/species/${slug}`));
+    additionalPages.push(...species.map(({ slug }) => `/education/species/${slug}`));
   }
 
   if (news) {