From 16261320d92dc22ebc024b5ce20234486a7ef0b9 Mon Sep 17 00:00:00 2001 From: Maik de Kruif Date: Thu, 8 Apr 2021 15:05:17 +0200 Subject: [PATCH] Improve SEO and code formatting --- config.toml | 25 ++++-- content/posts/adventofctf/challenge_6.md | 6 +- static/img/home/portrait.png | Bin 0 -> 15153 bytes themes/maik-blog/layouts/_default/baseof.html | 6 +- themes/maik-blog/layouts/_default/list.html | 62 +++++++------- themes/maik-blog/layouts/index.html | 9 +- themes/maik-blog/layouts/partials/footer.html | 20 +++-- themes/maik-blog/layouts/partials/head.html | 81 +++++------------- themes/maik-blog/layouts/partials/header.html | 4 +- .../layouts/partials/javascript.html | 31 ++++--- themes/maik-blog/layouts/partials/logo.html | 14 +-- themes/maik-blog/layouts/partials/menu.html | 2 +- .../maik-blog/layouts/partials/meta-tags.html | 64 ++++++++++++++ .../layouts/partials/sharing-buttons.html | 80 ++++++++++------- themes/maik-blog/layouts/posts/rss.xml | 38 +++++--- themes/maik-blog/layouts/posts/single.html | 42 +++++---- themes/maik-blog/layouts/rss.xml | 38 +++++--- 17 files changed, 309 insertions(+), 213 deletions(-) create mode 100644 static/img/home/portrait.png create mode 100644 themes/maik-blog/layouts/partials/meta-tags.html diff --git a/config.toml b/config.toml index 9f98a93..d18d33e 100644 --- a/config.toml +++ b/config.toml @@ -2,7 +2,6 @@ baseURL = "https://maik.dev/" # baseURL = "http://localhost:1313/" title = "Maik de Kruif" languageCode = "en-us" -# theme = "hello-friend-ng" theme = "maik-blog" paginate = 6 @@ -25,7 +24,7 @@ buildExpired = false canonifyURLs = true enableRobotsTXT = true -enableGitInfo = false +enableGitInfo = true enableEmoji = true enableMissingTranslationPlaceholders = false disableRSS = false @@ -40,6 +39,14 @@ googleAnalytics = "UA-136337666-1" [author] name = "Maik de Kruif" + twitter = "@maik_dev" + +[social] + twitter = "@maik_dev" + +[outputs] + home = ["HTML", "AMP", "RSS"] + page = ["HTML", "AMP", "RSS"] [params] dateform = "Jan 2, 2006" @@ -57,7 +64,7 @@ googleAnalytics = "UA-136337666-1" homeSubtitle = "Maik de Kruif (maik_dev)" # Prefix of link to the git commit detail page. GitInfo must be enabled. - # gitUrl = "" + gitUrl = "https://github.com/maikka39/Personal-Website/commit/" # Set disableReadOtherPosts to true in order to hide the links to other posts. disableReadOtherPosts = false @@ -66,7 +73,9 @@ googleAnalytics = "UA-136337666-1" # There are a lot of buttons preconfigured. If you want to change them, # generate the buttons here: https://sharingbuttons.io # and add them into your own `layouts/partials/sharing-buttons.html` + # Preconfigured: facebook, twitter, tumblr, email, pinterest, linkedin, reddit, xing, whatsapp, hackernews, telegram enableSharingButtons = true + sharingButtons = ["twitter", "email", "linkedin", "reddit", "whatsapp", "telegram"] # Integrate Javascript files or stylesheets by adding the url to the external assets or by # linking local files with their path relative to the static folder, e.g. "css/styles.css" @@ -97,10 +106,10 @@ googleAnalytics = "UA-136337666-1" # logoCursorAnimate = "2s" # Uncomment this if you want a portrait on your start page - # [params.portrait] - # path = "/img/image.jpg" - # alt = "Portrait" - # maxWidth = "50px" + [params.portrait] + path = "/img/home/portrait.png" + alt = "Portrait" + size = "175px" # Social icons [[params.social]] @@ -163,7 +172,7 @@ googleAnalytics = "UA-136337666-1" [languages.en] subtitle = "maik.dev" weight = 1 - copyright = 'All rights reserved.' + copyright = "© Maik de Kruif (maik_dev). All rights reserved." [menu] [[menu.main]] diff --git a/content/posts/adventofctf/challenge_6.md b/content/posts/adventofctf/challenge_6.md index e896e7a..4b7f0ac 100644 --- a/content/posts/adventofctf/challenge_6.md +++ b/content/posts/adventofctf/challenge_6.md @@ -254,13 +254,13 @@ This query also has to be converted to an input first. This will become `' UNION After submitting this input, I got the flag: `NOVI{7h1s_flag_w@s_chuncky_right}`. -\*Note: this only works if a table has only one column, if it has more, you have to get the columns first. See the [Getting the secrets](#optional-getting-the-secrets-) for more info about that. +\*Note: this only works if a table has only one column, if it has more, you have to get the columns first. See the [Getting the secrets]({{< ref "#getting-the-secrets" >}}) for more info about that. This flag can then be submitted for the [challenge](https://ctfd.adventofctf.com/challenges#6-7). -_For more information about how SQL injection works, please read my [previous post](/posts/2020/12/challenge-5-adventofctf/)._ +_For more information about how SQL injection works, please read my [previous post]({{< ref "challenge_5.md" >}})._ -## (Optional) Getting the secrets 😋 +## (Optional) Getting the secrets 😋 {#getting-the-secrets} Because the `secrets` table a more than one column, we need to know the column names first. We can get them with the following query: diff --git a/static/img/home/portrait.png b/static/img/home/portrait.png new file mode 100644 index 0000000000000000000000000000000000000000..6f94f4ac35afd532146e54c557eea23a04aa2419 GIT binary patch literal 15153 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 - {{ block "main" . }}{{ end }} + {{- block "main" . }}{{ end -}} - {{ block "footer" . }} + {{- block "footer" . }} {{ partial "footer.html" . }} - {{ end }} + {{- end }} {{ partial "javascript.html" . }} diff --git a/themes/maik-blog/layouts/_default/list.html b/themes/maik-blog/layouts/_default/list.html index 95055c7..9f09bdf 100644 --- a/themes/maik-blog/layouts/_default/list.html +++ b/themes/maik-blog/layouts/_default/list.html @@ -4,74 +4,74 @@

{{ .Title }}

- {{ if .Content }} + {{- if .Content }}
{{ .Content }}
- {{ end }} + {{- end }} - {{ if .Paginator.HasPrev }} + {{- if .Paginator.HasPrev }} {{ partial "pagination.html" . }} - {{ end }} + {{- end }}
{{ range $paginator.Pages }}

{{ .Title | markdownify }}

- {{ if .Date }} + {{- if .Date }} {{ .Date.Format ($.Site.Params.DateFormatList | default "2006-01-02") }} - - {{ end }} - {{ with .Params.Author }}{{ $.Site.Params.WrittenBy | default "Written by" }} - {{ . }}{{ end }} - {{ if $.Site.Params.ShowReadingTimeInList }} + {{- end }} + {{- with .Params.Author }} + {{ $.Site.Params.WrittenBy | default "Written by" }} {{ . }} + {{- end }} + {{- if $.Site.Params.ShowReadingTimeInList }} — {{ .ReadingTime }} {{ $.Site.Params.MinuteReadingTime | default "min read" }} - {{ end }} + {{- end }}
- {{ if .Params.tags }} + {{- if .Params.tags }} - {{ range .Params.tags }} + {{- range .Params.tags }} #{{ . }}  - {{ end }} + {{- end }} - {{ end }} + {{- end }} - {{ if .Params.Cover }} + {{- if .Params.Cover }}
- {{ $img := imageConfig (printf "static/%s" .Params.Cover) }} + {{- $img := imageConfig (printf "static/%s" .Params.Cover) }} - {{ if .Params.UseRelativeCover }} + {{- if .Params.UseRelativeCover }} {{ .Title | plainify | default - {{ else }} + {{- else }} {{ .Title | plainify | default - {{ end }} + {{- end }} - {{ if .Params.CoverCaption }} + {{- if .Params.CoverCaption }}
{{ .Params.CoverCaption | markdownify }}
- {{ end }} + {{- end }}
- {{ end }} + {{- end }}
- {{ with .Description }} + {{- with .Description }} {{ . | markdownify }} - {{ else }} - {{ if .Truncated }} + {{- else }} + {{- if .Truncated }} {{ .Summary | markdownify }} - {{ end }} - {{ end }} + {{- end }} + {{- end }}
- {{ if not .Params.hideReadMore }} + {{- if not .Params.hideReadMore }} - {{ end }} + {{- end }}
- {{ end }} + {{- end }}
{{ partial "pagination.html" . }} diff --git a/themes/maik-blog/layouts/index.html b/themes/maik-blog/layouts/index.html index e74a856..c9ea348 100644 --- a/themes/maik-blog/layouts/index.html +++ b/themes/maik-blog/layouts/index.html @@ -1,10 +1,10 @@ {{ define "main" }} -
+
- {{ if .Site.Params.Portrait.Path }} + {{- if .Site.Params.Portrait.Path }} {{ .Site.Params.Portrait.Alt }} - {{ end }} + style="max-width:{{ .Site.Params.Portrait.Size }}" /> + {{- end }}

{{ .Site.Title }}

{{- with .Site.Params.homeSubtitle }} @@ -16,6 +16,7 @@ {{ partial "social-icons.html" . }}
{{- end }} +
{{ end }} \ No newline at end of file diff --git a/themes/maik-blog/layouts/partials/footer.html b/themes/maik-blog/layouts/partials/footer.html index 0a9be7b..aefeb0c 100644 --- a/themes/maik-blog/layouts/partials/footer.html +++ b/themes/maik-blog/layouts/partials/footer.html @@ -2,17 +2,19 @@
© {{ now.Format "2006" }} - {{ if .Site.Author.name }} + {{- if .Site.Author.name }} {{ .Site.Author.name }} - {{ end }} - {{ if .Site.Copyright }} - {{ .Site.Copyright| safeHTML }} - {{ end }} + {{- end }} + {{- if .Site.Copyright }} + All rights reserved. + {{- end }} Privacy - {{- with (not (in (.Site.Language.Get "disableKinds") "RSS")) }} - {{ partial "svg.html" (dict "name" "rss") }} - {{ end }} + + {{- 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 ea17ad6..9a04770 100644 --- a/themes/maik-blog/layouts/partials/head.html +++ b/themes/maik-blog/layouts/partials/head.html @@ -1,82 +1,47 @@ - - - - - - + -{{ block "title" . }} - - {{ if .IsHome }} - {{ $.Site.Title }} {{ with $.Site.Params.Subtitle }} — {{ . }} {{ end }} - {{ else }} - {{ .Title }} :: {{ $.Site.Title }} {{ with $.Site.Params.Subtitle }} — {{ . }}{{ end }} - {{ end }} - -{{ end }} - {{ $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" | resources.ToCSS $options | resources.Fingerprint }} -{{ range $val := $.Site.Params.customCSS }} -{{ if gt (len $val) 0 }} +{{- range $val := $.Site.Params.customCSS }} +{{- if gt (len $val) 0 }} -{{ end }} -{{ end }} - - -{{- partial "favicons.html" . }} +{{- end }} +{{- end }} -{{ template "_internal/schema.html" . }} -{{ template "_internal/twitter_cards.html" . }} +{{- partial "favicons.html" . -}} -{{ if isset .Site.Taxonomies "series" }} -{{ template "_internal/opengraph.html" . }} -{{ end }} - -{{ range .Params.categories }} - -{{ end }} - -{{ if isset .Params "date" }} - -{{ end }} + +{{- partial "meta-tags.html" . -}} -{{ with .OutputFormats.Get "rss" -}} + + -{{ if .OutputFormats.Get "json" }} +{{- if .OutputFormats.Get "json" }} -{{ end }} - -{{ if .Site.GoogleAnalytics }} - - - -{{ end }} \ No newline at end of file +{{- block "title" . }} + + {{- if .IsHome }} + {{- $.Site.Title }} {{ with $.Site.Params.Subtitle }} — {{ . }} {{ end }} + {{- else }} + {{- .Title }} :: {{ $.Site.Title }} {{ with $.Site.Params.Subtitle }} — {{ . }}{{ end }} + {{- end -}} + +{{- end }} \ No newline at end of file diff --git a/themes/maik-blog/layouts/partials/header.html b/themes/maik-blog/layouts/partials/header.html index 2a15190..dbded2f 100644 --- a/themes/maik-blog/layouts/partials/header.html +++ b/themes/maik-blog/layouts/partials/header.html @@ -3,7 +3,7 @@ {{ partial "logo.html" . }} - {{ if len .Site.Menus }} + {{- if len .Site.Menus }} {{ partial "menu.html" . }} @@ -11,7 +11,7 @@ - {{ end }} + {{- end }} {{ partial "theme-icon.html" . }} diff --git a/themes/maik-blog/layouts/partials/javascript.html b/themes/maik-blog/layouts/partials/javascript.html index affc57b..cb33e07 100644 --- a/themes/maik-blog/layouts/partials/javascript.html +++ b/themes/maik-blog/layouts/partials/javascript.html @@ -1,15 +1,26 @@ -{{ $main := resources.Get "js/main.js" }} -{{ $menu := resources.Get "js/menu.js" }} -{{ $theme := resources.Get "js/theme.js" }} -{{ $secureJS := slice $main $menu $theme | resources.Concat "bundle.js" | resources.Minify | resources.Fingerprint "sha512" }} +{{- $main := resources.Get "js/main.js" }} +{{- $menu := resources.Get "js/menu.js" }} +{{- $theme := resources.Get "js/theme.js" }} +{{- $secureJS := slice $main $menu $theme | resources.Concat "bundle.js" | resources.Minify | resources.Fingerprint "sha512" }} {{- if .Site.GoogleAnalytics }} -{{ template "_internal/google_analytics.html" . }} -{{- end}} + + + +{{- end }} + +{{- range $val := $.Site.Params.customJS }} +{{- if gt (len $val) 0 }} -{{ end }} -{{ end }} \ No newline at end of file +{{- end }} +{{- end }} \ No newline at end of file diff --git a/themes/maik-blog/layouts/partials/logo.html b/themes/maik-blog/layouts/partials/logo.html index 44abe8f..39179fc 100644 --- a/themes/maik-blog/layouts/partials/logo.html +++ b/themes/maik-blog/layouts/partials/logo.html @@ -1,15 +1,15 @@ \ No newline at end of file diff --git a/themes/maik-blog/layouts/partials/menu.html b/themes/maik-blog/layouts/partials/menu.html index 3c57656..3a0eea4 100644 --- a/themes/maik-blog/layouts/partials/menu.html +++ b/themes/maik-blog/layouts/partials/menu.html @@ -1,7 +1,7 @@
{{ end }} \ No newline at end of file diff --git a/themes/maik-blog/layouts/rss.xml b/themes/maik-blog/layouts/rss.xml index 3fbe57b..1935f30 100644 --- a/themes/maik-blog/layouts/rss.xml +++ b/themes/maik-blog/layouts/rss.xml @@ -1,26 +1,36 @@ - + {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} {{ .Permalink }} - Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}{{ with .Site.LanguageCode }} - {{.}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.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" -}} + Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} + {{- with .Site.LanguageCode }} + {{.}} + {{- end }} + {{- with .Site.Author.email }} + {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}} + {{- end }} + {{- with .Site.Author.email }} + {{.}}{{ with $.Site.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 .Pages }} + {{- end }} + {{- range .Pages }} {{ .Title }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ .Site.Author.name }} {{ .Permalink }} - {{ .Summary | html }} - {{ printf `` .Content | safeHTML }} + {{ printf `` .Summary | safeHTML }} + {{ printf `` .Content | safeHTML }} - {{ end }} + {{- end }}