feat: custom sections, TV series section, fix table wrapping

assets/css/components/table.scss

@@ -8,7 +8,7 @@
 
 table {
   margin: auto;
-  width: 80%;
+  inline-size: 80%;
   display: table;
 
   & thead {
@@ -18,6 +18,11 @@ table {
   & td {
     padding: 0.5em 1em;
     border: 1px solid $dark;
+
+    &:nth-of-type(1),
+    &:nth-last-of-type(1) {
+      white-space: nowrap;
+    }
   }
 }
 

assets/css/layout/_header.scss

@@ -45,7 +45,7 @@
     grid-area: header-nav;
     margin: auto;
     width: 100%;
-    @include mq('desktop') {
+    @include mq("desktop") {
       width: 60%;
     }
 

assets/css/layout/_main.scss

@@ -2,7 +2,23 @@
   grid-area: page-container;
   margin-left: 1em;
   margin-right: 1em;
-  @include mq('desktop') {
+  @include mq("desktop") {
     margin: 2em;
   }
+
+  &__header {
+    & .section-nav {
+      padding-block-end: 1em;
+
+      & li {
+        float: left;
+        padding-inline: 1em;
+      }
+    }
+
+    & .section__desc {
+      border-block: 2px solid $dark;
+      margin-block: 1em;
+    }
+  }
 }

layouts/_default/section.html

@@ -1,5 +1,6 @@
 {{ define "title" }}
-  {{ .Page.Title | plainify }} | {{ .Site.Title }}
+  {{ .Page.Title | plainify }} |
+  {{ .Site.Title }}
 {{ end }}
 
 {{ define "main-class" }}--section{{ end }}
@@ -8,42 +9,53 @@
 {{ define "item-type" }}{{ .Params.itemsType }}{{ end }}
 
 {{ define "main-header" }}
-<header class="site-content__header">
+  <header class="site-content__header">
-  {{- .Scratch.Set "section" ( first 1 ( split .File.Dir "/" ) ) -}}
+    <h1 class="page-title">
-  {{- $section := .Scratch.Get "section" -}}
+      {{ .Title | safeHTML }}
-  {{ if ( or ( in "books" ( delimit $section "" ) ) ( in "games" ( delimit $section "" ) ) ) }}
-  <a href="/{{ delimit $section "" }}/current">Current</a> ~
-  {{ end }}
-  <a href="/{{ delimit $section "" }}/log">Log</a> ~
-  <a href="/{{ delimit $section "" }}/wishlist">Wishlist</a>
-  
-  <h1 class="page-title">{{ .Title | safeHTML }}
       {{ range .AlternativeOutputFormats -}}
         <a href="{{ .RelPermalink }}">
-       <img class="feed-icon" src="/images/feed-icon.svg">
+          <img
+            class="feed-icon"
+            src="/images/feed-icon.svg"
+          />
         </a>
       {{ end }}
     </h1>
+
+    {{ with ( default .Parent.Sections .Sections ) }}
+      <nav class="section-nav">
+        <ul>
+          {{ range .ByWeight }}
+            <li>
+              {{ if eq . $.Page }}
+                <p style="margin: 0;">{{ .Title }}</p>
+              {{ else }}
+                <a href="{{ .RelPermalink }}">{{ .Title }}</a>
+              {{ end }}
+            </li>
+          {{ end }}
+        </ul>
+      </nav>
+    {{ end }}
+
+
+    <div class="section__desc">
       {{ .Content }}
-</header>
+    </div>
+  </header>
 {{ end }}
 
 {{ define "main-body" }}
-<main class="site-content__body">
+  <main class="site-content__body">
-  {{ if .File }}
+    {{ .Scratch.Set "page" .Page.Slug }}
-
-    {{ .Scratch.Set "page" ( index ( split .File.Dir "/" ) 1 ) }}
     {{ if ( in "current log wishlist" ( .Scratch.Get "page" ) ) }}
 
       {{ if ( eq ( .Scratch.Get "page" ) "current" ) }}
         {{ .Scratch.Set "listMode" "current" }}
-
       {{ else if ( eq ( .Scratch.Get "page" ) "log" ) }}
         {{ .Scratch.Set "listMode" "log" }}
-
       {{ else if ( eq ( .Scratch.Get "page" ) "wishlist" ) }}
         {{ .Scratch.Set "listMode" "wishlist" }}
-
       {{ end }}
 
       {{ partial "stats" . }}
@@ -51,6 +63,5 @@
       {{ partial "table" . }}
 
     {{ end }}
-  {{ end }}
+  </main>
-</main>
 {{ end }}

layouts/partials/books/rows/read-dates.html

@@ -2,7 +2,9 @@
   {{- time.Format "Jan 2, 2006" . -}}
 {{- else -}}
   Unknown
-{{- end -}}–{{- with .date_finished -}}
+{{- end }}
+to<br />
+{{ with .date_finished -}}
   {{- time.Format "Jan 2, 2006" . -}}
 {{- else -}}
   Unknown

layouts/partials/books/table-body.html

@@ -1,7 +1,14 @@
 {{ if ( eq ( .Scratch.Get "listMode" ) "current" ) }}
   {{ range ( sort $.Site.Data.books.current "date_started" "desc" ) }}
     <tr>
-      <td>{{ with .date_added }}{{ time.Format "Jan 2, 2006" . }}{{ else }}n/a{{ end }}</td>
+      <td>
+        {{ with .date_added }}
+          {{ time.Format "Jan 2, 2006" . }}
+        {{ else }}
+          n/a
+        {{ end }}
+
+      </td>
 
       <td>
         {{- partial "books/rows/title.html" ( dict "c" . "g" $ ) -}}
@@ -21,7 +28,8 @@
 
       <td>
         {{- with .date_started -}}
-            Since {{ time.Format "Jan 2, 2006" . -}}
+          Since
+          {{ time.Format "Jan 2, 2006" . -}}
         {{- else -}}
           Unknown
         {{- end -}}
@@ -30,11 +38,18 @@
   {{ end }}
 {{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
   <tr>
-    <td colspan=5><h3>Diary</h3></td>
+    <td colspan="5"><h3>Diary</h3></td>
   </tr>
   {{ range ( sort ( where $.Site.Data.books.log "Date Finished" "!=" "" ) "Date Finished" "desc" ) }}
     <tr>
-      <td>{{ with .date_added }}{{ time.Format "Jan 2, 2006" . }}{{ else }}n/a{{ end }}</td>
+      <td>
+        {{ with .date_added }}
+          {{ time.Format "Jan 2, 2006" . }}
+        {{ else }}
+          n/a
+        {{ end }}
+
+      </td>
 
       <td>
         {{- partial "books/rows/title.html" ( dict "c" . "g" $ ) -}}
@@ -58,11 +73,18 @@
     </tr>
   {{ end }}
   <tr>
-    <td colspan=5><h3>Assorted</h3></td>
+    <td colspan="5"><h3>Assorted</h3></td>
   </tr>
   {{ range ( sort ( where $.Site.Data.books.log "Date Finished" "" ) "Title" "asc" ) }}
     <tr>
-      <td>{{ with .date_added }}{{ time.Format "Jan 2, 2006" . }}{{ else }}n/a{{ end }}</td>
+      <td>
+        {{ with .date_added }}
+          {{ time.Format "Jan 2, 2006" . }}
+        {{ else }}
+          n/a
+        {{ end }}
+
+      </td>
 
       <td>
         {{- partial "books/rows/title.html" ( dict "c" . "g" $ ) -}}
@@ -88,7 +110,14 @@
 {{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }}
   {{ range ( sort $.Site.Data.books.wishlist "Title" "asc" ) }}
     <tr>
-      <td>{{ with .date_added }}{{ time.Format "Jan 2, 2006" . }}{{ else }}n/a{{ end }}</td>
+      <td>
+        {{ with .date_added }}
+          {{ time.Format "Jan 2, 2006" . }}
+        {{ else }}
+          n/a
+        {{ end }}
+
+      </td>
 
       <td>
         {{- partial "books/rows/title.html" ( dict "c" . "g" $ ) -}}
@@ -105,8 +134,6 @@
       <td>
         {{- partial "books/rows/publish-date.html" . -}}
       </td>
-
-      <td>n/a</td>
     </tr>
   {{ end }}
 {{ end }}

layouts/partials/books/table-header.html

@@ -2,4 +2,6 @@
 <th>Title</th>
 <th>Author(s)</th>
 <th>Publication Date</th>
-<th>Dates Read</th>
+{{ if ( not ( eq ( .Scratch.Get "listMode" ) "wishlist" ) ) }}
+  <th>Dates Read</th>
+{{ end }}

layouts/partials/films/table-body.html

@@ -1,6 +1,6 @@
 {{ if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
   <tr>
-    <td colspan=4><h3>Diary</h3></td>
+    <td colspan="4"><h3>Diary</h3></td>
   </tr>
   {{ range ( sort ( where $.Site.Data.films.log "date_finished" "!=" "" ) "date_finished" "desc" ) }}
     <tr>
@@ -14,12 +14,14 @@
         {{- end -}}
       </td>
 
-    <td>{{ with .release_date }}{{ time.Format "Jan 2, 2006" . }}{{ end }}</td>
+      <td>
+        {{ with .release_date }}{{ time.Format "Jan 2, 2006" . }}{{ end }}
+      </td>
 
       <td>
         {{- if .date_finished -}}
           {{- time.Format "Jan 2, 2006" .date_finished -}}
-      {{- if .is_repeat }} &#x21BB;{{ end -}}
+          {{- if .is_repeat }}&#x21BB;{{ end -}}
         {{- else -}}
           n/a
         {{- end -}}
@@ -27,7 +29,7 @@
     </tr>
   {{ end }}
   <tr>
-    <td colspan=4><h3>Assorted</h3></td>
+    <td colspan="4"><h3>Assorted</h3></td>
   </tr>
   {{ range ( sort ( where $.Site.Data.films.log "date_finished" "" ) "title" "asc" ) }}
     <tr>
@@ -41,12 +43,14 @@
         {{- end -}}
       </td>
 
-    <td>{{ with .release_date }}{{ time.Format "Jan 2, 2006" . }}{{ end }}</td>
+      <td>
+        {{ with .release_date }}{{ time.Format "Jan 2, 2006" . }}{{ end }}
+      </td>
 
       <td>
         {{- if .date_finished -}}
           {{- time.Format "Jan 2, 2006" .date_finished -}}
-      {{- if .is_repeat }} &#x21BB;{{ end -}}
+          {{- if .is_repeat }}&#x21BB;{{ end -}}
         {{- else -}}
           n/a
         {{- end -}}
@@ -66,15 +70,8 @@
         {{- end -}}
       </td>
 
-    <td>{{ with .release_date }}{{ time.Format "Jan 2, 2006" . }}{{ end }}</td>
-
       <td>
-    {{- if .date_finished -}}
+        {{ with .release_date }}{{ time.Format "Jan 2, 2006" . }}{{ end }}
-      {{- time.Format "Jan 2, 2006" .date_finished -}}
-      {{- if .is_repeat }} &#x21BB;{{ end -}}
-    {{- else -}}
-      n/a
-    {{- end -}}
       </td>
     </tr>
   {{ end }}

layouts/partials/films/table-header.html

@@ -1,4 +1,6 @@
 <th>Date Added</th>
 <th>Title</th>
 <th>Release Date</th>
-<th>Date Watched</th>
+{{ if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
+  <th>Date Watched</th>
+{{ end }}

layouts/partials/games/table-body.html

@@ -1,14 +1,16 @@
 {{ if ( eq ( .Scratch.Get "listMode" ) "current" ) }}
   {{ range ( sort $.Site.Data.games.current "Date Started" "desc" ) }}
     <tr>
+      <td>TODO</td>
       <td>
         {{- partial "cite" ( dict "c" . "g" $ "section" "games" "schemaType" "VideoGame" ) -}}
       </td>
-    <td>{{ index . "Date Released" }}</td>
       <td>{{ .Platforms }}</td>
+      <td>{{ index . "Date Released" }}</td>
       <td>
         {{- if index . "Date Started" -}}
-        Since {{ time.Format "Jan 2, 2006" ( index . "Date Started" ) -}}
+          Since
+          {{ time.Format "Jan 2, 2006" ( index . "Date Started" ) -}}
         {{- else -}}
           Unknown
         {{- end -}}
@@ -17,15 +19,21 @@
   {{ end }}
 {{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
   <tr>
-    <td colspan=4><h3>Diary</h3></td>
+    <td colspan="6"><h3>Diary</h3></td>
   </tr>
   {{ range ( sort ( where $.Site.Data.games.log "Date Finished" "!=" "" ) "Date Finished" "desc" ) }}
     <tr>
+      <td>TODO</td>
       <td>
         {{- partial "cite" ( dict "c" . "g" $ "section" "games" "schemaType" "VideoGame" ) -}}
       </td>
-    <td>{{ index . "Date Released" }}</td>
       <td>{{ .Platforms }}</td>
+      <td>{{ index . "Date Released" }}</td>
+      <td>
+        {{- with index . "Level of Completion" }}
+          {{ . }}
+        {{- end -}}
+      </td>
       <td>
         {{- if index . "Date Started" -}}
           {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}}
@@ -36,20 +44,25 @@
         {{- else -}}
           Unknown
         {{- end -}}
-      {{- if index . "Level of Completion" }} <span class="games__level-of-completion">({{ index . "Level of Completion" }})</span>{{- end -}}
       </td>
     </tr>
   {{ end }}
   <tr>
-    <td colspan=5><h3>Assorted</h3></td>
+    <td colspan="6"><h3>Assorted</h3></td>
   </tr>
   {{ range ( sort ( where $.Site.Data.games.log "Date Finished" "" ) "Title" "asc" ) }}
     <tr>
+      <td>TODO</td>
       <td>
         {{- partial "cite" ( dict "c" . "g" $ "section" "games" "schemaType" "VideoGame" ) -}}
       </td>
-    <td>{{ index . "Date Released" }}</td>
       <td>{{ .Platforms }}</td>
+      <td>{{ index . "Date Released" }}</td>
+      <td>
+        {{- with index . "Level of Completion" }}
+          {{ . }}
+        {{- end -}}
+      </td>
       <td>
         {{- if index . "Date Started" -}}
           {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}}
@@ -60,19 +73,18 @@
         {{- else -}}
           Unknown
         {{- end -}}
-      {{- if index . "Level of Completion" }} <span class="games__level-of-completion">({{ index . "Level of Completion" }})</span>{{- end -}}
       </td>
     </tr>
   {{ end }}
 {{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }}
   {{ range ( sort $.Site.Data.games.wishlist "Title" "asc" ) }}
     <tr>
+      <td>TODO</td>
       <td>
         {{- partial "cite" ( dict "c" . "g" $ "section" "games" "schemaType" "VideoGame" ) -}}
       </td>
-    <td>{{ index . "Date Released" }}</td>
       <td>{{ .Platforms }}</td>
-    <td>n/a</td>
+      <td>{{ index . "Date Released" }}</td>
     </tr>
   {{ end }}
 {{ end }}

layouts/partials/games/table-header.html

@@ -1,4 +1,8 @@
+<th>Date Added</th>
 <th>Title</th>
+<th>Platform(s)</th>
 <th>Release Year</th>
-<th>Platform(s) Played</th>
+{{ if ( not ( eq ( .Scratch.Get "listMode" ) "wishlist" ) ) }}
-<th>Date Played</th>
+  <th>Level of Completion</th>
+  <th>Dates Played</th>
+{{ end }}

layouts/partials/header/site-header.html

@@ -1,12 +1,32 @@
 <header class="site-header">
   {{ block "header" . }}
-    <h1 class="site-header__title" itemprop="name"><a href="{{ .Site.Home.RelPermalink }}">{{ .Site.Title }}</a></h1>
+    <h1
-    <p class="site-header__tagline" itemprop="about">Views my own. Discussion ≠ endorsement. Do try this at home.</p>
+      class="site-header__title"
-    <p class="site-header__icons">~ 
+      itemprop="name"
-      <a href="mailto:{{ $.Site.Author.email }}" rel="me">&#128231;</a> ~ 
+    >
-      <a href="{{ .Site.Params.codeURL }}">&#128187;</a> ~ 
+      <a href="{{ .Site.Home.RelPermalink }}">{{ .Site.Title }}</a>
+    </h1>
+    <p
+      class="site-header__tagline"
+      itemprop="about"
+    >
+      Views my own. Discussion ≠ endorsement. Do try this at home.
+    </p>
+    <p class="site-header__icons">
+      ~
+      <a
+        href="mailto:{{ $.Site.Author.email }}"
+        rel="me"
+        >&#128231;</a
+      >
+      ~ <a href="{{ .Site.Params.codeURL }}">&#128187;</a> ~
       <a href="/{{ .Site.Params.keyfile }}">&#128272;</a> ~
-      <a href="/index.xml"><img class="feed-icon" src="/images/feed-icon.svg"></a> ~
+      <a href="/index.xml"
+        ><img
+          class="feed-icon"
+          src="/images/feed-icon.svg"
+      /></a>
+      ~
     </p>
 
     <nav class="site-header__nav">

layouts/partials/table.html

@@ -1,16 +1,25 @@
 {{ if ( .Scratch.Get "listMode" ) }}
-<table>
+  <table>
     <thead>
       <tr>
         {{ if ( and ( in site.Params.mainSections .Section ) ( in "current log wishlist" ( .Scratch.Get "page" ) ) ) }}
+          {{ if eq .Type "tv" }}
+            {{ partial ( printf "%s/%s/%s" .Section .Parent.Slug "table-header" ) . }}
+          {{ else }}
             {{ partial ( printf "%s/%s" .Section "table-header" ) . }}
           {{ end }}
+        {{ end }}
       </tr>
     </thead>
     <tbody>
       {{ if ( and ( in site.Params.mainSections .Section ) ( in "current log wishlist" ( .Scratch.Get "page" ) ) ) }}
+        {{ if eq .Type "tv" }}
+          {{ partial ( printf "%s/%s/%s" .Section .Parent.Slug "table-body" ) . }}
+        {{ else }}
           {{ partial ( printf "%s/%s" .Section "table-body" ) . }}
         {{ end }}
+      {{ end }}
     </tbody>
-<table>
+    <table></table>
+  </table>
 {{ end }}

layouts/partials/tv/series/table-body.html

@@ -0,0 +1,86 @@
+{{ if ( eq ( .Scratch.Get "listMode" ) "current" ) }}
+  {{ range ( sort $.Site.Data.tv_series.current "date_started" "desc" ) }}
+    <tr>
+      <td>
+        {{ with .date_added }}
+          {{ time.Format "Jan 2, 2006" . }}
+        {{ else }}
+          n/a
+        {{ end }}
+
+      </td>
+
+      <td>
+        {{- with ( index . "name" ) -}}
+          <cite
+            class="cite"
+            itemscope
+            itemtype="TVSeries"
+            >{{ . }}</cite
+          >
+        {{- end -}}
+      </td>
+
+      <td>
+        {{- partial "books/rows/read-dates.html" . -}}
+      </td>
+    </tr>
+  {{ end }}
+{{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
+  {{ if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
+    {{ .Scratch.Set "filterCol" "date_finished" }}
+    {{ .Scratch.Set "filterDir" "desc" }}
+  {{ end }}
+
+  {{ range ( sort $.Site.Data.tv_series.log ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }}
+    <tr>
+      <td>
+        {{ with .date_added }}
+          {{ time.Format "Jan 2, 2006" . }}
+        {{ else }}
+          n/a
+        {{ end }}
+
+      </td>
+
+      <td>
+        {{- with ( index . "name" ) -}}
+          <cite
+            class="cite"
+            itemscope
+            itemtype="TVSeries"
+            >{{ . }}</cite
+          >
+        {{- end -}}
+      </td>
+
+      <td>
+        {{- partial "books/rows/read-dates.html" . -}}
+      </td>
+    </tr>
+  {{ end }}
+{{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }}
+  {{ range ( sort $.Site.Data.tv_series.wishlist "name" "asc" ) }}
+    <tr>
+      <td>
+        {{ with .date_added }}
+          {{ time.Format "Jan 2, 2006" . }}
+        {{ else }}
+          n/a
+        {{ end }}
+
+      </td>
+
+      <td>
+        {{- with ( index . "name" ) -}}
+          <cite
+            class="cite"
+            itemscope
+            itemtype="TVSeries"
+            >{{ . }}</cite
+          >
+        {{- end -}}
+      </td>
+    </tr>
+  {{ end }}
+{{ end }}

layouts/partials/tv/series/table-header.html

@@ -0,0 +1,5 @@
+<th>Date Added</th>
+<th>Series Title</th>
+{{ if ( not ( eq ( .Scratch.Get "listMode" ) "wishlist" ) ) }}
+  <th>Dates Watched</th>
+{{ end }}