Update for modern hugo, deploy on gitea

.gitea/workflows/deploy.yaml

@@ -0,0 +1,42 @@
+name: Deploy
+run-name: ${{ gitea.actor }} is deploying ${{ gitea.repository }}
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    container:
+      image: docker.gitea.com/runner-images:ubuntu-latest
+      volumes:
+        - /opt/hugo/ally.id:/opt/hugo/ally.id
+    env:
+      DART_SASS_VERSION: 1.98.0
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v6
+        with:
+          submodules: 'true'
+
+      - name: Install Hugo
+        uses: peaceiris/actions-hugo@v3
+        with:
+          hugo-version: '0.157.0'
+          extended: true
+
+      - name: Install Dart Sass
+        run: |
+          curl -LJO https://github.com/sass/dart-sass/releases/download/${DART_SASS_VERSION}/dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz \
+          && tar -xf dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz \
+          && cp -r dart-sass/* /usr/local/bin \
+          && rm -rf dart-sass* \
+          && sass --embedded --version
+
+      - name: Build site
+        run: |
+          hugo build --gc --minify --baseURL https://ally.id --destination /opt/hugo/ally.id
+
+      - name: Set permissions
+        run: chown -R www-data:www-data /opt/hugo/ally.id

.gitignore

@@ -11,3 +11,4 @@ _site/*
 /public
 /resources
 /content/sex/kink/unspeakable.md
+.hugo_build.lock

config.toml

@@ -2,7 +2,9 @@ baseURL = "https://ally.id/"
 languageCode = "en-us"
 title = "ally"
 theme= "ally"
-paginatePath = ""
+
+[pagination]
+  path = ""
 
 [permalinks]
   news = "/:year/:month/:day/:slug/"

content/birds/02.md

@@ -11,14 +11,14 @@ weight: 2
 
 I've mentioned ritual before, but I think that's tied into the larger feeing of portentousness. Ritual is one way to sate that sense of intense meaning surrounding an act or an object.
 
-<blockquote class="twitter-tweet" lang="en"><p>A goose is dumb. A thousand geese darkening the horizon is a portent. Mindless honking, individually directionless, collectively unstoppable</p>&mdash; Makyo (@drab_makyo) <a href="https://twitter.com/drab_makyo/statuses/433658156988628992">February 12, 2014</a></blockquote> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+<blockquote class="twitter-tweet" lang="en"><p>A goose is dumb. A thousand geese darkening the horizon is a portent. Mindless honking, individually directionless, collectively unstoppable</p>&mdash; Makyo (@drab_makyo) <a href="https://twitter.com/drab_makyo/statuses/433658156988628992">February 12, 2014</a></blockquote> 
 
 Any little thing can carry meaning for one person far outweighing what it might mean to others.  Something about flocks of geese terrifies me.  It's not a logical fear, it's a sense of foreboding. It's not the geese themselves, it's the concept of geese, the lack of any ritual to solve the problem of geese.
 
-<blockquote class="twitter-tweet" lang="en"><p>A goose is tasty. Geese taste like horror. Acrid tang of ill omens *froth*</p>&mdash; Makyo (@drab_makyo) <a href="https://twitter.com/drab_makyo/statuses/433658390103879680">February 12, 2014</a></blockquote> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+<blockquote class="twitter-tweet" lang="en"><p>A goose is tasty. Geese taste like horror. Acrid tang of ill omens *froth*</p>&mdash; Makyo (@drab_makyo) <a href="https://twitter.com/drab_makyo/statuses/433658390103879680">February 12, 2014</a></blockquote> 
 
 It's dumb.  Geese are dumb.  There's no reason I should feel any sort of emotion at all surrounding geese, but I do.
 
-<blockquote class="twitter-tweet" lang="en"><p>Why are geese so portentous? Why do they cause anxiety? Did I take my meds this morning?</p>&mdash; Makyo (@drab_makyo) <a href="https://twitter.com/drab_makyo/statuses/433658641384607744">February 12, 2014</a></blockquote> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+<blockquote class="twitter-tweet" lang="en"><p>Why are geese so portentous? Why do they cause anxiety? Did I take my meds this morning?</p>&mdash; Makyo (@drab_makyo) <a href="https://twitter.com/drab_makyo/statuses/433658641384607744">February 12, 2014</a></blockquote> 
 
 Ritual is like that.  There is some level of meaning that's inexpressible except if you can find a way to come at it from the side.  Use words like 'portent'.  Describe it as an odor, a sense, a mystery.  Ritual and sensation are wily and wary critters that want nothing less than to be identified, pointed out, made plain.  You're supposed to just go along with the ritual and accept the portentous as fact.

content/book/_index.md

@@ -2,37 +2,38 @@
 type: single
 ---
 
-<img src="/book/cover-front.png" style="margin: 0 auto; display: block; width: 500px; max-width: 100%;" />
+<style>
+.buy a {
+  display: inline-block;
+  font-size: 14pt;
+  padding: 0.5rem;
+  background-color: #eee;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  box-shadow: 1px 1px 4px #222;
+  text-decoration: none;
+}
+</style>
 
-<p style="text-align:center"><script src="https://gumroad.com/js/gumroad.js"></script>
+<div class="book-box">
+<div class="book-cover">
+<img src="/book/cover-front.s.png" />
+</div>
+<div class="book-about">
+<blockquote>We don't experience memory in linear fashion, nor even in a strictly coherent one. It's peppered with tangents and strange loops. It's multithreaded. It's not always made up of words. Why should a memoir strive to strip memory completely of this context?</blockquote>
+<p style="text-align:center" class="buy">
 <a class="gumroad-button" href="https://makyo-ink.square.site/product/ally/5" target="_blank">Purchase paperback</a>
-&emsp;
+</p>
-<a class="gumroad-button" href="https://gum.co/rvof" target="_blank">Purchase PDF ebook</a></p>
+<p style="text-align:center" class="buy">
-
+<a class="gumroad-button" href="https://makyo.itch.io/ally" target="_blank">Purchase PDF ebook</a></p>
-> We don't experience memory in linear fashion, nor even in a strictly coherent one. It's peppered with tangents and strange loops. It's multithreaded. It's not always made up of words. Why should a memoir strive to strip memory completely of this context?
+<p><em>Also available at many independent booksellers and, of course,</em> <a target="_blank" href="https://www.amazon.com/gp/product/1948743159/">Amazon</a>
+</div>
+</div>
 
 <em class="ally-font">ally</em> is an ergodic, arborescent, semiautobiographical work about identity, mental health, spirituality, and the mutability of the past. A lot of the information contained within is real, some of it isn’t. Each page is structured as a conversation between myself and my ally, a mirror reflection of myself.
 
 Based off the interactive project at [<em class="ally-font">ally.id</em>](https://ally.id), this book explores different facets of my life — some true, some embellished, some wholly fictitious — in a non-linear, ergodic fashion, using color, page-layout, and mixed-media to create a book more experience than memoir.
 
-## Buying
-
-<p style="text-align:center">
-<a class="gumroad-button" href="https://makyo-ink.square.site/product/ally/5" target="_blank">Purchase paperback</a></p>
-
-<p style="text-align:center">
-<a class="gumroad-button" href="https://gum.co/rvof" target="_blank">Purchase PDF ebook</a></p>
-
-The paperback is now available for [order](https://gum.co/ally-paperback). All copies ordered direct are signed and come in a custom-made box by JD at <a href="https://twitter.com/makersdog" target="_blank">Dog Paw Makers</a>. You can also order from <a href="https://www.betterworldbooks.com/product/detail/ally-9781948743150" target="_blank">Better World Books</a>, <a href="https://www.powells.com/SearchResults?keyword=Madison+Scott-Clary" target="_blank">Powell's</a>, or many other fine independent booksellers (and I guess <a target="_blank" href="https://www.amazon.com/gp/product/1948743159/">Amazon</a> or <a target="_blank" href="https://www.barnesandnoble.com/w/ally-scott-clary-madison/1136517973?ean=9781948743150">Barnes &amp; Noble</a> if you must).
-
-You can also [order](https://gum.co/rvof) the PDF ebook exclusively from me. I have yet to figure out how to sign those. Sorry.
-
-<em class="ally-font">ally from start to finish</em> is a short companion book explaining how the project was made, both the website ally.id and the book. It talks about the structure, the tools and the pitfalls encountered along the way. It also comes with the source for itself so that you can see some of what goes into producing a book like this (as <span class="ally-font">ally</span> uses much the same structure).
-
-<p style="text-align:center">
-<a class="gumroad-button" href="https://gum.co/ally-making-of" target="_blank">Purchase <em>ally from start to finish</a></a>
-</p>
-
 ## Content warning
 
 Several sections focus on suicide, self-harm, rape, sexual content, and poor mental health.
@@ -51,10 +52,39 @@ Several sections focus on suicide, self-harm, rape, sexual content, and poor men
 
 > — [Rax](https://rax.dreamwidth.org/164542.html)
 
+"A recommended read if you enjoy listening to people tell their story . . . Scott-Clary's writing is clear and creative prose, uniquely presented and powerfully honest."
+
+> — [Morgan Gangwere](https://www.amazon.com/gp/customer-reviews/R1M6LN0WOVUC0A/ref=cm_cr_dp_d_rvw_ttl?ie=UTF8&ASIN=1948743159)
+
+"*ally* is an incredibly complex and beautiful glimpse into [Madison]'s mind and life. Personal and incomplete in a very intentional way."
+
+> --- [Jay Shirou](https://forums.furrywritersguild.com/t/thoughts-on-ally-by-madison-scott-clary-spoilers/2323)
+
 <div style="text-align: center">
 <strong><a target="_blank" href="https://www.goodreads.com/book/show/51687858-ally">Rate on Goodreads!</a></strong>
 </div>
 
+## Purchasing options
+
+The paperback is available for [order](https://makyo-ink.square.site/product/ally/5) direct from the author. All copies ordered direct are signed and come in a custom-made box by JD at <a href="https://twitter.com/makersdog" target="_blank">Dog Paw Design</a>. You can also order from <a href="https://www.betterworldbooks.com/product/detail/ally-9781948743150" target="_blank">Better World Books</a>, <a href="https://www.powells.com/SearchResults?keyword=Madison+Scott-Clary" target="_blank">Powell's</a>, or many other fine independent booksellers, as well as <a target="_blank" href="https://www.amazon.com/gp/product/1948743159/">Amazon</a> or <a target="_blank" href="https://www.barnesandnoble.com/w/ally-scott-clary-madison/1136517973?ean=9781948743150">Barnes &amp; Noble</a>.
+
+The PDF ebook is available for [order](https://makyo.itch.io/ally) exclusively from me. I have yet to figure out how to sign those. Sorry.
+
+### Making of
+
+<div class="book-box">
+<div class="book-cover">
+<img src="/book/making-of.png" />
+</div>
+<div class="book-about">
+<em class="ally-font">ally from start to finish</em> is a short companion book explaining how the project was made, both the website ally.id and the book. It talks about the structure, the tools and the pitfalls encountered along the way. It also comes with the source for itself so that you can see some of what goes into producing a book like this (as <span class="ally-font">ally</span> uses much the same structure).
+<p style="text-align:center" class="buy">
+<a class="gumroad-button" href="https://makyo.itch.io/ally-making-of" target="_blank">Purchase <em>ally from start to finish</em></a></a>
+</p>
+</div>
+</div>
+
+
 ## Paperback gallery
 
 <!-- <a href="/book/physical/01-front.s.jpg" target="_blank"><img src="/book/physical/thumbs/01-front.s.jpg" style="width: 200px; margin: 0.5rem;" /></a>

static/map.dot

@@ -221,6 +221,7 @@ digraph Map {
     "ally 34" [href="/34"]
     "ally 35" [href="/35"]
     "ally 36" [href="/36"]
+    "ally 37" [href="/37"]
     "To be continued..." [shape="none"]
     "ally 1" -> "ally 2" -> "ally 3" -> "ally 4" -> "ally 5" ->
     "ally 6" -> "ally 7" -> "ally 8" -> "ally 9" -> "ally 10" ->
@@ -229,7 +230,7 @@ digraph Map {
     "ally 21" -> "ally 22" -> "ally 23" -> "ally 24" -> "ally 25" ->
     "ally 26" -> "ally 27" -> "ally 28" -> "ally 29" -> "ally 30" ->
     "ally 31" -> "ally 32" -> "ally 33" -> "ally 34" -> "ally 35" ->
-    "ally 36" -> "To be continued..."
+    "ally 36" -> "ally 37" -> "To be continued..."
 
     node[group="birds",style="",fontcolor="#111111"]
     "Birds 1" [href="/birds"]
@@ -415,6 +416,20 @@ digraph Map {
     "Unemployment 1" -> "Unemployment 2" -> "Unemployment 3" -> "Unemployment 4" -> 
     "Unemployment 5" -> "Unemployment 6"
 
+    node[group="limerence",style="",fontcolor="#111111"]
+    "Limerence 1" [href="/limerence"]
+    "Limerence 2" [href="/limerence/2"]
+    "Limerence 3" [href="/limerence/3"]
+    "Limerence 4" [href="/limerence/4"]
+    "Limerence 5" [href="/limerence/5"]
+    "Limerence 6" [href="/limerence/6"]
+    "Limerence 7" [href="/limerence/7"]
+    "Limerence 8" [href="/limerence/8"]
+    "Limerence 9" [href="/limerence/9"]
+    "Limerence 1" -> "Limerence 2" -> "Limerence 3" -> "Limerence 4" -> 
+    "Limerence 5" -> "Limerence 6" -> "Limerence 7" -> "Limerence 8" -> 
+    "Limerence 9"
+
     /**
      Connections
 
@@ -448,6 +463,7 @@ digraph Map {
     "ally 29" -> "Burnout 1"
     "ally 33" -> "Unemployment 1"
     "ally 35" -> "Plurality 1"
+    "ally 37" -> "Limerence 1"
 
     // Dad
     "As a person 5" -> "ally 16"

themes/ally/layouts/news/list.html

@@ -3,7 +3,7 @@
     {{ .Content }}
     {{ $paginator := .Paginate (where .Pages.ByPublishDate.Reverse ".Params.date" "!=" nil) 10 }}
     {{ range $paginator.Pages.ByPublishDate.Reverse }}
-    <h2><a href="{{ .URL }}">{{ .Params.title }}</a> </h2>
+    <h2><a href="{{ .Permalink }}">{{ .Params.title }}</a> </h2>
     {{ if (ge .Date.Year 2019) }}<p class="date">{{ .Date.Format "January 2, 2006" }}</p>{{ end }}
     <div class="news-summary">{{ .Summary }}</div>
     {{ end }}

themes/ally/layouts/partials/header.html

@@ -1,5 +1,5 @@
 <body>
     <header>
         <h1><a href="/">ally</a></h1>
-        <nav><a href="/map">Map</a> <a href="/news">Updates</a> <a href="/book">The <span class="ally-font" style="font-size: 100%;">ally</span> book</a></nav>
+        <nav><a href="/map">Map</a> <a href="/news">Updates</a> <a href="/book">The <em>ally</em> book</a></nav>
     </header>

themes/ally/layouts/partials/pagination.html

@@ -3,19 +3,19 @@
 <nav class="paginator" aria-label="page">
     <ul class="pagination pagination-sm">
         <li class="page-item{{ if not $paginator.HasPrev }} disabled{{ end }}">
-            <a class="page-link"{{ if $paginator.HasPrev }} href="{{ $paginator.Prev.URL }}"{{ end }}><svg width="20" height="16"><path fill="none" stroke="currentColor" stroke-width="3" d="M 20 0 l -6 8 l 6 8" /></svg> Previous</a>
+            <a class="page-link"{{ if $paginator.HasPrev }} href="{{ replace $paginator.Prev.URL "//" "/" }}"{{ end }}><svg width="20" height="16"><path fill="none" stroke="currentColor" stroke-width="3" d="M 20 0 l -6 8 l 6 8" /></svg> Previous</a>
         </li>
         {{ if lt $paginator.TotalPages 10 }}
         {{ range $paginator.Pagers }}
         <li class="page-item{{ if eq . $paginator}} active{{ end }}">
-            <a class="page-link" href="{{ .URL }}">{{ .PageNumber }}{{ if eq . $paginator}}<span class="sr-only"></span>{{ end }}</a>
+            <a class="page-link" href="{{ replace .URL "//" "/" }}">{{ .PageNumber }}{{ if eq . $paginator}}<span class="sr-only"></span>{{ end }}</a>
         </li>
         {{ end }}
         {{ else }}
         <li class="page-item too-many">Page {{ $paginator.PageNumber }} of {{ $paginator.TotalPages }}</li>
         {{ end }}
         <li class="page-item{{ if not $paginator.HasNext }} disabled{{ end }}">
-            <a class="page-link"{{ if $paginator.HasNext }} href="{{ $paginator.Next.URL }}"{{ end }}>Next <svg width="20" height="16"><path fill="none" stroke="currentColor" stroke-width="3" d="M 0 0 l 6 8 l -6 8" /></svg></a>
+            <a class="page-link"{{ if $paginator.HasNext }} href="{{ replace $paginator.Next.URL "//" "/" }}"{{ end }}>Next <svg width="20" height="16"><path fill="none" stroke="currentColor" stroke-width="3" d="M 0 0 l 6 8 l -6 8" /></svg></a>
         </li>
     </ul>
 </nav>

themes/ally/static/css/main.css

@@ -321,6 +321,41 @@ ul.pagination .page-item.active a {
     cursor: text;
 }
 
+.book-box {
+    display: flex;
+    flex-flow: row wrap;
+    justify-content: space-around;
+    align-items: center;
+}
+
+.book-box .book-cover {
+    flex: 2;
+    padding: 0px 1rem 0px 0px;
+    max-width: 100%;
+}
+
+.book-box .book-cover img {
+    width: 100%;
+    box-shadow: 5px 5px 10px #ccc;
+    max-width: 100%;
+}
+
+.book-box .book-about {
+    flex: 1;
+    min-width: 200px;
+}
+
+.book-box .book-about blockquote {
+    margin: 0px 1rem;
+    text-align: justify;
+    border-bottom: 1px solid #ccc;
+}
+
+.book-box .book-about p {
+    margin: 1rem;
+    text-align: center;
+}
+
 @media only screen and (max-width: 500px) {
     main.fit .page .verse {
         font-size: 10pt;
@@ -328,4 +363,7 @@ ul.pagination .page-item.active a {
     main.fit .page .verse blockquote {
         font-size: 8pt;
     }
+    .book-box {
+        display: block;
+    }
 }