Skip to content
Snippets Groups Projects
Commit 39250df3 authored by Isabella Skořepová's avatar Isabella Skořepová
Browse files

Fix few urls

parent 266ef468
No related branches found
No related tags found
No related merge requests found
...@@ -83,6 +83,15 @@ function dateFilter(date, format) { ...@@ -83,6 +83,15 @@ function dateFilter(date, format) {
return result return result
} }
function relURL(filename, dir_) {
let dir = dir_
if (filename.substr(0, 1) === '/' || filename.match('://')) return filename
if (dir.substr(0, 1) !== '/') dir = `/${dir}`
if (filename.match(/\/$/)) return dir + filename
if (dir.match(/\/$/)) return dir + filename
return `${dir}/${filename}`
}
export function List({ subtags, tag, content, metadata, file, config }) { export function List({ subtags, tag, content, metadata, file, config }) {
return ( return (
<div id="content" class="container"> <div id="content" class="container">
...@@ -93,7 +102,7 @@ export function List({ subtags, tag, content, metadata, file, config }) { ...@@ -93,7 +102,7 @@ export function List({ subtags, tag, content, metadata, file, config }) {
{subtags && {subtags &&
subtags.map(subtag => ( subtags.map(subtag => (
<a <a
href="{{ config.baseurl }}/{{ subtag.url }}" href={`${config.baseurl}/${subtag.url}`}
class="chip" class="chip"
key={subtag.url} key={subtag.url}
> >
...@@ -106,19 +115,22 @@ export function List({ subtags, tag, content, metadata, file, config }) { ...@@ -106,19 +115,22 @@ export function List({ subtags, tag, content, metadata, file, config }) {
{content.map(page => ( {content.map(page => (
<div class="col s12 m6 l4" key={page.file}> <div class="col s12 m6 l4" key={page.file}>
<div class="block article"> <div class="block article">
<a href="{{ config.baseurl }}/{{ page.file }}"> <a href={`${config.baseurl}/${page.file}`}>
<div <div
style={{ style={{
height: 120, height: 120,
backgroundImage: page.metadata.image backgroundImage: page.metadata.image
? `url('{{ config.baseurl }}{{ page.metadata.image | relURL(page.file) }}')` ? `url('${config.baseurl}${relURL(
page.metadata.image,
page.file,
)}')`
: undefined, : undefined,
}} }}
className="leadimage light-blue darken-2" className="leadimage light-blue darken-2"
></div> ></div>
</a> </a>
<div class="head-title"> <div class="head-title">
<a href="{{ config.baseurl }}/{{ page.file }}"> <a href={`${config.baseurl}/${page.file}`}>
<h5 class="center">{page.metadata.title}</h5> <h5 class="center">{page.metadata.title}</h5>
</a> </a>
</div> </div>
...@@ -151,7 +163,7 @@ export function List({ subtags, tag, content, metadata, file, config }) { ...@@ -151,7 +163,7 @@ export function List({ subtags, tag, content, metadata, file, config }) {
display: 'inline-block', display: 'inline-block',
width: '25%', width: '25%',
}} }}
href="{{ config.baseurl }}/{{ page.file }}" href={`${config.baseurl}/${page.file}`}
> >
Číst&nbsp;dál Číst&nbsp;dál
</a> </a>
......
...@@ -63,7 +63,7 @@ export function Paginator({ metadata, file, config }) { ...@@ -63,7 +63,7 @@ export function Paginator({ metadata, file, config }) {
</li> </li>
) : ( ) : (
<li class="waves-effect" key={page.pagenumber}> <li class="waves-effect" key={page.pagenumber}>
<a href="{{ config.baseurl }}/{{ page.file }}"> <a href={`${config.baseurl}/${page.file}`}>
{page.metadata.pagenumber} {page.metadata.pagenumber}
</a> </a>
</li> </li>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment