From b8421103c63401f86caa369943b937550a2d8f36 Mon Sep 17 00:00:00 2001 From: Riley Shaw Date: Fri, 1 Sep 2023 09:32:55 -0400 Subject: [PATCH] Bugfix: Improve 404 consistency --- src/components/layout.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/layout.js b/src/components/layout.js index a869346e1..56218d67f 100644 --- a/src/components/layout.js +++ b/src/components/layout.js @@ -44,12 +44,14 @@ const Layout = ({children, location}) => { let {pathname} = location; if (pathname.endsWith('/')) pathname = pathname.slice(0, -1); + const is404 = !location.key; - const isBlogPost = pathname.match(/\/blog\/.*[^0-9/]/); - if (pathname.startsWith('/blog')) + const isBlogPost = !is404 && pathname.match(/\/blog\/.*[^0-9/]/); + if (!404 && pathname.startsWith('/blog')) pathname = isBlogPost ? '/blog/post' : '/blog'; - const showPageHeader = !(isBlogPost || pathname.startsWith('/curate/')); + const showPageHeader = + is404 || !(isBlogPost || pathname.startsWith('/curate/')); return (