Add breadcrumbs, let writeup urls make more sense and add section pages

config.toml

@@ -36,7 +36,8 @@ disableHugoGeneratorInject = false
 googleAnalytics = "UA-136337666-1"
 
 [permalinks]
-  posts = "/posts/:year/:month/:title/"
+  posts = "/posts/:title/"
+  writeups = "/:sections/:title/"
 
 [author]
   name = "Maik de Kruif"
@@ -48,8 +49,8 @@ googleAnalytics = "UA-136337666-1"
   twitter = "@maik_dev"
 
 [outputs]
-  home = ["HTML", "AMP", "RSS"]
+  home = ["HTML", "RSS"]
-  page = ["HTML", "AMP", "RSS"]
+  page = ["HTML", "RSS"]
 
 [params]
   dateform        = "Jan 2, 2006"

content/writeups/adventofctf/2020/_index.md

@@ -0,0 +1,5 @@
++++
+author = "Maik de Kruif"
+title = "2020"
+description = "My Advent of CTF - 2020 writeups."
++++

content/writeups/adventofctf/2020/challenge_0.md

@@ -18,6 +18,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_0"
+]
 +++
 
 - Points: 1

content/writeups/adventofctf/2020/challenge_1.md

@@ -18,6 +18,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_1"
+]
 +++
 
 - Points: 100

content/writeups/adventofctf/2020/challenge_10.md

@@ -18,6 +18,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_10"
+]
 +++
 
 - Points: 1000

content/writeups/adventofctf/2020/challenge_11.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_11"
+]
 +++
 
 - Points: 1100

content/writeups/adventofctf/2020/challenge_12.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_12"
+]
 +++
 
 - Points: 1200

content/writeups/adventofctf/2020/challenge_13.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_13"
+]
 +++
 
 - Points: 1300

content/writeups/adventofctf/2020/challenge_14.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_14"
+]
 +++
 
 - Points: 1400

content/writeups/adventofctf/2020/challenge_15.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_15"
+]
 +++
 
 - Points: 1500

content/writeups/adventofctf/2020/challenge_16.md

@@ -20,6 +20,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_16"
+]
 +++
 
 - Points: 1600

content/writeups/adventofctf/2020/challenge_17.md

@@ -20,6 +20,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_17"
+]
 +++
 
 - Points: 1700

content/writeups/adventofctf/2020/challenge_18.md

@@ -20,6 +20,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_18"
+]
 +++
 
 - Points: 1800

content/writeups/adventofctf/2020/challenge_19.md

@@ -20,6 +20,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_19"
+]
 +++
 
 - Points: 1900

content/writeups/adventofctf/2020/challenge_2.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_2"
+]
 +++
 
 - Points: 200

content/writeups/adventofctf/2020/challenge_20.md

@@ -20,6 +20,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_20"
+]
 +++
 
 - Points: 2000

content/writeups/adventofctf/2020/challenge_21.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_21"
+]
 +++
 
 - Points: 2100

content/writeups/adventofctf/2020/challenge_22.md

@@ -20,6 +20,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_22"
+]
 +++
 
 - Points: 2200

content/writeups/adventofctf/2020/challenge_23.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_23"
+]
 +++
 
 - Points: 2300

content/writeups/adventofctf/2020/challenge_24.md

@@ -21,6 +21,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_24"
+]
 +++
 
 - Points: 2400

content/writeups/adventofctf/2020/challenge_3.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_3"
+]
 +++
 
 - Points: 300

content/writeups/adventofctf/2020/challenge_4.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_4"
+]
 +++
 
 - Points: 400

content/writeups/adventofctf/2020/challenge_5.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_5"
+]
 +++
 
 - Points: 500

content/writeups/adventofctf/2020/challenge_6.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_6"
+]
 +++
 
 - Points: 600

content/writeups/adventofctf/2020/challenge_7.md

@@ -19,6 +19,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_7"
+]
 +++
 
 - Points: 700

content/writeups/adventofctf/2020/challenge_8.md

@@ -18,6 +18,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_8"
+]
 +++
 
 - Points: 800

content/writeups/adventofctf/2020/challenge_9.md

@@ -18,6 +18,9 @@ categories = [
     "writeups",
     "hacking",
 ]
+aliases = [
+    "challenge_9"
+]
 +++
 
 - Points: 900

content/writeups/adventofctf/2020/intro.md

@@ -15,6 +15,9 @@ categories = [
     "ctf",
     "hacking",
 ]
+aliases = [
+    "intro"
+]
 +++
 
 So, I'm in this Discord server and somebody by the name [@credmp](https://twitter.com/credmp) thought it'd be a great idea to do an advent calendar of CTF challenges. Every day of december, up until christmas, a new challenge will open up. It starts out easy, accessible to anyone and will grow in complexity as time progresses.

content/writeups/adventofctf/_index.md

@@ -0,0 +1,5 @@
++++
+author = "Maik de Kruif"
+title = "Advent of CTF"
+description = "My Advent of CTF writeups."
++++

content/writeups/google-ctf/2021/_index.md

@@ -0,0 +1,5 @@
++++
+author = "Maik de Kruif"
+title = "2021"
+description = "My Google CTF - 2021 writeups."
++++

content/writeups/google-ctf/2021/beginners-quest/1.md

@@ -20,6 +20,9 @@ categories = [
     "hacking",
     "rev",
 ]
+aliases = [
+    "1"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/10.md

@@ -19,6 +19,9 @@ categories = [
     "hacking",
     "hardware",
 ]
+aliases = [
+    "10"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/2.md

@@ -20,6 +20,9 @@ categories = [
     "hacking",
     "misc",
 ]
+aliases = [
+    "2"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/3.md

@@ -21,6 +21,9 @@ categories = [
     "hacking",
     "misc",
 ]
+aliases = [
+    "3"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/4.md

@@ -20,6 +20,9 @@ categories = [
     "writeups",
     "hw",
 ]
+aliases = [
+    "4"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/5.md

@@ -19,6 +19,9 @@ categories = [
     "hacking",
     "misc",
 ]
+aliases = [
+    "5"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/6.md

@@ -19,6 +19,9 @@ categories = [
     "hacking",
     "misc",
 ]
+aliases = [
+    "6"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/7.md

@@ -19,6 +19,9 @@ categories = [
     "hacking",
     "crypto",
 ]
+aliases = [
+    "7"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/8.md

@@ -19,6 +19,9 @@ categories = [
     "hacking",
     "misc",
 ]
+aliases = [
+    "8"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/9.md

@@ -19,6 +19,9 @@ categories = [
     "hacking",
     "reversing",
 ]
+aliases = [
+    "9"
+]
 +++
 
 ## Story line

content/writeups/google-ctf/2021/beginners-quest/_index.md

@@ -0,0 +1,5 @@
++++
+author = "Maik de Kruif"
+title = "Beginners Quest"
+description = "My Google CTF - 2021 - Beginners Quest writeups."
++++

content/writeups/google-ctf/_index.md

@@ -0,0 +1,5 @@
++++
+author = "Maik de Kruif"
+title = "Google CTF"
+description = "My Google CTF writeups."
++++

themes/maik-blog/layouts/_default/list.html

@@ -5,7 +5,7 @@
     <h1>{{ .Title }}</h1>
 
     {{- if and .Content (not .Paginator.HasPrev) }}
-    <div class="content">{{ .Content }}</div>
+    <div class="content content-list">{{ .Content }}</div>
     {{- end }}
 
     {{- if .Paginator.HasPrev }}

themes/maik-blog/layouts/partials/seo.html

@@ -1,8 +1,94 @@
+{{- /*  <!-- Breadcrumbs -->  */}}
+{{- $breadcrumbs := slice }}
+{{- $path := "" }}
+{{- if or (eq .Kind "taxonomy") (or (eq .Kind "term") (eq .Kind "404")) }}
+{{- $path = .RelPermalink }}
+{{- else if .File }}
+{{- $path = string .File }}
+{{- else if .IsHome }}
+{{- $path = "" }}
+{{- else }}
+{{- errorf "Could not find page at url: \"%s\"!" .RelPermalink }}
+{{- end }}
+{{- $path = trim $path "/" }}
+{{- $currentPath := "" }}
+{{- $breadcrumbs = $breadcrumbs | append (dict "name" "Home" "url" $.Site.BaseURL) }}
+{{- range split $path "/" }}
+{{- $currentPath = printf "%s/%s" $currentPath . }}
+{{- $page := $.GetPage $currentPath }}
+{{- if not $.IsHome }}
+{{- if ne . "_index.md" }}
+{{- if eq $.Kind "404" }}
+{{- $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) }}
+{{- else }}
+{{- $breadcrumbs = $breadcrumbs | append (dict "name" $title "url" $page.Permalink)}}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
 
-{{- if .IsHome }}
 <script type="application/ld+json">
 {
-    "@context": "http://schema.org",
+    "@context": "https://schema.org",
+    "@graph": [
+        {
+            "@type": "Person",
+            "@id": "{{ $.Site.BaseURL }}#website_founder",
+            "name": {{ $.Site.Author.name | safeHTML }},
+            {{- with $.Site.Author.email }}
+            "email": {{ . | safeHTML }},
+            {{- end }}
+            {{- with $.Site.Author.image }}
+            {{- $img := resources.Get . }}
+            {{- $img = $img.Resize (printf "%dx%d png" $img.Width $img.Height) }}
+            "image": {
+                "@type": "ImageObject",
+                "url": "{{ $img.Permalink }}",
+                "width": {{ $img.Width }},
+                "height": {{ $img.Height }}
+            },
+            {{- end }}
+            "url": "{{ $.Site.BaseURL }}"
+        },
+        {
+            "@type": "Organization",
+            "name": {{ $.Site.Author.name | safeHTML }},
+            "slogan": {{$.Site.Params.HomeSubtitle | safeHTML }},
+            {{- with $socials := .Site.Params.social }}
+            "sameAs": [
+                {{- range $index, $social := $socials }}
+                "{{ $social.url }}"{{ if ne $index (sub (len $socials) 1) }},{{ end }}
+                {{- end }}
+            ],
+            {{- end }}
+            {{- with $.Site.Author.email }}
+            "email": {{ . | safeHTML }},
+            {{- end }}
+            {{- with $.Site.Author.image }}
+            {{- $img := resources.Get . }}
+            {{- $img = $img.Resize (printf "%dx%d png" $img.Width $img.Height) }}
+            "logo": {
+                "@type": "ImageObject",
+                "url": "{{ $img.Permalink }}",
+                "width": {{ $img.Width }},
+                "height": {{ $img.Height }}
+            },
+            "image": {
+                "@type": "ImageObject",
+                "url": "{{ $img.Permalink }}",
+                "width": {{ $img.Width }},
+                "height": {{ $img.Height }}
+            },
+            {{- end }}
+            "url": "{{ $.Site.BaseURL }}",
+            "founder": { "@id": "{{ $.Site.BaseURL }}#website_founder" }
+        },
+        {
             "@type": "WebSite",
             "inLanguage": "{{ .Site.LanguageCode }}",
             {{- $img := resources.Get .Site.Params.portrait.path }}
@@ -18,7 +104,7 @@
             ],
             "genre": "{{ .Site.Params.genre }}",
             "keywords": "{{ .Site.Params.keywords }}{{ if .Params.tags }}{{ range .Params.tags }}, {{ . }}{{ end }}{{ end }}{{ with .Title }}, {{ delimit (split . " ") ", " }}{{ end }}{{ with .Params.Subtitle }}, {{ delimit (split . " ") ", " }}{{ end }}",
-    "url": "{{ .Permalink }}",
+            "url": "{{ .Site.BaseURL }}",
             {{- with .Site.Copyright }}
             "license": {{ . | safeHTML }},
             {{- end }}
@@ -47,10 +133,23 @@
             "headline": {{ .Site.Title }},
             "alternativeHeadline": {{ .Site.Params.homeSubtitle }},
             "description": {{ .Site.Params.description }}
+        },
+        {
+            "@type": "BreadcrumbList",
+            "itemListElement": [
+                {{- range $index, $breadcrumb := $breadcrumbs }}
+                {
+                    "@type": "ListItem",
+                    "position": {{ add $index 1 }},
+                    "item": {
+                        "@id": "{{ $breadcrumb.url }}",
+                        "url": "{{ $breadcrumb.url }}",
+                        "name": "{{ $breadcrumb.name }}"
                     }
-</script>
+                }{{ if ne $index (sub (len $breadcrumbs) 1) }},{{ end }}
-{{- else if .IsPage }}
+                {{- end }}
-<script type="application/ld+json">
+            ]
+        }{{ if .IsPage }},
         {
             "@context": "http://schema.org",
             "@type": "BlogPosting",
@@ -111,10 +210,7 @@
             {{- end }}
             {{- end }}
             "description": {{ .Params.description | plainify }}
-}
+        }{{ end }}{{ if .IsSection }},
-</script>
-{{- else if .IsSection }}
-<script type="application/ld+json">
         {
             "@context": "http://schema.org",
             "@type": "ItemList",
@@ -190,6 +286,7 @@
                 }{{ if ne (sub (len $pages) 1) $index }},{{ end }}
                 {{- end }}
             ]
+        }{{ end }}
+    ]
 }
 </script>
-{{- end }}

themes/maik-blog/layouts/portfolio/list.html

@@ -4,7 +4,7 @@
     <h1>Portfolio</h1>
 
     {{- if and .Content (not .Paginator.HasPrev) }}
-    <div class="content">{{ .Content }}</div>
+    <div class="content content-list">{{ .Content }}</div>
     {{- end }}
 
     <div class="portfolios-list">

themes/maik-blog/layouts/writeups/list.html

@@ -1,11 +1,19 @@
 {{ define "main" }}
-{{ $paginator := .Paginate .Data.Pages }}
+
+{{- $allWriteups := slice }}
+{{- range where (where .Site.Pages "Section" .Section) "IsPage" true }}
+{{- if  $.IsAncestor . }}
+{{- $allWriteups = $allWriteups | append . }}
+{{- end }}
+{{- end }}
+{{- $allWriteups = sort $allWriteups "Date" "desc" }}
+{{ $paginator := .Paginate $allWriteups }}
 
 <main class="posts">
     <h1>{{ .Title }}</h1>
 
     {{- if and .Content (not .Paginator.HasPrev) }}
-    <div class="content">{{ .Content }}</div>
+    <div class="content content-list">{{ .Content }}</div>
     {{- end }}
 
     {{- if .Paginator.HasPrev }}