diff --git a/public/keepsimple_/assets/longevity/diet/diet-results-ru.png b/public/keepsimple_/assets/longevity/diet/diet-results-ru.png new file mode 100644 index 0000000..8e5ec65 Binary files /dev/null and b/public/keepsimple_/assets/longevity/diet/diet-results-ru.png differ diff --git a/public/keepsimple_/assets/longevity/diet/diet-results.png b/public/keepsimple_/assets/longevity/diet/diet-results.png index 732c754..bcf87d0 100644 Binary files a/public/keepsimple_/assets/longevity/diet/diet-results.png and b/public/keepsimple_/assets/longevity/diet/diet-results.png differ diff --git a/public/keepsimple_/assets/longevity/diet/diet-smoke-and-drink-results-ru.png b/public/keepsimple_/assets/longevity/diet/diet-smoke-and-drink-results-ru.png new file mode 100644 index 0000000..4eefbb7 Binary files /dev/null and b/public/keepsimple_/assets/longevity/diet/diet-smoke-and-drink-results-ru.png differ diff --git a/public/keepsimple_/assets/longevity/diet/diet-smoke-and-drink-results.png b/public/keepsimple_/assets/longevity/diet/diet-smoke-and-drink-results.png index 289a068..5632a83 100644 Binary files a/public/keepsimple_/assets/longevity/diet/diet-smoke-and-drink-results.png and b/public/keepsimple_/assets/longevity/diet/diet-smoke-and-drink-results.png differ diff --git a/public/keepsimple_/assets/longevity/img.png b/public/keepsimple_/assets/longevity/img.png new file mode 100644 index 0000000..bcf87d0 Binary files /dev/null and b/public/keepsimple_/assets/longevity/img.png differ diff --git a/public/keepsimple_/assets/longevity/img_1.png b/public/keepsimple_/assets/longevity/img_1.png new file mode 100644 index 0000000..bcf87d0 Binary files /dev/null and b/public/keepsimple_/assets/longevity/img_1.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/book-notes-ru-mobile.png b/public/keepsimple_/assets/longevity/study/charts/book-notes-ru-mobile.png new file mode 100644 index 0000000..02863e0 Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/book-notes-ru-mobile.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/book-notes-ru.png b/public/keepsimple_/assets/longevity/study/charts/book-notes-ru.png new file mode 100644 index 0000000..626c03b Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/book-notes-ru.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/daily-work-ru-mobile.png b/public/keepsimple_/assets/longevity/study/charts/daily-work-ru-mobile.png new file mode 100644 index 0000000..9ccb92c Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/daily-work-ru-mobile.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/daily-work-ru.png b/public/keepsimple_/assets/longevity/study/charts/daily-work-ru.png new file mode 100644 index 0000000..9c45e55 Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/daily-work-ru.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/data-ru-mobile.png b/public/keepsimple_/assets/longevity/study/charts/data-ru-mobile.png new file mode 100644 index 0000000..2aab7ad Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/data-ru-mobile.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/data-ru.png b/public/keepsimple_/assets/longevity/study/charts/data-ru.png new file mode 100644 index 0000000..a9d35f3 Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/data-ru.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/research-tasks-ru-mobile.png b/public/keepsimple_/assets/longevity/study/charts/research-tasks-ru-mobile.png new file mode 100644 index 0000000..162347b Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/research-tasks-ru-mobile.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/research-tasks-ru.png b/public/keepsimple_/assets/longevity/study/charts/research-tasks-ru.png new file mode 100644 index 0000000..6223c50 Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/research-tasks-ru.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/what-to-read-ru-mobile.png b/public/keepsimple_/assets/longevity/study/charts/what-to-read-ru-mobile.png new file mode 100644 index 0000000..580bca9 Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/what-to-read-ru-mobile.png differ diff --git a/public/keepsimple_/assets/longevity/study/charts/what-to-read-ru.png b/public/keepsimple_/assets/longevity/study/charts/what-to-read-ru.png new file mode 100644 index 0000000..dc9f84f Binary files /dev/null and b/public/keepsimple_/assets/longevity/study/charts/what-to-read-ru.png differ diff --git a/public/keepsimple_/assets/longevity/workout/weekly-workout/2.png b/public/keepsimple_/assets/longevity/workout/weekly-workout/2.png index 8f1242f..7a5e497 100644 Binary files a/public/keepsimple_/assets/longevity/workout/weekly-workout/2.png and b/public/keepsimple_/assets/longevity/workout/weekly-workout/2.png differ diff --git a/src/api/longevity/what-is-this.ts b/src/api/longevity/about-project.ts similarity index 81% rename from src/api/longevity/what-is-this.ts rename to src/api/longevity/about-project.ts index 4854906..05fb7ba 100644 --- a/src/api/longevity/what-is-this.ts +++ b/src/api/longevity/about-project.ts @@ -1,4 +1,4 @@ -export async function getWhatIsThis(locale: string) { +export async function getAboutProject(locale: string) { const base = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-what-is-this`; const currentLocale = locale === 'ru' ? 'ru' : 'en'; @@ -12,10 +12,10 @@ export async function getWhatIsThis(locale: string) { `&populate[Seo]=*`; const res = await fetch(url, { - next: { revalidate: 3600, tags: ['contributor'] }, + next: { revalidate: 3600 }, }); - if (!res.ok) throw new Error('Failed to fetch contributor'); + if (!res.ok) throw new Error('Failed to fetch About Project'); const json = await res.json(); const attrs = json?.data?.attributes ?? {}; diff --git a/src/api/longevity/diet.ts b/src/api/longevity/diet.ts index 07a8ff7..5fb9f52 100644 --- a/src/api/longevity/diet.ts +++ b/src/api/longevity/diet.ts @@ -1,5 +1,5 @@ export async function getDiet(locale: string) { - const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-diet?populate=*`; + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-diet?populate=*&locale=${locale}`; const res = await fetch(url, { next: { revalidate: 3600 }, diff --git a/src/api/longevity/environment.ts b/src/api/longevity/environment.ts index 25302b6..3405a1f 100644 --- a/src/api/longevity/environment.ts +++ b/src/api/longevity/environment.ts @@ -1,6 +1,5 @@ export async function getEnvironment(locale: string) { - const currentLocale = 'en'; - const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-environment?populate[home][populate]=icon&populate[principles][populate]=icon&populate[data_tracking][populate]=icon&[populate]=image&populate[OGTags][populate]=ogImage&populate=Seo&locale=${currentLocale}`; + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-environment?populate[home][populate]=icon&populate[principles][populate]=icon&populate[data_tracking][populate]=icon&[populate]=image&populate[OGTags][populate]=ogImage&populate=Seo&locale=${locale}`; const res = await fetch(url, { next: { revalidate: 3600 }, diff --git a/src/api/longevity/habits-protocol.ts b/src/api/longevity/lifestyle.ts similarity index 64% rename from src/api/longevity/habits-protocol.ts rename to src/api/longevity/lifestyle.ts index 8484787..87a9b54 100644 --- a/src/api/longevity/habits-protocol.ts +++ b/src/api/longevity/lifestyle.ts @@ -1,13 +1,11 @@ -export async function getHabitsProtocol(locale: string) { - const base = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-habit-protocol`; - - const url = `${base}` + `?populate=*`; +export async function getLifestyleProtocol(locale: string) { + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-habit-protocol?populate=*&locale=${locale}`; const res = await fetch(url, { next: { revalidate: 3600 }, }); - if (!res.ok) throw new Error('Failed to fetch contributor'); + if (!res.ok) throw new Error('Failed to fetch longevity lifestyle protocol'); const json = await res.json(); const attrs = json?.data?.attributes ?? {}; diff --git a/src/api/longevity/results.ts b/src/api/longevity/results.ts index bcda55e..6536fd4 100644 --- a/src/api/longevity/results.ts +++ b/src/api/longevity/results.ts @@ -1,5 +1,5 @@ export async function getLongevityResults(locale: string) { - const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-result?populate=*`; + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-result?populate=*&locale=${locale}`; const res = await fetch(url, { next: { revalidate: 3600 }, diff --git a/src/api/longevity/sleep-supplements.ts b/src/api/longevity/sleep-supplements.ts index 0c90a0e..3e39a57 100644 --- a/src/api/longevity/sleep-supplements.ts +++ b/src/api/longevity/sleep-supplements.ts @@ -1,6 +1,6 @@ export async function getSleepSupplements(locale: string) { const chosenLocale = locale === 'ru' ? 'ru' : 'en'; - const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-sleep?locale=${chosenLocale}&populate[supplements][populate]=supplements`; + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-sleep?locale=${chosenLocale}&populate[supplements][populate][supplements][populate]=localizations`; const res = await fetch(url, { next: { revalidate: 3600 } }); diff --git a/src/api/longevity/sleep.ts b/src/api/longevity/sleep.ts index 33d9500..608253e 100644 --- a/src/api/longevity/sleep.ts +++ b/src/api/longevity/sleep.ts @@ -1,12 +1,12 @@ export async function getSleep(locale: string) { - const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-sleep?populate=* + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-sleep?populate=*&locale=${locale} `; const res = await fetch(url, { next: { revalidate: 3600 }, }); - if (!res.ok) throw new Error('Failed to fetch contributor'); + if (!res.ok) throw new Error('Failed to fetch Sleep data'); const json = await res.json(); const attrs = json?.data?.attributes ?? {}; diff --git a/src/api/longevity/study.ts b/src/api/longevity/study.ts index aea7176..118f6fc 100644 --- a/src/api/longevity/study.ts +++ b/src/api/longevity/study.ts @@ -1,13 +1,11 @@ export async function getStudy(locale: string) { - const base = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-study`; - - const url = `${base}` + `?populate=*`; + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-study?populate=*&locale=${locale}`; const res = await fetch(url, { next: { revalidate: 3600 }, }); - if (!res.ok) throw new Error('Failed to fetch contributor'); + if (!res.ok) throw new Error('Failed to fetch longevity study'); const json = await res.json(); const attrs = json?.data?.attributes ?? {}; diff --git a/src/api/longevity/supplements.ts b/src/api/longevity/supplements.ts index bc9ab62..3b4e071 100644 --- a/src/api/longevity/supplements.ts +++ b/src/api/longevity/supplements.ts @@ -1,5 +1,5 @@ export async function getSupplements(locale: string) { - const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-supplement?populate=*`; + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-supplement?populate=*&locale=${locale}`; const res = await fetch(url, { next: { revalidate: 3600 }, diff --git a/src/api/longevity/workout.ts b/src/api/longevity/workout.ts index ae14f41..09c0208 100644 --- a/src/api/longevity/workout.ts +++ b/src/api/longevity/workout.ts @@ -1,5 +1,5 @@ export async function getWorkout(locale: string) { - const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-workout?populate=*`; + const url = `${process.env.NEXT_PUBLIC_STRAPI}/api/longevity-workout?populate=*&locale=${locale}`; const res = await fetch(url, { next: { revalidate: 3600 }, diff --git a/src/components/BrainAgeActivity/BrainAgeActivity.module.scss b/src/components/BrainAgeActivity/BrainAgeActivity.module.scss index 3eb8f36..eab7ac2 100644 --- a/src/components/BrainAgeActivity/BrainAgeActivity.module.scss +++ b/src/components/BrainAgeActivity/BrainAgeActivity.module.scss @@ -79,12 +79,22 @@ font-size: 28px; text-transform: uppercase; } + + .subContent { + display: flex; + flex-direction: column; + } } .maximal { border: 1px solid #64b766; background-color: #64b7661a; + .subContent { + display: flex; + flex-direction: column; + } + .active { color: #64b766; border-bottom: 1px solid #64b766; @@ -93,6 +103,13 @@ } } } +.sectionRu { + .heading { + h3 { + font-family: 'Source-Serif-Regular', sans-serif !important; + } + } +} @media (max-width: 965px) { .section { diff --git a/src/components/BrainAgeActivity/BrainAgeActivity.tsx b/src/components/BrainAgeActivity/BrainAgeActivity.tsx index d64f8e7..150036d 100644 --- a/src/components/BrainAgeActivity/BrainAgeActivity.tsx +++ b/src/components/BrainAgeActivity/BrainAgeActivity.tsx @@ -1,19 +1,26 @@ -import { FC, useMemo, useState } from 'react'; +import { FC, useCallback, useMemo, useState } from 'react'; import cn from 'classnames'; import Heading from '@components/Heading'; +import longevityData from '@data/longevity'; import { BRAIN_AGE_TABLE } from '@constants/longevity'; +import { BrainAgeActivityProps } from './BrainAgeActivity.types'; + import styles from './BrainAgeActivity.module.scss'; -function formatDelta(delta: number) { - const sign = delta > 0 ? '+' : ''; - return `(${sign}${delta} years)`; -} +const BrainAgeActivity: FC = ({ locale }) => { + const { totalWeeklyActivity } = longevityData[locale]; -const BrainAgeActivity: FC = () => { const [selectedBaseline, setSelectedBaseline] = useState(32); + const formatDelta = useCallback( + (delta: number) => { + const sign = delta > 0 ? '+' : ''; + return `(${sign}${delta} ${totalWeeklyActivity.years})`; + }, + [totalWeeklyActivity.years], + ); const result = useMemo(() => { const row = BRAIN_AGE_TABLE.find(r => r.baseline === selectedBaseline); @@ -29,12 +36,16 @@ const BrainAgeActivity: FC = () => { activeDeltaText: formatDelta(activeDelta), sedentaryDeltaText: formatDelta(sedentaryDelta), }; - }, [selectedBaseline]); + }, [selectedBaseline, formatDelta]); return ( -
+
{ />{' '}
{
{result && (
-

- Brain age if sedentary +

+

+ {totalWeeklyActivity.brainIfSedentary} + {totalWeeklyActivity.brainIfSedentarySubText && ( + + {totalWeeklyActivity.brainIfSedentarySubText} + + )} +

{result.sedentary} {result.sedentaryDeltaText} -

-

- Brain age if active{' '} +

+
+

+ {totalWeeklyActivity.brainIfActive} + {totalWeeklyActivity.brainIfActiveSubText && ( + + {totalWeeklyActivity.brainIfActiveSubText} + + )} +

{result.active} -

+
)}
diff --git a/src/components/BrainAgeActivity/BrainAgeActivity.types.ts b/src/components/BrainAgeActivity/BrainAgeActivity.types.ts index e69de29..57ef3c5 100644 --- a/src/components/BrainAgeActivity/BrainAgeActivity.types.ts +++ b/src/components/BrainAgeActivity/BrainAgeActivity.types.ts @@ -0,0 +1,3 @@ +export type BrainAgeActivityProps = { + locale: string; +}; diff --git a/src/components/ContentHandler/ContentHandler.module.scss b/src/components/ContentHandler/ContentHandler.module.scss index 3863ce9..10ff0ae 100644 --- a/src/components/ContentHandler/ContentHandler.module.scss +++ b/src/components/ContentHandler/ContentHandler.module.scss @@ -62,14 +62,6 @@ font-weight: 400 !important; } - &.darkTheme .h1 { - color: #ffffffd9 !important; - } - - &.darkTheme.span { - color: #000000d9; - } - .a, .strong { color: #252626; @@ -218,7 +210,19 @@ .h3, .h2, .quote a { - color: #dadada; + color: #dadada !important; + } + .p, + .li, + .h1, + .h2, + h2, + h3, + .h3 { + p, + span { + color: #dadada !important; + } } .a { diff --git a/src/components/Header/Header.module.scss b/src/components/Header/Header.module.scss index c299080..83341a0 100644 --- a/src/components/Header/Header.module.scss +++ b/src/components/Header/Header.module.scss @@ -92,7 +92,7 @@ position: fixed; padding: 0 1.4rem; background-color: #fff; - z-index: 6; + z-index: 76; align-items: center; justify-content: center; @@ -215,7 +215,7 @@ padding: 0 1.4rem; height: 82px; background-color: #fff; - z-index: 6; + z-index: 40; align-items: center; justify-content: center; diff --git a/src/components/ScorePanel/ScorePanel.module.scss b/src/components/ScorePanel/ScorePanel.module.scss deleted file mode 100644 index 5ad0e11..0000000 --- a/src/components/ScorePanel/ScorePanel.module.scss +++ /dev/null @@ -1,188 +0,0 @@ -@import '@styles/_animations.scss'; - -.canves { - left: 50% !important; - transform: translateX(-50%); - border-radius: 50%; - top: 100px !important; -} - -.wrapper { - padding-top: 94px; - padding-bottom: 20px; - position: relative; - height: 170px; - display: flex; - justify-content: center; - align-items: center; - - .pointsWrapper { - background: #fff; - border-radius: 50%; - width: 110px; - height: 110px; - z-index: 40; - display: flex; - justify-content: center; - align-items: center; - - .emoji { - font-size: 48px; - position: absolute; - z-index: 40; - top: 70px; - padding-left: 30px; - animation: scaleEmoji 1s ease-out forwards; - } - - .imgWrapper { - position: absolute; - z-index: 40; - top: 100px; - padding-left: 10px; - } - - .points, - .pointsTxt { - color: #ff9900; - background: linear-gradient( - 180deg, - #ff9900 0%, - #ffbf00 83.33%, - #ffc700 100% - ), - linear-gradient(0deg, #ffa001, #ffa001); - -webkit-text-fill-color: transparent; - -webkit-background-clip: text; - background-clip: text; - font-weight: bold; - } - - .milestoneReached { - background: linear-gradient( - 180deg, - #d253ff 25%, - #7c67ce 54.41%, - #246dc4 85.71% - ); - background-clip: text; - } - - .milestone { - color: #9f68ca; - background: unset; - -webkit-text-fill-color: unset; - } - - .points { - font-size: 48px; - position: relative; - } - - .pointsTxt { - font-size: 14px; - margin-top: 20px; - } - } - - .finalTestPointsWrapper { - background-color: unset; - width: unset; - } - - .title { - color: #617181; - font-size: 32px; - position: absolute; - bottom: 0; - z-index: 40; - @extend .animate-slowFadeIn; - } - - .finalTestTitle, - .encouragement { - z-index: 1; - } - - .encouragementMilestone { - z-index: 41; - } -} - -.finalTestWrapper { - height: 342px; - padding-top: unset; - - .points { - top: 70px; - } - - .title { - opacity: 0; - transform: translateY(-100%) scale(0.5); - animation: textFallAndGrow 1s ease-out forwards; - text-align: center; - bottom: -15px; - } -} - -.finalTestCanvas { - top: 135px !important; -} - -@media (max-width: 901px) { - .wrapper { - width: 100%; - - .title { - font-size: 20px; - text-align: center; - margin-bottom: -10px; - } - } - - .finalTestWrapper { - .title { - font-size: 20px; - bottom: 0; - margin-bottom: unset; - } - - .pointsWrapper { - .points { - font-size: 40px; - } - } - } -} - -@keyframes textFallAndGrow { - 0% { - opacity: 0; - transform: translateY(-100%) scale(0.5); - } - - 60% { - opacity: 0.5; - transform: translateY(20%) scale(1.1); - } - - 100% { - opacity: 1; - transform: translateY(0) scale(1); - } -} - -@keyframes scaleEmoji { - 0% { - transform: scale(0); - } - - 50% { - transform: scale(1.1); - } - - 100% { - transform: scale(1); - } -} diff --git a/src/components/ScorePanel/ScorePanel.tsx b/src/components/ScorePanel/ScorePanel.tsx deleted file mode 100644 index 6395010..0000000 --- a/src/components/ScorePanel/ScorePanel.tsx +++ /dev/null @@ -1,169 +0,0 @@ -import { FC, useEffect, useState } from 'react'; -import Image from 'next/image'; -import Confetti from 'react-confetti'; -import cn from 'classnames'; - -import styles from './ScorePanel.module.scss'; - -type ScorePanelProps = { - points?: number; - greatJobTxt: string; - pointsTxt?: string; - finalTestResultHeader: boolean; - finalTestPassed?: boolean; - isMilestoneReached?: boolean; - passedFinalTestTxt?: string; - failedFinalTestTxt?: string; - encouragementTxt?: string; - passedFinalTestSubtext?: string; - failedFinalTestSubtext?: string; - loading?: boolean; - greatJobFor100?: string; -}; - -const ScorePanel: FC = ({ - points, - greatJobTxt, - pointsTxt, - finalTestResultHeader, - finalTestPassed, - isMilestoneReached, - passedFinalTestTxt, - failedFinalTestTxt, - passedFinalTestSubtext, - failedFinalTestSubtext, - encouragementTxt, - loading, - greatJobFor100, -}) => { - const [displayPoints, setDisplayPoints] = useState(0); - const [displayConfetti, setDisplayConfetti] = useState(false); - - const txtFinalTest = !finalTestPassed - ? failedFinalTestSubtext - : passedFinalTestSubtext; - - const successText = !finalTestPassed - ? failedFinalTestTxt - : passedFinalTestTxt; - - const scoredPoints = points === 0 ? points : `+${displayPoints}`; - const passedEncouragement = points === 100 ? greatJobFor100 : greatJobTxt; - const encouragement = points === 0 ? encouragementTxt : passedEncouragement; - - useEffect(() => { - if (points > 0) { - const duration = 1000; - const startTime = performance.now(); - - const animatePoints = currentTime => { - const elapsed = currentTime - startTime; - - const progress = Math.min(elapsed / duration, 1); - const currentPoints = Math.floor(progress * points); - - setDisplayPoints(currentPoints); - - if (progress < 1) { - requestAnimationFrame(animatePoints); - } else { - setDisplayPoints(points); - } - }; - - requestAnimationFrame(animatePoints); - } else { - setDisplayPoints(points); - } - }, [points]); - - useEffect(() => { - const confettiTimer = setTimeout(() => { - if (finalTestPassed ?? points > 0) { - setDisplayConfetti(true); - } else { - setDisplayConfetti(false); - } - }, 1000); - - return () => clearTimeout(confettiTimer); - }, [finalTestPassed, points]); - - return ( -
-
- {finalTestResultHeader ? ( - !finalTestPassed ? ( -
- {'Enlightened'} -
- ) : null - ) : ( - points > 0 && 🎉 - )} - - {finalTestResultHeader ? successText : scoredPoints} - - {!finalTestResultHeader && ( - - {pointsTxt} - - )} -
- {displayConfetti && ( - - )} - {!loading && ( -

- {finalTestResultHeader ? txtFinalTest : encouragement} -

- )} -
- ); -}; - -export default ScorePanel; diff --git a/src/components/ScorePanel/index.ts b/src/components/ScorePanel/index.ts deleted file mode 100644 index aaab381..0000000 --- a/src/components/ScorePanel/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import ScorePanel from "./ScorePanel"; - -export default ScorePanel; diff --git a/src/components/SeoGenerator/SeoGenerator.tsx b/src/components/SeoGenerator/SeoGenerator.tsx index 3380139..795d8b1 100644 --- a/src/components/SeoGenerator/SeoGenerator.tsx +++ b/src/components/SeoGenerator/SeoGenerator.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import Head from 'next/head'; import { useRouter } from 'next/router'; - +import Script from 'next/script'; import type { TRouter } from '@local-types/global'; import { generateSchema } from '@lib/schema'; @@ -59,7 +59,6 @@ const SeoGenerator: FC = ({ ...questionsSeo.ru, }; } - const { locale, asPath } = router as TRouter; let pathname = asPath; @@ -160,121 +159,125 @@ const SeoGenerator: FC = ({ ); return ( - - - - - - {pathname.includes('/user') ? ( - - ) : ( + <> + + - )} + + + {pathname.includes('/user') ? ( + + ) : ( + + )} - - {title} - {/*Testing canonical links on Staging*/} - {/*{process.env.NEXT_PUBLIC_DOMAIN === 'https://keepsimple.io' && (*/} - - {/*)}*/} - - - - - - - {/* GOOGLE */} - - - + + {title} + + + + + + + + {/* GOOGLE */} + + + - - - - - - + + + + + + - + - {/* AUTHRO */} + {/* AUTHRO */} - + - {/* TWITTER */} - - - - - - - - -