diff --git a/components/featureimage.js b/components/featureimage.js index f3a2914..da5b920 100755 --- a/components/featureimage.js +++ b/components/featureimage.js @@ -6,8 +6,8 @@ const FeatureImage = ({ imagedata, basepath }) => (
diff --git a/components/main.js b/components/main.js index 2573199..bea9836 100755 --- a/components/main.js +++ b/components/main.js @@ -7,14 +7,17 @@ import { render } from "less" import { Route, Switch } from 'react-router'; import StorySideBar from "./storysidebar" -const Layout = (props) => ( +const Layout = (props) => { + return ( +
{props.pagedata.title} - + - + +
@@ -23,6 +26,7 @@ const Layout = (props) => (
-) + ) +} export default Layout \ No newline at end of file diff --git a/pages/news/[slug].js b/pages/news/[slug].js index 94124f8..30ec09b 100755 --- a/pages/news/[slug].js +++ b/pages/news/[slug].js @@ -7,8 +7,9 @@ import { getAllPosts, getSinglePost } from '../../data/external/cms' import * as gtag from "../../lib/gtag" import Image from 'next/image'; import Head from 'next/head' +import config from "../../data/internal/config" -const Article = ({article_obj, sections, pagedata, stories, serverRuntimeConfig}) => { +const Article = ({article_obj, sections, pagedata, stories, serverRuntimeConfig, config}) => { if (!article_obj) return null var featureImage @@ -18,11 +19,18 @@ const Article = ({article_obj, sections, pagedata, stories, serverRuntimeConfig} featureImage = article_obj.FeatureImage.data.attributes.formats.large } } - console.log(article_obj.FeatureImage) + console.log(article_obj) return ( - + + + + + + { article_obj.FeatureImage.data != null && + + }
{ article_obj.FeatureImage.data != null && @@ -52,6 +60,7 @@ export async function getStaticPaths() { export async function getStaticProps({params}) { const { serverRuntimeConfig, publicRuntimeConfig } = getConfig() + const conf = config const slug = params.slug const article_obj = await getSinglePost(slug) @@ -96,7 +105,7 @@ export async function getStaticProps({params}) { const secdata = await secres.json() return { - props: { article_obj, sections: secdata, pagedata, stories, serverRuntimeConfig }, // will be passed to the page component as props + props: { article_obj, sections: secdata, pagedata, stories, serverRuntimeConfig, config }, // will be passed to the page component as props revalidate: 60 } } diff --git a/pages/podcasts/shows/[...episode].js b/pages/podcasts/shows/[...episode].js index b0344e6..e9eeff2 100755 --- a/pages/podcasts/shows/[...episode].js +++ b/pages/podcasts/shows/[...episode].js @@ -6,6 +6,8 @@ import AudioPlayer from "react-h5-audio-player"; import 'react-h5-audio-player/lib/styles.css'; import EpisodeSideBar from "../../../components/episodesidebar" import { getPodcastEpisode, getPodcastSeriesEpisodes } from '../../../data/external/cms.js'; +import Head from "next/head" +import config from "../../../data/internal/config" export async function getServerSideProps(context) { @@ -29,7 +31,7 @@ export async function getServerSideProps(context) { } return { - props: { pagedata, sections: secdata, episode, audiodata, sepisodes } + props: { pagedata, sections: secdata, episode, audiodata, sepisodes, config } } } @@ -40,6 +42,14 @@ const Episode = ( props ) => { episode={props.episode} audiodata={props.audiodata} sepdata={props.sepisodes}> + + + + + + + +

{props.episode.data[0].attributes.Title}

- +

{project.data[0].attributes.Title}