This is /mock/faq
- - ) -} diff --git a/packages/app-root/src/app/page.js b/packages/app-root/src/app/page.js index e6f147be98..366110524c 100644 --- a/packages/app-root/src/app/page.js +++ b/packages/app-root/src/app/page.js @@ -1,87 +1,59 @@ -import { AboutHeader } from '@zooniverse/content' +import HomePageContainer from '@/components/HomePageContainer' + +// daily.zooniverse.org most recent 4 posts +const DAILY_ZOO_FEED = + 'https://public-api.wordpress.com/rest/v1.1/sites/57182749/posts?number=4' +// blog.zooniverse.org most recent 4 posts +const ZOO_BLOG_FEED = + 'https://public-api.wordpress.com/rest/v1.1/sites/36711287/posts?number=4' + +/** Grab the data we want from each post */ +function parseFeedPost(post) { + return { + id: post.ID, // number + title: post.title, // string + excerpt: post.excerpt, // string but text is wrapped in + created_at: new Date(post.date), // string such as '2024-02-02T15:00:00+00:00' + url: post.URL, // string + imageSrc: post.featured_image // src string + } +} -export default function MockPage() { - const links = [ - { - href: '/', - label: 'Mock' - }, - { - href: '/resources', - label: 'Resources' - }, - { - href: '/faq', - label: 'FAQ' +async function fetchBlogFeed(url) { + try { + const response = await fetch(url) + if (response.ok) { + const feed = await response.json() + return feed.posts } - ] - - return ( - <> -This is /mock
- - ) + return [] + } catch (error) { + console.error(error) + return [] + } } -/* Code below is temporary ignored to allow for testing /mock urls with Azure FrontDoor */ - -// import HomePageContainer from '@/components/HomePageContainer' - -// // daily.zooniverse.org most recent 4 posts -// const DAILY_ZOO_FEED = -// 'https://public-api.wordpress.com/rest/v1.1/sites/57182749/posts?number=4' -// // blog.zooniverse.org most recent 4 posts -// const ZOO_BLOG_FEED = -// 'https://public-api.wordpress.com/rest/v1.1/sites/36711287/posts?number=4' - -// /** Grab the data we want from each post */ -// function parseFeedPost(post) { -// return { -// id: post.ID, // number -// title: post.title, // string -// excerpt: post.excerpt, // string but text is wrapped in -// created_at: new Date(post.date), // string such as '2024-02-02T15:00:00+00:00' -// url: post.URL, // string -// imageSrc: post.featured_image // src string -// } -// } - -// async function fetchBlogFeed(url) { -// try { -// const response = await fetch(url) -// if (response.ok) { -// const feed = await response.json() -// return feed.posts -// } -// return [] -// } catch (error) { -// console.error(error) -// return [] -// } -// } - -// async function getBlogPosts(url) { -// let posts = [] -// try { -// const feed = await fetchBlogFeed(url) -// posts = feed.map(post => parseFeedPost(post)) - -// return posts -// } catch (error) { -// console.error(error) -// } -// return posts -// } +async function getBlogPosts(url) { + let posts = [] + try { + const feed = await fetchBlogFeed(url) + posts = feed.map(post => parseFeedPost(post)) + + return posts + } catch (error) { + console.error(error) + } + return posts +} -// export default async function HomePage() { -// const dailyZooPosts = await getBlogPosts(DAILY_ZOO_FEED) -// const zooBlogPosts = await getBlogPosts(ZOO_BLOG_FEED) +export default async function HomePage() { + const dailyZooPosts = await getBlogPosts(DAILY_ZOO_FEED) + const zooBlogPosts = await getBlogPosts(ZOO_BLOG_FEED) -// return ( -//This is /mock/resources
- - ) -} diff --git a/packages/app-root/src/middleware.js b/packages/app-root/src/middleware.js index 4cc871cd74..07f3937a22 100644 --- a/packages/app-root/src/middleware.js +++ b/packages/app-root/src/middleware.js @@ -4,23 +4,6 @@ import { NextResponse } from 'next/server' export function middleware(req) { - /* - Bypass /assets. - */ - if (req.nextUrl.pathname.startsWith('/assets')) { - return NextResponse.next() - } - /* - Bypass internal NextJS requests. - */ - if (req.nextUrl.pathname.startsWith('/_next')) { - return NextResponse.next() - } - /* This is a temporary mocked env */ - if (req.nextUrl.pathname.startsWith('/mock/wrong')) { - return NextResponse.redirect(new URL('/mock', req.url)) - } - /* Redirect legacy PFE /about and /get-involved paths to new FEM paths */ @@ -65,5 +48,5 @@ export function middleware(req) { /* Only care about /about and /get-involved routes */ export const config = { - matcher: ['/mock/:path*', '/about/:path*', '/get-involved/:paths*'] + matcher: ['/about/:path*', '/get-involved/:paths*'] } diff --git a/packages/lib-content/src/components/AboutHeader/AboutHeader.js b/packages/lib-content/src/components/AboutHeader/AboutHeader.js index 7d0b295bd0..020fcf1ff2 100644 --- a/packages/lib-content/src/components/AboutHeader/AboutHeader.js +++ b/packages/lib-content/src/components/AboutHeader/AboutHeader.js @@ -1,5 +1,3 @@ -'use client' - import { Box } from 'grommet' import { ZooniverseLogotype } from '@zooniverse/react-components' import styled from 'styled-components' diff --git a/packages/lib-content/src/index.js b/packages/lib-content/src/index.js index 4d43a1b51c..672abd758d 100644 --- a/packages/lib-content/src/index.js +++ b/packages/lib-content/src/index.js @@ -1,5 +1,4 @@ export { default as About } from './screens/About/About.js' -export { default as AboutHeader } from './components/AboutHeader/AboutHeader.js' export { default as Collaborate } from './screens/Collaborate/Collaborate.js' export { default as CommunityContainer } from './screens/Home/Community/CommunityContainer.js' export { default as Default404 } from './screens/404/Default404.js'