From 0c1463a413dfc823a8aa80cf510e4318c2533868 Mon Sep 17 00:00:00 2001 From: Calum Muir Date: Thu, 25 Dec 2025 23:01:14 +0000 Subject: [PATCH] Update routes and hero buttons --- client/public/sitemap.xml | 12 +- client/src/App.tsx | 8 +- client/src/components/SiteFooter.tsx | 4 - .../content/news/2024-06-volunteers-summer.md | 2 +- client/src/pages/About.tsx | 4 +- client/src/pages/Accessibility.tsx | 4 +- client/src/pages/Contact.tsx | 18 +- client/src/pages/Desktop.tsx | 6 +- client/src/pages/Facebook.tsx | 18 +- client/src/pages/News.tsx | 24 +- client/src/pages/NewsArticle.tsx | 10 +- client/src/pages/Privacy.tsx | 4 +- client/src/pages/Safeguarding.tsx | 247 ------------------ client/src/pages/SupportUs.tsx | 12 +- 14 files changed, 75 insertions(+), 298 deletions(-) delete mode 100644 client/src/pages/Safeguarding.tsx diff --git a/client/public/sitemap.xml b/client/public/sitemap.xml index d962077..84be2c0 100644 --- a/client/public/sitemap.xml +++ b/client/public/sitemap.xml @@ -7,22 +7,22 @@ https://highlandgrouprda.org.uk/about - https://highlandgrouprda.org.uk/news + https://highlandgrouprda.org.uk/events - https://highlandgrouprda.org.uk/news/volunteers-summer-2024 + https://highlandgrouprda.org.uk/events/volunteers-summer-2024 - https://highlandgrouprda.org.uk/news/summer-awards-2024 + https://highlandgrouprda.org.uk/events/summer-awards-2024 - https://highlandgrouprda.org.uk/news/race-night + https://highlandgrouprda.org.uk/events/race-night - https://highlandgrouprda.org.uk/news/important-news + https://highlandgrouprda.org.uk/events/important-news - https://highlandgrouprda.org.uk/support + https://highlandgrouprda.org.uk/support-us https://highlandgrouprda.org.uk/contact diff --git a/client/src/App.tsx b/client/src/App.tsx index 0247544..5c4bb30 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -14,7 +14,6 @@ import { Privacy } from "@/pages/Privacy"; import { NewsArticle } from "@/pages/NewsArticle"; import { Facebook } from "@/pages/Facebook"; import { Accessibility } from "@/pages/Accessibility"; -import { Safeguarding } from "@/pages/Safeguarding"; function Router() { return ( @@ -22,12 +21,11 @@ function Router() { {/* Add pages below */} - - + + - - + {/* Fallback to 404 */} diff --git a/client/src/components/SiteFooter.tsx b/client/src/components/SiteFooter.tsx index bb18b3e..6407be7 100644 --- a/client/src/components/SiteFooter.tsx +++ b/client/src/components/SiteFooter.tsx @@ -47,10 +47,6 @@ export const SiteFooter = ({ Privacy Policy {" "} ·{" "} - - Safeguarding - {" "} - ·{" "} Accessibility diff --git a/client/src/content/news/2024-06-volunteers-summer.md b/client/src/content/news/2024-06-volunteers-summer.md index 52c2bae..3eba01a 100644 --- a/client/src/content/news/2024-06-volunteers-summer.md +++ b/client/src/content/news/2024-06-volunteers-summer.md @@ -5,4 +5,4 @@ summary: "Volunteers summer 2024" image: "/Vols5-2880w-1024x768.avif" slug: "volunteers-summer-2024" --- -We welcomed a group of our volunteers to the centre for a catch up and discussion about upcoming events. It’s always great to get together! Find out how you can help out by **[Volunteering for us](/support)**. +We welcomed a group of our volunteers to the centre for a catch up and discussion about upcoming events. It’s always great to get together! Find out how you can help out by **[Volunteering for us](/support-us)**. diff --git a/client/src/pages/About.tsx b/client/src/pages/About.tsx index b5beb0a..98b366c 100644 --- a/client/src/pages/About.tsx +++ b/client/src/pages/About.tsx @@ -6,8 +6,8 @@ import { usePageMeta } from "@/lib/seo"; const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; diff --git a/client/src/pages/Accessibility.tsx b/client/src/pages/Accessibility.tsx index 89b1f8e..e2d6d76 100644 --- a/client/src/pages/Accessibility.tsx +++ b/client/src/pages/Accessibility.tsx @@ -6,8 +6,8 @@ import { usePageMeta } from "@/lib/seo"; const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; diff --git a/client/src/pages/Contact.tsx b/client/src/pages/Contact.tsx index 530ee80..dc1d594 100644 --- a/client/src/pages/Contact.tsx +++ b/client/src/pages/Contact.tsx @@ -12,8 +12,8 @@ declare global { const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; @@ -110,7 +110,7 @@ export const Contact = (): JSX.Element => { theme="dark" className="px-6 sm:px-4" /> -
+

Get in touch @@ -127,6 +127,18 @@ export const Contact = (): JSX.Element => {

+ + Donate via JustGiving +
diff --git a/client/src/pages/Desktop.tsx b/client/src/pages/Desktop.tsx index 8ae08ac..f681b25 100644 --- a/client/src/pages/Desktop.tsx +++ b/client/src/pages/Desktop.tsx @@ -7,8 +7,8 @@ import { usePageMeta } from "@/lib/seo"; const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; @@ -23,7 +23,7 @@ const cardData = [ title: "Support Us", imageUrl: "/support-640.webp", imageSrcSet: "/support-640.webp 640w, /support-960.webp 960w", - href: "/support", + href: "/support-us", }, { title: "Contact", diff --git a/client/src/pages/Facebook.tsx b/client/src/pages/Facebook.tsx index 5973c4f..dbe1b87 100644 --- a/client/src/pages/Facebook.tsx +++ b/client/src/pages/Facebook.tsx @@ -6,8 +6,8 @@ import { usePageMeta } from "@/lib/seo"; const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; @@ -42,7 +42,7 @@ export const Facebook = (): JSX.Element => { className="px-6 sm:px-4" facebookHref={facebookPageUrl} /> -
+

Social @@ -57,6 +57,18 @@ export const Facebook = (): JSX.Element => {

+ + Donate via JustGiving +
diff --git a/client/src/pages/News.tsx b/client/src/pages/News.tsx index 65ee00f..7df8a3b 100644 --- a/client/src/pages/News.tsx +++ b/client/src/pages/News.tsx @@ -7,15 +7,15 @@ import { usePageMeta } from "@/lib/seo"; const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; export const News = (): JSX.Element => { usePageMeta({ title: "News", - path: "/news", + path: "/events", description: "News, events, and updates from Highland Group RDA and our community.", }); @@ -35,7 +35,7 @@ export const News = (): JSX.Element => { theme="dark" className="px-6 sm:px-4" /> -
+

Latest News @@ -51,6 +51,18 @@ export const News = (): JSX.Element => {

+ + Donate via JustGiving +
@@ -77,7 +89,7 @@ export const News = (): JSX.Element => {

{item.title} @@ -87,7 +99,7 @@ export const News = (): JSX.Element => {

Read more diff --git a/client/src/pages/NewsArticle.tsx b/client/src/pages/NewsArticle.tsx index 2b1f6ad..e962c68 100644 --- a/client/src/pages/NewsArticle.tsx +++ b/client/src/pages/NewsArticle.tsx @@ -9,13 +9,13 @@ import NotFound from "@/pages/not-found"; const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; export const NewsArticle = (): JSX.Element => { - const [, params] = useRoute("/news/:slug"); + const [, params] = useRoute("/events/:slug"); const article = getNewsArticle(params?.slug ?? ""); if (!article) { @@ -24,7 +24,7 @@ export const NewsArticle = (): JSX.Element => { usePageMeta({ title: article.title, - path: `/news/${article.slug}`, + path: `/events/${article.slug}`, description: article.summary, image: article.image, }); @@ -73,7 +73,7 @@ export const NewsArticle = (): JSX.Element => {
Back to news diff --git a/client/src/pages/Privacy.tsx b/client/src/pages/Privacy.tsx index 2b8029a..7e5bb7a 100644 --- a/client/src/pages/Privacy.tsx +++ b/client/src/pages/Privacy.tsx @@ -6,8 +6,8 @@ import { usePageMeta } from "@/lib/seo"; const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; diff --git a/client/src/pages/Safeguarding.tsx b/client/src/pages/Safeguarding.tsx deleted file mode 100644 index 9fc6d29..0000000 --- a/client/src/pages/Safeguarding.tsx +++ /dev/null @@ -1,247 +0,0 @@ -import React from "react"; -import { SiteHeader } from "@/components/SiteHeader"; -import { SiteFooter } from "@/components/SiteFooter"; -import { usePageMeta } from "@/lib/seo"; - -const navigationItems = [ - { label: "Home", href: "/" }, - { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, - { label: "Contact", href: "/contact" }, -]; - -export const Safeguarding = (): JSX.Element => { - usePageMeta({ - title: "Safeguarding", - path: "/safeguarding", - description: - "Safeguarding policy and commitment for Highland Group RDA.", - }); - - return ( -
-
-
-
- -

- Safeguarding -

-

- Safeguarding -

- -

- Our commitment -

-

- Highland Group RDA is fully committed to - safeguarding and promoting the welfare of children, - young people, and vulnerable adults who take part in - our activities. -

-

- Everyone involved with the group has a - responsibility to help create a safe, supportive, - and respectful environment. -

-

- Safeguarding is always a priority and underpins - everything we do. -

- -

- What safeguarding means to us -

-

- Safeguarding means: -

-
    -
  • - Protecting people from harm, abuse, or neglect -
    • -
  • - Ensuring participants feel safe, listened to, - and respected -
    • -
  • - Acting promptly and appropriately if concerns - arise -
    • -
  • - Creating an environment where concerns can be - raised without fear -
    • -
-

- This applies to all participants, whether children - or adults, and to everyone involved in the group. -

- -

- Who this applies to -

-

- Our safeguarding approach applies to: -

-
    -
  • Participants
    • -
  • Parents and carers
    • -
  • Volunteers
    • -
  • Coaches and instructors
    • -
  • Trustees and committee members
    • -
  • - Anyone working with or on behalf of Highland - Group RDA -
    • -
- -

- How we keep people safe -

-

- Behind the scenes, we take safeguarding seriously - by: -

-
    -
  • - Following RDA UK safeguarding policies and - guidance -
    • -
  • - Ensuring appropriate checks (including DBS/PVG - where required) -
    • -
  • - Providing safeguarding awareness and guidance to - volunteers and staff -
    • -
  • - Maintaining clear boundaries and codes of - conduct -
    • -
  • - Ensuring activities are supervised and - risk-assessed -
    • -
  • - Handling personal and sensitive information - confidentially -
    • -
-

- From a participant’s point of view, this means - activities are delivered in a calm, structured, and - supportive way. -

- -

- Recognising concerns -

-

- A safeguarding concern may include: -

-
    -
  • - A disclosure from a child, young person, or - adult at risk -
    • -
  • A change in behaviour that causes concern
    • -
  • Something observed or overheard
    • -
  • - A situation where someone feels unsafe or - uncomfortable -
    • -
-

- All concerns are taken seriously. -

- -

- Reporting a safeguarding concern -

-

- If you have a safeguarding concern about someone - involved with Highland Group RDA: -

-
    -
  • Report it as soon as possible
    • -
  • - Speak to a coach, trustee, or safeguarding lead -
    • -
  • - You can also contact us confidentially by email -
    • -
-

- Email: info@highlandgrouprda.org.uk -

-

- If someone is in immediate danger, contact the - emergency services straight away. -

- -

- What happens next -

-

- When a concern is raised: -

-
    -
  • - It will be listened to carefully and - respectfully -
    • -
  • - Information will be shared only on a - need-to-know basis -
    • -
  • - Appropriate action will be taken in line with - RDA UK guidance -
    • -
  • - The safety and wellbeing of the individual will - always come first -
    • -
-

- Safeguarding concerns are never ignored or - dismissed. -

- -

- Photography and media -

-

- Photographs or videos are only taken with - appropriate consent and are used responsibly. -

-

- Images are never shared in a way that could place - someone at risk. -

- -

- Policy and review -

-

- Our safeguarding arrangements are reviewed regularly - to ensure they remain effective and appropriate. -

-

- This page reflects our ongoing commitment to - providing a safe environment for everyone involved - in Highland Group RDA. -

-
-
- -
-
- ); -}; diff --git a/client/src/pages/SupportUs.tsx b/client/src/pages/SupportUs.tsx index 1298f1d..8be3734 100644 --- a/client/src/pages/SupportUs.tsx +++ b/client/src/pages/SupportUs.tsx @@ -6,15 +6,15 @@ import { usePageMeta } from "@/lib/seo"; const navigationItems = [ { label: "Home", href: "/" }, { label: "About", href: "/about" }, - { label: "News", href: "/news" }, - { label: "Support Us", href: "/support" }, + { label: "News", href: "/events" }, + { label: "Support Us", href: "/support-us" }, { label: "Contact", href: "/contact" }, ]; export const SupportUs = (): JSX.Element => { usePageMeta({ title: "Support Us", - path: "/support", + path: "/support-us", description: "Support Highland Group RDA through donations, volunteering, and fundraising.", }); @@ -90,12 +90,6 @@ export const SupportUs = (): JSX.Element => {
-
-
-
-
-
-