From ffd9b46bd87ac178f15ed53e5deb3b0aa9774a92 Mon Sep 17 00:00:00 2001 From: Maik de Kruif Date: Fri, 11 Oct 2024 16:18:41 +0200 Subject: [PATCH] Update Hugo version --- archetypes/default.md | 13 ----- archetypes/posts.md | 13 ----- config.toml => config/_default/hugo.toml | 44 ++++++++--------- config/production/hugo.toml | 5 ++ content/portfolio/watch-together.md | 2 +- themes/maik-blog/archetypes/posts.md | 13 ----- themes/maik-blog/layouts/_default/baseof.html | 3 +- themes/maik-blog/layouts/_default/rss.xml | 10 ++-- themes/maik-blog/layouts/partials/footer.html | 6 +-- themes/maik-blog/layouts/partials/head.html | 7 +-- .../layouts/partials/javascript.html | 6 +-- .../maik-blog/layouts/partials/meta-tags.html | 8 ++-- themes/maik-blog/layouts/partials/seo.html | 47 +++++++++---------- .../maik-blog/layouts/portfolio/single.html | 2 +- themes/maik-blog/layouts/posts/single.html | 2 +- themes/maik-blog/layouts/rss.xml | 10 ++-- themes/maik-blog/layouts/writeups/list.html | 3 +- themes/maik-blog/layouts/writeups/rss.xml | 45 ++++++++++++++++++ themes/maik-blog/layouts/writeups/single.html | 2 +- 19 files changed, 122 insertions(+), 119 deletions(-) delete mode 100644 archetypes/default.md delete mode 100644 archetypes/posts.md rename config.toml => config/_default/hugo.toml (90%) create mode 100644 config/production/hugo.toml delete mode 100644 themes/maik-blog/archetypes/posts.md create mode 100644 themes/maik-blog/layouts/writeups/rss.xml diff --git a/archetypes/default.md b/archetypes/default.md deleted file mode 100644 index 7201aca..0000000 --- a/archetypes/default.md +++ /dev/null @@ -1,13 +0,0 @@ -+++ -author = "Maik de Kruif" -title = "{{ replace .Name "-" " " | title }}" -date = {{ .Date }} -description = "" -images = [] -tags = [ - "untagged", -] -categories = [ - "uncategorized", -] -+++ diff --git a/archetypes/posts.md b/archetypes/posts.md deleted file mode 100644 index 7201aca..0000000 --- a/archetypes/posts.md +++ /dev/null @@ -1,13 +0,0 @@ -+++ -author = "Maik de Kruif" -title = "{{ replace .Name "-" " " | title }}" -date = {{ .Date }} -description = "" -images = [] -tags = [ - "untagged", -] -categories = [ - "uncategorized", -] -+++ diff --git a/config.toml b/config/_default/hugo.toml similarity index 90% rename from config.toml rename to config/_default/hugo.toml index 8607aef..afdea31 100644 --- a/config.toml +++ b/config/_default/hugo.toml @@ -1,12 +1,8 @@ -baseURL = "https://maik.dev/" -# baseURL = "http://localhost:1313/" +baseURL = "http://localhost:1313/" title = "Maik de Kruif" languageCode = "en-us" theme = "maik-blog" -paginate = 12 -rssLimit = 10 - copyright = "© Maik de Kruif (maik_dev). All rights reserved." PygmentsCodeFences = true @@ -27,31 +23,21 @@ canonifyURLs = true enableRobotsTXT = true enableGitInfo = true enableEmoji = true -enableMissingTranslationPlaceholders = false -disableRSS = false -disableSitemap = false -disable404 = false -disableHugoGeneratorInject = false - -googleAnalytics = "UA-136337666-1" [permalinks] - posts = "/posts/:title/" - writeups = "/:sections/:title/" - -[author] - name = "Maik de Kruif" - email = "maik@maik.dev" - twitter = "@maik_dev" - image = "/img/home/portrait.png" - -[social] - twitter = "@maik_dev" + [permalinks.page] + posts = "/posts/:title/" + writeups = "/:sections/:title/" + # writeups = "/writeups/:title/" + portfolio = "/portfolio/:title/" [outputs] home = ["HTML", "RSS"] page = ["HTML", "RSS"] +[pagination] + pagerSize = 12 + [params] dateform = "Jan 2, 2006" dateformShort = "Jan 2" @@ -65,6 +51,8 @@ googleAnalytics = "UA-136337666-1" genre = "Blog" + rssLimit = 15 + showReadingTimeInList = false homeSubtitle = "Software Engineering, Linux and Cyber Security" @@ -111,6 +99,15 @@ googleAnalytics = "UA-136337666-1" alt = "Portrait" size = "175px" + [params.author] + name = "Maik de Kruif" + email = "maik@maik.dev" + twitter = "@maik_dev" + image = "/img/home/portrait.png" + + [params.general] + twitter = "@maik_dev" + # Wallets [[params.wallets]] name = "XMR" @@ -175,7 +172,6 @@ googleAnalytics = "UA-136337666-1" [languages] [languages.en] - subtitle = "maik.dev" weight = 1 copyright = "© Maik de Kruif (maik_dev). All rights reserved." diff --git a/config/production/hugo.toml b/config/production/hugo.toml new file mode 100644 index 0000000..856a307 --- /dev/null +++ b/config/production/hugo.toml @@ -0,0 +1,5 @@ +baseURL = "https://maik.dev/" + +[services] + [services.googleAnalytics] + id = "UA-136337666-1" \ No newline at end of file diff --git a/content/portfolio/watch-together.md b/content/portfolio/watch-together.md index bf7ef35..58b9816 100644 --- a/content/portfolio/watch-together.md +++ b/content/portfolio/watch-together.md @@ -2,7 +2,7 @@ author = "Maik de Kruif" title = "WatchTogether" start_date = 2018-08-17 -end_date = 9999-01-01 +end_date = 2021-01-25 company_name = "Personal" company_url = "https://maik.dev" cover = "img/portfolio/watch-together/screenshot.png" diff --git a/themes/maik-blog/archetypes/posts.md b/themes/maik-blog/archetypes/posts.md deleted file mode 100644 index 695af53..0000000 --- a/themes/maik-blog/archetypes/posts.md +++ /dev/null @@ -1,13 +0,0 @@ -+++ -author = "Maik de Kruif" -title = "{{ replace .Name "-" " " | title }}" -date = {{ .Date }} -description = "" -cover = "" -tags = [ - "untagged", -] -categories = [ - "uncategorized", -] -+++ diff --git a/themes/maik-blog/layouts/_default/baseof.html b/themes/maik-blog/layouts/_default/baseof.html index 2f279c5..9c28994 100644 --- a/themes/maik-blog/layouts/_default/baseof.html +++ b/themes/maik-blog/layouts/_default/baseof.html @@ -1,4 +1,3 @@ -{{- $paginator := .Paginate .RegularPagesRecursive }} @@ -20,6 +19,8 @@ {{ partial "javascript.html" . }} + + {{ partial "seo.html" . }} \ No newline at end of file diff --git a/themes/maik-blog/layouts/_default/rss.xml b/themes/maik-blog/layouts/_default/rss.xml index fdc1319..ae64104 100644 --- a/themes/maik-blog/layouts/_default/rss.xml +++ b/themes/maik-blog/layouts/_default/rss.xml @@ -7,11 +7,11 @@ {{- with .Site.LanguageCode }} {{.}} {{- end }} - {{- with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}} + {{- with .Site.Params.author.email }} + {{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}} {{- end }} - {{- with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}} + {{- with .Site.Params.author.email }} + {{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}} {{- end }} {{- with .Site.Copyright }} {{.}} @@ -22,7 +22,7 @@ {{- with .OutputFormats.Get "RSS" }} {{ printf "" .Permalink .MediaType | safeHTML }} {{- end }} - {{ range .Pages | first 15 }} + {{ range .Pages | first .Site.Params.rssLimit }} {{ .Title }}{{ with .Params.Subtitle }} // {{ . }}{{ end }} {{ .Permalink }} diff --git a/themes/maik-blog/layouts/partials/footer.html b/themes/maik-blog/layouts/partials/footer.html index 39e1941..df9bf39 100644 --- a/themes/maik-blog/layouts/partials/footer.html +++ b/themes/maik-blog/layouts/partials/footer.html @@ -3,19 +3,17 @@
© {{ now.Format "2006" }} - {{- if .Site.Author.name }} - {{ .Site.Author.name }} + {{- if .Site.Params.author.name }} + {{ .Site.Params.author.name }} {{- end }} {{- if .Site.Copyright }} All rights reserved. {{- end }} Privacy - {{- with (not (in (.Site.Language.Get "disableKinds") "RSS")) }} {{ partial "svg.html" (dict "name" "rss") }} - {{- end }}
diff --git a/themes/maik-blog/layouts/partials/head.html b/themes/maik-blog/layouts/partials/head.html index a7f046b..68eefa1 100644 --- a/themes/maik-blog/layouts/partials/head.html +++ b/themes/maik-blog/layouts/partials/head.html @@ -10,11 +10,11 @@ crossorigin="anonymous"> {{ $options := (dict "targetPath" "main.css" "outputStyle" "compressed" "enableSourceMap" true) }} -{{- $style := resources.Get "scss/main.scss" | resources.ToCSS $options | resources.Fingerprint }} +{{- $style := resources.Get "scss/main.scss" | css.Sass $options | resources.Fingerprint }} {{ $options := (dict "targetPath" "syntax_highlighting.css" "outputStyle" "compressed" "enableSourceMap" true) }} -{{- $style := resources.Get "scss/syntax_highlighting.scss" | resources.ToCSS $options | resources.Fingerprint }} +{{- $style := resources.Get "scss/syntax_highlighting.scss" | css.Sass $options | resources.Fingerprint }} {{- range $val := $.Site.Params.customCSS }} @@ -28,9 +28,6 @@ {{- partial "meta-tags.html" . -}} - -{{- partial "seo.html" . -}} - - + {{- end }} diff --git a/themes/maik-blog/layouts/partials/meta-tags.html b/themes/maik-blog/layouts/partials/meta-tags.html index 15f3dd9..67ed737 100644 --- a/themes/maik-blog/layouts/partials/meta-tags.html +++ b/themes/maik-blog/layouts/partials/meta-tags.html @@ -1,6 +1,6 @@ + content="{{ if .Params.author }}{{ .Params.author }}{{ else }}{{ with .Site.Params.author.name }}{{ . }}{{ end }}{{ end }}"> + content="{{ if .Params.author }}{{ .Params.author }}{{ else }}{{ with .Site.Params.author.name }}{{ . }}{{ end }}{{ end }}"> {{- if isset .Params "date" }} @@ -60,9 +60,9 @@ -{{- with .Site.Social.twitter }} +{{- with .Site.Params.general.twitter }} {{- end }} -{{- with .Site.Author.twitter }} +{{- with .Site.Params.author.twitter }} {{- end }} \ No newline at end of file diff --git a/themes/maik-blog/layouts/partials/seo.html b/themes/maik-blog/layouts/partials/seo.html index 597b6d8..1339c66 100644 --- a/themes/maik-blog/layouts/partials/seo.html +++ b/themes/maik-blog/layouts/partials/seo.html @@ -1,10 +1,9 @@ {{- /* */}} +{{- $visiblePage := .}} {{- $breadcrumbs := slice }} {{- $path := "" }} -{{- if or (eq .Kind "taxonomy") (or (eq .Kind "term") (eq .Kind "404")) }} +{{- if or (eq .Kind "taxonomy") (or (eq .Kind "term") (or (eq .Kind "404") (.File))) }} {{- $path = .RelPermalink }} -{{- else if .File }} -{{- $path = string .File }} {{- else if .IsHome }} {{- $path = "" }} {{- else }} @@ -22,10 +21,10 @@ {{- $breadcrumbs = $breadcrumbs | append (dict "name" "Not Found" "url" (printf "%s%s" $.Site.BaseURL (strings.TrimLeft "/" $currentPath))) }} {{- else }} {{- $title := $page.Title }} -{{- if eq $page $ }} -{{- $breadcrumbs = $breadcrumbs | append (dict "name" $title "url" $page.Permalink) }} +{{- if eq (trim $currentPath "/") $path }} +{{- $breadcrumbs = $breadcrumbs | append (dict "name" $visiblePage.Title "url" $visiblePage.Permalink) }} {{- else }} -{{- $breadcrumbs = $breadcrumbs | append (dict "name" $title "url" $page.Permalink)}} +{{- $breadcrumbs = $breadcrumbs | append (dict "name" $title "url" $page.Permalink) }} {{- end }} {{- end }} {{- end }} @@ -39,11 +38,11 @@ { "@type": "Person", "@id": "{{ $.Site.BaseURL }}#website_founder", - "name": {{ $.Site.Author.name | safeHTML }}, - {{- with $.Site.Author.email }} + "name": {{ $.Site.Params.author.name | safeHTML }}, + {{- with $.Site.Params.author.email }} "email": {{ . | safeHTML }}, {{- end }} - {{- with $.Site.Author.image }} + {{- with $.Site.Params.author.image }} {{- $img := resources.Get . }} {{- $img = $img.Resize (printf "%dx%d png" $img.Width $img.Height) }} "image": { @@ -57,7 +56,7 @@ }, { "@type": "Organization", - "name": {{ $.Site.Author.name | safeHTML }}, + "name": {{ $.Site.Params.author.name | safeHTML }}, "slogan": {{$.Site.Params.HomeSubtitle | safeHTML }}, {{- with $socials := .Site.Params.social }} "sameAs": [ @@ -66,10 +65,10 @@ {{- end }} ], {{- end }} - {{- with $.Site.Author.email }} + {{- with $.Site.Params.author.email }} "email": {{ . | safeHTML }}, {{- end }} - {{- with $.Site.Author.image }} + {{- with $.Site.Params.author.image }} {{- $img := resources.Get . }} {{- $img = $img.Resize (printf "%dx%d png" $img.Width $img.Height) }} "logo": { @@ -108,15 +107,15 @@ {{- with .Site.Copyright }} "license": {{ . | safeHTML }}, {{- end }} - {{- if .Site.Author.name }} + {{- if .Site.Params.author.name }} {{- range slice "publisher" "author" }} {{ . }}: { "@type": "Person", - "name": {{ $.Site.Author.name | safeHTML }}, - {{- with $.Site.Author.email }} + "name": {{ $.Site.Params.author.name | safeHTML }}, + {{- with $.Site.Params.author.email }} "email": {{ . | safeHTML }}, {{- end }} - {{- with $.Site.Author.image }} + {{- with $.Site.Params.author.image }} {{- $img := resources.Get . }} {{- $img = $img.Resize (printf "%dx%d png" $img.Width $img.Height) }} "image": { @@ -187,15 +186,15 @@ {{- with .Site.Copyright }} "license": {{ . | safeHTML }}, {{- end }} - {{- if .Site.Author.name }} + {{- if .Site.Params.author.name }} {{- range slice "publisher" "author" }} {{ . }}: { "@type": "Person", - "name": {{ $.Site.Author.name | safeHTML }}, - {{- with $.Site.Author.email }} + "name": {{ $.Site.Params.author.name | safeHTML }}, + {{- with $.Site.Params.author.email }} "email": {{ . | safeHTML }}, {{- end }} - {{- with $.Site.Author.image }} + {{- with $.Site.Params.author.image }} {{- $img := resources.Get . }} {{- $img = $img.Resize (printf "%dx%d png" $img.Width $img.Height) }} "image": { @@ -258,15 +257,15 @@ {{- with .Site.Copyright }} "license": {{ . | safeHTML }}, {{- end }} - {{- if .Site.Author.name }} + {{- if .Site.Params.author.name }} {{- range slice "publisher" "author" }} {{ . }}: { "@type": "Person", - "name": {{ $.Site.Author.name | safeHTML }}, - {{- with $.Site.Author.email }} + "name": {{ $.Site.Params.author.name | safeHTML }}, + {{- with $.Site.Params.author.email }} "email": {{ . | safeHTML }}, {{- end }} - {{- with $.Site.Author.image }} + {{- with $.Site.Params.author.image }} {{- $img := resources.Get . }} {{- $img = $img.Resize (printf "%dx%d png" $img.Width $img.Height) }} "image": { diff --git a/themes/maik-blog/layouts/portfolio/single.html b/themes/maik-blog/layouts/portfolio/single.html index 7807b0d..7d07ff5 100644 --- a/themes/maik-blog/layouts/portfolio/single.html +++ b/themes/maik-blog/layouts/portfolio/single.html @@ -144,7 +144,7 @@ {{- end }} - {{- if .Site.DisqusShortname }} + {{- if .Site.Config.Services.Disqus.Shortname }} {{- if not (eq .Params.Comments "false") }}
{{ template "_internal/disqus.html" . }} diff --git a/themes/maik-blog/layouts/posts/single.html b/themes/maik-blog/layouts/posts/single.html index da0abc6..6843119 100644 --- a/themes/maik-blog/layouts/posts/single.html +++ b/themes/maik-blog/layouts/posts/single.html @@ -152,7 +152,7 @@ {{- end }} - {{- if .Site.DisqusShortname }} + {{- if .Site.Config.Services.Disqus.Shortname }} {{- if not (eq .Params.Comments "false") }}
{{ template "_internal/disqus.html" . }} diff --git a/themes/maik-blog/layouts/rss.xml b/themes/maik-blog/layouts/rss.xml index 53ce01a..8a434a8 100644 --- a/themes/maik-blog/layouts/rss.xml +++ b/themes/maik-blog/layouts/rss.xml @@ -7,11 +7,11 @@ {{- with .Site.LanguageCode }} {{.}} {{- end }} - {{- with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}} + {{- with .Site.Params.author.email }} + {{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}} {{- end }} - {{- with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}} + {{- with .Site.Params.author.email }} + {{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}} {{- end }} {{- with .Site.Copyright }} {{.}} @@ -27,7 +27,7 @@ {{- $allContent = union $allContent .RegularPagesRecursive }} {{- end }} {{- $allContent = sort $allContent "Date" "desc" }} - {{- $allContent = $allContent | first 15 }} + {{- $allContent = $allContent | first .Site.Params.rssLimit }} {{- range $allContent }} {{ .Title }}{{ with .Params.Subtitle }} // {{ . }}{{ end }} diff --git a/themes/maik-blog/layouts/writeups/list.html b/themes/maik-blog/layouts/writeups/list.html index 440c072..852b4c3 100644 --- a/themes/maik-blog/layouts/writeups/list.html +++ b/themes/maik-blog/layouts/writeups/list.html @@ -1,4 +1,5 @@ {{ define "main" }} +{{ $paginator := (.Paginate .RegularPagesRecursive) }}

{{ .Title }}

@@ -12,7 +13,7 @@ {{- end }}
- {{ range .Paginator.Pages }} + {{ range $paginator.Pages }}

{{ .Title | markdownify }}

diff --git a/themes/maik-blog/layouts/writeups/rss.xml b/themes/maik-blog/layouts/writeups/rss.xml new file mode 100644 index 0000000..32757e3 --- /dev/null +++ b/themes/maik-blog/layouts/writeups/rss.xml @@ -0,0 +1,45 @@ + + + {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} + {{"favicon-32x32.png" | absURL}} + {{ .Permalink }} + Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} + {{- with .Site.LanguageCode }} + {{.}} + {{- end }} + {{- with .Site.Params.author.email }} + {{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}} + {{- end }} + {{- with .Site.Params.author.email }} + {{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}} + {{- end }} + {{- with .Site.Copyright }} + {{.}} + {{- end }} + {{- if not .Date.IsZero }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{- end }} + {{- with .OutputFormats.Get "RSS" }} + {{ printf "" .Permalink .MediaType | safeHTML }} + {{- end }} + {{ range .RegularPagesRecursive | first .Site.Params.rssLimit }} + + {{ .Title }}{{ with .Params.Subtitle }} // {{ . }}{{ end }} + {{ .Permalink }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ .Date.Format "2006-01-02T15:04:05Z0700" | safeHTML }} + {{- if .GitInfo }} + {{ dateFormat "2006-01-02T15:04:05Z0700" .GitInfo.AuthorDate.Local | safeHTML }} + {{- end }} + {{ .Params.author }} + {{ .Permalink }} + {{ printf `` .Params.description | safeHTML }} + {{ $content := .Content}} + {{- if .Params.Cover }} + {{- $content = (printf `%s%s` (partial "image.html" (dict "path" .Params.Cover "alt" (.Title | plainify) "class" "post-cover")) $content) }} + {{- end }} + {{ printf `` $content | safeHTML }} + + {{ end }} + + diff --git a/themes/maik-blog/layouts/writeups/single.html b/themes/maik-blog/layouts/writeups/single.html index da0abc6..6843119 100644 --- a/themes/maik-blog/layouts/writeups/single.html +++ b/themes/maik-blog/layouts/writeups/single.html @@ -152,7 +152,7 @@ {{- end }} - {{- if .Site.DisqusShortname }} + {{- if .Site.Config.Services.Disqus.Shortname }} {{- if not (eq .Params.Comments "false") }}
{{ template "_internal/disqus.html" . }}