From 3a17de633b414bd88f188495e493a64da644cf8a Mon Sep 17 00:00:00 2001
From: Hamcha <hamcha@crunchy.rocks>
Date: Thu, 14 Sep 2023 11:55:12 +0200
Subject: [PATCH] add cad shootout page

---
 content/cad-shootout.md                    |  9 +++++++++
 content/posts/cad-shootout-freecad.md      |  2 ++
 content/posts/cad-shootout-onshape.md      |  2 ++
 layouts/pages/list.html                    | 18 ++++++++++++------
 layouts/shortcodes/cad-list.html           | 14 ++++++++++++++
 layouts/taxonomy/tag.html                  | 19 +++++++++++--------
 themes/fesite/assets/scss/cad.scss         | 16 ++++++++++++++++
 themes/fesite/assets/scss/main.scss        |  1 +
 themes/fesite/layouts/_default/single.html |  5 +++--
 9 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 content/cad-shootout.md
 create mode 100644 layouts/shortcodes/cad-list.html
 create mode 100644 themes/fesite/assets/scss/cad.scss

diff --git a/content/cad-shootout.md b/content/cad-shootout.md
new file mode 100644
index 0000000..56997c5
--- /dev/null
+++ b/content/cad-shootout.md
@@ -0,0 +1,9 @@
+---
+title: Hobby CAD shootout
+---
+
+As 3D printing and others means of manufacturing become more accessible to the average Joe, more people are getting familiar with the tools needed to make designs to have manufactured.  Today there are many CAD tools around, but which fits the average hobbyist like me the best?
+
+Reading in publication order is suggested (there are callouts) but feel free to pick whatever, I provide plenty of links when I make references:
+
+{{< cad-list >}}
diff --git a/content/posts/cad-shootout-freecad.md b/content/posts/cad-shootout-freecad.md
index 172143f..0442ab0 100644
--- a/content/posts/cad-shootout-freecad.md
+++ b/content/posts/cad-shootout-freecad.md
@@ -2,6 +2,8 @@
 title: "Hobby CAD shootout: FreeCAD"
 date: 2023-09-13T22:00:00+02:00
 toc: true
+software: FreeCAD
+license: Free and open source, LGPL license
 tags:
   - cad
 tldr: |
diff --git a/content/posts/cad-shootout-onshape.md b/content/posts/cad-shootout-onshape.md
index 858bcf1..645a8cc 100644
--- a/content/posts/cad-shootout-onshape.md
+++ b/content/posts/cad-shootout-onshape.md
@@ -2,6 +2,8 @@
 title: "Hobby CAD shootout: Onshape"
 date: 2023-09-11T19:00:00+02:00
 toc: true
+software: Onshape
+license: Free for non-commercial, starts at $1500/year/user otherwise
 tags:
   - cad
 tldr: |
diff --git a/layouts/pages/list.html b/layouts/pages/list.html
index e403fac..bb9c037 100644
--- a/layouts/pages/list.html
+++ b/layouts/pages/list.html
@@ -2,10 +2,16 @@
 <h1>All pages</h1>
 <p>These documents are a personal dump of notes and may change at any time.</p>
 <section class="post-list">
-{{ range .Pages.ByPublishDate.Reverse }}
-<article>
-	<a class="title" href="{{ .RelPermalink }}">{{ .Title }}</a> <span class="lastmod">(Last modified: <time datetime="{{ .Lastmod | time.Format "2006-01-02"}}">{{ .Lastmod | time.Format "2006-01-02"}}</time>)</span>
-</article>
-{{ end }}
+  {{ range .Pages.ByPublishDate.Reverse }}
+  <article>
+    <a class="title" href="{{ .RelPermalink }}">{{ .Title }}</a>
+    <span class="lastmod"
+      >(Last modified:
+      <time datetime='{{ .Lastmod | time.Format "2006-01-02"}}'
+        >{{ .Lastmod | time.Format "2006-01-02"}}</time
+      >)</span
+    >
+  </article>
+  {{ end }}
 </section>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/shortcodes/cad-list.html b/layouts/shortcodes/cad-list.html
new file mode 100644
index 0000000..0c85906
--- /dev/null
+++ b/layouts/shortcodes/cad-list.html
@@ -0,0 +1,14 @@
+<section class="cad-list">
+{{ $pages := where site.RegularPages ".Params.tags" "intersect" (slice "cad") }}
+{{- with $pages }}
+{{ range .ByPublishDate }}
+<article>
+	<a class="title" href="{{ .RelPermalink }}">{{ with .Params.Software }}{{.}}{{else}}{{.Title}}{{end}}</a>
+	<time datetime="{{ .Date | time.Format "2006-01-02"}}">(published {{ .Date | time.Format "2006-01-02"}})</time>
+	{{ with .Params.License }}
+		<section class="license">{{.}}</section>
+	{{end}}
+</article>
+{{ end }}
+{{ end }}
+</section>
\ No newline at end of file
diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html
index 326ddaa..6e3b78a 100644
--- a/layouts/taxonomy/tag.html
+++ b/layouts/taxonomy/tag.html
@@ -1,13 +1,16 @@
 {{ define "main" }}
 <h1>Posts tagged "{{ .Title }}"</h1>
 <section class="post-list">
-{{ range .Pages.ByPublishDate.Reverse }}
-<article>
-	<time datetime="{{ .Date | time.Format "2006-01-02"}}">{{ .Date | time.Format "2006-01-02"}}</time> <a class="title" href="{{ .RelPermalink }}">{{ .Title }}</a>
-	{{ if .Params.tldr }}
-	<div class="summary">{{.Params.tldr|markdownify}}</div>
-	{{ end }} 
-</article>
-{{ end }}
+  {{ range .Pages.ByPublishDate.Reverse }}
+  <article>
+    <time datetime='{{ .Date | time.Format "2006-01-02"}}'
+      >{{ .Date | time.Format "2006-01-02"}}</time
+    >
+    <a class="title" href="{{ .RelPermalink }}">{{ .Title }}</a>
+    {{ if .Params.tldr }}
+    <div class="summary">{{.Params.tldr|markdownify}}</div>
+    {{ end }}
+  </article>
+  {{ end }}
 </section>
 {{ end }}
diff --git a/themes/fesite/assets/scss/cad.scss b/themes/fesite/assets/scss/cad.scss
new file mode 100644
index 0000000..9960d9f
--- /dev/null
+++ b/themes/fesite/assets/scss/cad.scss
@@ -0,0 +1,16 @@
+.cad-list {
+  article {
+    .title {
+      font-size: 17pt;
+      font-family: $iosevka;
+      font-weight: bold;
+    }
+    time {
+      color: rgb(160, 155, 166);
+    }
+    .license {
+      font-size: $text-small;
+    }
+    margin-bottom: 1.5rem;
+  }
+}
diff --git a/themes/fesite/assets/scss/main.scss b/themes/fesite/assets/scss/main.scss
index 948df3c..d26aa46 100644
--- a/themes/fesite/assets/scss/main.scss
+++ b/themes/fesite/assets/scss/main.scss
@@ -4,3 +4,4 @@
 @import "layout.scss";
 @import "home.scss";
 @import "post.scss";
+@import "cad.scss";
diff --git a/themes/fesite/layouts/_default/single.html b/themes/fesite/layouts/_default/single.html
index 0664e13..f6685b2 100644
--- a/themes/fesite/layouts/_default/single.html
+++ b/themes/fesite/layouts/_default/single.html
@@ -1,8 +1,9 @@
 {{ define "main" }}
 <h1>{{ .Title }}</h1>
 <section class="meta">
-  Published on {{.Date | time.Format "2006-01-02" }} {{ if (gt .Lastmod .Date)
-  }}| Last modified on {{.Lastmod | time.Format "2006-01-02" }} {{ end }}
+  {{ with .Date }}Published on {{. | time.Format "2006-01-02" }}{{ end }} {{ if
+  (gt .Lastmod .Date) }}| Last modified on {{.Lastmod | time.Format "2006-01-02"
+  }} {{ end }}
 </section>
 {{ if .Params.tldr }}
 <div class="tldr">{{.Params.tldr|markdownify}}</div>