deploy: 8d2e1c787c0bfc761940c347f9d448c75125f0fe

diff --git a/.gitmodules b/.gitmodules
index 1974fa1..597681c 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "blog/themes/smigle"]
-       path = blog/themes/smigle
+[submodule "blog/src/themes/smigle"]
+       path = blog/src/themes/smigle
        url = https://gitlab.com/ian-s-mcb/smigle-hugo-theme.git

diff --git a/blog/public/404.html b/blog/404.html
similarity index 100%
rename from blog/public/404.html
rename to blog/404.html

diff --git a/blog/public/android-chrome-192x192.png b/blog/android-chrome-192x192.png
similarity index 100%
rename from blog/public/android-chrome-192x192.png
rename to blog/android-chrome-192x192.png

diff --git a/blog/public/android-chrome-512x512.png b/blog/android-chrome-512x512.png
similarity index 100%
rename from blog/public/android-chrome-512x512.png
rename to blog/android-chrome-512x512.png

diff --git a/blog/public/apple-touch-icon.png b/blog/apple-touch-icon.png
similarity index 100%
rename from blog/public/apple-touch-icon.png
rename to blog/apple-touch-icon.png

diff --git a/blog/public/browserconfig.xml b/blog/browserconfig.xml
similarity index 100%
rename from blog/public/browserconfig.xml
rename to blog/browserconfig.xml

diff --git a/blog/public/categories/index.html b/blog/categories/index.html
similarity index 100%
rename from blog/public/categories/index.html
rename to blog/categories/index.html

diff --git a/blog/public/categories/index.xml b/blog/categories/index.xml
similarity index 100%
rename from blog/public/categories/index.xml
rename to blog/categories/index.xml

diff --git a/blog/config.toml b/blog/config.toml
index bb3747a..da39355 100644 (file)
--- a/blog/config.toml
+++ b/blog/config.toml
@@ -3,25 +3,11 @@ languageCode = 'ja-JP'
 title = 'ハヤオのブログ'
 theme = "smigle"
 
-[module]
-[[module.mounts]]
-  source = '/blog/content'
-  target = '/blog/content'
-[[module.mounts]]
-  source = '/blog/static'
-  target = '/blog/static'
-[[module.mounts]]
-  source = '/blog/layouts'
-  target = '/blog/layouts'
-[[module.mounts]]
-  source = '/blog/data'
-  target = '/blog/data'
-[[module.mounts]]
-  source = '/blog/assets'
-  target = '/blog/assets'
-[[module.mounts]]
-  source = '/blog/i18n'
-  target = '/blog/i18n'
-[[module.mounts]]
-  source = '/blog/archetypes'
-  target = '/blog/archetypes'
+archetypeDir = "src/archetypes"
+assetDir = "src/assets"
+contentDir = "src/content"
+dataDir = "src/data"
+layoutDir = "src/layouts"
+staticDir = "src/static"
+themesDir = "src/themes"
+publishDir = "./"

diff --git a/blog/public/css/font.css b/blog/css/font.css
similarity index 100%
rename from blog/public/css/font.css
rename to blog/css/font.css

diff --git a/blog/public/css/reset.css b/blog/css/reset.css
similarity index 100%
rename from blog/public/css/reset.css
rename to blog/css/reset.css

diff --git a/blog/public/css/smigle.css b/blog/css/smigle.css
similarity index 100%
rename from blog/public/css/smigle.css
rename to blog/css/smigle.css

diff --git a/blog/public/favicon-16x16.png b/blog/favicon-16x16.png
similarity index 100%
rename from blog/public/favicon-16x16.png
rename to blog/favicon-16x16.png

diff --git a/blog/public/favicon-32x32.png b/blog/favicon-32x32.png
similarity index 100%
rename from blog/public/favicon-32x32.png
rename to blog/favicon-32x32.png

diff --git a/blog/public/favicon.ico b/blog/favicon.ico
similarity index 100%
rename from blog/public/favicon.ico
rename to blog/favicon.ico

diff --git a/blog/public/fonts/iosevka-bold.woff2 b/blog/fonts/iosevka-bold.woff2
similarity index 100%
rename from blog/public/fonts/iosevka-bold.woff2
rename to blog/fonts/iosevka-bold.woff2

diff --git a/blog/public/fonts/iosevka-oblique.woff2 b/blog/fonts/iosevka-oblique.woff2
similarity index 100%
rename from blog/public/fonts/iosevka-oblique.woff2
rename to blog/fonts/iosevka-oblique.woff2

diff --git a/blog/public/fonts/iosevka-regular.woff2 b/blog/fonts/iosevka-regular.woff2
similarity index 100%
rename from blog/public/fonts/iosevka-regular.woff2
rename to blog/fonts/iosevka-regular.woff2

diff --git a/blog/public/images/brandIcon.svg b/blog/images/brandIcon.svg
similarity index 100%
rename from blog/public/images/brandIcon.svg
rename to blog/images/brandIcon.svg

diff --git a/blog/public/index.html b/blog/index.html
similarity index 100%
rename from blog/public/index.html
rename to blog/index.html

diff --git a/blog/public/index.xml b/blog/index.xml
similarity index 100%
rename from blog/public/index.xml
rename to blog/index.xml

diff --git a/blog/public/js/.gitkeep b/blog/js/.gitkeep
similarity index 100%
rename from blog/public/js/.gitkeep
rename to blog/js/.gitkeep

diff --git a/blog/public/mstile-150x150.png b/blog/mstile-150x150.png
similarity index 100%
rename from blog/public/mstile-150x150.png
rename to blog/mstile-150x150.png

diff --git a/blog/public/page/1/index.html b/blog/page/1/index.html
similarity index 100%
rename from blog/public/page/1/index.html
rename to blog/page/1/index.html

diff --git a/blog/public/safari-pinned-tab.svg b/blog/safari-pinned-tab.svg
similarity index 100%
rename from blog/public/safari-pinned-tab.svg
rename to blog/safari-pinned-tab.svg

diff --git a/blog/public/site.webmanifest b/blog/site.webmanifest
similarity index 100%
rename from blog/public/site.webmanifest
rename to blog/site.webmanifest

diff --git a/blog/public/sitemap.xml b/blog/sitemap.xml
similarity index 100%
rename from blog/public/sitemap.xml
rename to blog/sitemap.xml

diff --git a/blog/archetypes/default.md b/blog/src/archetypes/default.md
similarity index 100%
rename from blog/archetypes/default.md
rename to blog/src/archetypes/default.md

diff --git a/blog/content/posts/20211009/index.md b/blog/src/content/posts/20211009/index.md
similarity index 100%
rename from blog/content/posts/20211009/index.md
rename to blog/src/content/posts/20211009/index.md

diff --git a/blog/themes/smigle/LICENSE b/blog/src/themes/smigle/LICENSE
similarity index 100%
rename from blog/themes/smigle/LICENSE
rename to blog/src/themes/smigle/LICENSE

diff --git a/blog/themes/smigle/README.md b/blog/src/themes/smigle/README.md
similarity index 100%
rename from blog/themes/smigle/README.md
rename to blog/src/themes/smigle/README.md

diff --git a/blog/themes/smigle/archetypes/default.md b/blog/src/themes/smigle/archetypes/default.md
similarity index 100%
rename from blog/themes/smigle/archetypes/default.md
rename to blog/src/themes/smigle/archetypes/default.md

diff --git a/blog/themes/smigle/exampleSite/config.yaml b/blog/src/themes/smigle/exampleSite/config.yaml
similarity index 100%
rename from blog/themes/smigle/exampleSite/config.yaml
rename to blog/src/themes/smigle/exampleSite/config.yaml

diff --git a/blog/themes/smigle/exampleSite/content/about.md b/blog/src/themes/smigle/exampleSite/content/about.md
similarity index 100%
rename from blog/themes/smigle/exampleSite/content/about.md
rename to blog/src/themes/smigle/exampleSite/content/about.md

diff --git a/blog/themes/smigle/exampleSite/content/posts/emoji-support.md b/blog/src/themes/smigle/exampleSite/content/posts/emoji-support.md
similarity index 100%
rename from blog/themes/smigle/exampleSite/content/posts/emoji-support.md
rename to blog/src/themes/smigle/exampleSite/content/posts/emoji-support.md

diff --git a/blog/themes/smigle/exampleSite/content/posts/markdown-syntax.md b/blog/src/themes/smigle/exampleSite/content/posts/markdown-syntax.md
similarity index 100%
rename from blog/themes/smigle/exampleSite/content/posts/markdown-syntax.md
rename to blog/src/themes/smigle/exampleSite/content/posts/markdown-syntax.md

diff --git a/blog/themes/smigle/exampleSite/content/posts/math-typesetting.md b/blog/src/themes/smigle/exampleSite/content/posts/math-typesetting.md
similarity index 100%
rename from blog/themes/smigle/exampleSite/content/posts/math-typesetting.md
rename to blog/src/themes/smigle/exampleSite/content/posts/math-typesetting.md

diff --git a/blog/themes/smigle/exampleSite/content/posts/placeholder-text.md b/blog/src/themes/smigle/exampleSite/content/posts/placeholder-text.md
similarity index 100%
rename from blog/themes/smigle/exampleSite/content/posts/placeholder-text.md
rename to blog/src/themes/smigle/exampleSite/content/posts/placeholder-text.md

diff --git a/blog/themes/smigle/exampleSite/content/posts/rich-content.md b/blog/src/themes/smigle/exampleSite/content/posts/rich-content.md
similarity index 100%
rename from blog/themes/smigle/exampleSite/content/posts/rich-content.md
rename to blog/src/themes/smigle/exampleSite/content/posts/rich-content.md

diff --git a/blog/themes/smigle/images/screenshot.png b/blog/src/themes/smigle/images/screenshot.png
similarity index 100%
rename from blog/themes/smigle/images/screenshot.png
rename to blog/src/themes/smigle/images/screenshot.png

diff --git a/blog/themes/smigle/images/tn.png b/blog/src/themes/smigle/images/tn.png
similarity index 100%
rename from blog/themes/smigle/images/tn.png
rename to blog/src/themes/smigle/images/tn.png

diff --git a/blog/themes/smigle/layouts/404.html b/blog/src/themes/smigle/layouts/404.html
similarity index 100%
rename from blog/themes/smigle/layouts/404.html
rename to blog/src/themes/smigle/layouts/404.html

diff --git a/blog/themes/smigle/layouts/_default/baseof.html b/blog/src/themes/smigle/layouts/_default/baseof.html
similarity index 100%
rename from blog/themes/smigle/layouts/_default/baseof.html
rename to blog/src/themes/smigle/layouts/_default/baseof.html

diff --git a/blog/themes/smigle/layouts/_default/default.html b/blog/src/themes/smigle/layouts/_default/default.html
similarity index 100%
rename from blog/themes/smigle/layouts/_default/default.html
rename to blog/src/themes/smigle/layouts/_default/default.html

diff --git a/blog/themes/smigle/layouts/_default/summary.html b/blog/src/themes/smigle/layouts/_default/summary.html
similarity index 100%
rename from blog/themes/smigle/layouts/_default/summary.html
rename to blog/src/themes/smigle/layouts/_default/summary.html

diff --git a/blog/themes/smigle/layouts/categories/taxonomy.html b/blog/src/themes/smigle/layouts/categories/taxonomy.html
similarity index 100%
rename from blog/themes/smigle/layouts/categories/taxonomy.html
rename to blog/src/themes/smigle/layouts/categories/taxonomy.html

diff --git a/blog/themes/smigle/layouts/categories/terms.html b/blog/src/themes/smigle/layouts/categories/terms.html
similarity index 100%
rename from blog/themes/smigle/layouts/categories/terms.html
rename to blog/src/themes/smigle/layouts/categories/terms.html

diff --git a/blog/themes/smigle/layouts/index.html b/blog/src/themes/smigle/layouts/index.html
similarity index 100%
rename from blog/themes/smigle/layouts/index.html
rename to blog/src/themes/smigle/layouts/index.html

diff --git a/blog/themes/smigle/layouts/partials/footer.html b/blog/src/themes/smigle/layouts/partials/footer.html
similarity index 100%
rename from blog/themes/smigle/layouts/partials/footer.html
rename to blog/src/themes/smigle/layouts/partials/footer.html

diff --git a/blog/themes/smigle/layouts/partials/head.html b/blog/src/themes/smigle/layouts/partials/head.html
similarity index 100%
rename from blog/themes/smigle/layouts/partials/head.html
rename to blog/src/themes/smigle/layouts/partials/head.html

diff --git a/blog/themes/smigle/layouts/partials/header.html b/blog/src/themes/smigle/layouts/partials/header.html
similarity index 100%
rename from blog/themes/smigle/layouts/partials/header.html
rename to blog/src/themes/smigle/layouts/partials/header.html

diff --git a/blog/themes/smigle/layouts/partials/pagination.html b/blog/src/themes/smigle/layouts/partials/pagination.html
similarity index 100%
rename from blog/themes/smigle/layouts/partials/pagination.html
rename to blog/src/themes/smigle/layouts/partials/pagination.html

diff --git a/blog/themes/smigle/layouts/partials/postMeta.html b/blog/src/themes/smigle/layouts/partials/postMeta.html
similarity index 100%
rename from blog/themes/smigle/layouts/partials/postMeta.html
rename to blog/src/themes/smigle/layouts/partials/postMeta.html

diff --git a/blog/themes/smigle/layouts/partials/postMetaDetailed.html b/blog/src/themes/smigle/layouts/partials/postMetaDetailed.html
similarity index 100%
rename from blog/themes/smigle/layouts/partials/postMetaDetailed.html
rename to blog/src/themes/smigle/layouts/partials/postMetaDetailed.html

diff --git a/blog/themes/smigle/layouts/partials/postsByDate.html b/blog/src/themes/smigle/layouts/partials/postsByDate.html
similarity index 100%
rename from blog/themes/smigle/layouts/partials/postsByDate.html
rename to blog/src/themes/smigle/layouts/partials/postsByDate.html

diff --git a/blog/themes/smigle/layouts/partials/terms.html b/blog/src/themes/smigle/layouts/partials/terms.html
similarity index 100%
rename from blog/themes/smigle/layouts/partials/terms.html
rename to blog/src/themes/smigle/layouts/partials/terms.html

diff --git a/blog/themes/smigle/layouts/posts/list.html b/blog/src/themes/smigle/layouts/posts/list.html
similarity index 100%
rename from blog/themes/smigle/layouts/posts/list.html
rename to blog/src/themes/smigle/layouts/posts/list.html

diff --git a/blog/themes/smigle/layouts/posts/single.html b/blog/src/themes/smigle/layouts/posts/single.html
similarity index 100%
rename from blog/themes/smigle/layouts/posts/single.html
rename to blog/src/themes/smigle/layouts/posts/single.html

diff --git a/blog/themes/smigle/layouts/tags/taxonomy.html b/blog/src/themes/smigle/layouts/tags/taxonomy.html
similarity index 100%
rename from blog/themes/smigle/layouts/tags/taxonomy.html
rename to blog/src/themes/smigle/layouts/tags/taxonomy.html

diff --git a/blog/themes/smigle/layouts/tags/terms.html b/blog/src/themes/smigle/layouts/tags/terms.html
similarity index 100%
rename from blog/themes/smigle/layouts/tags/terms.html
rename to blog/src/themes/smigle/layouts/tags/terms.html

diff --git a/blog/themes/smigle/netlify.toml b/blog/src/themes/smigle/netlify.toml
similarity index 100%
rename from blog/themes/smigle/netlify.toml
rename to blog/src/themes/smigle/netlify.toml

diff --git a/blog/themes/smigle/static/android-chrome-192x192.png b/blog/src/themes/smigle/static/android-chrome-192x192.png
similarity index 100%
rename from blog/themes/smigle/static/android-chrome-192x192.png
rename to blog/src/themes/smigle/static/android-chrome-192x192.png

diff --git a/blog/themes/smigle/static/android-chrome-512x512.png b/blog/src/themes/smigle/static/android-chrome-512x512.png
similarity index 100%
rename from blog/themes/smigle/static/android-chrome-512x512.png
rename to blog/src/themes/smigle/static/android-chrome-512x512.png

diff --git a/blog/themes/smigle/static/apple-touch-icon.png b/blog/src/themes/smigle/static/apple-touch-icon.png
similarity index 100%
rename from blog/themes/smigle/static/apple-touch-icon.png
rename to blog/src/themes/smigle/static/apple-touch-icon.png

diff --git a/blog/themes/smigle/static/browserconfig.xml b/blog/src/themes/smigle/static/browserconfig.xml
similarity index 100%
rename from blog/themes/smigle/static/browserconfig.xml
rename to blog/src/themes/smigle/static/browserconfig.xml

diff --git a/blog/themes/smigle/static/css/font.css b/blog/src/themes/smigle/static/css/font.css
similarity index 100%
rename from blog/themes/smigle/static/css/font.css
rename to blog/src/themes/smigle/static/css/font.css

diff --git a/blog/themes/smigle/static/css/reset.css b/blog/src/themes/smigle/static/css/reset.css
similarity index 100%
rename from blog/themes/smigle/static/css/reset.css
rename to blog/src/themes/smigle/static/css/reset.css

diff --git a/blog/themes/smigle/static/css/smigle.css b/blog/src/themes/smigle/static/css/smigle.css
similarity index 100%
rename from blog/themes/smigle/static/css/smigle.css
rename to blog/src/themes/smigle/static/css/smigle.css

diff --git a/blog/themes/smigle/static/favicon-16x16.png b/blog/src/themes/smigle/static/favicon-16x16.png
similarity index 100%
rename from blog/themes/smigle/static/favicon-16x16.png
rename to blog/src/themes/smigle/static/favicon-16x16.png

diff --git a/blog/themes/smigle/static/favicon-32x32.png b/blog/src/themes/smigle/static/favicon-32x32.png
similarity index 100%
rename from blog/themes/smigle/static/favicon-32x32.png
rename to blog/src/themes/smigle/static/favicon-32x32.png

diff --git a/blog/themes/smigle/static/favicon.ico b/blog/src/themes/smigle/static/favicon.ico
similarity index 100%
rename from blog/themes/smigle/static/favicon.ico
rename to blog/src/themes/smigle/static/favicon.ico

diff --git a/blog/themes/smigle/static/fonts/iosevka-bold.woff2 b/blog/src/themes/smigle/static/fonts/iosevka-bold.woff2
similarity index 100%
rename from blog/themes/smigle/static/fonts/iosevka-bold.woff2
rename to blog/src/themes/smigle/static/fonts/iosevka-bold.woff2

diff --git a/blog/themes/smigle/static/fonts/iosevka-oblique.woff2 b/blog/src/themes/smigle/static/fonts/iosevka-oblique.woff2
similarity index 100%
rename from blog/themes/smigle/static/fonts/iosevka-oblique.woff2
rename to blog/src/themes/smigle/static/fonts/iosevka-oblique.woff2

diff --git a/blog/themes/smigle/static/fonts/iosevka-regular.woff2 b/blog/src/themes/smigle/static/fonts/iosevka-regular.woff2
similarity index 100%
rename from blog/themes/smigle/static/fonts/iosevka-regular.woff2
rename to blog/src/themes/smigle/static/fonts/iosevka-regular.woff2

diff --git a/blog/themes/smigle/static/images/brandIcon.svg b/blog/src/themes/smigle/static/images/brandIcon.svg
similarity index 100%
rename from blog/themes/smigle/static/images/brandIcon.svg
rename to blog/src/themes/smigle/static/images/brandIcon.svg

diff --git a/blog/themes/smigle/static/js/.gitkeep b/blog/src/themes/smigle/static/js/.gitkeep
similarity index 100%
rename from blog/themes/smigle/static/js/.gitkeep
rename to blog/src/themes/smigle/static/js/.gitkeep

diff --git a/blog/themes/smigle/static/mstile-150x150.png b/blog/src/themes/smigle/static/mstile-150x150.png
similarity index 100%
rename from blog/themes/smigle/static/mstile-150x150.png
rename to blog/src/themes/smigle/static/mstile-150x150.png

diff --git a/blog/themes/smigle/static/safari-pinned-tab.svg b/blog/src/themes/smigle/static/safari-pinned-tab.svg
similarity index 100%
rename from blog/themes/smigle/static/safari-pinned-tab.svg
rename to blog/src/themes/smigle/static/safari-pinned-tab.svg

diff --git a/blog/themes/smigle/static/site.webmanifest b/blog/src/themes/smigle/static/site.webmanifest
similarity index 100%
rename from blog/themes/smigle/static/site.webmanifest
rename to blog/src/themes/smigle/static/site.webmanifest

diff --git a/blog/themes/smigle/theme.toml b/blog/src/themes/smigle/theme.toml
similarity index 100%
rename from blog/themes/smigle/theme.toml
rename to blog/src/themes/smigle/theme.toml

diff --git a/blog/public/tags/index.html b/blog/tags/index.html
similarity index 100%
rename from blog/public/tags/index.html
rename to blog/tags/index.html

diff --git a/blog/public/tags/index.xml b/blog/tags/index.xml
similarity index 100%
rename from blog/public/tags/index.xml
rename to blog/tags/index.xml

diff --git a/blog/update-theme.sh b/blog/update-theme.sh
index 69f464f..dcb9aba 100755 (executable)
--- a/blog/update-theme.sh
+++ b/blog/update-theme.sh
@@ -3,7 +3,7 @@
 set -eu
 
 script_path="$( cd -P "$( dirname "$(readlink -f "${0}")" )" && pwd )"
-theme_dir="${script_path}/themes/"
+theme_dir="${script_path}/src/themes/"
 
 cd "${theme_dir}"
 for _theme in "${theme_dir}/"*; do