diff --git a/components/BannerPartners.jsx b/components/BannerPartners.jsx index 99004edcf..c76ccddfe 100644 --- a/components/BannerPartners.jsx +++ b/components/BannerPartners.jsx @@ -2,47 +2,13 @@ import PartnersMap from "./PartnersMap"; import React from "react"; import getContentful from "lib/get-contentful"; import { useRouter } from "next/router"; +import useSamveraPartners from "hooks/use-samvera-partners"; export default function BannerPartners() { const router = useRouter(); const isHomePage = router.pathname === "/"; - const contentful = getContentful(); - const [entries, setEntries] = React.useState([]); - const partnersForMap = []; - - React.useEffect(() => { - async function fetchEntries() { - const entries = await contentful.getEntries({ - content_type: "samveraPartner", - }); - - if (!entries.items) { - return console.error("Error getting entries."); - } - - const sorted = entries.items.sort((a, b) => - a.fields.name.localeCompare(b.fields.name) - ); - setEntries(sorted); - } - - fetchEntries(); - }, [contentful]); - - for (const entry of entries) { - const { location } = entry.fields; - const { id } = entry.sys; - - if (location?.lat && location?.lon) { - partnersForMap.push({ - lat: location.lat, - lon: location.lon, - id, - name: entry.fields.name, - }); - } - } + const { partners } = useSamveraPartners(); return ( <> @@ -50,7 +16,7 @@ export default function BannerPartners() {

Samvera Partners

- {isHomePage && } + {isHomePage && } ); } diff --git a/components/PartnersMap.jsx b/components/PartnersMap.jsx index 7212e715f..f9eb67ed7 100644 --- a/components/PartnersMap.jsx +++ b/components/PartnersMap.jsx @@ -4,7 +4,7 @@ import React from "react"; const DEFAULT_CENTER = [38.907132, -77.036546]; const PartnersMap = ({ partners }) => { - if (partners.length === 0) return; + if (partners.length === 0) return null; return ( <> @@ -15,13 +15,18 @@ const PartnersMap = ({ partners }) => { url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" attribution='© OpenStreetMap contributors' /> - {partners.map((partner) => ( - - - {partner.name} - - - ))} + {partners.map(({ id, location, name }) => { + const hasLocation = location && location.lat && location.lon; + if (!hasLocation) return; + + return ( + + + {name} + + + ); + })} )} diff --git a/components/the-community/Partners.jsx b/components/the-community/Partners.jsx new file mode 100644 index 000000000..1d6e63376 --- /dev/null +++ b/components/the-community/Partners.jsx @@ -0,0 +1,52 @@ +import { useEffect, useState } from "react"; + +import Breadcrumbs from "components/Breadcrumbs"; +import Layout from "../layout/Layout"; +import Main from "components/layout/Main"; +import MarkdownContent from "components/MarkdownContent"; +import useSamveraPartners from "hooks/use-samvera-partners"; + +export default function SamveraPartners({ config, content, frontmatter }) { + const { partners } = useSamveraPartners(); + + return ( + + + +

{frontmatter.title}

+ +
+
    + {partners.map(({ id, name, url }) => ( +
  • + {!url && name} + {url && ( + + {name} + + )} +
    • + ))} +
+
+ + +
+ + ); +} diff --git a/hooks/use-samvera-partners.jsx b/hooks/use-samvera-partners.jsx new file mode 100644 index 000000000..61a3dafd0 --- /dev/null +++ b/hooks/use-samvera-partners.jsx @@ -0,0 +1,32 @@ +import { useEffect, useState } from "react"; + +import getContentful from "lib/get-contentful"; + +export default function useSamveraPartners() { + const contentful = getContentful(); + + const [partners, setPartners] = useState([]); + + useEffect(() => { + (async function init() { + const partners = await contentful.getEntries({ + content_type: "samveraPartner", + }); + + if (!partners.items) { + return console.error("Error getting partners."); + } + + const sorted = partners.items.sort((a, b) => + a.fields.name.localeCompare(b.fields.name) + ); + const groomedData = sorted.map((record) => ({ + ...record.fields, + id: record.sys.id, + })); + setPartners(groomedData); + })(); + }, [contentful]); + + return { partners }; +} diff --git a/markdown/the-community/samvera-partners.md b/markdown/the-community/samvera-partners.md index 9039bfa81..31a54fe3a 100644 --- a/markdown/the-community/samvera-partners.md +++ b/markdown/the-community/samvera-partners.md @@ -5,8 +5,9 @@ date: "2016-12-06" The Samvera Community is built around a core group of Partners committed to the success of the project and more importantly to the success of each other.  There are also many institutions and individuals that have formally committed to the sustainability of the Community through code contributions, participation in working or interest groups, helping with documentation, design, or planning.  No contribution is too small.  If you are interested in contributing to the Samvera Community or just interested in Samvera in general read more about the Community [here](https://samvera.org/hydra-partners/community-framework/). The number of Samvera Partners has grown steadily worldwide. - + +
The Hydra Project, Samvera's original name, was founded in 2008 by: - Stanford University @@ -20,35 +21,4 @@ quickly augmented by: The three founding universities are still very active and, together with Data Curation Experts, continue to contribute to the work of the Samvera Community.  DuraSpace withdrew from formal Partnership in 2020 following their merger with Lyrasis but is still active in supporting the Community. -Additional Partners have formally committed themselves to support and further Samvera’s work.  In order of Partnership: - -- Northwestern University -- Columbia University -- Penn State University -- Indiana University -- GBH Archives -- Boston Public Library -- Duke University -- Yale University -- University of Cincinnati -- Princeton University Library -- Cornell University -- University of Oregon -- Oregon State University -- Tufts University -- University of Michigan -- University of California, San Diego -- Lafayette College -- Washington University in St Louis -- Digital Repository of Ireland -- University of California, Santa Barbara -- University of Houston Libraries -- Emory University -- CoSector, University of London -- Ubiquity Press -- University of Utah -- Software Services by Scientist.com -- Hyku for Consortia (PALNI & PALCI) -- El Colegio de Mexico - -…and further institutions are working with Samvera and its components.  Many of them are listed on our '[Samvera adopters](https://samvera.org/samvera-adopters/)' page. +Additional Partners have formally committed themselves to support and further Samvera’s work. Further institutions are working with Samvera and its components.  Many of them are listed on our '[Samvera adopters](https://samvera.org/samvera-adopters/)' page. diff --git a/pages/the-community/[slug].jsx b/pages/the-community/[slug].jsx index 717ab93af..60dfcbce1 100644 --- a/pages/the-community/[slug].jsx +++ b/pages/the-community/[slug].jsx @@ -3,6 +3,7 @@ import { getMarkdownPageContent, getPaths } from "lib/markdown-helpers"; import CommunityLeadership from "components/the-community/CommunityLeadership"; import DynamicPage from "components/layout/DynamicPage"; import Faq from "components/the-community/Faq"; +import SamveraPartners from "components/the-community/Partners"; import ServiceProviders from "components/the-community/ServiceProviders"; import UserProfilesPage from "components/the-community/UserProfiles"; import { buildWorkOpenGraphData } from "lib/open-graph"; @@ -35,6 +36,17 @@ export default function TheCommunityPage({ content, frontmatter, slug }) { return ; } + // Samvera Partners + if (slug === "samvera-partners") { + return ( + + ); + } + // Service Providers if (slug === "service-providers") { return ( diff --git a/styles/global.css b/styles/global.css index 9304bfde3..aaad697d4 100644 --- a/styles/global.css +++ b/styles/global.css @@ -55,6 +55,10 @@ strong { @apply font-fontinBold; } +hr { + @apply my-8; +} + .ul-disc { @apply ml-4 list-disc; }