From be12aaa4abcf627e67f90ddc66606ca2112539b3 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Wed, 31 Jul 2024 21:41:04 -0400
Subject: [PATCH] zola static assets from kita theme moved to non-root

---
 src/netlify_configs/fakeyou.com/_redirects    |   3 ++
 .../kita/.github/workflows/publish-pages.yml  |  34 ------------------
 zola/themes/kita/static/{ => zola}/app.css    |   0
 .../static/{ => zola}/apple-touch-icon.png    | Bin
 .../themes/kita/static/{ => zola}/favicon.ico | Bin
 .../kita/static/{ => zola}/icons/abstract.svg |   0
 .../kita/static/{ => zola}/icons/bug.svg      |   0
 .../kita/static/{ => zola}/icons/danger.svg   |   0
 .../kita/static/{ => zola}/icons/email.svg    |   0
 .../kita/static/{ => zola}/icons/example.svg  |   0
 .../kita/static/{ => zola}/icons/failure.svg  |   0
 .../kita/static/{ => zola}/icons/github.svg   |   0
 .../kita/static/{ => zola}/icons/info.svg     |   0
 .../kita/static/{ => zola}/icons/note.svg     |   0
 .../kita/static/{ => zola}/icons/question.svg |   0
 .../kita/static/{ => zola}/icons/quote.svg    |   0
 .../kita/static/{ => zola}/icons/rss.svg      |   0
 .../kita/static/{ => zola}/icons/success.svg  |   0
 .../kita/static/{ => zola}/icons/theme.svg    |   0
 .../kita/static/{ => zola}/icons/tip.svg      |   0
 .../kita/static/{ => zola}/icons/warning.svg  |   0
 .../{ => zola}/images/markdown-content.png    | Bin
 zola/themes/kita/static/{ => zola}/main.css   |   0
 .../01-zola.7c3a26eed1c7ab5f.png              | Bin
 .../02-zola-manet.e4241a911597aca7.png        | Bin
 .../03-zola-cezanne.6a107e2be8013406.png      | Bin
 .../04-gutenberg.faa753e9bf9c7908.jpg         | Bin
 .../05-example.ae15f30d897ab593.jpg           | Bin
 .../06-example.c154d01e3ae79960.jpg           | Bin
 .../07-example.0bae5e2aea7a32b4.jpg           | Bin
 .../08-example.5c0108fc0d117d1c.jpg           | Bin
 zola/themes/kita/templates/macros.html        |   4 +--
 zola/themes/kita/templates/partials/head.html |  12 +++----
 33 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 zola/themes/kita/.github/workflows/publish-pages.yml
 rename zola/themes/kita/static/{ => zola}/app.css (100%)
 rename zola/themes/kita/static/{ => zola}/apple-touch-icon.png (100%)
 rename zola/themes/kita/static/{ => zola}/favicon.ico (100%)
 rename zola/themes/kita/static/{ => zola}/icons/abstract.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/bug.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/danger.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/email.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/example.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/failure.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/github.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/info.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/note.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/question.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/quote.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/rss.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/success.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/theme.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/tip.svg (100%)
 rename zola/themes/kita/static/{ => zola}/icons/warning.svg (100%)
 rename zola/themes/kita/static/{ => zola}/images/markdown-content.png (100%)
 rename zola/themes/kita/static/{ => zola}/main.css (100%)
 rename zola/themes/kita/static/{ => zola}/processed_images/01-zola.7c3a26eed1c7ab5f.png (100%)
 rename zola/themes/kita/static/{ => zola}/processed_images/02-zola-manet.e4241a911597aca7.png (100%)
 rename zola/themes/kita/static/{ => zola}/processed_images/03-zola-cezanne.6a107e2be8013406.png (100%)
 rename zola/themes/kita/static/{ => zola}/processed_images/04-gutenberg.faa753e9bf9c7908.jpg (100%)
 rename zola/themes/kita/static/{ => zola}/processed_images/05-example.ae15f30d897ab593.jpg (100%)
 rename zola/themes/kita/static/{ => zola}/processed_images/06-example.c154d01e3ae79960.jpg (100%)
 rename zola/themes/kita/static/{ => zola}/processed_images/07-example.0bae5e2aea7a32b4.jpg (100%)
 rename zola/themes/kita/static/{ => zola}/processed_images/08-example.5c0108fc0d117d1c.jpg (100%)

diff --git a/src/netlify_configs/fakeyou.com/_redirects b/src/netlify_configs/fakeyou.com/_redirects
index 79c3f3bf08..d1bb8c02e2 100644
--- a/src/netlify_configs/fakeyou.com/_redirects
+++ b/src/netlify_configs/fakeyou.com/_redirects
@@ -19,6 +19,9 @@
 /bar                /zola/bar/index.html     200!
 /bar/*              /zola/bar/:splat         200!
 
+# Zola static assets from theme:
+/zola/*             /zola/zola/:splat        200!
+
 # Website root:
 /                      /website/index.html   200
 
diff --git a/zola/themes/kita/.github/workflows/publish-pages.yml b/zola/themes/kita/.github/workflows/publish-pages.yml
deleted file mode 100644
index ce2d1a19dc..0000000000
--- a/zola/themes/kita/.github/workflows/publish-pages.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Publish demo on GitHub Pages
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Upload Pages artifact
-        uses: st1020/zola-deploy@v1
-
-  deploy:
-    needs: build
-
-    permissions:
-      pages: write
-      id-token: write
-
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
diff --git a/zola/themes/kita/static/app.css b/zola/themes/kita/static/zola/app.css
similarity index 100%
rename from zola/themes/kita/static/app.css
rename to zola/themes/kita/static/zola/app.css
diff --git a/zola/themes/kita/static/apple-touch-icon.png b/zola/themes/kita/static/zola/apple-touch-icon.png
similarity index 100%
rename from zola/themes/kita/static/apple-touch-icon.png
rename to zola/themes/kita/static/zola/apple-touch-icon.png
diff --git a/zola/themes/kita/static/favicon.ico b/zola/themes/kita/static/zola/favicon.ico
similarity index 100%
rename from zola/themes/kita/static/favicon.ico
rename to zola/themes/kita/static/zola/favicon.ico
diff --git a/zola/themes/kita/static/icons/abstract.svg b/zola/themes/kita/static/zola/icons/abstract.svg
similarity index 100%
rename from zola/themes/kita/static/icons/abstract.svg
rename to zola/themes/kita/static/zola/icons/abstract.svg
diff --git a/zola/themes/kita/static/icons/bug.svg b/zola/themes/kita/static/zola/icons/bug.svg
similarity index 100%
rename from zola/themes/kita/static/icons/bug.svg
rename to zola/themes/kita/static/zola/icons/bug.svg
diff --git a/zola/themes/kita/static/icons/danger.svg b/zola/themes/kita/static/zola/icons/danger.svg
similarity index 100%
rename from zola/themes/kita/static/icons/danger.svg
rename to zola/themes/kita/static/zola/icons/danger.svg
diff --git a/zola/themes/kita/static/icons/email.svg b/zola/themes/kita/static/zola/icons/email.svg
similarity index 100%
rename from zola/themes/kita/static/icons/email.svg
rename to zola/themes/kita/static/zola/icons/email.svg
diff --git a/zola/themes/kita/static/icons/example.svg b/zola/themes/kita/static/zola/icons/example.svg
similarity index 100%
rename from zola/themes/kita/static/icons/example.svg
rename to zola/themes/kita/static/zola/icons/example.svg
diff --git a/zola/themes/kita/static/icons/failure.svg b/zola/themes/kita/static/zola/icons/failure.svg
similarity index 100%
rename from zola/themes/kita/static/icons/failure.svg
rename to zola/themes/kita/static/zola/icons/failure.svg
diff --git a/zola/themes/kita/static/icons/github.svg b/zola/themes/kita/static/zola/icons/github.svg
similarity index 100%
rename from zola/themes/kita/static/icons/github.svg
rename to zola/themes/kita/static/zola/icons/github.svg
diff --git a/zola/themes/kita/static/icons/info.svg b/zola/themes/kita/static/zola/icons/info.svg
similarity index 100%
rename from zola/themes/kita/static/icons/info.svg
rename to zola/themes/kita/static/zola/icons/info.svg
diff --git a/zola/themes/kita/static/icons/note.svg b/zola/themes/kita/static/zola/icons/note.svg
similarity index 100%
rename from zola/themes/kita/static/icons/note.svg
rename to zola/themes/kita/static/zola/icons/note.svg
diff --git a/zola/themes/kita/static/icons/question.svg b/zola/themes/kita/static/zola/icons/question.svg
similarity index 100%
rename from zola/themes/kita/static/icons/question.svg
rename to zola/themes/kita/static/zola/icons/question.svg
diff --git a/zola/themes/kita/static/icons/quote.svg b/zola/themes/kita/static/zola/icons/quote.svg
similarity index 100%
rename from zola/themes/kita/static/icons/quote.svg
rename to zola/themes/kita/static/zola/icons/quote.svg
diff --git a/zola/themes/kita/static/icons/rss.svg b/zola/themes/kita/static/zola/icons/rss.svg
similarity index 100%
rename from zola/themes/kita/static/icons/rss.svg
rename to zola/themes/kita/static/zola/icons/rss.svg
diff --git a/zola/themes/kita/static/icons/success.svg b/zola/themes/kita/static/zola/icons/success.svg
similarity index 100%
rename from zola/themes/kita/static/icons/success.svg
rename to zola/themes/kita/static/zola/icons/success.svg
diff --git a/zola/themes/kita/static/icons/theme.svg b/zola/themes/kita/static/zola/icons/theme.svg
similarity index 100%
rename from zola/themes/kita/static/icons/theme.svg
rename to zola/themes/kita/static/zola/icons/theme.svg
diff --git a/zola/themes/kita/static/icons/tip.svg b/zola/themes/kita/static/zola/icons/tip.svg
similarity index 100%
rename from zola/themes/kita/static/icons/tip.svg
rename to zola/themes/kita/static/zola/icons/tip.svg
diff --git a/zola/themes/kita/static/icons/warning.svg b/zola/themes/kita/static/zola/icons/warning.svg
similarity index 100%
rename from zola/themes/kita/static/icons/warning.svg
rename to zola/themes/kita/static/zola/icons/warning.svg
diff --git a/zola/themes/kita/static/images/markdown-content.png b/zola/themes/kita/static/zola/images/markdown-content.png
similarity index 100%
rename from zola/themes/kita/static/images/markdown-content.png
rename to zola/themes/kita/static/zola/images/markdown-content.png
diff --git a/zola/themes/kita/static/main.css b/zola/themes/kita/static/zola/main.css
similarity index 100%
rename from zola/themes/kita/static/main.css
rename to zola/themes/kita/static/zola/main.css
diff --git a/zola/themes/kita/static/processed_images/01-zola.7c3a26eed1c7ab5f.png b/zola/themes/kita/static/zola/processed_images/01-zola.7c3a26eed1c7ab5f.png
similarity index 100%
rename from zola/themes/kita/static/processed_images/01-zola.7c3a26eed1c7ab5f.png
rename to zola/themes/kita/static/zola/processed_images/01-zola.7c3a26eed1c7ab5f.png
diff --git a/zola/themes/kita/static/processed_images/02-zola-manet.e4241a911597aca7.png b/zola/themes/kita/static/zola/processed_images/02-zola-manet.e4241a911597aca7.png
similarity index 100%
rename from zola/themes/kita/static/processed_images/02-zola-manet.e4241a911597aca7.png
rename to zola/themes/kita/static/zola/processed_images/02-zola-manet.e4241a911597aca7.png
diff --git a/zola/themes/kita/static/processed_images/03-zola-cezanne.6a107e2be8013406.png b/zola/themes/kita/static/zola/processed_images/03-zola-cezanne.6a107e2be8013406.png
similarity index 100%
rename from zola/themes/kita/static/processed_images/03-zola-cezanne.6a107e2be8013406.png
rename to zola/themes/kita/static/zola/processed_images/03-zola-cezanne.6a107e2be8013406.png
diff --git a/zola/themes/kita/static/processed_images/04-gutenberg.faa753e9bf9c7908.jpg b/zola/themes/kita/static/zola/processed_images/04-gutenberg.faa753e9bf9c7908.jpg
similarity index 100%
rename from zola/themes/kita/static/processed_images/04-gutenberg.faa753e9bf9c7908.jpg
rename to zola/themes/kita/static/zola/processed_images/04-gutenberg.faa753e9bf9c7908.jpg
diff --git a/zola/themes/kita/static/processed_images/05-example.ae15f30d897ab593.jpg b/zola/themes/kita/static/zola/processed_images/05-example.ae15f30d897ab593.jpg
similarity index 100%
rename from zola/themes/kita/static/processed_images/05-example.ae15f30d897ab593.jpg
rename to zola/themes/kita/static/zola/processed_images/05-example.ae15f30d897ab593.jpg
diff --git a/zola/themes/kita/static/processed_images/06-example.c154d01e3ae79960.jpg b/zola/themes/kita/static/zola/processed_images/06-example.c154d01e3ae79960.jpg
similarity index 100%
rename from zola/themes/kita/static/processed_images/06-example.c154d01e3ae79960.jpg
rename to zola/themes/kita/static/zola/processed_images/06-example.c154d01e3ae79960.jpg
diff --git a/zola/themes/kita/static/processed_images/07-example.0bae5e2aea7a32b4.jpg b/zola/themes/kita/static/zola/processed_images/07-example.0bae5e2aea7a32b4.jpg
similarity index 100%
rename from zola/themes/kita/static/processed_images/07-example.0bae5e2aea7a32b4.jpg
rename to zola/themes/kita/static/zola/processed_images/07-example.0bae5e2aea7a32b4.jpg
diff --git a/zola/themes/kita/static/processed_images/08-example.5c0108fc0d117d1c.jpg b/zola/themes/kita/static/zola/processed_images/08-example.5c0108fc0d117d1c.jpg
similarity index 100%
rename from zola/themes/kita/static/processed_images/08-example.5c0108fc0d117d1c.jpg
rename to zola/themes/kita/static/zola/processed_images/08-example.5c0108fc0d117d1c.jpg
diff --git a/zola/themes/kita/templates/macros.html b/zola/themes/kita/templates/macros.html
index a533d1ce19..89d943774d 100644
--- a/zola/themes/kita/templates/macros.html
+++ b/zola/themes/kita/templates/macros.html
@@ -1,7 +1,7 @@
 {%- macro get_social_icon(icon) -%}
-{%- set meta = get_image_metadata(path="/static/icons/" ~ icon ~ ".svg", allow_missing=true) -%}
+{%- set meta = get_image_metadata(path="/static/zola/icons/" ~ icon ~ ".svg", allow_missing=true) -%}
 {%- if meta -%}
-{{- get_url(path="icons/" ~ icon ~ ".svg") -}}
+{{- get_url(path="zola/icons/" ~ icon ~ ".svg") -}}
 {%- else -%}
 {{- "https://cdn.jsdelivr.net/npm/simple-icons/icons/" ~ icon ~ ".svg" -}}
 {%- endif -%}
diff --git a/zola/themes/kita/templates/partials/head.html b/zola/themes/kita/templates/partials/head.html
index 2476f8830a..824586187c 100644
--- a/zola/themes/kita/templates/partials/head.html
+++ b/zola/themes/kita/templates/partials/head.html
@@ -60,7 +60,7 @@
   {% endif %}
 
   <!-- CSS & JS -->
-  <link rel="preload stylesheet" as="style" href="{{ get_url(path=`main.css`) }}" />
+  <link rel="preload stylesheet" as="style" href="{{ get_url(path=`zola/main.css`) }}" />
   <style>
     :root {
       --bg: {{ config.extra.style.bg_color | default(value="#f4f4f5") }};
@@ -88,7 +88,7 @@
   {% endif %}
 
   <!-- Dark Icon -->
-  <link rel="preload" as="image" href="{{ get_url(path=`icons/` ~ `theme.svg`) }}" />
+  <link rel="preload" as="image" href="{{ get_url(path=`zola/icons/` ~ `theme.svg`) }}" />
 
   <!-- Math -->
   {% if page.extra.math | default(value=config.extra.math) %}
@@ -107,8 +107,8 @@
   <!---->
 
   <!-- Favicon -->
-  <link rel="icon" href="{{ get_url(path=`favicon.ico`) }}" />
-  <link rel="apple-touch-icon" href="{{ get_url(path=`apple-touch-icon.png`) }}" />
+  <link rel="icon" href="{{ get_url(path=`zola/favicon.ico`) }}" />
+  <link rel="apple-touch-icon" href="{{ get_url(path=`zola/apple-touch-icon.png`) }}" />
 
   <!-- Feeds -->
   {% if config.generate_feed %}
@@ -118,14 +118,14 @@
     rel="alternate"
     type="application/atom+xml"
     title="Atom"
-    href="{{ get_url(path=`atom.xml`) }}"
+    href="{{ get_url(path=`zola/atom.xml`) }}"
   />
   {% endif %} {% if "rss.xml" in config.feed_filenames %}
   <link
     rel="alternate"
     type="application/rss+xml"
     title="RSS"
-    href="{{ get_url(path=`rss.xml`) }}"
+    href="{{ get_url(path=`zola/rss.xml`) }}"
   />
   {% endif %}
   <!---->