From 84a9bc68713106ec5a2327e7a72c1c460343f40c Mon Sep 17 00:00:00 2001 From: Awstin Date: Wed, 8 Jan 2025 07:54:20 -0500 Subject: [PATCH] Moved garden to projects, updated now --- src/html/garden.rs | 67 ------------------------------------- src/html/mod.rs | 2 +- src/html/projects.rs | 36 ++++++++++++++++++++ src/html/root.rs | 41 ++++++++++++++++++++--- src/html/templates.rs | 4 +-- templates/base.html | 4 +-- templates/books.html | 5 ++- templates/garden.html | 47 -------------------------- templates/home.html | 15 ++++----- templates/interests.html | 30 +++++++++++++++-- templates/now.html | 27 ++++++++------- templates/projects.html | 25 ++++++++++++++ templates/self_hosting.html | 14 ++++++++ 13 files changed, 166 insertions(+), 151 deletions(-) delete mode 100644 src/html/garden.rs create mode 100644 src/html/projects.rs delete mode 100644 templates/garden.html create mode 100644 templates/projects.html create mode 100644 templates/self_hosting.html diff --git a/src/html/garden.rs b/src/html/garden.rs deleted file mode 100644 index 3542d15..0000000 --- a/src/html/garden.rs +++ /dev/null @@ -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) -} diff --git a/src/html/mod.rs b/src/html/mod.rs index 753a20e..1c3524c 100644 --- a/src/html/mod.rs +++ b/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; diff --git a/src/html/projects.rs b/src/html/projects.rs new file mode 100644 index 0000000..48a79d2 --- /dev/null +++ b/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) +} diff --git a/src/html/root.rs b/src/html/root.rs index e66e79c..d9253c5 100644 --- a/src/html/root.rs +++ b/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) +} diff --git a/src/html/templates.rs b/src/html/templates.rs index a9b2393..22933ec 100644 --- a/src/html/templates.rs +++ b/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")] diff --git a/templates/base.html b/templates/base.html index e0c862d..170243a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -44,9 +44,9 @@ -
  • +
  • - Garden + Projects diff --git a/templates/books.html b/templates/books.html index 3635f2a..e3ffeb4 100755 --- a/templates/books.html +++ b/templates/books.html @@ -17,9 +17,7 @@ I have a couple books on the go at the moment.

    - 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.

    River of Gods by Ian McDonald for fiction. @@ -29,6 +27,7 @@

    Read so far in 2024
    +
    +

    Projects

    +

    + +

    Interests

    diff --git a/templates/interests.html b/templates/interests.html index 2f67e3c..0b0748e 100644 --- a/templates/interests.html +++ b/templates/interests.html @@ -86,7 +86,31 @@ It is what I am making this site to be a part of.

    -

    Reading

    -

    Cooking

    -

    Technology

    +

    Books

    +

    + Books, what I am reading, why I love them so much. + Just book stuff. +

    + +

    Thoughts on how I spend my time

    +

    + Some thoughts on time. + I catch myself coming back to this subject pretty regularly. +

    + +

    Making things

    +

    + I have been pondering a lot lately on the act of creation 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. +

    + +

    Cooking

    +

    + I love to cook, 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 cooking page when I get it set up. + For now it is just my thoughts on the activity. +

    {% endblock %} diff --git a/templates/now.html b/templates/now.html index 8667465..770af70 100644 --- a/templates/now.html +++ b/templates/now.html @@ -3,24 +3,23 @@ {% block content %}

    - Last updated: 2024-12-15 + Last updated: 2025-01-08

    Work

    - 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.

    Still keeping my eyes open for other opportunities.

    Life

    - 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.

    Working to find the path that feels right for me career wise. @@ -32,9 +31,7 @@ I am so grateful for the community.

    - 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.

    Learning

    @@ -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.

    +

    + Joined the Lean Web Club 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. +

    Tinkering

    Wedding website still under construction. @@ -59,7 +62,7 @@

    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 thoughts clarified and down in writing. + First I want to get my thoughts 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.

    diff --git a/templates/projects.html b/templates/projects.html new file mode 100644 index 0000000..8b77fa6 --- /dev/null +++ b/templates/projects.html @@ -0,0 +1,25 @@ + +{% extends "base.html" %} + +{% block content %} +

    Projects

    +

    + 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. +

    +

    + 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. +

    +

    + Some personal projects that I have worked on +

    + +{% endblock %} diff --git a/templates/self_hosting.html b/templates/self_hosting.html new file mode 100644 index 0000000..d1d9338 --- /dev/null +++ b/templates/self_hosting.html @@ -0,0 +1,14 @@ + +{% extends "base.html" %} + +{% block content %} +

    Self Hosting

    +

    + 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. +

    +

    + I am doing my best to self host everything that I need. + +

    +{% endblock %}