Moved garden to projects, updated now

src/html/garden.rs

@@ -1,67 +0,0 @@
-use axum::{
-    response::IntoResponse,
-    routing::{get, Router},
-};
-
-use super::templates::{
-    ArchServerTemplate, BooksTemplate, CookingTemplate, CreationTemplate, EdgeDetectionTemplate,
-    GardenTemplate, HtmlTemplate, TakTemplate, TechnologyTemplate, TimeTemplate,
-};
-
-pub fn get_router() -> Router {
-    Router::new()
-        .route("/", get(garden))
-        .route("/ed", get(edge_detection))
-        .route("/books", get(books))
-        .route("/time", get(time))
-        .route("/tak", get(tak))
-        .route("/archserver", get(arch_server))
-        .route("/cooking", get(cooking))
-        .route("/creation", get(creation))
-        .route("/technology", get(technology))
-}
-
-async fn garden() -> impl IntoResponse {
-    let garden_page = GardenTemplate {};
-    HtmlTemplate(garden_page)
-}
-
-async fn edge_detection() -> impl IntoResponse {
-    let edge_detection_page = EdgeDetectionTemplate {};
-    HtmlTemplate(edge_detection_page)
-}
-
-async fn books() -> impl IntoResponse {
-    let books_page = BooksTemplate {};
-    HtmlTemplate(books_page)
-}
-
-async fn time() -> impl IntoResponse {
-    let time_page = TimeTemplate {};
-    HtmlTemplate(time_page)
-}
-
-async fn tak() -> impl IntoResponse {
-    let tak_page = TakTemplate {};
-    HtmlTemplate(tak_page)
-}
-
-async fn arch_server() -> impl IntoResponse {
-    let arch_server_page = ArchServerTemplate {};
-    HtmlTemplate(arch_server_page)
-}
-
-async fn cooking() -> impl IntoResponse {
-    let cooking_page = CookingTemplate {};
-    HtmlTemplate(cooking_page)
-}
-
-async fn creation() -> impl IntoResponse {
-    let creation_page = CreationTemplate {};
-    HtmlTemplate(creation_page)
-}
-
-async fn technology() -> impl IntoResponse {
-    let technology_page = TechnologyTemplate {};
-    HtmlTemplate(technology_page)
-}

src/html/mod.rs

@@ -2,7 +2,7 @@ use serde::Deserialize;
 
 pub mod admin;
 pub mod blog;
-pub mod garden;
+pub mod projects;
 pub mod root;
 pub mod templates;
 

src/html/projects.rs

@@ -0,0 +1,36 @@
+use axum::{
+    response::IntoResponse,
+    routing::{get, Router},
+};
+
+use super::templates::{
+    ArchServerTemplate, EdgeDetectionTemplate, HtmlTemplate, ProjectsTemplate, TakTemplate
+};
+
+pub fn get_router() -> Router {
+    Router::new()
+        .route("/", get(projects))
+        .route("/ed", get(edge_detection))
+        .route("/tak", get(tak))
+        .route("/archserver", get(arch_server))
+}
+
+async fn projects() -> impl IntoResponse {
+    let projects_page = ProjectsTemplate {};
+    HtmlTemplate(projects_page)
+}
+
+async fn edge_detection() -> impl IntoResponse {
+    let edge_detection_page = EdgeDetectionTemplate {};
+    HtmlTemplate(edge_detection_page)
+}
+
+async fn tak() -> impl IntoResponse {
+    let tak_page = TakTemplate {};
+    HtmlTemplate(tak_page)
+}
+
+async fn arch_server() -> impl IntoResponse {
+    let arch_server_page = ArchServerTemplate {};
+    HtmlTemplate(arch_server_page)
+}

src/html/root.rs

@@ -24,11 +24,12 @@ use crate::{
 use super::{
     admin,
     blog::{self, get_articles_date_sorted},
-    garden,
+    projects,
     templates::{
-        AboutTemplate, AiTemplate, BlogrollTemplate, ContactTemplate, GiftsTemplate, HomeTemplate,
-        HtmlTemplate, InterestsTemplate, LinksPageTemplate, LoginTemplate, NowTemplate,
-        ResumeTemplate, SignupTemplate, UsesTemplate, WorkTemplate,
+        AboutTemplate, AiTemplate, BlogrollTemplate, BooksTemplate, ContactTemplate,
+        CookingTemplate, CreationTemplate, GiftsTemplate, HomeTemplate, HtmlTemplate,
+        InterestsTemplate, LinksPageTemplate, LoginTemplate, NowTemplate, ResumeTemplate,
+        SignupTemplate, TechnologyTemplate, TimeTemplate, UsesTemplate, WorkTemplate,
     },
 };
 
@@ -40,7 +41,7 @@ pub fn get_router(pool: PgPool) -> Router {
 
     Router::new()
         .nest("/blog", blog::get_router())
-        .nest("/garden", garden::get_router())
+        .nest("/projects", projects::get_router())
         .nest("/admin", admin::get_router())
         .nest_service(
             "/assets",
@@ -58,6 +59,11 @@ pub fn get_router(pool: PgPool) -> Router {
         .route("/resume", get(resume))
         .route("/gifts", get(gifts))
         .route("/hire", get(work))
+        .route("/books", get(books))
+        .route("/time", get(time))
+        .route("/cooking", get(cooking))
+        .route("/creation", get(creation))
+        .route("/technology", get(technology))
         .route("/login", get(get_login).post(post_login))
         .route("/signup", get(get_signup).post(post_signup))
         .route("/logout", post(logout_response))
@@ -169,3 +175,28 @@ pub async fn get_login() -> impl IntoResponse {
 pub async fn get_signup() -> impl IntoResponse {
     HtmlTemplate(SignupTemplate {})
 }
+
+async fn books() -> impl IntoResponse {
+    let books_page = BooksTemplate {};
+    HtmlTemplate(books_page)
+}
+
+async fn time() -> impl IntoResponse {
+    let time_page = TimeTemplate {};
+    HtmlTemplate(time_page)
+}
+
+async fn cooking() -> impl IntoResponse {
+    let cooking_page = CookingTemplate {};
+    HtmlTemplate(cooking_page)
+}
+
+async fn creation() -> impl IntoResponse {
+    let creation_page = CreationTemplate {};
+    HtmlTemplate(creation_page)
+}
+
+async fn technology() -> impl IntoResponse {
+    let technology_page = TechnologyTemplate {};
+    HtmlTemplate(technology_page)
+}

src/html/templates.rs

@@ -59,8 +59,8 @@ pub struct BlogTemplate {
 pub struct NowTemplate {}
 
 #[derive(Template)]
-#[template(path = "garden.html")]
-pub struct GardenTemplate {}
+#[template(path = "projects.html")]
+pub struct ProjectsTemplate {}
 
 #[derive(Template)]
 #[template(path = "books.html")]

templates/base.html

@@ -44,9 +44,9 @@
                         </svg>
                     </a>
                 </li>
-                <li><a id="garden" href="/garden">
+                <li><a id="projects" href="/projects">
                         <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="#b8bb26">
-                            <title>Garden</title>
+                            <title>Projects</title>
                             <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
                             <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
                             <g id="SVGRepo_iconCarrier"> 

templates/books.html

@@ -17,9 +17,7 @@
     I have a couple books on the go at the moment.
 </p>
 <p>
-    Data Grab by Ulisses Mejas & Nick Couldry for my non-fiction.
-    It is an exploration of our modern digital world through a colonial lens.
-    I am finding it very interesting and thought provoking.
+    Bit Tyrants by Rob Larson for non fiction.
 </p>
 <p>
     River of Gods by Ian McDonald for fiction.
@@ -29,6 +27,7 @@
 
 <h4>Read so far in 2024</h4>
 <ul class="no-bul">
+    <li>Data Grab - Ulisses Mejas & Nick Couldry</li>
     <li>Less is More - Jason Hickel</li>
     <li>King Rat - China Mieville</li>
     <li>Surely You Must be Joking Mr Feynman - Richard Feynman</li>

templates/garden.html

@@ -1,47 +0,0 @@
-<!-- prettier-ignore -->
-{% extends "base.html" %}
-
-{% block content %}
-<h2>My Garden</h2>
-<p>
-    Hi all, welcome to the starting point for exploring my digital garden.
-    I am just starting out so things will be sparse as I tend to and grow it.
-</p>
-<p>
-    I am finding the idea of a digital garden to be much more attractive then a traditional blog.
-    It alligns with how I like to write, organize my information, and explore the web.
-    So I am going to switch the site over to that structure and see where things go from there.
-    I expect the structure to change over time as more information is added and I work out how I want to have it organized.
-</p>
-<p>
-    Some personal projects that I have worked on
-</p>
-<ul>
-    <li><a href="/garden/archserver">ArchServer</a></li>
-    <li><a href="/garden/tak">Tak</a></li>
-    <li><a href="/garden/ed">Edge Detection</a></li>
-</ul>
-<p>
-    <a href="/garden/books">Books</a>, what I am reading, why I love them so much.
-    Just book stuff.
-</p>
-
-<p>
-    Some thoughts on <a href="/garden/time">time</a>.
-    I catch myself coming back to this subject pretty regularly.
-</p>
-
-<p>
-    I have been pondering a lot lately on the act of <a href="/garden/creation">creation</a> and of making things.
-    Getting more in touch with that as I have been tinkering more and more.
-    Building out the website for our wedding and other small projects.
-</p>
-
-<p>
-    I love to <a href="/garden/cooking">cook</a>, however very much hate recipe websites.
-    Too much extra stuff.
-    I want to build a place to store and share my recipes without any of that.
-    Will be added to the <a href="/garden/cooking">cooking</a> page when I get it set up.
-    For now it is just my thoughts on the activity.
-</p>
-{% endblock %}

templates/home.html

@@ -30,19 +30,11 @@
     </a>
 </section><br>
 
-<section id="garden">
-    <h2>Garden</h2>
-    <p>
-        Just starting to work to shift the structure of my website from chronological posts to a digital garden.
-        Start <a href="/garden">here</a>.
-    </p>
-</section><br>
-
 <section id="blog">
     <h2>Blog</h2>
     <p>
         Chronological <a href="blog">stuff</a> that I have written.
-        Not adding to this as much with the focus more on the garden but if something is timely then will still be added as a blog post.
+        Not adding to this as much with the focus more on less time sensitive information, but if something is timely then will still be added as a blog post.
     </p>
     <h3>Most Recent Posts</h3>
 
@@ -53,6 +45,11 @@
     </ul>
 </section><br>
 
+<section id="projects">
+    <h2><a href="/projects">Projects</a></h2>
+</section><br>
+
+
 <section id="interests">
     <h2>Interests</h2>
     <p>

templates/interests.html

@@ -86,7 +86,31 @@
     It is what I am making this site to be a part of.
 </p>
 
-<h2><a href="/garden/books">Reading</h2>
-<h2><a href="/garden/cooking">Cooking</h2>
-<h2><a href="/garden/technology">Technology</h2>
+<h3>Books</h3>
+<p>
+    <a href="/books">Books</a>, what I am reading, why I love them so much.
+    Just book stuff.
+</p>
+
+<h3>Thoughts on how I spend my time</h3>
+<p>
+    Some thoughts on <a href="/time">time</a>.
+    I catch myself coming back to this subject pretty regularly.
+</p>
+
+<h3>Making things</h3>
+<p>
+    I have been pondering a lot lately on the act of <a href="/creation">creation</a> and of making things.
+    Getting more in touch with that as I have been tinkering more and more.
+    Building out the website for our wedding and other small projects.
+</p>
+
+<h3>Cooking</h3>
+<p>
+    I love to <a href="/cooking">cook</a>, however very much hate recipe websites.
+    Too much extra stuff.
+    I want to build a place to store and share my recipes without any of that.
+    Will be added to the <a href="/cooking">cooking</a> page when I get it set up.
+    For now it is just my thoughts on the activity.
+</p>
 {% endblock %}

templates/now.html

@@ -3,24 +3,23 @@
 
 {% block content %}
 <p>
-    Last updated: 2024-12-15
+    Last updated: 2025-01-08
 </p>
 <h2>Work</h2>
 <p>
-    Development is slow during peak.
-    The whole team is spending so much time making sure that nothing breaks.
-    Bug fixes and maintenance.
-    It is a different pace than the rest of the year.
-    Both more stressful in some ways, and less.
+    The madness of peak is over, we are figuring out our plans for development for the year.
+    May partially loose one team member for a few months for personal reasons, 
+    so figuring out what we can accomplish and how we will allocate work with the reduced headcount.
 </p>
 <p>
     Still keeping my eyes open for other opportunities.
 </p>
 <h2>Life</h2>
 <p>
-    We now have less than 6 months till our wedding.
-    So many little ends to tie up.
+    Getting married this year!
+    Loose ends are starting to come together.
     A fun process but a little overwhelming at times.
+    Working with a tailor on the suit top to go with my kilt.
 </p>
 <p>
     Working to find the path that feels right for me career wise.
@@ -32,9 +31,7 @@
     I am so grateful for the community.
 </p>
 <p>
-    Back to training regularly.
-    There is a competition coming up in March that a bunch of us are going to try and make it to.
-    Hoping to go for both Gi and No gi.
+    Training ramping up for the competition in March, looks like quite a few of us are going.
 </p>
 <h2>Learning</h2>
 <p>
@@ -50,6 +47,12 @@
     Both similar in ways to Rust (focus on performance, strong type system), and completely different (still a runtime, much simpler).
     Enjoying it so far, still very early days.
 </p>
+<p>
+    Joined the <a href="https://leanwebclub.com">Lean Web Club</a> course for web development.
+    Have been muddling my way through on my own up to this point trying to just use HTML and CSS with most of the actual logic in the backend where I am more comfortable.
+    Figured it was time to learn all the stuff that browsers are capable of and how to make the best use of them.
+    They have come a long way and there is so much that you can do with just plain JS and no external dependencies.
+</p>
 <h2>Tinkering</h2>
 <p>
     Wedding website still under construction.
@@ -59,7 +62,7 @@
 <p>
     Shifting my attention back to adding content to my personal website.
     I have been having a bit of an ongoing moral crisis with the state of the tech industry at the moment.
-    First I want to get my <a href="/garden/technology">thoughts</a> clarified and down in writing.
+    First I want to get my <a href="/technology">thoughts</a> clarified and down in writing.
     Then I want to see what I can do about it and how I can contribute to a user centric web.
 </p>
 <p>

templates/projects.html

@@ -0,0 +1,25 @@
+<!-- prettier-ignore -->
+{% extends "base.html" %}
+
+{% block content %}
+<h2>Projects</h2>
+<p>
+    My main projects at the moment are this website and the website for our upcoming wedding.
+    That one is private though so won't be shared.
+    Also I am building some custom keyboards for my brothers as groomsmen gifts.
+</p>
+<p>
+    I am finding the idea of a digital garden to be much more attractive then a traditional blog.
+    It alligns with how I like to write, organize my information, and explore the web.
+    So I am going to switch the site over to that structure and see where things go from there.
+    I expect the structure to change over time as more information is added and I work out how I want to have it organized.
+</p>
+<p>
+    Some personal projects that I have worked on
+</p>
+<ul>
+    <li><a href="/projects/archserver">ArchServer</a></li>
+    <li><a href="/projects/tak">Tak</a></li>
+    <li><a href="/projects/ed">Edge Detection</a></li>
+</ul>
+{% endblock %}

templates/self_hosting.html

@@ -0,0 +1,14 @@
+<!-- prettier-ignore -->
+{% extends "base.html" %}
+
+{% block content %}
+<h2>Self Hosting</h2>
+<p>
+    I think it is important to be able to rely on our technological systems.
+    And as importantly have control and own the services that we depend on.
+</p>
+<p>
+    I am doing my best to self host everything that I need.
+
+</p>
+{% endblock %}