@newskit-render/core 1.50.1 → 1.63.2

package/pages/api/feed.ts

@@ -1,18 +1,22 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { rssFeed, UpdatePeriod } from '@newskit-render/feed'
+import { Publisher } from '@newskit-render/api'
+import { publisher, siteHost } from '../../config'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) =>
   rssFeed({
     res,
+    publisher:
+      publisher === 'DEMO' ? Publisher.VIRGIN : (publisher as Publisher),
+    domain: siteHost,
     titeAttributes: {
       title: 'Demo Site',
-      link: `${process.env.SITE_HOST}/feed`,
+      link: '/feed',
       description: 'Newskit Render Demo site',
-      lastBuildDate: new Date().toUTCString(),
       language: 'en-US',
       updatePeriod: 'hourly' as UpdatePeriod,
       updateFrequency: 1,
-      logoUrl: `${process.env.SITE_HOST}/favicon.ico`,
+      logoUrl: '/icon.png',
     },
   })
 

package/pages/api/news-sitemap.ts

@@ -1,7 +1,7 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { newsSitemap } from '@newskit-render/feed'
 import { Publisher } from '@newskit-render/api'
-
+import { publisher, siteHost, sitemapPublicationName } from '../../config'
 /* We do not have sitemap date for Demo so using Virgin,
  * This can be removed and replace with just - publisher: process.env.PUBLISHER as PublisherGroup, in created projects
  */
@@ -10,11 +10,9 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) =>
   newsSitemap({
     res,
     publisher:
-      process.env.PUBLISHER === 'DEMO'
-        ? Publisher.VIRGIN
-        : (process.env.PUBLISHER as Publisher),
-    domain: new URL(process.env.SITE_HOST as string).host,
-    publicationName: process.env.SITEMAP_PUBLICATION_NAME as string,
+      publisher === 'DEMO' ? Publisher.VIRGIN : (publisher as Publisher),
+    domain: new URL(siteHost as string).host,
+    publicationName: sitemapPublicationName as string,
   })
 
 export default handler

package/pages/api/sitemap.ts

@@ -1,7 +1,12 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { genericSitemap, CustomStaticPage } from '@newskit-render/feed'
 import { Publisher } from '@newskit-render/api'
-
+import {
+  publisher,
+  siteHost,
+  sitemapFirstPublicationDate,
+  sitemapPublicationName,
+} from '../../config'
 /* We do not have sitemap date for Demo so using Virgin,
  * This can be removed and replace with just - publisher: process.env.PUBLISHER as PublisherGroup, in created projects
  */
@@ -16,12 +21,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) =>
     res,
     query: req.query,
     publisher:
-      process.env.PUBLISHER === 'DEMO'
-        ? Publisher.VIRGIN
-        : (process.env.PUBLISHER as Publisher),
-    domain: new URL(process.env.SITE_HOST as string).host,
-    firstArticleDate: process.env.SITEMAP_FIRST_PUBLICATION_DATE as string,
-    publicationName: process.env.SITEMAP_PUBLICATION_NAME as string,
+      publisher === 'DEMO' ? Publisher.VIRGIN : (publisher as Publisher),
+    domain: new URL(siteHost as string).host,
+    firstArticleDate: sitemapFirstPublicationDate as string,
+    publicationName: sitemapPublicationName as string,
     customStaticPageCollection: defaultCustomStaticPagesCollection,
   })
 

package/pages/help-hub/[id]/index.tsx

@@ -0,0 +1,11 @@
+import React from 'react'
+import { ResultsPage } from '@newskit-render/standalone-components'
+import Layout from '../../../components/layout'
+
+const HelpHubResultsPage = () => (
+  <Layout>
+    <ResultsPage />
+  </Layout>
+)
+
+export default HelpHubResultsPage

package/pages/help-hub/index.tsx

@@ -0,0 +1,11 @@
+import React from 'react'
+import { SearchPage } from '@newskit-render/standalone-components'
+import Layout from '../../components/layout'
+
+const HelpHub = () => (
+  <Layout>
+    <SearchPage />
+  </Layout>
+)
+
+export default HelpHub

package/pages/index.tsx

@@ -12,6 +12,7 @@ import { addCacheHeaders } from '../helpers/addCacheHeaders'
 
 export async function getServerSideProps(context) {
   newrelic.setTransactionName('Homepage')
+  console.warn('config:')
   console.warn('context:')
   console.warn(context.req && context.req.headers)
 

package/pages/player/brightcove.tsx

@@ -0,0 +1,19 @@
+import React from 'react'
+import { VideoPlayer } from 'newskit'
+import { useRouter } from 'next/router'
+
+const BrightcovePlayer: React.FC<{}> = () => {
+  const router = useRouter()
+
+  const videoConfig = {
+    'data-account': router.query.account_id as string,
+    'data-player': router.query.player_id as string,
+    'data-video-id': router.query.video_id as string,
+    'data-embed': 'default',
+    controls: true,
+  }
+
+  return <VideoPlayer config={videoConfig} />
+}
+
+export default BrightcovePlayer

package/pages/preview/[articleId]/version/[versionId]/index.tsx

@@ -22,6 +22,11 @@ import {
   relatedArticles,
 } from '../../../../../helpers/mocks/articleMock'
 import { addCacheHeaders } from '../../../../../helpers/addCacheHeaders'
+import {
+  siteHost as configSiteHost,
+  twitterUsername as configTwitterUsername,
+  gscId as configGscId,
+} from '../../../../../config'
 
 const PreviewArticle = ({
   universalArticle,
@@ -104,10 +109,10 @@ export async function getServerSideProps(context) {
     props: {
       universalArticle: data.universalArticle,
       session,
-      articleURL: `${process.env.SITE_HOST}/preview/${articleId}/version/${versionId}`,
-      twitterUsername: process.env.TWITTER_USERNAME || '',
-      siteHost: process.env.SITE_HOST || '',
-      gscId: process.env.GSC_ID || '',
+      articleURL: `${configSiteHost}/preview/${articleId}/version/${versionId}`,
+      twitterUsername: configTwitterUsername || '',
+      siteHost: configSiteHost || '',
+      gscId: configGscId || '',
     },
   }
 }

package/queries/getRadioPosts.ts

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client'
 
 export const GET_RADIO_POSTS = gql`
-  query GetRadioPosts($pageCursors: String!) {
+  query getRadioPosts($pageCursors: String!) {
     radioPosts(cursor: $pageCursors) {
       data {
         dateCreated

package/queries/getUniversalArticle.ts

@@ -49,6 +49,19 @@ export const GET_UNIVERSAL_ARTICLE = gql`
             aspectRatio
           }
         }
+        ... on Video {
+          accountId
+          videoId
+          posterImage {
+            ... on Image {
+              crops {
+                url
+                alt
+                aspectRatio
+              }
+            }
+          }
+        }
       }
     }
   }

package/temp/header.tsx

@@ -121,6 +121,13 @@ const pastDueBanner = {
     text:
       'You have cancelled your subscription and will lose access to all benefits on ##DATE##. To re-activate your subscription call ##PHONE_NUMBER##.',
   },
+  toBeCancelledWithRefund: {
+    title: 'Your subscription will end soon.',
+    phoneNumber: '0800 xxxx xxxxx',
+    text:
+      'We have successfully cancelled your subscription and will be processing your refund shortly. If you have any question please call ##PHONE_NUMBER##.',
+    dismissDays: 7,
+  },
   treshold: {
     firstNotice: 26,
     secondNotice: 30,