Swap prettier for djlint
This commit is contained in:
Jan Kremer
parent
e2fd2a13e8
commit
212ca46616
12 changed files with 150 additions and 178 deletions
|
|
@ -1,27 +1,25 @@
|
|||
<ul>
|
||||
<li>
|
||||
<a
|
||||
href="https://creativecommons.org/publicdomain/zero/1.0/"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="CC0: This work has been marked as dedicated to the public domain."
|
||||
>
|
||||
{{ partial "cc.svg" . }}
|
||||
{{ partial "zero.svg" . }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/about" id="title">
|
||||
{{ partial "logo.svg" . }}
|
||||
{{ site.Title }}
|
||||
</a>
|
||||
</li>
|
||||
<!-- <li>
|
||||
{{ with .GitInfo }}
|
||||
<a href="https://github.com/jukremer/jukremer.github.io/commit/{{ .Hash }}">
|
||||
{{ partial "git.svg" }} {{ .Subject }} ({{ .AbbreviatedHash }})
|
||||
</a>
|
||||
{{ end }}
|
||||
</li> -->
|
||||
<li>2021–{{ now.Year }}</li>
|
||||
<li>
|
||||
<a href="https://creativecommons.org/publicdomain/zero/1.0/"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="CC0: This work has been marked as dedicated to the public domain.">
|
||||
{{ partial "cc.svg" . }}
|
||||
{{ partial "zero.svg" . }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/about" id="title">
|
||||
{{ partial "logo.svg" . }}
|
||||
{{ site.Title }}
|
||||
</a>
|
||||
</li>
|
||||
<!-- <li>
|
||||
{{ with .GitInfo }}
|
||||
<a href="https://github.com/jukremer/jukremer.github.io/commit/{{ .Hash }}">
|
||||
{{ partial "git.svg" }} {{ .Subject }} ({{ .AbbreviatedHash }})
|
||||
</a>
|
||||
{{ end }}
|
||||
</li> -->
|
||||
<li>2021–{{ now.Year }}</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -10,18 +10,18 @@
|
|||
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
|
||||
<link rel="manifest" href="/site.webmanifest" />
|
||||
<title>
|
||||
{{ if .IsHome }}
|
||||
{{ if .IsHome }}
|
||||
{{ site.Title }}
|
||||
{{ else }}
|
||||
{{ else }}
|
||||
{{ printf "%s – %s" .Title
|
||||
site.Title
|
||||
site.Title
|
||||
}}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
</title>
|
||||
{{ partialCached "head/css.html" . }}
|
||||
{{ partialCached "head/js.html" . }}
|
||||
{{ with .OutputFormats.Get "rss" }}
|
||||
{{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }}
|
||||
{{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }}
|
||||
{{ end }}{{ with .OutputFormats.Get "atom" }}
|
||||
{{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }}
|
||||
{{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }}
|
||||
{{ end }}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,14 @@
|
|||
{{- with resources.Get "css/main.css" }}
|
||||
{{- if eq hugo.Environment
|
||||
"development"
|
||||
}}
|
||||
<link rel="stylesheet" href="{{ .RelPermalink }}" />
|
||||
{{- else }}
|
||||
{{- with . | minify | fingerprint }}
|
||||
<link
|
||||
rel="stylesheet"
|
||||
href="{{ .RelPermalink }}"
|
||||
integrity="{{ .Data.Integrity }}"
|
||||
crossorigin="anonymous"
|
||||
/>
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if eq hugo.Environment
|
||||
"development"
|
||||
}}
|
||||
<link rel="stylesheet" href="{{ .RelPermalink }}" />
|
||||
{{- else }}
|
||||
{{- with . | minify | fingerprint }}
|
||||
<link rel="stylesheet"
|
||||
href="{{ .RelPermalink }}"
|
||||
integrity="{{ .Data.Integrity }}"
|
||||
crossorigin="anonymous" />
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,16 @@
|
|||
{{- with resources.Get "js/main.js" }}
|
||||
{{- if eq hugo.Environment "development" }}
|
||||
{{- with . | js.Build }}
|
||||
<script src="{{ .RelPermalink }}"></script>
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{- $opts := dict "minify" true }}
|
||||
{{- with . | js.Build
|
||||
$opts | fingerprint
|
||||
}}
|
||||
<script
|
||||
src="{{ .RelPermalink }}"
|
||||
integrity="{{- .Data.Integrity }}"
|
||||
crossorigin="anonymous"
|
||||
></script>
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if eq hugo.Environment "development" }}
|
||||
{{- with . | js.Build }}
|
||||
<script src="{{ .RelPermalink }}"></script>
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{- $opts := dict "minify" true }}
|
||||
{{- with . | js.Build
|
||||
$opts | fingerprint
|
||||
}}
|
||||
<script src="{{ .RelPermalink }}"
|
||||
integrity="{{- .Data.Integrity }}"
|
||||
crossorigin="anonymous"></script>
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,2 @@
|
|||
<a href="/" class="title">
|
||||
{{ partial "logo.svg" . }}{{ site.Title }}
|
||||
</a>
|
||||
<a href="/" class="title">{{ partial "logo.svg" . }}{{ site.Title }}</a>
|
||||
{{ partial "menu.html" (dict "menuID" "main" "page" .) }}
|
||||
|
|
|
|||
|
|
@ -9,44 +9,39 @@
|
|||
*/}}
|
||||
{{- $page := .page }}
|
||||
{{- $menuID := .menuID }}
|
||||
|
||||
{{- with index site.Menus $menuID }}
|
||||
<nav>
|
||||
<nav>
|
||||
<ul>
|
||||
{{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
|
||||
{{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
|
||||
</ul>
|
||||
</nav>
|
||||
</nav>
|
||||
{{- end }}
|
||||
|
||||
{{- define "partials/inline/menu/walk.html" }}
|
||||
{{- $page := .page }}
|
||||
{{- range .menuEntries }}
|
||||
{{- $attrs := dict "href" .URL }}
|
||||
{{- if $page.IsMenuCurrent .Menu . }}
|
||||
{{- $attrs = merge $attrs (dict "class" "active" "aria-current" "page") }}
|
||||
{{- else if $page.HasMenuCurrent .Menu . }}
|
||||
{{- $attrs = merge $attrs (dict "class" "ancestor" "aria-current" "true") }}
|
||||
{{- end }}
|
||||
{{- $name := .Name }}
|
||||
{{- with .Identifier }}
|
||||
{{- with T . }}
|
||||
{{- $name = . }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
<li>
|
||||
<a
|
||||
{{- range $k, $v := $attrs }}
|
||||
{{- with $v }}
|
||||
{{- printf " %s=%q" $k $v | safeHTMLAttr }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
>{{ $name }}</a
|
||||
>
|
||||
{{- with .Children }}
|
||||
<ul>
|
||||
{{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
|
||||
</ul>
|
||||
{{- end }}
|
||||
</li>
|
||||
{{- end }}
|
||||
{{- $page := .page }}
|
||||
{{- range .menuEntries }}
|
||||
{{- $attrs := dict "href" .URL }}
|
||||
{{- if $page.IsMenuCurrent .Menu . }}
|
||||
{{- $attrs = merge $attrs (dict "class" "active" "aria-current" "page") }}
|
||||
{{- else if $page.HasMenuCurrent .Menu . }}
|
||||
{{- $attrs = merge $attrs (dict "class" "ancestor" "aria-current" "true") }}
|
||||
{{- end }}
|
||||
{{- $name := .Name }}
|
||||
{{- with .Identifier }}
|
||||
{{- with T . }}
|
||||
{{- $name = . }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
<li>
|
||||
<a {{- range $k, $v := $attrs }}
|
||||
{{- with $v }}
|
||||
{{- printf " %s=%q" $k $v | safeHTMLAttr }}
|
||||
{{- end }}
|
||||
{{- end -}}>{{ $name }}</a>
|
||||
{{- with .Children }}
|
||||
<ul>
|
||||
{{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
|
||||
</ul>
|
||||
{{- end }}
|
||||
</li>
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -6,17 +6,19 @@
|
|||
{{- $page := .page }}
|
||||
{{- $taxonomy := .taxonomy }}
|
||||
{{- with $page.GetTerms
|
||||
$taxonomy
|
||||
$taxonomy
|
||||
}}
|
||||
{{- $label := (index . 0).Parent.LinkTitle }}
|
||||
<div class="tags">
|
||||
{{- $label := (index . 0).Parent.LinkTitle }}
|
||||
<div class="tags">
|
||||
<ul>
|
||||
<li>Tags:</li>
|
||||
<ul>
|
||||
{{- range . }}
|
||||
<li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
|
||||
{{- end }}
|
||||
</ul>
|
||||
<li>Tags:</li>
|
||||
<ul>
|
||||
{{- range . }}
|
||||
<li>
|
||||
<a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
|
||||
</li>
|
||||
{{- end }}
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
<!doctype html>
|
||||
<html
|
||||
lang="{{ or site.Language.LanguageCode site.Language.Lang }}"
|
||||
dir="{{ or site.Language.LanguageDirection `ltr` }}"
|
||||
>
|
||||
<head>
|
||||
{{ partial "head.html" . }}
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header>{{ partial "header.html" . }}</header>
|
||||
<main>{{ block "main" . }}{{ end }}</main>
|
||||
<footer>{{ partial "footer.html" . }}</footer>
|
||||
</body>
|
||||
<!DOCTYPE html>
|
||||
<html lang="{{ or site.Language.LanguageCode site.Language.Lang }}"
|
||||
dir="{{ or site.Language.LanguageDirection `ltr` }}">
|
||||
<head>{{ partial "head.html" . }}</head>
|
||||
<body>
|
||||
<header>
|
||||
{{ partial "header.html" . }}
|
||||
</header>
|
||||
<main>
|
||||
{{ block "main" . }}{{ end }}
|
||||
</main>
|
||||
<footer>
|
||||
{{ partial "footer.html" . }}
|
||||
</footer>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{{ define "main" }}
|
||||
{{ .Content }}
|
||||
{{ $pages := .Paginate (where
|
||||
.Site.RegularPages "Type" "ne" "page")
|
||||
}}
|
||||
<div class="list">
|
||||
{{ .Content }}
|
||||
{{ $pages := .Paginate (where
|
||||
.Site.RegularPages "Type" "ne" "page")
|
||||
}}
|
||||
<div class="list">
|
||||
<ul>
|
||||
{{ range $pages.Pages }}
|
||||
{{ range $pages.Pages }}
|
||||
<li>
|
||||
<a href="{{ .RelPermalink }}" style="display: block">
|
||||
<h2>{{ .Title }}</h2>
|
||||
<p class="lead">{{ .Description }}</p>
|
||||
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
|
||||
{{ $dateHuman := .Date | time.Format ":date_long" }}
|
||||
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
|
||||
</a>
|
||||
<a href="{{ .RelPermalink }}" style="display: block">
|
||||
<h2>{{ .Title }}</h2>
|
||||
<p class="lead">{{ .Description }}</p>
|
||||
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
|
||||
{{ $dateHuman := .Date | time.Format ":date_long" }}
|
||||
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
|
||||
</a>
|
||||
</li>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{{ end }}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,18 @@
|
|||
{{ define "main" }}
|
||||
{{ .Content }}
|
||||
<div class="list">
|
||||
{{ .Content }}
|
||||
<div class="list">
|
||||
<ul>
|
||||
{{ range .Pages }}
|
||||
{{ range .Pages }}
|
||||
<li>
|
||||
<a href="{{ .RelPermalink }}" style="display: block">
|
||||
<h2>{{ .Title }}</h2>
|
||||
|
||||
<p class="lead">{{ .Description }}</p>
|
||||
|
||||
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
|
||||
{{ $dateHuman := .Date | time.Format ":date_long" }}
|
||||
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
|
||||
</a>
|
||||
<a href="{{ .RelPermalink }}" style="display: block">
|
||||
<h2>{{ .Title }}</h2>
|
||||
<p class="lead">{{ .Description }}</p>
|
||||
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
|
||||
{{ $dateHuman := .Date | time.Format ":date_long" }}
|
||||
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
|
||||
</a>
|
||||
</li>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{{ end }}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{{ define "main" }}
|
||||
<article>
|
||||
<article>
|
||||
{{ $dateHuman := .Date | time.Format ":date_long" }}
|
||||
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
|
||||
{{ $lastmodDateHuman := .Lastmod | time.Format ":date_long" }}
|
||||
{{ $lastmodDateMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }}
|
||||
<div class="dates">
|
||||
<p>
|
||||
Editiert:
|
||||
<time datetime="{{ $lastmodDateMachine }}"
|
||||
>{{ $lastmodDateHuman }}</time
|
||||
>
|
||||
</p>
|
||||
<p><time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time></p>
|
||||
<p>
|
||||
Editiert:
|
||||
<time datetime="{{ $lastmodDateMachine }}">{{ $lastmodDateHuman }}</time>
|
||||
</p>
|
||||
<p>
|
||||
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
|
||||
</p>
|
||||
</div>
|
||||
<h1>{{ .Title }}</h1>
|
||||
<p class="lead">{{ .Description }}</p>
|
||||
{{ .Content }}
|
||||
</article>
|
||||
</article>
|
||||
{{ end }}
|
||||
|
|
|
|||
18
treefmt.nix
18
treefmt.nix
|
|
@ -1,26 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs = {
|
||||
nixfmt.enable = true;
|
||||
gofmt.enable = true;
|
||||
taplo.enable = true;
|
||||
prettier = {
|
||||
enable = true;
|
||||
settings = {
|
||||
plugins = [
|
||||
"${pkgs.prettier-plugin-go-template}/lib/node_modules/prettier-plugin-go-template/lib/index.js"
|
||||
];
|
||||
overrides = [
|
||||
{
|
||||
files = [ "*.html" ];
|
||||
options.parser = "go-template";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
djlint.enable = true;
|
||||
};
|
||||
settings.global.excludes = [
|
||||
"archetypes/**"
|
||||
"public/**"
|
||||
"static/**"
|
||||
".envrc"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue