diff --git a/src/api/strapi.ts b/src/api/strapi.ts index d77be94..f4776eb 100644 --- a/src/api/strapi.ts +++ b/src/api/strapi.ts @@ -28,7 +28,7 @@ export const getArticles = async (locale: TLocales) => { const articleUrl = `${process.env.NEXT_PUBLIC_STRAPI}/api/articles?locale=${currentLocale} &populate[coverImage]=* &populate[footerImage]=* -&populate[OGTags][populate]=ogImage`; +&populate[OGTags][populate]=ogImage&pagination[pageSize]=50`; const articles: TArticle[] = await fetch(articleUrl) .then(resp => resp.json()) .then(json => json?.data || []); diff --git a/src/components/longevity/LongevitySubSection/LongevitySubSection.module.scss b/src/components/longevity/LongevitySubSection/LongevitySubSection.module.scss index d0978a0..1c55dd1 100644 --- a/src/components/longevity/LongevitySubSection/LongevitySubSection.module.scss +++ b/src/components/longevity/LongevitySubSection/LongevitySubSection.module.scss @@ -134,6 +134,16 @@ } } } + .foodChoicesContent { + p:first-child { + margin-bottom: 10px; + } + img { + width: 16px; + margin-bottom: -2px; + height: 16px; + } + } } } diff --git a/src/components/longevity/LongevitySubSection/LongevitySubSection.tsx b/src/components/longevity/LongevitySubSection/LongevitySubSection.tsx index 61ecbae..d2411d7 100644 --- a/src/components/longevity/LongevitySubSection/LongevitySubSection.tsx +++ b/src/components/longevity/LongevitySubSection/LongevitySubSection.tsx @@ -26,6 +26,7 @@ const LongevitySubSection: FC = ({ date, isHacks, damageTypeHeadline, + isFoodChoices, }) => { const { habitTooltipTitle } = longevityData[locale]; const isMobile = useIsWidthLessThan(956); @@ -96,7 +97,9 @@ const LongevitySubSection: FC = ({ {description ? (
) : (
{children}
diff --git a/src/components/longevity/LongevitySubSection/LongevitySubSection.types.ts b/src/components/longevity/LongevitySubSection/LongevitySubSection.types.ts index 8a4a519..27b281d 100644 --- a/src/components/longevity/LongevitySubSection/LongevitySubSection.types.ts +++ b/src/components/longevity/LongevitySubSection/LongevitySubSection.types.ts @@ -8,4 +8,5 @@ export type LongevitySubSectionProps = { date?: string; isHacks?: boolean; damageTypeHeadline?: string; + isFoodChoices?: boolean; }; diff --git a/src/components/longevity/MobileNavigation/MobileNavigation.tsx b/src/components/longevity/MobileNavigation/MobileNavigation.tsx index 929fdd0..7045e78 100644 --- a/src/components/longevity/MobileNavigation/MobileNavigation.tsx +++ b/src/components/longevity/MobileNavigation/MobileNavigation.tsx @@ -254,7 +254,7 @@ const MobileNavigation: FC = () => { onClick={() => nextPathname && router.push(nextPathname.path)} > {nextBtn}{' '} - {nextPathname.name} + {nextPathname?.name} ); diff --git a/src/layouts/DietLayout/DietLayout.tsx b/src/layouts/DietLayout/DietLayout.tsx index c8e6fbd..04a74c6 100644 --- a/src/layouts/DietLayout/DietLayout.tsx +++ b/src/layouts/DietLayout/DietLayout.tsx @@ -167,6 +167,7 @@ const DietLayout: FC = ({ locale, data }) => { />