aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXe Iaso <me@christine.website>2022-11-25 19:01:10 -0500
committerGitHub <noreply@github.com>2022-11-25 19:01:10 -0500
commitcc933b31fd23bb06e95bf41f848a1c99353d44ae (patch)
treeaf8288dbd4db2ad886d6b326bffb1c9d5b568de3
parent551e0384c923ff3ee98cfddf7e3eb42c6dbb2941 (diff)
downloadxesite-cc933b31fd23bb06e95bf41f848a1c99353d44ae.tar.xz
xesite-cc933b31fd23bb06e95bf41f848a1c99353d44ae.zip
Start version 3 (#573)
* Start version 3 * Change version to 3.0.0 in Cargo.toml * Add metadata for series * Change types for signal boosts * Add start of LaTeX resume generation at Nix time * Add start of proper author tagging for posts in JSONFeed and ldjson * Convert templates to use Maud * Add start of dynamic resume generation from dhall * Make patrons page embed thumbnails TODO: * [ ] Remove the rest of the old templates * [ ] Bring in Xeact for the share on mastodon button * [ ] Site update post Signed-off-by: Xe <me@christine.website> * fix nix builds Signed-off-by: Xe Iaso <me@christine.website> * fix dhall build Signed-off-by: Xe Iaso <me@christine.website> * fix non-flakes build Signed-off-by: Xe Iaso <me@christine.website> * make new mastodon share button Signed-off-by: Xe Iaso <me@christine.website> * remove the rest of the ructe templates that I can remove Signed-off-by: Xe Iaso <me@christine.website> * refactor blogposts to its own file Signed-off-by: Xe Iaso <me@christine.website> * move resume to be generated by nix Signed-off-by: Xe Iaso <me@christine.website> * write article Signed-off-by: Xe Iaso <me@christine.website> * blog/site-update-v3: hero image Signed-off-by: Xe Iaso <me@christine.website> * add site update series tag to site updates Signed-off-by: Xe Iaso <me@christine.website> Signed-off-by: Xe <me@christine.website> Signed-off-by: Xe Iaso <me@christine.website>
-rw-r--r--Cargo.lock18
-rw-r--r--Cargo.toml4
-rw-r--r--blog/a-tool-to-aid-forgetfulness-2022-01-12.markdown2
-rw-r--r--blog/anbernic-win600-review.markdown2
-rw-r--r--blog/fear-07-24-2018.markdown2
-rw-r--r--blog/one-day-2018-11-01.markdown2
-rw-r--r--blog/site-update-2020-07-16.markdown1
-rw-r--r--blog/site-update-2021-12-19.markdown1
-rw-r--r--blog/site-update-axum-2022-03-21.markdown1
-rw-r--r--blog/site-update-hero-images.markdown1
-rw-r--r--blog/site-update-let-there-be-light-2021-03-13.markdown3
-rw-r--r--blog/site-update-mastodon-quoting.markdown1
-rw-r--r--blog/site-update-patron-page-fixed.markdown1
-rw-r--r--blog/site-update-rss-bandwidth-2021-01-14.markdown1
-rw-r--r--blog/site-update-salary-transparency.markdown3
-rw-r--r--blog/site-update-v3.markdown417
-rw-r--r--blog/sonic-frontiers.markdown2
-rw-r--r--blog/the-service-is-already-down-2018-10-13.markdown2
-rw-r--r--config.dhall12
-rw-r--r--default.nix67
-rw-r--r--dhall/Prelude.dhall3
-rw-r--r--dhall/authors.dhall64
-rw-r--r--dhall/authors/xe.dhall19
-rw-r--r--dhall/latex/.gitignore5
-rw-r--r--dhall/latex/resume.cls131
-rw-r--r--dhall/latex/resume.dhall110
-rw-r--r--dhall/package.dhall78
-rw-r--r--dhall/resume.dhall91
-rw-r--r--dhall/seriesDescriptions.dhall135
-rw-r--r--dhall/signalboost.dhall186
-rw-r--r--dhall/types/Author.dhall16
-rw-r--r--dhall/types/Config.dhall18
-rw-r--r--dhall/types/Link.dhall4
-rw-r--r--dhall/types/Person.dhall25
-rw-r--r--dhall/types/Resume.dhall10
-rw-r--r--dhall/types/SeriesDescription.dhall3
-rw-r--r--dhall/types/package.dhall1
-rw-r--r--flake.lock38
-rw-r--r--flake.nix79
-rw-r--r--src/app/config.rs90
-rw-r--r--src/app/mod.rs8
-rwxr-xr-xsrc/frontend/build.sh6
-rw-r--r--src/frontend/deno.json8
-rw-r--r--src/frontend/import_map.json8
-rw-r--r--src/frontend/mastodon_share_button.tsx55
-rw-r--r--src/frontend/xeact/jsx-runtime.js16
-rw-r--r--src/frontend/xeact/xeact.js88
-rw-r--r--src/frontend/xeact/xeact.ts9
-rw-r--r--src/handlers/blog.rs66
-rw-r--r--src/handlers/gallery.rs28
-rw-r--r--src/handlers/mod.rs77
-rw-r--r--src/handlers/talks.rs28
-rw-r--r--src/main.rs12
-rw-r--r--src/post/mod.rs24
-rw-r--r--src/post/schemaorg.rs14
-rw-r--r--src/signalboost.rs12
-rw-r--r--src/tmpl/asciiart.txt45
-rw-r--r--src/tmpl/blog.rs215
-rw-r--r--src/tmpl/mod.rs573
-rw-r--r--src/tmpl/nag.rs2
-rw-r--r--static/js/.gitignore1
-rw-r--r--static/js/conversation.js36
-rw-r--r--static/js/hnwarn.js35
-rw-r--r--static/js/xeact-html.min.js1
-rw-r--r--static/js/xeact.min.js1
-rw-r--r--static/resume/.gitignore1
-rw-r--r--static/resume/resume.md171
-rw-r--r--templates/blogindex.rs.html94
-rw-r--r--templates/blogpost.rs.html162
-rw-r--r--templates/contact.rs.html53
-rw-r--r--templates/error.rs.html13
-rw-r--r--templates/feeds.rs.html17
-rw-r--r--templates/footer.rs.html16
-rw-r--r--templates/galleryindex.rs.html23
-rw-r--r--templates/gallerypost.rs.html124
-rw-r--r--templates/gitea.rs.html14
-rw-r--r--templates/header.rs.html102
-rw-r--r--templates/index.rs.html87
-rw-r--r--templates/notfound.rs.html11
-rw-r--r--templates/patrons.rs.html20
-rw-r--r--templates/resume.rs.html13
-rw-r--r--templates/salary_transparency.rs.html44
-rw-r--r--templates/series.rs.html17
-rw-r--r--templates/series_posts.rs.html18
-rw-r--r--templates/signalboost.rs.html46
-rw-r--r--templates/talkindex.rs.html23
-rw-r--r--templates/talkpost.rs.html124
87 files changed, 2439 insertions, 1771 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 04429dc..091b113 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1551,14 +1551,14 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.3"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
dependencies = [
"libc",
"log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -2812,16 +2812,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.19.2"
+version = "1.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
+checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
dependencies = [
+ "autocfg",
"bytes",
"libc",
"memchr",
"mio",
"num_cpus",
- "once_cell",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
@@ -2929,9 +2929,9 @@ dependencies = [
[[package]]
name = "tower-layer"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
[[package]]
name = "tower-service"
@@ -3428,7 +3428,7 @@ dependencies = [
[[package]]
name = "xesite"
-version = "2.5.0"
+version = "3.0.0"
dependencies = [
"axum",
"axum-extra",
diff --git a/Cargo.toml b/Cargo.toml
index 8523d23..c2c2dfe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "xesite"
-version = "2.5.0"
+version = "3.0.0"
authors = ["Xe Iaso <me@xeiaso.net>"]
-edition = "2018"
+edition = "2021"
build = "src/build.rs"
repository = "https://github.com/Xe/site"
license = "zlib"
diff --git a/blog/a-tool-to-aid-forgetfulness-2022-01-12.markdown b/blog/a-tool-to-aid-forgetfulness-2022-01-12.markdown
index fad70cd..6cb032b 100644
--- a/blog/a-tool-to-aid-forgetfulness-2022-01-12.markdown
+++ b/blog/a-tool-to-aid-forgetfulness-2022-01-12.markdown
@@ -1,7 +1,7 @@
---
title: A Tool to Aid Forgetfulness
date: 2022-01-12
-series: stories
+series: short-story
---
The Egyptian God Thoth lived in the Egyptian city of Naucratis. Thoth was the
diff --git a/blog/anbernic-win600-review.markdown b/blog/anbernic-win600-review.markdown
index eeeafde..1a4a7bc 100644
--- a/blog/anbernic-win600-review.markdown
+++ b/blog/anbernic-win600-review.markdown
@@ -1,7 +1,7 @@
---
title: Anbernic Win600 Review
date: 2022-08-19
-series: review
+series: reviews
tags:
- anbernic
- win600
diff --git a/blog/fear-07-24-2018.markdown b/blog/fear-07-24-2018.markdown
index cf47527..8e06d5a 100644
--- a/blog/fear-07-24-2018.markdown
+++ b/blog/fear-07-24-2018.markdown
@@ -3,7 +3,7 @@ title: Fear
date: 2018-07-24
thanks: CelestialBoon, no really this guy is amazing and doesn't get enough credit, I'm so grateful for him.
for: Twilight Sparkle
-series: stories
+series: short-story
---
_I must not fear._
diff --git a/blog/one-day-2018-11-01.markdown b/blog/one-day-2018-11-01.markdown
index 20e969a..c3d2826 100644
--- a/blog/one-day-2018-11-01.markdown
+++ b/blog/one-day-2018-11-01.markdown
@@ -2,7 +2,7 @@
title: "One Day"
date: 2018-11-01
for: "Nicole"
-series: stories
+series: short-story
---
In the beginning there was the void. All was the void and the void was all.
diff --git a/blog/site-update-2020-07-16.markdown b/blog/site-update-2020-07-16.markdown
index 431ee4d..b89e427 100644
--- a/blog/site-update-2020-07-16.markdown
+++ b/blog/site-update-2020-07-16.markdown
@@ -3,6 +3,7 @@ title: "Site Update: Rewrite in Rust"
date: 2020-07-16
tags:
- rust
+series: site-update
---
Hello there! You are reading this post thanks to a lot of effort, research and
diff --git a/blog/site-update-2021-12-19.markdown b/blog/site-update-2021-12-19.markdown
index f92693e..d563c57 100644
--- a/blog/site-update-2021-12-19.markdown
+++ b/blog/site-update-2021-12-19.markdown
@@ -1,6 +1,7 @@
---
title: "Site Updates: Better Contrast Ratio and Using Xeact"
date: 2021-12-19
+series: site-update
---
Happy holidays all! As the year rolls to a close I wanted to take a moment to
diff --git a/blog/site-update-axum-2022-03-21.markdown b/blog/site-update-axum-2022-03-21.markdown
index f20e547..1529050 100644
--- a/blog/site-update-axum-2022-03-21.markdown
+++ b/blog/site-update-axum-2022-03-21.markdown
@@ -1,6 +1,7 @@
---
title: "Site Update: Axum"
date: 2022-03-21
+series: site-update
---
I have made a bunch of huge changes to my website that hopefully you won't
diff --git a/blog/site-update-hero-images.markdown b/blog/site-update-hero-images.markdown
index 41cbafe..ac31db5 100644
--- a/blog/site-update-hero-images.markdown
+++ b/blog/site-update-hero-images.markdown
@@ -1,6 +1,7 @@
---
title: "Site Update: Hero Images"
date: 2022-06-08
+series: site-update
---
For a while I've been wondering how I can add dramatic flair to my website with
diff --git a/blog/site-update-let-there-be-light-2021-03-13.markdown b/blog/site-update-let-there-be-light-2021-03-13.markdown
index aaa7a68..9c1572e 100644
--- a/blog/site-update-let-there-be-light-2021-03-13.markdown
+++ b/blog/site-update-let-there-be-light-2021-03-13.markdown
@@ -3,6 +3,7 @@ title: "Site Update: Let There Be Light"
date: 2021-03-13
tags:
- a11y
+series: site-update
---
In the beginning there was darkness. Darkness was all, and darkness was where the author of this site was comfortable with. However, we live in a time of (supposed) enlightenment. Thanks to the magic of CSS media queries, if you have your computer set to prefer light mode, you will get the light mode version of this website.
@@ -13,4 +14,4 @@ In the beginning there was darkness. Darkness was all, and darkness was where th
</center>
-According to [caniuse.com](https://caniuse.com/?search=prefers-color-scheme) I should _probably_ be fine with this. Please contact me if this acts up for you in an odd way. It shouldn't, but knowing the internet I probably messed something up somewhere. \ No newline at end of file
+According to [caniuse.com](https://caniuse.com/?search=prefers-color-scheme) I should _probably_ be fine with this. Please contact me if this acts up for you in an odd way. It shouldn't, but knowing the internet I probably messed something up somewhere.
diff --git a/blog/site-update-mastodon-quoting.markdown b/blog/site-update-mastodon-quoting.markdown
index 72bb865..72dd50c 100644
--- a/blog/site-update-mastodon-quoting.markdown
+++ b/blog/site-update-mastodon-quoting.markdown
@@ -7,6 +7,7 @@ tags:
- sonicfrontiers
- robocadey
- noxp
+series: site-update
---
<xeblog-hero ai="Waifu Diffusion v1.3 (float16)" file="foxgirl-surfing" prompt="landscape, mountains, breath of the wild, 1girl, fox ears, dark blue hair, blue eyes, surfboard, surfing, beach, simple sketch, clean lines, rakugaki"></xeblog-hero>
diff --git a/blog/site-update-patron-page-fixed.markdown b/blog/site-update-patron-page-fixed.markdown
index a9974d9..f82de36 100644
--- a/blog/site-update-patron-page-fixed.markdown
+++ b/blog/site-update-patron-page-fixed.markdown
@@ -1,6 +1,7 @@
---
title: "Site Update: I Fixed the Patron Page"
date: 2022-05-18
+series: site-update
---
So I fixed [the patron page](https://xeiaso.net/patrons) and the
diff --git a/blog/site-update-rss-bandwidth-2021-01-14.markdown b/blog/site-update-rss-bandwidth-2021-01-14.markdown
index ff4f611..82dd029 100644
--- a/blog/site-update-rss-bandwidth-2021-01-14.markdown
+++ b/blog/site-update-rss-bandwidth-2021-01-14.markdown
@@ -4,6 +4,7 @@ date: 2021-01-14
tags:
- devops
- optimization
+series: site-update
---
Well, so I think I found out where my Kubernetes cluster cost came from. For
diff --git a/blog/site-update-salary-transparency.markdown b/blog/site-update-salary-transparency.markdown
index 7b4a536..33b9550 100644
--- a/blog/site-update-salary-transparency.markdown
+++ b/blog/site-update-salary-transparency.markdown
@@ -1,7 +1,8 @@
---
title: "Site Update: Salary Transparency Page Added"
date: 2022-06-14
-author: Sephie
+author: sephiraloveboo
+series: site-update
---
<xeblog-hero file="miku-dark-souls" prompt="hatsune miku, elden ring, dark souls, concept art, crowbar"></xeblog-hero>
diff --git a/blog/site-update-v3.markdown b/blog/site-update-v3.markdown
new file mode 100644
index 0000000..1ee41b6
--- /dev/null
+++ b/blog/site-update-v3.markdown
@@ -0,0 +1,417 @@
+---
+title: "Site Update: Version 3.0"
+date: 2022-11-26
+author: Heartmender
+series: site-update
+tags:
+ - dhall
+ - LaTeX
+ - rust
+ - typescript
+ - Xeact
+---
+
+<xeblog-hero ai="Waifu Diffusion v1.3 (float16)" file="aoi-onsen" prompt="1girl, fox ears, dark blue hair, blue eyes, kimono, festival, landscape, makoto shinrai, arknights, fireworks, pagodas, onsen, long hair, princess, -hands, -amputee"></xeblog-hero>
+
+Hey all! Welcome to Xesite 3.0! Over the last few days I've taken a huge chunk
+out of my backlog and I have redone _a lot_ of this website. My hope is that
+this will make it faster, more reliable and ultimately make things a lot easier
+for everyone. There's a lot of improvements here so I'm just going to start
+going over them one by one.
+
+## Project name changed
+
+This website has historically been named `site`. It's had a lot of work put into
+it over the years and I've never really referred to it by anything but "the
+website" or "my blog". However I've noticed a change in my notes and I think I
+should make this official. The project behind this website is now officially
+called `xesite`.
+
+<xeblog-conv name="Mara" mood="hmm">What about all of the custom HTML tags?
+Aren't they all called `xeblog-$NAME`? Are you going to change
+those?</xeblog-conv>
+
+<xeblog-conv name="Cadey" mood="coffee">The custom HTML tags are an
+implementation detail, not something that is exposed to end users. Plus, those<