diff --git a/public/keepsimple_/assets/globe-dark.png b/public/keepsimple_/assets/globe-dark.png index 2e9f84d..4c680b6 100644 Binary files a/public/keepsimple_/assets/globe-dark.png and b/public/keepsimple_/assets/globe-dark.png differ diff --git a/public/keepsimple_/assets/globe-light.png b/public/keepsimple_/assets/globe-light.png index 5a4c0b5..c574f1d 100644 Binary files a/public/keepsimple_/assets/globe-light.png and b/public/keepsimple_/assets/globe-light.png differ diff --git a/public/keepsimple_/assets/globe-light.svg b/public/keepsimple_/assets/globe-light.svg new file mode 100644 index 0000000..183e7de --- /dev/null +++ b/public/keepsimple_/assets/globe-light.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/public/keepsimple_/assets/globe.svg b/public/keepsimple_/assets/globe.svg new file mode 100644 index 0000000..9dd4731 --- /dev/null +++ b/public/keepsimple_/assets/globe.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/public/keepsimple_/assets/tools/bob.skill b/public/keepsimple_/assets/tools/bob.skill index 20bb1ad..7314be8 100644 Binary files a/public/keepsimple_/assets/tools/bob.skill and b/public/keepsimple_/assets/tools/bob.skill differ 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/Header/Header.module.scss b/src/components/Header/Header.module.scss index 6201cc1..f928b18 100644 --- a/src/components/Header/Header.module.scss +++ b/src/components/Header/Header.module.scss @@ -56,6 +56,7 @@ align-items: flex-end; text-transform: uppercase; gap: 4px; + font-family: 'Sarabun-Regular', serif; } &.en a:nth-child(1) { diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 6e5ec76..956208b 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -120,8 +120,8 @@ const Header: FC = () => { { = ({ handleToggleSidebar, handleClick }) => { const { isDarkTheme, isOpenedSidebar } = useGlobals()[1]; const { accountData } = useContext(GlobalContext); - const { - about, - companyManagement, - articles, - contributorsTxt, - tools, - longevity, - } = navbar[locale]; + const { about, articles, contributorsTxt, tools, longevity } = navbar[locale]; const normalizePath = (p: string) => { const noQueryOrHash = p.split('?')[0].split('#')[0]; @@ -61,14 +53,6 @@ const Navbar: FC = ({ handleToggleSidebar, handleClick }) => { target: '_blank', id: 'uxcore', }, - { - name: companyManagement, - path: '/company-management', - logo: , - target: '', - id: 'companyManagement', - }, - { name: longevity, path: '/tools/longevity-protocol/about-project', 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/hooks/useContentType.tsx b/src/hooks/useContentType.tsx index e3922bf..e8189f5 100644 --- a/src/hooks/useContentType.tsx +++ b/src/hooks/useContentType.tsx @@ -95,17 +95,7 @@ const useContentType = (styles: any, usePTag: boolean) => { li: (props: any) =>
  • {props.children}
    • , ul: (props: any) =>
      {props.children}
    , img: (props: any) => { - return ( - - ); + return ; }, download: ({ url, children }: any) => { const src = useMemo( 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 }) => { /> = ({ const [transitionKey, setTransitionKey] = useState(0); const typedBufferRef = useRef(''); const easterThemeIndexRef = useRef(0); + const easterActivatedRef = useRef(false); useEffect(() => { easterThemeIndexRef.current = easterThemeIndex; @@ -64,19 +65,26 @@ const ToolsLayout: FC = ({ const normalizedBuffer = nextBuffer.replace(/\s+/g, ''); const idx = easterThemeIndexRef.current; - if (idx === 0 && normalizedBuffer.endsWith(FIBONACCI_CODE_NORMALIZED)) { + if ( + !easterActivatedRef.current && + normalizedBuffer.endsWith(FIBONACCI_CODE_NORMALIZED) + ) { typedBufferRef.current = ''; + easterActivatedRef.current = true; + easterThemeIndexRef.current = 1; setEasterThemeIndex(1); setTransitionKey(prev => prev + 1); return; } if ( - idx > 0 && + easterActivatedRef.current && normalizedBuffer.endsWith(EASTER_SUBSEQUENT_CODE_NORMALIZED) ) { typedBufferRef.current = ''; - setEasterThemeIndex(prev => (prev + 1) % 4); + const next = (idx + 1) % 4; + easterThemeIndexRef.current = next; + setEasterThemeIndex(next); setTransitionKey(prev => prev + 1); } };