Skip to content

Adding baseUrl to feed links. #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoelMarcey merged 4 commits into from
Jun 10, 2018
Merged

Adding baseUrl to feed links. #745

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
393d38c
Adding baseUrl to feed links.
skratchdot Jun 9, 2018
b275b1a
Ensure the feedBase variable does not end in a slash
skratchdot Jun 9, 2018
7f46dc2
Get more re-use out of the new `siteUrl` variable
skratchdot Jun 10, 2018
2505d4a
Slight regex performance tweak
skratchdot Jun 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions lib/core/Head.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ class Head extends React.Component {
highlight.version
}/styles/${highlight.theme}.min.css`;

// ensure the siteUrl variable ends with a single slash
const siteUrl =
(this.props.config.url + this.props.config.baseUrl).replace(/\/+$/, '') +
'/';
Copy link
Contributor

@JoelMarcey JoelMarcey Jun 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this won't cause a possible double ending // when we use it below?

For example, siteUrl always ends with a single slash. Could this.props.config.ogImage start with a single slash, causing a // in line 51?

Just wanting to make sure we are still good there.


return (
<head>
<meta charSet="utf-8" />
Expand All @@ -43,22 +48,14 @@ class Head extends React.Component {
{this.props.config.ogImage && (
<meta
property="og:image"
content={
this.props.config.url +
this.props.config.baseUrl +
this.props.config.ogImage
}
content={siteUrl + this.props.config.ogImage}
/>
)}
<meta name="twitter:card" content="summary" />
{this.props.config.twitterImage && (
<meta
name="twitter:image"
content={
this.props.config.url +
this.props.config.baseUrl +
this.props.config.twitterImage
}
content={siteUrl + this.props.config.twitterImage}
/>
)}
{this.props.config.noIndex && <meta name="robots" content="noindex" />}
Expand All @@ -80,15 +77,15 @@ class Head extends React.Component {
<link
rel="alternate"
type="application/atom+xml"
href={this.props.config.url + '/blog/atom.xml'}
href={siteUrl + 'blog/atom.xml'}
title={this.props.config.title + ' Blog ATOM Feed'}
/>
)}
{hasBlog && (
<link
rel="alternate"
type="application/rss+xml"
href={this.props.config.url + '/blog/feed.xml'}
href={siteUrl + 'blog/feed.xml'}
title={this.props.config.title + ' Blog RSS Feed'}
/>
)}
Expand Down