@@ -46,9 +46,9 @@ function SongsAndStoriesList({
)
}
-const { func, object, string } = PropTypes
+const { func, object } = PropTypes
SongsAndStoriesList.propTypes = {
- pluralDocType: string,
+ labels: object,
items: object,
handleItemClick: func,
showNoResultsMessage: func,
diff --git a/src/components/SongsAndStories/SongsAndStoriesPresentation.js b/src/components/SongsAndStories/SongsAndStoriesPresentation.js
index 8e5da90a..07a5ccf3 100644
--- a/src/components/SongsAndStories/SongsAndStoriesPresentation.js
+++ b/src/components/SongsAndStories/SongsAndStoriesPresentation.js
@@ -3,8 +3,6 @@ import PropTypes from 'prop-types'
import { useNavigate } from 'react-router-dom'
// FPCC
-import { makePlural } from 'common/utils/urlHelpers'
-
import Drawer from 'components/Drawer'
import GridListToggle from 'components/GridListToggle'
import SectionTitle from 'components/SectionTitle'
@@ -12,21 +10,17 @@ import Song from 'components/Song'
import Story from 'components/Story'
import SongsAndStoriesGrid from 'components/SongsAndStories/SongsAndStoriesGrid'
import SongsAndStoriesList from 'components/SongsAndStories/SongsAndStoriesList'
-import { TYPE_SONG } from 'common/constants'
function SongsAndStoriesPresentation({
- searchType,
infiniteScroll,
items,
kids,
+ labels,
loadRef,
sitename,
}) {
- const type = searchType.toLowerCase()
- const accentColor = type === TYPE_SONG ? 'song-color-900' : 'story-color-900'
- const pluralDocType = makePlural(searchType)
+ const accentColor = labels?.textColor
const [isGridView, setIsGridView] = useState(true)
-
const [drawerOpen, setDrawerOpen] = useState(false)
const [selectedItem, setSelectedItem] = useState({})
const { isFetchingNextPage, fetchNextPage, hasNextPage, loadButtonLabel } =
@@ -46,11 +40,7 @@ function SongsAndStoriesPresentation({
function handleItemClick(item) {
if (window.innerWidth < 768 || kids) {
- navigate(
- `/${sitename}/${kids ? 'kids/' : ''}${makePlural(item?.type)}/${
- item?.id
- }`,
- )
+ navigate(`/${sitename}/${kids ? 'kids/' : ''}${labels?.slug}/${item?.id}`)
}
setSelectedItem(item)
setDrawerOpen(true)
@@ -61,7 +51,7 @@ function SongsAndStoriesPresentation({
!page.results?.length && (
- No {makePlural(type)} have been added to this site yet!
+ No {labels?.lowercase} have been added to this site yet!
)
@@ -76,7 +66,7 @@ function SongsAndStoriesPresentation({
>
@@ -103,13 +93,13 @@ function SongsAndStoriesPresentation({
)}
{isGridView
? SongsAndStoriesGrid({
- pluralDocType,
+ labels,
items,
showNoResultsMessage,
handleItemClick,
})
: SongsAndStoriesList({
- pluralDocType,
+ labels,
items,
showNoResultsMessage,
handleItemClick,
@@ -137,9 +127,7 @@ function SongsAndStoriesPresentation({
maxWidth="max-w-lg"
fullScreenPath={
selectedItem?.type
- ? `/${sitename}/${makePlural(selectedItem?.type)}/${
- selectedItem?.id
- }`
+ ? `/${sitename}/${labels?.slug}/${selectedItem?.id}`
: null
}
>
@@ -151,10 +139,10 @@ function SongsAndStoriesPresentation({
// PROPTYPES
const { bool, object, string } = PropTypes
SongsAndStoriesPresentation.propTypes = {
- searchType: string,
infiniteScroll: object,
items: object,
kids: bool,
+ labels: object,
loadRef: object,
sitename: string,
}
diff --git a/src/components/Story/StoryPresentation.js b/src/components/Story/StoryPresentation.js
index 0e7c4d4e..f0b05588 100644
--- a/src/components/Story/StoryPresentation.js
+++ b/src/components/Story/StoryPresentation.js
@@ -7,6 +7,7 @@ import LazyLoader from 'components/LazyLoader'
import WysiwygBlock from 'components/WysiwygBlock'
import { IMAGE, VIDEO, VIDEO_LINK, MEDIUM, ORIGINAL } from 'common/constants'
import { getMediaPath } from 'common/utils/mediaHelpers'
+import SiteDocHead from 'components/SiteDocHead'
function StoryPresentation({ entry }) {
const coverMedia = entry?.coverVisual?.entry
@@ -18,6 +19,7 @@ function StoryPresentation({ entry }) {
return (
+
{/* Cover with image */}
{entry?.coverVisual?.type === IMAGE && (
diff --git a/src/components/Support/Support.js b/src/components/Support/Support.js
index 6df7f1a6..79df9a14 100644
--- a/src/components/Support/Support.js
+++ b/src/components/Support/Support.js
@@ -1,5 +1,8 @@
import React from 'react'
+
+// FPCC
import SectionTitle from 'components/SectionTitle'
+import DocHead from 'components/DocHead'
function Support() {
const headerStyle = 'text-xl font-bold mb-1 mt-4'
@@ -9,10 +12,8 @@ function Support() {
'flex ring ring-scarlet-800 rounded-lg p-2 text-white bg-scarlet-800 w-full'
return (
-