diff --git a/data/external/cms.js b/data/external/cms.js index a58c18b..d8ab945 100755 --- a/data/external/cms.js +++ b/data/external/cms.js @@ -148,7 +148,7 @@ export const getPodcastSeries = async (podcastId) => { }, { encodeValuesOnly: true, }) - const url = serverRuntimeConfig.base_path + `/api/podcast-serie?${query}`; + const url = serverRuntimeConfig.base_path + `podcast-series?${query}`; const showres = await fetch(url, { headers: new Headers({ 'Authorization': serverRuntimeConfig.strapi_token, @@ -186,4 +186,35 @@ export const getPodcastSeriesEpisodes = async (podcastId, limit, page) => { }) return await epres.json(); +} + +export const getLatestPodcastEpisode = async () => { + const { serverRuntimeConfig} = getConfig() + const qs = require('qs') + var query = qs.stringify({ + sort: ['publishedAt:desc'], + pagination: { + page: 1, + pageSize: 1, + }, + populate: '*' + }) + + const epres = await fetch(serverRuntimeConfig.base_path + `podcast-episodes?${query}`, { + headers: new Headers({ + 'Authorization': serverRuntimeConfig.strapi_token, + 'Content-Type': 'application/x-www-form-urlencoded' + }) + }) + + const episode = await epres.json() + + const seriesres = await getPodcastSeries(episode.data[0].attributes.podcast_sery.data.attributes.Slug) + + const res = { + ...episode, + ...seriesres.data[0].attributes + } + + return res } \ No newline at end of file diff --git a/data/internal/feed-generator.js b/data/internal/feed-generator.js index 870f123..7d76242 100755 --- a/data/internal/feed-generator.js +++ b/data/internal/feed-generator.js @@ -68,11 +68,6 @@ export const generateRssFeed = async (filter) => { const url = `${siteURL}/news/${post.attributes.Slug}`; - console.log(htmlFindReplaceElementAttrs.find( - post.attributes.Body, - {tag: "img", attr: "src"} - )) - const body = htmlFindReplaceElementAttrs.replace( post.attributes.Body, item => item.parsedUrl, @@ -120,8 +115,6 @@ export const generateRssFeed = async (filter) => { export const generatePodcastFeeds = async () => { const podcastSeries = await getAllPodcastSeries() const siteURL = config.siteURL; - - console.log(config) const author = { @@ -143,9 +136,9 @@ export const generatePodcastFeeds = async () => { description: series.attributes.Description, - id: siteURL, + id: siteURL + "/podcasts/shows/" + series.attributes.Slug, - link: siteURL, + link: siteURL + "/podcasts/shows/" + series.attributes.Slug, image: `${siteURL}/public/images/logo.svg`, @@ -171,7 +164,7 @@ export const generatePodcastFeeds = async () => { episodes.forEach((episode) => { - const url = `${siteURL}/shows/${series.attributes.Slug}/${episode.attributes.Slug}`; + const url = `${siteURL}/podcasts/shows/${series.attributes.Slug}/${episode.attributes.Slug}`; const media_url = `${siteURL}${episode.attributes.Audio_MP3.data.attributes.url}` @@ -205,8 +198,6 @@ export const generatePodcastFeeds = async () => { }) }) - console.log(feed.rss2()) - fs.writeFileSync(`./public/feed/${series.attributes.Slug}.xml`, feed.rss2()); }) } diff --git a/data/internal/sitemap-generator.js b/data/internal/sitemap-generator.js index a395c34..f79af6d 100755 --- a/data/internal/sitemap-generator.js +++ b/data/internal/sitemap-generator.js @@ -22,7 +22,6 @@ export const generateSitemap = async () => { } }) .map((staticPagePath) => { - console.log(staticPagePath) return `${config.siteURL}/${path.parse(staticPagePath.name).name}`; } ); @@ -31,8 +30,6 @@ export const generateSitemap = async () => { const postList = [] postData.data.forEach(post => postList.push({slug: post.attributes.Slug, updatedAt: post.attributes.updatedAt})) - console.log(postList) - const formatted = sitemap => prettier.format(sitemap, { parser: "html" }); const pageListMap = staticPaths.map(page => { @@ -62,8 +59,6 @@ xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitem >${pageListMap}${postListSiteMap} ` - - console.log(generatedSitemap) const formattedSitemap = [formatted(generatedSitemap)]; fs.writeFileSync("public/sitemap.xml", generatedSitemap, "utf8") diff --git a/pages/index.js b/pages/index.js index 277d8a8..7d0280f 100755 --- a/pages/index.js +++ b/pages/index.js @@ -7,6 +7,7 @@ import Image from 'next/image'; import { FEEDS, getFeed } from "../lib/rss" import { generatePodcastFeeds, generateRssFeed } from "../data/internal/feed-generator" import { generateSitemap } from "../data/internal/sitemap-generator" +import { getLatestPodcastEpisode } from "../data/external/cms" export async function getStaticProps(context) { generateRssFeed() @@ -14,7 +15,6 @@ export async function getStaticProps(context) { generatePodcastFeeds() generateSitemap() const { serverRuntimeConfig, publicRuntimeConfig, strapiConfig } = getConfig() - console.log(serverRuntimeConfig.strapi_token) const qs = require('qs') const query = qs.stringify({ @@ -26,7 +26,7 @@ export async function getStaticProps(context) { }, { encodeValuesOnly: true, }) - console.log(query) + const res = await fetch(serverRuntimeConfig.base_path +`articles?${query}`, { headers: new Headers({ 'Authorization': serverRuntimeConfig.strapi_token, @@ -37,9 +37,8 @@ export async function getStaticProps(context) { const article = artdata.data[0].attributes - console.log(article) - // const epres = await fetch(serverRuntimeConfig.base_path + '/api/podcasts/episodes/latest/0/1') - // const epdata = await epres.json() + const epdata = await getLatestPodcastEpisode() + console.log(epdata.Logo.data.attributes.height) const flickr = await fetch('https://www.flickr.com/services/feeds/photos_public.gne?id=25875680@N05&lang=en-us&format=json&nojsoncallback=1') const flickrdata = await flickr.json() @@ -52,7 +51,7 @@ export async function getStaticProps(context) { // const tadfirstitem = tadfullfeed.items[0] return { - props: { article, pagedata, config: serverRuntimeConfig, firstimage}, + props: { article, pagedata, config: serverRuntimeConfig, firstimage, episodedata: epdata}, revalidate: 60 // will be passed to the page component as props } } @@ -86,30 +85,29 @@ function HomePage (props) { - {/* {props.episodedata.map((episode) => ( + {props.episodedata.data.map((episode) => (