fix: invalid canonicalization

This commit is contained in:
Kamran Ahmed
2020-01-17 19:18:47 +04:00
parent ae6763bf83
commit 21b3b7cbdf
5 changed files with 18 additions and 6 deletions

View File

@@ -4,11 +4,12 @@ import SiteNav from 'components/site-nav';
import PageFooter from 'components/page-footer';
import { serverOnlyProps } from 'lib/server';
import { getRequestedRoadmap } from 'lib/roadmap';
import siteConfig from 'storage/site';
import Helmet from 'components/helmet';
import RoadmapSummary from 'components/roadmap-summary';
import DetailedRoadmap from 'components/detailed-roadmap';
const Roadmap = ({ roadmap }) => {
const Roadmap = ({ roadmap, canonical }) => {
if (!roadmap) {
return <Error statusCode={ 404 } />
}
@@ -16,7 +17,11 @@ const Roadmap = ({ roadmap }) => {
const showSummary = roadmap.upcoming || !roadmap.detailed;
return (
<DefaultLayout>
<Helmet title={ roadmap.title } description={ roadmap.description } />
<Helmet
canonical={canonical}
title={ roadmap.title }
description={ roadmap.description }
/>
<SiteNav />
{ showSummary ? <RoadmapSummary roadmap={roadmap} /> : <DetailedRoadmap roadmap={roadmap} /> }
<PageFooter />
@@ -26,6 +31,7 @@ const Roadmap = ({ roadmap }) => {
Roadmap.getInitialProps = serverOnlyProps(({ req }) => {
return {
canonical: `${siteConfig.url.web}${req.url}`,
roadmap: getRequestedRoadmap(req),
};
});