+ {{- .Content -}} +

+ {{ if isset .Params "image" }} + Book cover of the book {{ .Title }}

+ {{ end }} + {{ if isset .Params "amazon" }} +

+ {{ end }} +

Rating:

+ {{ if isset .Params "rating" }} + {{ $rating := .Params.rating }} + {{ range $i, $num := (seq $rating) }} + ⭐ + {{ end }} + {{ else }} +

N/A

+ {{ end }} +

Date: Tue, 26 Sep 2023 22:06:05 -0400 Subject: stuff --- assets/css/main.css | 43 ++++++++++++++++++++++++++++++++++++++++ layouts/partials/footer.html | 47 ++++++++++++++++++++++++++++++++++++++++++++ layouts/partials/social.html | 16 +++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 layouts/partials/social.html diff --git a/assets/css/main.css b/assets/css/main.css index 75f2b9e..e49a669 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -7,4 +7,47 @@ main { display: flex; flex-direction: column; justify-content: stretch; +} + +footer { + background: #00000055; +} + +.flex { + display: flex; +} + +.flex.row { + flex-direction: row; +} + +.flex.col { + flex-direction: column; +} + +.footer-info { + width: 100%; + justify-content: center; +} + +.flex.footer-info { + gap: 1rem; +} + +.footer-info .flex.col { + min-width: 250px; +} + +footer { + position:relative; +} + +.copyright { + background: #00000055; + position: absolute; + left: 0; + bottom: 0; + width: 100%; + padding: 1rem; + text-align: center; } \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index eb1e7e7..d60e941 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,5 +1,52 @@ \ No newline at end of file diff --git a/layouts/partials/social.html b/layouts/partials/social.html new file mode 100644 index 0000000..03645ad --- /dev/null +++ b/layouts/partials/social.html @@ -0,0 +1,16 @@ +{{ $social := .social }} +{{ $username := .username }} + +{{ $url := "" }} + +{{ if eq $social "github" }} + {{ $url = printf "https://github.com/%s" $username }} +{{ else if eq $social "linkedin" }} + {{ $url = printf "https://www.linkedin.com/in/%s" $username }} +{{ else }} + {{ $url = "#" }} +{{ end }} + + + {{ title $social }} + \ No newline at end of file -- cgit v1.1 From f7ccee9be8569eb2efc2319554e49757f550c77f Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Tue, 26 Sep 2023 23:26:39 -0400 Subject: update archetypes --- archetypes/guide-post.md | 5 +++++ archetypes/guide/images/.gitkeep | 0 archetypes/guide/index.md | 6 ++++++ archetypes/post.md | 3 +++ archetypes/recipe.md | 7 +++++++ layouts/_default/single.html | 1 - layouts/post/single.html | 11 +++++++++++ 7 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 archetypes/guide-post.md create mode 100644 archetypes/guide/images/.gitkeep create mode 100644 archetypes/guide/index.md create mode 100644 archetypes/post.md create mode 100644 archetypes/recipe.md create mode 100644 layouts/post/single.html diff --git a/archetypes/guide-post.md b/archetypes/guide-post.md new file mode 100644 index 0000000..8e4b597 --- /dev/null +++ b/archetypes/guide-post.md @@ -0,0 +1,5 @@ +--- +title: "{{ replace .Name "-" " " | title }}" +date: {{ .Date }} +draft: true +--- \ No newline at end of file diff --git a/archetypes/guide/images/.gitkeep b/archetypes/guide/images/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/archetypes/guide/index.md b/archetypes/guide/index.md new file mode 100644 index 0000000..00e77bd --- /dev/null +++ b/archetypes/guide/index.md @@ -0,0 +1,6 @@ +--- +title: "{{ replace .Name "-" " " | title }}" +date: {{ .Date }} +draft: true +--- + diff --git a/archetypes/post.md b/archetypes/post.md new file mode 100644 index 0000000..7b017b9 --- /dev/null +++ b/archetypes/post.md @@ -0,0 +1,3 @@ +--- +title: "{{ replace .File.ContentBaseName "-" " " | title }}" +--- \ No newline at end of file diff --git a/archetypes/recipe.md b/archetypes/recipe.md new file mode 100644 index 0000000..051745e --- /dev/null +++ b/archetypes/recipe.md @@ -0,0 +1,7 @@ +--- +title: "{{ replace .Name "-" " " | title }}" +date: {{ .Date }} +draft: true +categories: + - Recipes +--- \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 306df48..db0c449 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,7 +2,6 @@

{{- .Content -}} diff --git a/layouts/post/single.html b/layouts/post/single.html new file mode 100644 index 0000000..306df48 --- /dev/null +++ b/layouts/post/single.html @@ -0,0 +1,11 @@ +{{ define "main" }} +

+ {{- .Content -}} +

+{{ end }} \ No newline at end of file -- cgit v1.1 From b179606dac7cf36c490512146ad8ce898f7800b2 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Wed, 27 Sep 2023 21:50:42 -0400 Subject: theme tweaks --- archetypes/post.md | 3 ++- assets/css/main.css | 6 +++++- layouts/_default/list.html | 19 +++++++++++++++---- layouts/_default/single.html | 4 ++-- layouts/_default/summary.html | 2 +- layouts/partials/head.html | 2 +- layouts/post/single.html | 16 ++++++++-------- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/archetypes/post.md b/archetypes/post.md index 7b017b9..d62ae73 100644 --- a/archetypes/post.md +++ b/archetypes/post.md @@ -1,3 +1,4 @@ --- title: "{{ replace .File.ContentBaseName "-" " " | title }}" ---- \ No newline at end of file +date: {{ .Date }} +--- diff --git a/assets/css/main.css b/assets/css/main.css index e49a669..934e91b 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -50,4 +50,8 @@ footer { width: 100%; padding: 1rem; text-align: center; -} \ No newline at end of file +} + +.post { + margin-bottom: 1em; +} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index cf36155..a86ef3a 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,10 +1,21 @@ {{ define "main" }}

- {{ range .Paginator.Pages }} -

- {{ .Render "summary" }} + {{ range sort (.Paginator 3).Pages "Date" "desc" }} +

+ {{ end }} + {{ with .Paginator }} +

+ {{ if .HasPrev }} + prev + {{ end }} +

{{ .PageNumber }} of {{ .TotalPages }}

+ {{ if .HasNext }} + next + {{ end }} +

diff --git a/layouts/_default/single.html b/layouts/_default/single.html index db0c449..1564845 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,10 +1,10 @@ {{ define "main" }}

-{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 6ae4fd0..0753995 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -1,4 +1,4 @@ -

index.html @@ -3,12 +3,5 @@
{{- .Content -}}
- {{ with .Site.GetPage "post" }} - {{ range .Pages }} -
-
{{ .Render "summary" }}
-
- {{ end }} - {{ end }}

-{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index d60e941..3800b98 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -47,6 +47,9 @@

+ Powered by Hugo & Blackbear +

- \ No newline at end of file + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 4a9ae70..28d3734 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,13 +1,9 @@

{{ .Name }}

\ No newline at end of file + -- cgit v1.1 From 93a4ba55f2159e69aa1fcdaa1cf87c09e7455017 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Tue, 3 Oct 2023 23:44:31 -0400 Subject: add changelog, assets, new partial --- archetypes/changelog.md | 15 +++++++++++++++ archetypes/post.md | 1 + assets/css/main.css | 6 +++++- assets/js/fullscreen.js | 30 ++++++++++++++++++++++++++++++ layouts/404.html | 7 +++++++ layouts/_default/baseof.html | 2 ++ layouts/_default/list.html | 9 +++++++-- layouts/_default/single.html | 2 +- layouts/partials/head.html | 4 ++-- layouts/partials/scripts.html | 4 ++++ layouts/post/single.html | 2 +- layouts/robots.txt | 11 +++++++++++ static/css/main.css | 16 ---------------- 13 files changed, 86 insertions(+), 23 deletions(-) create mode 100644 archetypes/changelog.md create mode 100644 assets/js/fullscreen.js create mode 100644 layouts/partials/scripts.html create mode 100644 layouts/robots.txt delete mode 100644 static/css/main.css diff --git a/archetypes/changelog.md b/archetypes/changelog.md new file mode 100644 index 0000000..3a002ba --- /dev/null +++ b/archetypes/changelog.md @@ -0,0 +1,15 @@ +--- +title: {{ .Date }} +date: {{ .Date }} +draft: true +--- + +## Changes + +- Change 1 +- Change 2 + +## Notes + +- Note 1 +- Note 2 \ No newline at end of file diff --git a/archetypes/post.md b/archetypes/post.md index d62ae73..43dca9a 100644 --- a/archetypes/post.md +++ b/archetypes/post.md @@ -1,4 +1,5 @@ --- title: "{{ replace .File.ContentBaseName "-" " " | title }}" date: {{ .Date }} +draft: true --- diff --git a/assets/css/main.css b/assets/css/main.css index 792f1f6..97d1f73 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,3 +1,7 @@ +:fullscreen { + color: blue; +} + body { min-height: 100vh; } @@ -71,4 +75,4 @@ footer { text-transform: uppercase; font-weight: 600; } - + \ No newline at end of file diff --git a/assets/js/fullscreen.js b/assets/js/fullscreen.js new file mode 100644 index 0000000..e191854 --- /dev/null +++ b/assets/js/fullscreen.js @@ -0,0 +1,30 @@ +// get with web apis #fullscren element and on click toggle fullscreen +const fullscreen = document.getElementById('fullscreen'); +const elem = document.documentElement; +fullscreen.addEventListener('click', () => { + if (document.fullscreenElement) { + closeFullscreen(); + } else { + openFullscreen(); + } +}); + +function openFullscreen() { + if (elem.requestFullscreen) { + elem.requestFullscreen(); + } else if (elem.webkitRequestFullscreen) { /* Safari */ + elem.webkitRequestFullscreen(); + } else if (elem.msRequestFullscreen) { /* IE11 */ + elem.msRequestFullscreen(); + } +} + +function closeFullscreen() { + if (document.exitFullscreen) { + document.exitFullscreen(); + } else if (document.webkitExitFullscreen) { /* Safari */ + document.webkitExitFullscreen(); + } else if (document.msExitFullscreen) { /* IE11 */ + document.msExitFullscreen(); + } +} \ No newline at end of file diff --git a/layouts/404.html b/layouts/404.html index e69de29..1a739ff 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -0,0 +1,7 @@ +{{ define "main" }} +

Go Home

+{{ end }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 6ed81b9..bb27232 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,6 +2,7 @@ {{- partial "head.html" . -}} + {{- partial "header.html" . -}}

{{- partial "footer.html" . -}} + {{- partial "scripts.html" . -}} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index a86ef3a..38ef025 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,6 +1,9 @@ {{ define "main" }} -

+ {{ if .Content }} +

+ {{ end }}

@@ -11,7 +14,9 @@ {{ if .HasPrev }} prev {{ end }} -

{{ .PageNumber }} of {{ .TotalPages }}

+ {{ if (or (.HasPrev) (.HasNext)) }} +

{{ .PageNumber }} of {{ .TotalPages }}

+ {{ end }} {{ if .HasNext }} next {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 1564845..996ad9e 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -3,7 +3,7 @@

diff --git a/layouts/partials/head.html b/layouts/partials/head.html index d7b2381..2106ef3 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,8 +1,8 @@ {{ .Title }} - {{ with resources.Get "css/pico.min.css" }} + {{ with resources.Get "css/main.css" }} {{ end }} diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html new file mode 100644 index 0000000..152c32b --- /dev/null +++ b/layouts/partials/scripts.html @@ -0,0 +1,4 @@ +{{ $scripts := resources.Match "js/*.js" }} +{{ range $script := $scripts }} + +{{ end }} \ No newline at end of file diff --git a/layouts/post/single.html b/layouts/post/single.html index 432b9df..f2a333e 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -4,7 +4,7 @@

diff --git a/layouts/robots.txt b/layouts/robots.txt new file mode 100644 index 0000000..45a37d1 --- /dev/null +++ b/layouts/robots.txt @@ -0,0 +1,11 @@ +User-agent: Googlebot +Allow: / + +User-agent: ChatGPT-User +Disallow: / + +User-agent: GPTBot +Disallow: / + +User-agent: * +Disallow: / \ No newline at end of file diff --git a/static/css/main.css b/static/css/main.css deleted file mode 100644 index d4c7edd..0000000 --- a/static/css/main.css +++ /dev/null @@ -1,16 +0,0 @@ -header { - background: red; -} - -footer { - background: blue; - color: red; -} - -main { - background: green; -} - -body { - background: yellow; -} \ No newline at end of file -- cgit v1.1 From 4e30ae95eaf52a7f427bdf020d118f40e00ab291 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Mon, 9 Oct 2023 13:41:04 -0400 Subject: add some homemade svg, wpartials, and darkmode --- assets/Fullscreen.svg | 19 ++++++++++++ assets/Smallscreen.svg | 21 ++++++++++++++ assets/css/main.css | 59 +++++++++++++++++++++++++++++++++++++- assets/js/darkmode.js | 11 +++++++ assets/js/fullscreen.js | 27 ++++++++++++++--- layouts/_default/baseof.html | 2 +- layouts/partials/func/GetSvg.html | 5 ++++ layouts/partials/head.html | 4 +-- layouts/partials/scripts.html | 3 +- layouts/partials/site-actions.html | 12 ++++++++ 10 files changed, 154 insertions(+), 9 deletions(-) create mode 100755 assets/Fullscreen.svg create mode 100755 assets/Smallscreen.svg create mode 100644 assets/js/darkmode.js create mode 100644 layouts/partials/func/GetSvg.html create mode 100644 layouts/partials/site-actions.html diff --git a/assets/Fullscreen.svg b/assets/Fullscreen.svg new file mode 100755 index 0000000..0de34f0 --- /dev/null +++ b/assets/Fullscreen.svg @@ -0,0 +1,19 @@ + + + diff --git a/assets/Smallscreen.svg b/assets/Smallscreen.svg new file mode 100755 index 0000000..de417ed --- /dev/null +++ b/assets/Smallscreen.svg @@ -0,0 +1,21 @@ + + + diff --git a/assets/css/main.css b/assets/css/main.css index 97d1f73..a7d2bf8 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -17,6 +17,35 @@ footer { background: #00000055; } +.fixed { + position: fixed; + top: 0; +} + +#actions { + width: 100%; + padding: .5rem; +} + +#actions button:first-of-type { + margin-right: 1rem; +} + +#actions button { + background: transparent; + border: none; + width: fit-content; + padding: 0; +} + +#actions button:hover { + color:aquamarine !important; +} + +.aligned.right { + justify-content: flex-end; +} + .flex { display: flex; } @@ -25,6 +54,11 @@ footer { flex-direction: row; } +.centered { + align-items: center; + justify-content: center; +} + .flex.col { flex-direction: column; } @@ -75,4 +109,27 @@ footer { text-transform: uppercase; font-weight: 600; } - \ No newline at end of file + +.icon svg { + width: 1em; + height: 1em; + margin-right: .4em; +} + +.hide { + display: none; +} + +.icon:hover { + color: inherit !important; +} + +html[data-theme="dark"] .icon, +html[data-theme="dark"] #actions button { + color: white; +} + +html[data-theme="light"] .icon, +html[data-theme="light"] #actions button { + color: #24333e; +} \ No newline at end of file diff --git a/assets/js/darkmode.js b/assets/js/darkmode.js new file mode 100644 index 0000000..c6094d0 --- /dev/null +++ b/assets/js/darkmode.js @@ -0,0 +1,11 @@ +// get with web apis #fullscren element and on click toggle fullscreen +const darkmode = document.getElementById('darkmode'); +const html = document.querySelector('html'); +darkmode.addEventListener('click', () => { + if (html.dataset.theme === 'dark') { + html.dataset.theme = 'light'; + } else { + html.dataset.theme = 'dark'; + } +}); + diff --git a/assets/js/fullscreen.js b/assets/js/fullscreen.js index e191854..e3cc342 100644 --- a/assets/js/fullscreen.js +++ b/assets/js/fullscreen.js @@ -1,15 +1,27 @@ -// get with web apis #fullscren element and on click toggle fullscreen +// page const fullscreen = document.getElementById('fullscreen'); +const fullscreenIcon = document.getElementById('fullscreen-icon'); +const smallscreenIcon = document.getElementById('smallscreen-icon'); const elem = document.documentElement; -fullscreen.addEventListener('click', () => { + +// Functions + +function toggleFullscreen(event) { + // check if the event is a keydown event or a click event + if (event.type === 'keydown') { + // check if the key pressed is '/' key + if (event.key !== '/') return; + } if (document.fullscreenElement) { closeFullscreen(); } else { openFullscreen(); } -}); +} function openFullscreen() { + smallscreenIcon.classList.toggle('hide'); + fullscreenIcon.classList.toggle('hide'); if (elem.requestFullscreen) { elem.requestFullscreen(); } else if (elem.webkitRequestFullscreen) { /* Safari */ @@ -20,6 +32,8 @@ function openFullscreen() { } function closeFullscreen() { + smallscreenIcon.classList.toggle('hide'); + fullscreenIcon.classList.toggle('hide'); if (document.exitFullscreen) { document.exitFullscreen(); } else if (document.webkitExitFullscreen) { /* Safari */ @@ -27,4 +41,9 @@ function closeFullscreen() { } else if (document.msExitFullscreen) { /* IE11 */ document.msExitFullscreen(); } -} \ No newline at end of file +} + +// Listeners + +fullscreen.addEventListener('click', toggleFullscreen); +document.addEventListener('keydown', toggleFullscreen); \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index bb27232..cceaa25 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,7 +2,7 @@ {{- partial "head.html" . -}} - + {{- partial "site-actions" . -}} {{- partial "header.html" . -}}

{{ .Title }} - + {{ end }} {{ with resources.Get "css/main.css" }} {{ end }} diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html index 152c32b..f7c95bd 100644 --- a/layouts/partials/scripts.html +++ b/layouts/partials/scripts.html @@ -1,4 +1,5 @@ {{ $scripts := resources.Match "js/*.js" }} {{ range $script := $scripts }} + {{ $script := $script | minify | fingerprint }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/partials/site-actions.html b/layouts/partials/site-actions.html new file mode 100644 index 0000000..b9afa66 --- /dev/null +++ b/layouts/partials/site-actions.html @@ -0,0 +1,12 @@ +

+ + +

\ No newline at end of file -- cgit v1.1 From d0e7f43601e90229b95191a1cdc85039e233b622 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Mon, 9 Oct 2023 21:08:24 -0400 Subject: add icons, refine styles, update layouts --- assets/Darkmode.svg | 12 ++++++++++++ assets/Lightmode.svg | 39 ++++++++++++++++++++++++++++++++++++++ assets/css/main.css | 6 ++++++ layouts/_default/list.html | 2 +- layouts/_default/summary.html | 3 +++ layouts/book/list.html | 33 ++++++++++++++++++++++++++++++++ layouts/book/single.html | 15 ++++++++++++++- layouts/partials/site-actions.html | 18 ++++++++++++------ 8 files changed, 120 insertions(+), 8 deletions(-) create mode 100755 assets/Darkmode.svg create mode 100755 assets/Lightmode.svg create mode 100644 layouts/book/list.html diff --git a/assets/Darkmode.svg b/assets/Darkmode.svg new file mode 100755 index 0000000..e6d13b6 --- /dev/null +++ b/assets/Darkmode.svg @@ -0,0 +1,12 @@ + + + diff --git a/assets/Lightmode.svg b/assets/Lightmode.svg new file mode 100755 index 0000000..f4c4319 --- /dev/null +++ b/assets/Lightmode.svg @@ -0,0 +1,39 @@ + + + diff --git a/assets/css/main.css b/assets/css/main.css index a7d2bf8..af25dae 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -110,6 +110,12 @@ footer { font-weight: 600; } +.icon span { + display: inline-block; + width: fit-content; + height: fit-content; +} + .icon svg { width: 1em; height: 1em; diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 38ef025..c265f91 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,5 +1,5 @@ {{ define "main" }} -

diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 0753995..5e4ac4b 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -4,6 +4,9 @@ {{ .Title }} + {{ if isset .Params "rating" }} + {{ .Params.rating }} + {{ end }}

{{ .Date | time.Format ":date_full" }} diff --git a/layouts/book/list.html b/layouts/book/list.html new file mode 100644 index 0000000..628d8b8 --- /dev/null +++ b/layouts/book/list.html @@ -0,0 +1,33 @@ +{{ define "main" }} +

+ {{ if .Content }} +

+ {{ end }} +

+ {{ if .IsSection }} + {{ range sort (.Paginator 3).Pages "Date" "desc" }} + {{ if ne .Layout "list" }} +

+ {{ end }} + {{ end }} + {{ else }} + {{ $metric := .Params.sortby }} + {{ $direction := "asc" }} + {{ if eq .Params.sortby "rating" }} + {{ $direction = "desc" }} + {{ end }} + {{ $pages := (where .Site.RegularPages "Type" "book") }} + {{ $pages = (where $pages "Layout" "!=" "list")}} + {{ if eq $direction "desc" }} + {{ $pages = (sort ($pages.ByParam $metric).Reverse) }} + {{ else }} + {{ $pages = (sort ($pages.ByParam $metric)) }} + {{ end }} + {{ range $pages }} +

+ {{ end }} + {{ end }} +

+{{ end }} \ No newline at end of file diff --git a/layouts/book/single.html b/layouts/book/single.html index 3ffb236..0bbd265 100644 --- a/layouts/book/single.html +++ b/layouts/book/single.html @@ -4,7 +4,20 @@

{{ if isset .Params "image" }} - Book cover of the book {{ .Title }}

+ {{ with resources.GetRemote .Params.image }} + {{ with .Err }} + {{ errorf "%s" . }} + {{ else }} + Book cover of the book {{ .Title }}

+ {{ end }} + {{ else }} + {{ errorf "unable to get remote resource %q" .Params.image }} + {{ end }} {{ end }} {{ if isset .Params "amazon" }}

diff --git a/layouts/partials/site-actions.html b/layouts/partials/site-actions.html index b9afa66..ac9013a 100644 --- a/layouts/partials/site-actions.html +++ b/layouts/partials/site-actions.html @@ -1,12 +1,18 @@

- +

\ No newline at end of file -- cgit v1.1 From 6e6412e4a693ddc2da5e4611363fb882ad6497be Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Thu, 12 Oct 2023 08:08:37 -0400 Subject: Switch to light theme. remove articles. --- assets/css/main.css | 12 ++++++++ layouts/_default/baseof.html | 2 +- layouts/_default/list.html | 44 +++++++++++++------------- layouts/_default/single.html | 15 +++++---- layouts/_default/summary.html | 9 +++--- layouts/book/list.html | 2 +- layouts/book/single.html | 61 ++++++++++++++++++------------------- layouts/index.html | 4 --- layouts/partials/updated_posts.html | 17 +++++++++++ layouts/post/single.html | 5 ++- 10 files changed, 96 insertions(+), 75 deletions(-) create mode 100644 layouts/partials/updated_posts.html diff --git a/assets/css/main.css b/assets/css/main.css index af25dae..4574690 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -6,6 +6,18 @@ body { min-height: 100vh; } +body::-webkit-scrollbar { + display: none;; +} + +#content { + width: 65ch; +} + +#content::first-letter { + initial-letter: 2; +} + main { height: inherit; display: flex; diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index cceaa25..acb6c6a 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,5 +1,5 @@ - + {{- partial "head.html" . -}} {{- partial "site-actions" . -}} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index c265f91..065f708 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,28 +1,26 @@ {{ define "main" }} -

- {{ if .Content }} -

+ {{ if .Content }} +

+ {{ end }} +

+ {{ range sort (.Paginator 3).Pages "Date" "desc" }} +

{{ end }} -

- {{ range sort (.Paginator 3).Pages "Date" "desc" }} -

+ {{ with .Paginator }} +

+ {{ if .HasPrev }} + prev {{ end }} - {{ with .Paginator }} -

- {{ if .HasPrev }} - prev - {{ end }} - {{ if (or (.HasPrev) (.HasNext)) }} -

{{ .PageNumber }} of {{ .TotalPages }}

- {{ end }} - {{ if .HasNext }} - next - {{ end }} -

+ {{ if (or (.HasPrev) (.HasNext)) }} +

{{ .PageNumber }} of {{ .TotalPages }}

+ {{ end }} + {{ if .HasNext }} + next {{ end }} -

+ {{ end }} + {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 996ad9e..49137fb 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,10 +1,9 @@ {{ define "main" }} -

- {{- .Content -}} -

+ +

Some dude on the internet with—like—opinions and stuff

+ +

+ {{- .Content -}} +

{{ end }} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 5e4ac4b..4512b16 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -9,10 +9,11 @@ {{ end }}

- {{ .Date | time.Format ":date_full" }} + {{ .WordCount }} words + {{ .ReadingTime }} min read

- {{ .Summary | markdownify }} -

Published: {{ .Date | time.Format ":date_full" }} +

diff --git a/layouts/book/list.html b/layouts/book/list.html index 628d8b8..346a918 100644 --- a/layouts/book/list.html +++ b/layouts/book/list.html @@ -2,7 +2,7 @@

{{ if .Content }} -

{{ if .IsSection }} diff --git a/layouts/book/single.html b/layouts/book/single.html index 0bbd265..66456e1 100644 --- a/layouts/book/single.html +++ b/layouts/book/single.html @@ -1,39 +1,38 @@ {{ define "main" }} -

- {{ if isset .Params "image" }} - {{ with resources.GetRemote .Params.image }} - {{ with .Err }} - {{ errorf "%s" . }} - {{ else }} - Book cover of the book {{ .Title }}

- {{ end }} + + {{ if isset .Params "image" }} + {{ with resources.GetRemote .Params.image }} + {{ with .Err }} + {{ errorf "%s" . }} {{ else }} - {{ errorf "unable to get remote resource %q" .Params.image }} + Book cover of the book {{ .Title }}

{{ end }} + {{ else }} + {{ errorf "unable to get remote resource %q" .Params.image }} + {{ end }} + {{ end }} + {{ if isset .Params "amazon" }} +

+ amazon +

+ {{ end }} +

Rating:

+ {{ if isset .Params "rating" }} + {{ $rating := .Params.rating }} + {{ range $i, $num := (seq $rating) }} + ⭐ {{ end }} - {{ if isset .Params "amazon" }} -

- amazon -

+ {{ else }} +

N/A

{{ end }} -

Rating:

- {{ if isset .Params "rating" }} - {{ $rating := .Params.rating }} - {{ range $i, $num := (seq $rating) }} - ⭐ - {{ end }} - {{ else }} -

N/A

- {{ end }} -

+ {{ end }} \ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index 2f86fca..7d9bf2a 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,7 +1,3 @@ {{ define "main" }} -

{{- .Content -}} -

{{ end }} diff --git a/layouts/partials/updated_posts.html b/layouts/partials/updated_posts.html new file mode 100644 index 0000000..7010a5b --- /dev/null +++ b/layouts/partials/updated_posts.html @@ -0,0 +1,17 @@ +{{ $lastBuildTime := time "2021-09-08T12:51:38-0400" }} +{{ $updatedPosts := slice }} + +{{ range .Site.Pages }} + {{ if .Lastmod.After $lastBuildTime }} +

{{ .Title }} - {{ .Lastmod }}

+ {{ end }} +{{ end }} + +

Updated Posts:

{{ . }}

+ +{{ $currentTime := now.UTC }} diff --git a/layouts/post/single.html b/layouts/post/single.html index f2a333e..166ecd6 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -1,9 +1,8 @@ {{ define "main" }} -

-- cgit v1.1 From 2545016f8d6b63b0d857fc20fdd7276d2f0fc2a9 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Thu, 12 Oct 2023 23:40:26 -0400 Subject: Layout refinements. add config, disclaimer --- assets/css/main.css | 48 ++++++++---------------------- config.toml | 3 ++ layouts/_default/list.html | 19 ++---------- layouts/_default/summary.html | 18 +++++------ layouts/book/list.html | 54 ++++++++++++++++----------------- layouts/partials/disclaimer.html | 2 ++ layouts/partials/footer.html | 64 ++++++++++++++-------------------------- layouts/post/single.html | 5 +++- 8 files changed, 79 insertions(+), 134 deletions(-) create mode 100644 config.toml create mode 100644 layouts/partials/disclaimer.html diff --git a/assets/css/main.css b/assets/css/main.css index 4574690..c1aae11 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,7 +1,3 @@ -:fullscreen { - color: blue; -} - body { min-height: 100vh; } @@ -10,14 +6,6 @@ body::-webkit-scrollbar { display: none;; } -#content { - width: 65ch; -} - -#content::first-letter { - initial-letter: 2; -} - main { height: inherit; display: flex; @@ -25,10 +13,6 @@ main { justify-content: stretch; } -footer { - background: #00000055; -} - .fixed { position: fixed; top: 0; @@ -66,6 +50,14 @@ footer { flex-direction: row; } +.space-between { + justify-content: space-between; +} + +.align-end { + align-items: flex-end; +} + .centered { align-items: center; justify-content: center; @@ -80,6 +72,10 @@ footer { justify-content: center; } +.flex-end { + justify-content: flex-end; +} + .flex.footer-info { gap: 1rem; } @@ -92,26 +88,6 @@ footer { position:relative; } -.poweredby, -.copyright { - position: absolute; - left: 0; - width: 100%; - padding: 1rem; - text-align: center; -} - -.poweredby { - background: #00000055; - bottom: 0; - padding: .5rem; -} - -.copyright { - background: #00000022; - bottom: 50px; -} - .post { margin-bottom: 1em; } diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..c41540e --- /dev/null +++ b/config.toml @@ -0,0 +1,3 @@ +[params] + _merge = 'deep' + themeVersion = '0.1' diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 065f708..7a26339 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,26 +1,11 @@ {{ define "main" }} -

- {{ range sort (.Paginator 3).Pages "Date" "desc" }} + {{ range sort .Pages "Date" "desc" }}

{{ end }} - {{ with .Paginator }} -

- {{ if .HasPrev }} - prev - {{ end }} - {{ if (or (.HasPrev) (.HasNext)) }} -

{{ .PageNumber }} of {{ .TotalPages }}

- {{ end }} - {{ if .HasNext }} - next - {{ end }} -

- {{ end }}

{{ end }} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 4512b16..48c7b97 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -1,19 +1,17 @@ -

+
+ +
{{ .Title }} {{ if isset .Params "rating" }} {{ .Params.rating }} {{ end }} -
+

- {{ .WordCount }} words {{ .ReadingTime }} min read

Published: {{ .Date | time.Format ":date_full" }} -

+ +

diff --git a/layouts/book/list.html b/layouts/book/list.html index 346a918..d1d1263 100644 --- a/layouts/book/list.html +++ b/layouts/book/list.html @@ -1,33 +1,31 @@ {{ define "main" }} -

- {{ if .Content }} -

- {{ end }} -

- {{ if .IsSection }} - {{ range sort (.Paginator 3).Pages "Date" "desc" }} - {{ if ne .Layout "list" }} -

- {{ end }} - {{ end }} - {{ else }} - {{ $metric := .Params.sortby }} - {{ $direction := "asc" }} - {{ if eq .Params.sortby "rating" }} - {{ $direction = "desc" }} - {{ end }} - {{ $pages := (where .Site.RegularPages "Type" "book") }} - {{ $pages = (where $pages "Layout" "!=" "list")}} - {{ if eq $direction "desc" }} - {{ $pages = (sort ($pages.ByParam $metric).Reverse) }} - {{ else }} - {{ $pages = (sort ($pages.ByParam $metric)) }} - {{ end }} - {{ range $pages }} +

+ {{ if .Content }} +

+ {{ end }} +

+ {{ if .IsSection }} + {{ range sort (.Paginator 3).Pages "Date" "desc" }} + {{ if ne .Layout "list" }}

{{ end }} {{ end }} -

+ {{ else }} + {{ $metric := .Params.sortby }} + {{ $direction := "asc" }} + {{ if eq .Params.sortby "rating" }} + {{ $direction = "desc" }} + {{ end }} + {{ $pages := (where .Site.RegularPages "Type" "book") }} + {{ $pages = (where $pages "Layout" "!=" "list")}} + {{ if eq $direction "desc" }} + {{ $pages = (sort ($pages.ByParam $metric).Reverse) }} + {{ else }} + {{ $pages = (sort ($pages.ByParam $metric)) }} + {{ end }} + {{ range $pages }} +

+ {{ end }} + {{ end }} + {{ end }} \ No newline at end of file diff --git a/layouts/partials/disclaimer.html b/layouts/partials/disclaimer.html new file mode 100644 index 0000000..7cac018 --- /dev/null +++ b/layouts/partials/disclaimer.html @@ -0,0 +1,2 @@ +{{ $disclaimer := .Site.GetPage "/disclaimer.md" }} +{{ $disclaimer.Content }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 3800b98..171d3ba 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,55 +1,35 @@ + \ No newline at end of file diff --git a/layouts/post/single.html b/layouts/post/single.html index 166ecd6..25bfc23 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -1,10 +1,13 @@ {{ define "main" }} + {{ if not .Params.dontDisclaim }} + {{ partial "disclaimer" . }} + {{ end }}

{{ end }} -- cgit v1.1 From cf6c17546bc40d41c169279ad7b8f60bf0888ab3 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Fri, 13 Oct 2023 21:26:24 -0400 Subject: new templates, and refinements --- assets/css/main.css | 15 ++++++++++++++- assets/fonts/.gitkeep | 0 layouts/post/single.html | 11 ++++++++++- layouts/shortcodes/projects.html | 12 ++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 assets/fonts/.gitkeep create mode 100644 layouts/shortcodes/projects.html diff --git a/assets/css/main.css b/assets/css/main.css index c1aae11..47cb5f5 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -126,4 +126,17 @@ html[data-theme="dark"] #actions button { html[data-theme="light"] .icon, html[data-theme="light"] #actions button { color: #24333e; -} \ No newline at end of file +} + +.pills { + margin-top: 1em; +} + +.pill { + background-color: #237fc0; + display: inline-block; + border-radius: .25em; + line-height: 1em; + padding: .5em .5em; + color: white; +} diff --git a/assets/fonts/.gitkeep b/assets/fonts/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/layouts/post/single.html b/layouts/post/single.html index 25bfc23..2c4c23e 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -2,10 +2,19 @@ {{ if not .Params.dontDisclaim }} {{ partial "disclaimer" . }} {{ end }} + {{ with .GetTerms "categories" }} + {{ (index . 0).RelPermalink }} + {{ end }}

+ {{ with .Params.categories }} +

+ {{ range $value := . }} + {{ $value }} + {{ end }} +

+ {{ end }}

{{- .Content -}} diff --git a/layouts/shortcodes/projects.html b/layouts/shortcodes/projects.html new file mode 100644 index 0000000..b9cf8b5 --- /dev/null +++ b/layouts/shortcodes/projects.html @@ -0,0 +1,12 @@ +{{ $projects := where .Site.RegularPages "Params.categories" "intersect" (slice "projects") }} + +

+ {{ .Title }} + {{ with .Description }} + — {{ . }} + {{ end }} +

\ No newline at end of file -- cgit v1.1 From 6bfd84ae2c7aad006c3bc84cdce9aebf894cbe62 Mon Sep 17 00:00:00 2001 From: user Date: Fri, 20 Oct 2023 22:49:31 -0400 Subject: add summary for books --- LICENSE | 20 -------------------- README.md | 5 ++--- archetypes/book.md | 7 +++++++ archetypes/post.md | 2 ++ assets/css/main.css | 8 ++++++++ config.toml | 8 +++++++- layouts/book/list.html | 2 +- layouts/book/single.html | 14 ++++++++------ layouts/book/summary.html | 29 +++++++++++++++++++++++++++++ layouts/partials/header.html | 8 ++++---- layouts/post/single.html | 3 --- 11 files changed, 68 insertions(+), 38 deletions(-) delete mode 100644 LICENSE create mode 100644 layouts/book/summary.html diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 17993f6..0000000 --- a/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2023 YOUR_NAME_HERE - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 597b8b4..e1e8bb1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ # Blackbear, a hugo theme. -A hugo theme built from the ground up for my personal site. It is not open source. You do not have permission to use it. +A hugo theme built from the ground up for my personal site. ## Features -- Responsive -- Contact form \ No newline at end of file +- Responsive \ No newline at end of file diff --git a/archetypes/book.md b/archetypes/book.md index 1c79e82..39928c7 100644 --- a/archetypes/book.md +++ b/archetypes/book.md @@ -2,8 +2,15 @@ title: "{{ replace .File.ContentBaseName "-" " " | title }}" author: "" image: "" +description: "Review and notes for {{ replace .File.ContentBaseName "-" " " | title }} by {{ .Params.author }}" amazon: "" rating: 4 type: 'book' +genres: + - fiction +categories: + - fiction date: {{ .Date }} +last_read: ['{{ dateFormat "2006-01-02" .Date }}'] +headless: true --- \ No newline at end of file diff --git a/archetypes/post.md b/archetypes/post.md index 43dca9a..304e9f5 100644 --- a/archetypes/post.md +++ b/archetypes/post.md @@ -1,5 +1,7 @@ --- title: "{{ replace .File.ContentBaseName "-" " " | title }}" date: {{ .Date }} +image: "" +description: "Thoughts about some topic" draft: true --- diff --git a/assets/css/main.css b/assets/css/main.css index 47cb5f5..fff7794 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -84,6 +84,14 @@ main { min-width: 250px; } +.gap-1 { + gap: 1rem; +} + +.wrap { + flex-wrap: wrap; +} + footer { position:relative; } diff --git a/config.toml b/config.toml index c41540e..fb3164e 100644 --- a/config.toml +++ b/config.toml @@ -1,3 +1,9 @@ +[taxonomies] + _merge = 'deep' + tag = 'tags' + category = 'categories' + genre = 'genres' + [params] _merge = 'deep' - themeVersion = '0.1' + themeVersion = '0.1' \ No newline at end of file diff --git a/layouts/book/list.html b/layouts/book/list.html index d1d1263..25976dd 100644 --- a/layouts/book/list.html +++ b/layouts/book/list.html @@ -5,7 +5,7 @@ {{ end }}

{{ if .IsSection }} - {{ range sort (.Paginator 3).Pages "Date" "desc" }} + {{ range sort .Pages "Date" "desc" }} {{ if ne .Layout "list" }}

{{ end }} diff --git a/layouts/book/single.html b/layouts/book/single.html index 66456e1..baedf32 100644 --- a/layouts/book/single.html +++ b/layouts/book/single.html @@ -8,12 +8,14 @@ {{ with .Err }} {{ errorf "%s" . }} {{ else }} - Book cover of the book {{ .Title }}

+ {{ $image := . }} + {{ $image := $image.Resize "250x" }} + Book cover of the book {{ .Title }}

{{ end }} {{ else }} {{ errorf "unable to get remote resource %q" .Params.image }} diff --git a/layouts/book/summary.html b/layouts/book/summary.html new file mode 100644 index 0000000..900fb87 --- /dev/null +++ b/layouts/book/summary.html @@ -0,0 +1,29 @@ +

+ {{ with resources.GetRemote .Params.image }} + {{ with .Err }} + {{ errorf "%s" . }} + {{ else }} + {{ $image := . }} + {{ $image := $image.Resize "150x" }} + Book cover of the book {{ .Title }}

+ {{ end }} + {{ else }} + {{ errorf "unable to get remote resource %q" .Params.image }} + {{ end }} + +

+ + {{ .Title }} + +

Rating: {{ .Params.rating }} / 5

+ {{ with .Params.last_read }} +

Last Read: {{ . | time.Format ":date_full" }}

+ {{ end }} + +

diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 28d3734..0137db1 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,9 +1,9 @@

- {{ .Site.Title }} -

+ {{ .Site.Title }} +

{{ .Name }}

-- cgit v1.1

{{ .Title }}

{{ .Title }}

{{ .Title }}

{{ .Title }}

{{ .Date | time.Format ":date_full" }}

{{ .Title }}

{{ .Params.author }}

{{ .Date | time.Format ":date_full" }}

{{ .Title }}

{{ .Date | time.Format ":date_full" }}

{{ .Title }}

{{ .Date | time.Format ":date_full" }}

{{ .Title }}

{{ .Title }}

{{- .Title -}}

{{ .Title }}

{{ .Date | time.Format ":date_full" }}

Go Home

{{ .Title }}

{{- .Title -}}

{{ .Title }}

{{ .Date | time.Format ":date_full" }}

{{ .Title }}

{{ .Title }}

{{ .Params.author }}

{{ .Date | time.Format ":date_full" }}

{{ .Title }}

{{ .Title }}

{{- .Title -}}

{{- .Title -}}

{{ .Title }}

{{ .Title }}

{{ .Params.author }}

{{ .Date | time.Format ":date_full" }}

Updated Posts:

{{ .Title }}

{{ .Date | time.Format ":date_full" }}

{{ .Title }}

{{ .Title | title }}

+ + + {{ .Title }} {{ if isset .Params "rating" }} {{ .Params.rating }} {{ end }} - +

{{ .Title }} {{ if isset .Params "rating" }} {{ .Params.rating }} {{ end }} -

{{ .Title }}

{{ .Title }}

{{ .Title }}

{{ .Date | time.Format ":date_full" }}

{{ .Lastmod | time.Format ":date_full" }}

{{ .Title }}

{{ .Date | time.Format ":date_full" }}

{{ .Lastmod | time.Format ":date_full" }}

+ + {{ .Title }} + +

+
+ +
{{ .Title }} {{ if isset .Params "rating" }} {{ .Params.rating }} {{ end }} -
+