Update dump

Also testing removal of the CNAME file!
😁

.github/workflows/gh-pages.yml

@@ -8,17 +8,17 @@ jobs:
   deploy:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      # - uses: actions/checkout@v2
-        with:
+      #   with:
-          submodules: true
+      #     submodules: true
-          fetch-depth: 0
+      #     fetch-depth: 0
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
           hugo-version: 'latest'
           # extended: true
       - name: Build
-        run: hugo --minify
+        run: hugo -e prod --minify
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         if: github.ref == 'refs/heads/master'

.gitignore

@@ -1,2 +1,3 @@
 .hugo_build.lock
+resources/
 public/

Makefile

@@ -1,12 +1,28 @@
-HUGO := hugo
+.PHONY: help build create debug clean
 
-.PHONY: build create clean
+help:
+	@echo '= Make targets:'
+	@echo 'build: creates a public/ folder with the built static files'
+	@echo 'create: runs the development server serving the built static files'
+	@echo 'check: like create but production environment'
+	@echo 'debug: like create without drafts and with --debug'
+	@echo 'clean: deletes the public/ folder'
 
-build: clean
+HUGO := hugo --printI18nWarnings --printPathWarnings --printUnusedTemplates --templateMetricsHints # --templateMetrics --cleanDestinationDir --gc
-	$(HUGO) --gc
+SERV := server --bind 0.0.0.0 --liveReloadPort 80 --appendPort=false --disableFastRender --printMemoryUsage --noHTTPCache --renderToDisk --navigateToChanged
+DEV := $(HUGO) -e dev $(SERV)
+
+build: # clean
+	$(HUGO) -e prod
+
+check:
+	$(HUGO) -e prod $(SERV)
 
 create:
-	$(HUGO) server -D --bind 0.0.0.0 --disableFastRender
+	$(DEV) -D
+
+debug:
+	$(DEV) --debug
 
 clean:
-	rm -fr public/
+	rm -fr public/ resources/

archetypes/blog.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: {{ .Date }}
 date: {{ .Date }}
 draft: true

archetypes/default.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: {{ .Date }}
 date: {{ .Date }}
 draft: true

assets/main.scss

@@ -0,0 +1,66 @@
+h1,h2,h3,h4,h5,h6 {
+  @extend %headings !optional;
+}
+
+body {
+  background-color: rgb(18, 20, 21);
+  color: lime;
+}
+
+#content {
+  main {
+    background-color: rgb(24, 26, 27);
+    margin: 3% 10%;
+    padding: 3%;
+  }
+  a:hover %headings {
+    text-decoration: underline;
+    color: blue;
+  }
+  a {
+    text-decoration: none;
+    color: lime;
+  }
+}
+
+#navbar {
+  background-color: #222;
+  li a:hover {
+    background-color: #333;
+  }
+  .link-group li {
+    float: right;
+  }
+  li {
+    display: inline;
+    float: left;
+  }
+  ul {
+    list-style-type: none;
+    overflow: hidden;
+    padding: 0;
+    margin: 0;
+  }
+  a {
+    text-decoration: none;
+    text-align: center;
+    padding: 14px 16px;
+    display: block;
+    color: lime;
+  }
+}
+
+#lang-menu {
+  ul {
+    background-color: #222;
+    position: absolute;
+    display: none;
+    z-index: 1;
+  }
+  a {
+    display: block;
+  }
+}
+#lang-menu:hover ul {
+  display: block;
+}

content/_index.en.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: 2022-03-27T18:08:24Z
 date: 2022-03-27T18:08:24Z
 draft: false

content/_index.nl.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: 2022-03-27T18:08:24Z
 date: 2022-03-27T18:08:24Z
 draft: false

content/_index.no.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: 2022-03-27T18:08:24Z
 date: 2022-03-27T18:08:24Z
 draft: false

content/about.en.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: 2022-03-27T18:08:24Z
 date: 2022-03-27T18:08:24Z
 draft: false

content/about.no.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: 2022-03-29T21:10:24Z
 date: 2022-03-29T21:10:24Z
 draft: false

content/blog/_index.en.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: 2022-03-27T18:08:24Z
 date: 2022-03-27T18:08:24Z
 draft: false

content/blog/_index.nl.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: 2022-03-30T12:04:24Z
 date: 2022-03-30T12:04:24Z
 draft: true

content/blog/_index.no.md

@@ -1,5 +1,4 @@
 ---
-deprecated: false
 publishdate: 2022-03-29T21:00:24Z
 date: 2022-03-29T21:00:24Z
 draft: false

content/blog/apprentice/_index.en.md

@@ -0,0 +1,13 @@
+---
+publishdate: 2022-04-05T18:33:08Z
+date: 2022-04-05T18:33:08Z
+draft: true
+aliases: []
+categories: ["apprentice"]
+series: []
+tags: ["apprentice"]
+toc: false
+title: Apprentice
+description: This part of my blog is a collection of things I've learned as an apprentice working in IT.
+---
+

layouts/_default/baseof.html

@@ -3,6 +3,9 @@
 <head>
   <meta charset="UTF-8">
   <meta name=”robots” content="index,follow">
+  {{ with resources.Get "favicon.ico" | resources.Fingerprint }}
+    <link rel="icon" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" />
+  {{ end }}
   {{ block "meta" . }}
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
   {{ end }}
@@ -19,15 +22,19 @@
     <title>{{ site.Title }} - {{ .Title }}</title>
   {{ else }}
     <title>{{ site.Title }}</title>
-  {{ end }}{{ if .Description }}
+  {{ end }}
+  {{ if .Description }}
     <meta name='description' content='{{ .Description }}'>
   {{ end }}
-  {{ block "head" . }}
+  {{ block "head" . }}{{ end }}
-  {{ end }}
   {{ if .Param "chroma" }}
-  <link href='/chroma.css' rel='stylesheet'>
+    {{ with resources.Get "chroma.css" | resources.Minify | resources.Fingerprint }}
+      <link href='{{ .Rel }}' integrity="{{ .Data.Integrity }}" rel='stylesheet'>
+    {{ end }}
+  {{ end }}
+  {{ with resources.Get "main.scss" | resources.ToCSS (dict "outputStyle" "expanded" "enableSourceMap" false) | resources.Fingerprint }}
+    <link href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" rel="stylesheet">
   {{ end }}
-  <link href='/main.css' rel='stylesheet'>
 </head>
 <body>
   <header>

layouts/_default/list.html

@@ -6,9 +6,10 @@
   {{ .Content }}
   <ul class="contents">
   {{ range .Pages }}
-    <li>
+    <br />
-    {{ partial "summary.html" . }}
+    <a href='{{ .RelPermalink }}'>
-    </li>
+      <li>{{ partial "summary.html" . }}</li>
+    </a>
   {{ end }}
   </ul>
 </article>

layouts/index.html

@@ -7,9 +7,9 @@
   <ul class="contents">
   {{ range .Pages }}
     <br />
-    <li>
+    <a href='{{ .RelPermalink }}'>
-    {{ partial "summary.html" . }}
+      <li>{{ partial "summary.html" . }}</li>
-    </li>
+    </a>
   {{ end }}
   </ul>
 </article>

layouts/partials/summary.html

@@ -2,7 +2,8 @@
 {{- $lastmod := .Lastmod.Format "02/01/2006" }}
 <article>
   <div>
-    <h3><a href='{{ .RelPermalink }}'>{{ .Title }}</a></h3>
+    <!-- <h3><a href='{{ .RelPermalink }}'>{{ .Title }}</a></h3> -->
+    <h3>{{ .Title }}</h3>
     {{ i18n "published" }} {{ $pubdate }}
     {{ if ne $pubdate $lastmod }}
     {{ i18n "modified" }} {{ $lastmod }}

static/CNAME

@@ -1 +0,0 @@
-io.sivert.pw

static/main.css

@@ -1,50 +0,0 @@
-
-body {
-  background-color: rgb(18, 20, 21);
-  color: lime;
-}
-#content main {
-  background-color: rgb(24, 26, 27);
-  margin: 3% 10%;
-  padding: 3%;
-}
-
-#navbar {
-  background-color: #222;
-}
-#navbar li a:hover {
-  background-color: #333;
-}
-#navbar .link-group li {
-  float: right;
-}
-#navbar li {
-  display: inline;
-  float: left;
-}
-#navbar ul {
-  list-style-type: none;
-  overflow: hidden;
-  padding: 0;
-  margin: 0;
-}
-#navbar a {
-  text-decoration: none;
-  text-align: center;
-  padding: 14px 16px;
-  display: block;
-  color: lime;
-}
-
-#lang-menu ul {
-  background-color: #222;
-  position: absolute;
-  display: none;
-  z-index: 1;
-}
-#lang-menu a {
-  display: block;
-}
-#lang-menu:hover ul {
-  display: block;
-}

static/old/README.md

@@ -1,3 +0,0 @@
-# My github.io
-
-I dunno what to host here, prolly will add someting cool later some time.