diff --git a/site/components/Home/Latest.js b/site/components/Home/Latest.js index 614e604..73c9403 100644 --- a/site/components/Home/Latest.js +++ b/site/components/Home/Latest.js @@ -1,20 +1,7 @@ -// import { useState } from "react" import Link from "next/link" import { YOUTUBE_REGEX } from "../../lib/constants" -import { getYoutube } from "../../utils/getYoutube" export function Latest({ posts }) { - // const initialValue = 6 - // const [ value, setValue ] = useState(initialValue) - // const initialPosts = posts && posts.slice(0, value) - - // const handleButton = () => { - // setValue(prev => - // initialPosts.length === posts.length - // ? initialValue - // : prev + 3) - // } - return (
@@ -28,22 +15,10 @@ export function Latest({ posts }) {

- {posts && posts.map(({ _id, title, description, image, youtube, link }) => { - const { thumbnail } = getYoutube(youtube) - const imageSource = image || thumbnail - return ( -
+ {posts && posts.map(({ title, description, image, youtube, link }) => ( +
- {imageSource ? - {title} - : ( -
- - {title} - -
- ) - } + {image && {title}}
- ) - })} + ))}
- {/*
- {!(posts.length === initialPosts.length && value === initialValue) && - - } -
*/}
) diff --git a/site/components/MDX.js b/site/components/MDX.js index b4afab5..b9f6763 100644 --- a/site/components/MDX.js +++ b/site/components/MDX.js @@ -3,13 +3,13 @@ import MdxContent from "./MdxContent"; import siteConfig from "../config/siteConfig"; import LiteYouTubeEmbed from "react-lite-youtube-embed"; -import { getYoutube } from "utils/getYoutube" +import { YOUTUBE_REGEX, YOUTUBE_ID_REGEX } from "lib/constants"; export default function MdxPage({ body, meta }) { const { title, description, date, keywords, youtube, podcast, image, _raw } = meta; - const { id: youtubeId, thumbnail: youtubeThumnbnail } = getYoutube(youtube) + const youtubeId = youtube && YOUTUBE_REGEX.test(youtube) && youtube.match(YOUTUBE_ID_REGEX)[1] const PodcastIcon = siteConfig.social.find((s) => s.name === "Podcast").icon; @@ -21,11 +21,7 @@ export default function MdxPage({ body, meta }) { .replace(/(^\w{1})|(\s{1}\w{1})/g, (str) => str.toUpperCase()); const SeoTitle = title ?? titleFromUrl; - const imageUrl = image - ? siteConfig.url + image - : youtubeThumnbnail - ? youtubeThumnbnail - : null; + const imageUrl = image ? siteConfig.url + image : null; // enable editing for all pages for now const editUrl = siteConfig.repoRoot + siteConfig.repoEditPath + _raw.sourceFilePath diff --git a/site/pages/demo.js b/site/pages/demo.js deleted file mode 100644 index 782291e..0000000 --- a/site/pages/demo.js +++ /dev/null @@ -1,25 +0,0 @@ -import { Latest } from "components/Home/Latest" -import { allOtherPages } from "contentlayer/generated" - -export default function Demo ({ deepDivePages }) { - return -} - -export async function getStaticProps() { - const deepDivePages = allOtherPages - .filter((page) => page.featured !== undefined && page.featured) - .sort((a, b) => new Date(b.date) - new Date(a.date)) - .map((page) => { - return { - title: page.title ?? null, - description: page.description ?? null, - image: page.image ?? null, - youtube: page.youtube ?? null, - link: `/${page._raw.flattenedPath}`, - }; - }); - - return { - props: { deepDivePages } - } -} \ No newline at end of file diff --git a/site/utils/getYoutube.js b/site/utils/getYoutube.js deleted file mode 100644 index 4eef886..0000000 --- a/site/utils/getYoutube.js +++ /dev/null @@ -1,21 +0,0 @@ -import { YOUTUBE_REGEX, YOUTUBE_ID_REGEX } from "lib/constants"; - -export function getYoutube(youtube) { - let youtubeThumbnail; - - const youtubeId = - youtube && YOUTUBE_REGEX.test(youtube) && youtube.match(YOUTUBE_ID_REGEX)[1]; - - if (youtubeId) { - // get the youtube thumbnail image from https://img.youtube.com/vi//maxresdefault.jpg - youtubeThumbnail = youtube.replace( - YOUTUBE_REGEX, - `https://img.youtube.com/vi/${youtubeId}/maxresdefault.jpg` - ); - } - - return { - id: youtubeId, - thumbnail: youtubeThumbnail - }; -}