From d13abe7afa70e4ec388c514352ddb4dc30232323 Mon Sep 17 00:00:00 2001 From: liquidev Date: Tue, 12 Nov 2024 22:51:36 +0100 Subject: [PATCH] restructuring page:index --- content/about-treehouse.tree | 3 + content/about.tree | 12 +-- content/index.tree | 85 +++++++++---------- content/philosophy.tree | 17 +--- content/programming.tree | 14 ++- .../blog/try-is-not-the-only-option.tree} | 3 +- crates/treehouse/src/generate.rs | 6 +- static/css/page/index.css | 13 ++- 8 files changed, 80 insertions(+), 73 deletions(-) rename content/{short-thoughts.tree => programming/blog/try-is-not-the-only-option.tree} (92%) diff --git a/content/about-treehouse.tree b/content/about-treehouse.tree index e789089..06c76a9 100644 --- a/content/about-treehouse.tree +++ b/content/about-treehouse.tree @@ -400,3 +400,6 @@ % id = "01HRD97CSJSQN78SGM691B6PNQ" - NOTE: not slanted anymore. `slnt` is 0. + +% id = "01JCGYHVMWWKKZ1532WC32DXNW" +- _NOTE: this page is quite old, so I moved it from the main page to the programming blog to reduce clutter. I deemed it wasn't important enough to have it on display so profoundly._ diff --git a/content/about.tree b/content/about.tree index ab4ec78..8d03f9c 100644 --- a/content/about.tree +++ b/content/about.tree @@ -1,7 +1,7 @@ %% title = "who that! (about me)" % id = "01J09B2BZXJ989S2SGWBNZ397C" -+ hello! I am *liquidex*. ++ I am *liquidex*. % id = "01J09B2BZX54T2GSP8H3D62S6J" + also known as *liquidex* @@ -113,16 +113,10 @@ % id = "01J09B2BZX39FGP634BM5HJ0FD" + did I mention [music][page:music]? - I also {-aspire to-} [make ][def:social/soundcloud][music][page:music][ sometimes][def:social/soundcloud]. - - % id = "01J09B2BZXGG5HYVYDNPVFRKY1" - - I say aspire because I'd really like to be better at it, but _time_, man… + I also [make ][def:social/soundcloud][music][page:music][ sometimes][def:social/soundcloud]. % id = "01J09B2BZXY6AN3242DYECK74Z" - + from time to time I also try to draw things, but _time_, it's killing me, man… - - % id = "01J09B2BZXN3263NEHCKQ931TS" - - I'm sure one day you'll see the results of my practice, (unless you've already seen them :ralsei_wave:,) but for now I keep them largely to myself. + + from time to time I also try to draw things, but _time_, it's killing me, man... % id = "hello" + if all that sounds like an interesting bunch of words, feel free to come up to me and say hi! diff --git a/content/index.tree b/content/index.tree index c687d50..af010a1 100644 --- a/content/index.tree +++ b/content/index.tree @@ -4,29 +4,20 @@ % id = "01H8V556P1PND8DQ73XBTZZJH7" - welcome! make yourself at home. [= --w-- =]{style="white-space: nowrap;"} -% id = "01H8VWEHX501SNYQTE61WX7YJC" -- :folder: [_"owo, what's this?"_][page:kuroneko]{.secret} - - % id = "about" - content.link = "about" - + ## about me - - % id = "about-treehouse" - content.link = "about-treehouse" - + ## about this - -% id = "01H8V556P1GRAA3717VH3QJFMV" - classes.branch_children = "index:hobby-corners" -- :folder: hobby corners - ``` =html + + + + + + + + - - + + @@ -41,9 +32,7 @@ - + @@ -57,33 +46,43 @@ + + + + + + + + + + + + + ``` - % id = "programming" - content.link = "programming" - + ## ``{=html}programming +% id = "about" + content.link = "about" ++ ## ``{=html}me - % id = "design" - content.link = "design" - + ## ``{=html}design +% id = "programming" + content.link = "programming" ++ ## ``{=html}programming - % id = "music" - content.link = "music" - + ## ``{=html}music +% id = "design" + content.link = "design" ++ ## ``{=html}design - % id = "games" - content.link = "games" - + ## ``{=html}games +% id = "music" + content.link = "music" ++ ## ``{=html}music -% id = "01HFYZKREWE2AM61ZRW3R501H6" -- :folder: /var +% id = "games" + content.link = "games" ++ ## ``{=html}games - % id = "short-thoughts" - content.link = "short-thoughts" - + ## [sh](https://www.youtube.com/watch?v=rFL2VOdb944){.secret}ort thoughts - - % id = "philosophy" - content.link = "philosophy" - + ## philosophy and worldview +% id = "philosophy" + content.link = "philosophy" ++ ## ``{=html}shower diff --git a/content/philosophy.tree b/content/philosophy.tree index 1f0317e..ef05192 100644 --- a/content/philosophy.tree +++ b/content/philosophy.tree @@ -6,19 +6,9 @@ % id = "01HFYZKREV1GSWT2Q07XFRTTBH" + but if you've been wondering what makes my brain tick, you've come to the right place - % id = "01HFYZKREVXY44MS45P5J0BRBE" - - perhaps my thoughts here will be more than _just_ pure philosophy and worldview, who knows! - - % id = "01HFYZKREVSW8KTGVKN4R8GPKK" - - *perhaps this will be the most controversial branch of this tree, so maybe if you don't like to - get all fired up... stop reading here.* - - % id = "01HFYZKREV1CYFWBF4ZM4R3Y15" - - but if you decide to stay please approach these thoughtfully and respectfully, with more - of a a "this is interesting" than "I disagree with this" vibe - - % id = "01JBAK8GABBRYFED4AMGC4BKTB" - - there's a reason I don't include these branches in [page:treehouse/new][] alright + % id = "01JCGZ4E7F5XPJHGWCY0N6A03Q" + - hey don't make this weird, okay. + showers are good for having thoughts. % content.link = "philosophy/furry" id = "01JCGVBXVME8DC9T79GQPXFZ3C" @@ -47,3 +37,4 @@ % id = "01HFYZKREV634J021ZMCDSP7G4" content.link = "philosophy/hedonic-treadmill" + :page: hedonic treadmill ([wikipedia](https://en.wikipedia.org/wiki/Hedonic_treadmill)) + diff --git a/content/programming.tree b/content/programming.tree index 948e67a..419b192 100644 --- a/content/programming.tree +++ b/content/programming.tree @@ -9,10 +9,6 @@ % id = "01HPD4XQQ5GPQ20C6BPA8G670F" - ### :folder: blog - % content.link = "programming/blog/haku" - id = "01J4J4PAXRWZDP9PAZNGCQ9S3D" - + [featured]{.badge .blue} :page: haku - writing a little programming language for fun - % content.link = "programming/blog/cstring-starts-with" id = "01JCGAM56KS2C6D4XZ1MRATXH4" + :page: prefix matches with C strings @@ -21,6 +17,10 @@ id = "01J7BYKQHZKYQ969T3PH3V8HF1" + :page: not quite buildless + % content.link = "programming/blog/haku" + id = "01J4J4PAXRWZDP9PAZNGCQ9S3D" + + :page: haku - writing a little programming language for fun + % content.link = "programming/blog/lvalues" id = "01HY5R1ZW0M0Y5KQ1E8F0Q73ZT" + :page: places, or what is up with `*x` not always meaning the same thing @@ -37,6 +37,11 @@ id = "01HPD4XQQ5WM0APCAX014HM43V" + :page: tairu - an interactive exploration of 2D autotiling techniques + % content.link = "about-treehouse" + id = "01H89RFHCQ1YB7CXBBR6NDDAC1" + redirect_from = ["about-treehouse"] + + :page: about the treehouse + % id = "programming/projects" content.link = "programming/projects" + ### :folder: projects @@ -67,3 +72,4 @@ id = "programming/opinions" + ### :folder: opinions + diff --git a/content/short-thoughts.tree b/content/programming/blog/try-is-not-the-only-option.tree similarity index 92% rename from content/short-thoughts.tree rename to content/programming/blog/try-is-not-the-only-option.tree index b9f2961..59597f0 100644 --- a/content/short-thoughts.tree +++ b/content/programming/blog/try-is-not-the-only-option.tree @@ -1,4 +1,4 @@ -%% title = "short thoughts" +%% title = "`?` is not the only option" % id = "01J4J6400Q4MWF2QPGX3P9Q2WQ" - if there's one thing I learned from Go... @@ -17,3 +17,4 @@ if !list.ok { ``` ...it's that `?` is not the only option. + diff --git a/crates/treehouse/src/generate.rs b/crates/treehouse/src/generate.rs index 423240e..ad197bc 100644 --- a/crates/treehouse/src/generate.rs +++ b/crates/treehouse/src/generate.rs @@ -543,12 +543,16 @@ impl Generator { feeds: &feeds, season: Season::current(), }; - let template_name = roots + let mut template_name = roots .attributes .template .clone() .unwrap_or_else(|| "_tree.hbs".into()); + if !template_file_ids.contains_key(&template_name) { + template_name = "_tree.hbs".into(); + } + // Reinsert the stolen roots. treehouse.roots.insert(parsed_tree.root_key, roots); diff --git a/static/css/page/index.css b/static/css/page/index.css index 632d329..0f23a03 100644 --- a/static/css/page/index.css +++ b/static/css/page/index.css @@ -40,7 +40,7 @@ h1.page-title { } } -.index\:hobby-corners { +main.tree > ul { /* Optical text offset to make the icons look less misaligned. This is adjusted per each hobby corner to fit the icons. @@ -49,6 +49,7 @@ h1.page-title { This aims to improve the readability of that a bit without being too noticable. */ --section-text-offset: 0em; + --section-icon-align: -30%; & > li { & > details > summary { @@ -61,12 +62,16 @@ h1.page-title { margin-right: calc(0.2em + var(--section-text-offset)); - vertical-align: -38%; + vertical-align: var(--section-icon-align); } } } } +#index\:about { + --section-color: #a7d5e0; +} + #index\:programming { --section-color: var(--liquidex-brand-red); --section-text-offset: -0.1em; @@ -85,3 +90,7 @@ h1.page-title { --section-color: var(--liquidex-brand-blue); --section-text-offset: 0.05em; } + +#index\:philosophy { + --section-color: #c952f5; +}