From a845ea0f8ccbd902a898b992bb950fce9880235a Mon Sep 17 00:00:00 2001
From: Karol Wypchlo <kwypchlo@gmail.com>
Date: Sun, 3 Oct 2021 01:24:22 +0200
Subject: [PATCH] fixed the latest news link redirect in the news header

---
 .../src/components/NewsHeader/NewsHeader.js   |  6 ++--
 packages/website/src/pages/news.js            | 29 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/website/src/components/NewsHeader/NewsHeader.js b/packages/website/src/components/NewsHeader/NewsHeader.js
index cdbbffb7..17161f26 100644
--- a/packages/website/src/components/NewsHeader/NewsHeader.js
+++ b/packages/website/src/components/NewsHeader/NewsHeader.js
@@ -12,6 +12,7 @@ const NewsHeader = () => {
             id
             frontmatter {
               title
+              external
             }
             fields {
               slug
@@ -26,8 +27,9 @@ const NewsHeader = () => {
 
   if (!latestNews) return null; // no news
 
-  const title = latestNews.node.frontmatter.title;
-  const link = { to: latestNews.node.fields.slug };
+  const { frontmatter, fields } = latestNews.node;
+  const { title, external } = frontmatter;
+  const link = external ? { href: external } : { to: fields.slug };
 
   return (
     <div className="bg-palette-500 px-8 p-3">
diff --git a/packages/website/src/pages/news.js b/packages/website/src/pages/news.js
index 7c0f7719..f3b9a220 100644
--- a/packages/website/src/pages/news.js
+++ b/packages/website/src/pages/news.js
@@ -6,39 +6,36 @@ import { NewsSummary } from "../components/News";
 import Link from "../components/Link";
 import Seo from "../components/seo";
 
-const NewsCard = ({ ...props }) => {
-  const linkProps = { to: !props.frontmatter.external && props.fields.slug, href: props.frontmatter.external };
+const NewsCard = ({ frontmatter, fields }) => {
+  const { title, external, categories, description, thumbnail, avatar, author, date } = frontmatter;
+  const link = external ? { href: external } : { to: fields.slug };
 
   return (
     <div className="flex flex-col">
-      <Link {...linkProps} className="flex items-center">
-        <GatsbyImage image={getImage(props.frontmatter.thumbnail)} alt={props.frontmatter.title} />
+      <Link {...link} className="flex items-center">
+        <GatsbyImage image={getImage(thumbnail)} alt={title} />
       </Link>
 
-      {props.frontmatter.categories && (
+      {categories && (
         <div className="mt-6">
-          {props.frontmatter.categories.map((category) => (
+          {categories.map((category) => (
             <Label key={category}>{category}</Label>
           ))}
         </div>
       )}
 
-      <Link {...linkProps} className="text-xl mt-6">
-        {props.frontmatter.title}
+      <Link {...link} className="text-xl mt-6">
+        {title}
       </Link>
 
-      {props.frontmatter.description && (
-        <Link {...linkProps} className="font-content text-palette-400 mt-4">
-          {props.frontmatter.description}
+      {description && (
+        <Link {...link} className="font-content text-palette-400 mt-4">
+          {description}
         </Link>
       )}
 
       <div className="mt-6">
-        <NewsSummary
-          avatar={props.frontmatter.avatar}
-          author={props.frontmatter.author}
-          date={props.frontmatter.date}
-        />
+        <NewsSummary avatar={avatar} author={author} date={date} />
       </div>
     </div>
   );