From 7cc662a83e8dd42ac73ec81d6e646646fb1f3d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Sun, 2 Oct 2022 21:38:38 +0200 Subject: [PATCH] Fix most errors --- _data/{cssCacheBust.yml => cacheBust.yml} | 0 _includes/Background.tsx | 5 +- _includes/HakkenDates.tsx | 1 + _includes/Head.tsx | 16 +- _includes/layouts/default.tsx | 25 ++- _includes/layouts/homepage.tsx | 22 +-- about.html | 94 ---------- about.yml | 2 + filters.ts | 9 - hakken-dates.js | 198 +++++++++++----------- hakken.html | 100 ----------- hakken.yml | 92 ++++++++++ index.html | 39 ----- index.yml | 1 + privacy.html | 91 ---------- privacy.yml | 70 ++++++++ scripts/background.js | 20 ++- scripts/hakken-dates.js | 107 ++++++++++++ style.css | 10 +- 19 files changed, 436 insertions(+), 466 deletions(-) rename _data/{cssCacheBust.yml => cacheBust.yml} (100%) create mode 100644 _includes/HakkenDates.tsx delete mode 100644 about.html delete mode 100644 hakken.html create mode 100644 hakken.yml delete mode 100644 index.html delete mode 100644 privacy.html create mode 100644 privacy.yml create mode 100644 scripts/hakken-dates.js diff --git a/_data/cssCacheBust.yml b/_data/cacheBust.yml similarity index 100% rename from _data/cssCacheBust.yml rename to _data/cacheBust.yml diff --git a/_includes/Background.tsx b/_includes/Background.tsx index daba45b..59b9f0a 100644 --- a/_includes/Background.tsx +++ b/_includes/Background.tsx @@ -1,17 +1,18 @@ import Logo from './Logo.tsx'; const x1312 = (new Array(400)).fill("0x1312").join(" "); + export default () =>
-
{x1312}
+
; diff --git a/_includes/HakkenDates.tsx b/_includes/HakkenDates.tsx new file mode 100644 index 0000000..e316cef --- /dev/null +++ b/_includes/HakkenDates.tsx @@ -0,0 +1 @@ +export default ({ lang }) =>
; diff --git a/_includes/Head.tsx b/_includes/Head.tsx index c79bcb3..b339223 100644 --- a/_includes/Head.tsx +++ b/_includes/Head.tsx @@ -1,6 +1,12 @@ import { title as titleFilter } from '../filters.ts'; -export default ({ title, theme, extraStylesheets }) => +export default ({ + title, + theme, + extraStylesheets, + extraScripts, + cacheBust, +}) => { titleFilter(title) } @@ -11,10 +17,14 @@ export default ({ title, theme, extraStylesheets }) => - + <> {(extraStylesheets || []) - .map(extraStylesheet => )} + .map(extraStylesheet => )} + + <> + {(extraScripts || []) + .map(extraScript => )} ; diff --git a/_includes/layouts/default.tsx b/_includes/layouts/default.tsx index 15ab51b..c00c888 100644 --- a/_includes/layouts/default.tsx +++ b/_includes/layouts/default.tsx @@ -1,28 +1,31 @@ -import { - title as titleFilter, - en, - de, - md, -} from '../../filters.ts'; +import { md } from '../../filters.ts'; import Head from '../Head.tsx'; import Background from '../Background.tsx'; +import HakkenDates from '../HakkenDates.tsx'; export default ({ title, + content, + theme, extraStylesheets, - content, - cssCacheBust, + extraScripts, + cacheBust, + + showHakkenDates, }) => <> + +
+ + {showHakkenDates ? : null}
+ + {showHakkenDates ? : null}
diff --git a/_includes/layouts/homepage.tsx b/_includes/layouts/homepage.tsx index c92230e..4ec6d99 100644 --- a/_includes/layouts/homepage.tsx +++ b/_includes/layouts/homepage.tsx @@ -1,31 +1,31 @@ -import { - title as titleFilter, - en, - de, - md, -} from '../../filters.ts'; import Head from '../Head.tsx'; import Background from '../Background.tsx'; export default ({ title, + content, + links, + theme, extraStylesheets, - links, - cssCacheBust, + extraScripts, + cacheBust, + + showHakkenDates, }) => <>
- {links.map(({ href, title }) => - {title} + {links.map(({ href, title, openInNewTab }) => + {title} )}