From fd3d3c41799bc1901309a812e18290a6ec06dd46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isabella=20Sko=C5=99epov=C3=A1?= <isabella@skorepova.info>
Date: Wed, 4 Jan 2023 19:36:33 +0100
Subject: [PATCH] make the move work
---
sitegin/index.js | 7 +++++--
sitegin/readFiles.js | 1 +
sitegin/urls.js | 10 +++++++++-
theme-source/templates/article.tsx | 6 ++----
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/sitegin/index.js b/sitegin/index.js
index 81d4fe19..11f1d0e1 100755
--- a/sitegin/index.js
+++ b/sitegin/index.js
@@ -128,10 +128,13 @@ function copyStaticFiles(builddir) {
},
)
fsextra.copy(
- path.join(__dirname, '..', 'static', 'articles'),
+ path.join(__dirname, '..', 'content', 'articles'),
`${builddir}/clanek`,
+ (file) => {
+ return !file.endsWith('.md')
+ },
() => {
- console.log('copy static/articles done')
+ console.log('copy content/articles done')
},
)
}
diff --git a/sitegin/readFiles.js b/sitegin/readFiles.js
index 3976c29d..aca48237 100644
--- a/sitegin/readFiles.js
+++ b/sitegin/readFiles.js
@@ -10,6 +10,7 @@ export default (obj) => {
const onFile = (root, fileStats, next, array) => {
// ignore files like .gitkeep
if (fileStats.name.startsWith('.')) return next()
+ if (!fileStats.name.endsWith('.md')) return next()
const filename = path.join(root, fileStats.name)
const file = path.relative(path.join(__dirname, '..', 'content'), filename)
fs.readFile(filename, 'utf8', (err, data) => {
diff --git a/sitegin/urls.js b/sitegin/urls.js
index 23fa9c05..03e16ca4 100644
--- a/sitegin/urls.js
+++ b/sitegin/urls.js
@@ -1,14 +1,22 @@
/*
* This jobs translates files to resulting URL
*/
+import path from 'path'
export const rewriteURL = (file) =>
- file.replace(/\.md$/, '/').replace(/^articles/, 'clanek')
+ file.replace(/\/[^/]+$/, '/').replace(/^articles/, 'clanek')
export default (obj) => {
console.log('Build step: URLs')
return new Promise((resolve) => {
for (const page of obj.pages) {
+ const basename = path.basename(page.file, '.md')
+ if (!page.file.endsWith(basename + '/' + basename + '.md')) {
+ throw new Error(
+ 'Article md file must be in eponymous folder (ie. something/article-name/article-name.md)',
+ )
+ }
+ page.originalFile = page.file
page.file = rewriteURL(page.file)
page.canonicalURL = `https://ok1kvk.cz/${page.file}`
}
diff --git a/theme-source/templates/article.tsx b/theme-source/templates/article.tsx
index 8d0ef77e..16794bdc 100644
--- a/theme-source/templates/article.tsx
+++ b/theme-source/templates/article.tsx
@@ -84,7 +84,7 @@ export default {
},
}
-function Article({ metadata, content, config, file }) {
+function Article({ metadata, content, config, originalFile }) {
return (
<BaseBody config={config}>
<div className="section container" id="content">
@@ -98,9 +98,7 @@ function Article({ metadata, content, config, file }) {
className="author"
style={{ color: '#a2a2a2', display: 'block' }}
target="_blank"
- href={`https://git.ok1kvk.cz/ok1kvk.cz/content/tree/main/content/articles/${file
- .replace('clanek/', '')
- .replace(/\/$/, '')}.md`}
+ href={`https://git.ok1kvk.cz/ok1kvk.cz/content/tree/main/content/articles/${originalFile}`}
>
{metadata.published ? (
<>
--
GitLab