Merge pull request #173 from wearefuturegov/develop

staging deployment
wearefuturegov · Nov 19, 2024 · 4893ce7 · 4893ce7
2 parents 82e1ce3 + be5fe1c
commit 4893ce7
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 3 deletions.
diff --git a/src/components/DetailDialog/ScheduleTable.jsx b/src/components/DetailDialog/ScheduleTable.jsx
@@ -75,7 +75,7 @@ const ScheduleTable = ({ title, subtitle, regular_schedules }) => {
   const EventTimes = () => (
     <List>
       {event_times.map((sched, i) => (
-        <ListItem>{sched.description}</ListItem>
+        <ListItem key={i}>{sched.description}</ListItem>
       ))}
     </List>
   )

diff --git a/src/components/DetailDialog/index.jsx b/src/components/DetailDialog/index.jsx
@@ -326,6 +326,12 @@ const DetailDialog = ({ serviceId, location, navigate }) => {
               />
             </Body>
           )}
+
+          {theme.DetailDialogExtra && (
+            <Body>
+              <theme.DetailDialogExtra service={service} />
+            </Body>
+          )}
           <Body>
             {service.hasOwnProperty("service_at_locations") &&
               service.service_at_locations.length === 1 &&

diff --git a/src/components/FamilyHubsNetwork/FamilyHubsNetworkLogo.jsx b/src/components/FamilyHubsNetwork/FamilyHubsNetworkLogo.jsx
@@ -0,0 +1,34 @@
+import React from "react"
+import styled from "styled-components"
+import text from "./family-hubs-text.png"
+import { Crosshead } from "../DetailDialog/DetailDialog.styles"
+
+const FamilyHubsNetwork = styled(Crosshead)`
+  &:before {
+    content: "";
+    display: inline-block;
+    margin-right: 8px;
+    width: 307px;
+    height: 50px;
+    background-image: url(${text});
+    background-size: cover;
+    background-position: center;
+  }
+  > span {
+    clip: rect(0 0 0 0);
+    clip-path: inset(50%);
+    height: 1px;
+    overflow: hidden;
+    position: absolute;
+    white-space: nowrap;
+    width: 1px;
+  }
+`
+
+export const FamilyHubsNetworkLogo = () => {
+  return (
+    <FamilyHubsNetwork>
+      <span>Part of Family Hub Network</span>
+    </FamilyHubsNetwork>
+  )
+}
diff --git a/src/components/FamilyHubsNetwork/index.js b/src/components/FamilyHubsNetwork/index.js
@@ -1 +1,2 @@
 export * from "./FamilyHubsNetworkTag"
+export * from "./FamilyHubsNetworkLogo"
diff --git a/src/components/Filter/index.jsx b/src/components/Filter/index.jsx
@@ -71,7 +71,6 @@ const Filter = ({
       }
     } else {
       if (isMeta) {
-        console.log(meta, value)
         setMeta(selection.filter(el => el !== value))
       } else {
         setSelection(selection.filter(el => el !== value))

diff --git a/src/themes/bfis/vars_bfis.jsx b/src/themes/bfis/vars_bfis.jsx
@@ -4,7 +4,10 @@ import logo from "./logo.svg"
 import * as Styles from "../../components/Footer/Footer.styles"
 import ResponsiveSentence from "../../components/ResponsiveSentence"
 import { AStrong } from "../../components/A"
-import { FamilyHubsNetworkTag } from "../../components/FamilyHubsNetwork"
+import {
+  FamilyHubsNetworkTag,
+  FamilyHubsNetworkLogo,
+} from "../../components/FamilyHubsNetwork"
 
 export const vars_bfis = {
   slug: "bfis",
@@ -198,6 +201,24 @@ export const vars_bfis = {
         .length > 0
     return <>{isFamilyHub && <FamilyHubsNetworkTag />}</>
   },
+  DetailDialogExtra: ({ service }) => {
+    if (service.meta?.some(m => m.key === "family-hub")) {
+      return (
+        <>
+          <FamilyHubsNetworkLogo />
+          <p>
+            The Family Hub network helps families with babies, children, and
+            young people from birth until they turn 19 (or up to 25 for those
+            with special educational needs and disabilities). As part of the
+            Family Hub Network in Buckinghamshire, we are committed to making it
+            easier for families to get the help and support they need.
+          </p>
+        </>
+      )
+    } else {
+      return <></>
+    }
+  },
 }
 
 export default vars_bfis
diff --git a/src/themes/theme_generator.jsx b/src/themes/theme_generator.jsx
@@ -91,6 +91,7 @@ const generate_theme = (vars, theme_vars) => {
     headerComponentsBeforeSearch:
       vars.headerComponentsBeforeSearch ?? vars.headerComponentsBeforeSearch,
     ServiceCardFooter: vars.ServiceCardFooter ?? vars.ServiceCardFooter,
+    DetailDialogExtra: vars.DetailDialogExtra ?? vars.DetailDialogExtra,
     cookiesDisabledMessage: vars.cookiesDisabledMessage,
     cookieMessage: vars.cookieMessage,
     cookieName: vars.cookieName,
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from "./FamilyHubsNetworkTag"
		export * from "./FamilyHubsNetworkLogo"