Adding gifts routing and updating my now page

src/html/root.rs

@@ -16,7 +16,7 @@ use crate::database::{
 use super::{
     blog, garden,
     templates::{
-        AboutTemplate, AiTemplate, BlogrollTemplate, ContactTemplate, HomeTemplate, HtmlTemplate, InterestsTemplate, LinksPageTemplate, NowTemplate, UsesTemplate
+        AboutTemplate, AiTemplate, BlogrollTemplate, ContactTemplate, GiftsTemplate, HomeTemplate, HtmlTemplate, InterestsTemplate, LinksPageTemplate, NowTemplate, UsesTemplate
     },
     AppState,
 };
@@ -40,6 +40,7 @@ pub fn get_router(pool: PgPool) -> Router {
         .route("/blogroll", get(blogroll))
         .route("/links", get(links))
         .route("/interests", get(interests))
+        .route("/gifts", get(gifts))
         .route(
             "/robots.txt",
             get(|| async { Redirect::permanent("/assets/robots.txt") }),
@@ -75,6 +76,10 @@ async fn interests() -> impl IntoResponse {
     HtmlTemplate(InterestsTemplate {})
 }
 
+async fn gifts() -> impl IntoResponse {
+    HtmlTemplate(GiftsTemplate {})
+}
+
 async fn blogroll(state: Extension<AppState>) -> impl IntoResponse {
     let blogroll_page = BlogrollTemplate {
         blogs: match get_links_as_list(&state.db, LinkType::BLOG).await {

templates/now.html

@@ -3,68 +3,57 @@
 
 {% block content %}
 <p>
-    Last updated: 2024-08-08
+    Last updated: 2024-09-07
 </p>
 <h2>Work</h2>
 <p>
     Still in Toronto, still working in software at Amazon.
     My team writes tools to help automate and test new machine setups.
-    Just got a promotion from L4 (entry level software engineer) to L5 (regular software engineer).
-    Was not something that I chased but there is an "up or out" when in the L4 position so it is really nice to have that worry off my mind.
+    Working on fixing up and expanding a tool that I wrote earlier in the year that didn't quite make it into production.
+    After the meeting showing the tool the team it was for had a couple more features they wanted added before it was deployed.
+    The configurations had changed before I got those done and some parts had to be redesigned/rebuild.
+    Making it more adaptable to keep this drift from happening in the future.
 </p>
 <h2>Life</h2>
 <p>
     I am engaged and living with the most wonderful woman I have ever met.
-    Planning our wedding (slowly bit by bit) for next spring.
+    We have booked a venue and a date!!
+    So excited and frees us up to start booking a lot of other stuff.
+    Found a wonderful venue that incorporates a lot of nature and is comfortably in our budget.
 </p>
 <p>
     Actually planning for the long term financially now that I am lucky enough to have a job that leaves me with money to save and invest after the bills are payed.
     It still feels new to have that cushion and to plan long term, definitely enjoying it.        
 </p>
-<p>
-    Got covid for the second time just this week.
-    Not great but much lighter then the last time that I got it.
-</p>
 <h2>Brazilian Jiu-Jitsu</h2>
 <p>
     Got my blue belt just before the new year.
-    Still training as much as I can.
     The team here at GB Toronto has become an external family.
     I am so grateful for the community.
 </p>
 <p>
-    Competiton is this Saturday.
-    I have made the weight, however they opened the weigh in on Friday evening which is unusual.
-    Means that I can cut water weight aggressively and re-hydrate before the first match so I don't feel terrible.
-    So putting a little of it back on.
-</p>
-<p>
-    We have a lot of people from the school going.
-    It is going to be a very fun day.
+    Competiton coming up on September 14th.
+    Not may of us from the school are going to compete but there are some members coming out to support.
+    Pulled back on training a bit after the last competition to make sure I had some balance in my life.
+    I want this training to be sustainable for the long term.
+    Just competing in Gi this time as opposed to both Gi and No-Gi.
 </p>
 <h2>Learning</h2>
 <p>
-    I am working to learn Japanese and Portuguese on Duolingo.
+    I am working to learn japanese and portuguese on Duolingo.
     I love the program and it is 100% worth paying for, but the fact that even when paying it keeps asking for ratings, putting widgets on my home screen, or turning on notifications bothers me.
     You already have my money now please don't bother me.
     Finding the lessons really helpful.
 </p>
 <p>
-    I started studying for the CompTIA ITF+ certification test but that has fallen off in the last little bit.
-    I have been learning hardware and networking playing with my home network and a small homelab consisting of my NAS and a few raspberry pis.
-    Just not very stoked on going for certifications and much prefer to learn this stuff by just playing around with it than reading textbooks and doing practice questions.
+    Had not realized how much the anki flash cards that I have been making alongside the course were until I got out of sync.
+    Did make the time to make new cards for a few weeks and was wondering why I was having such a hard time remembering the new japanese words.
+    I didn't have flashcards for them.
+    So updated them all today and am now back on track.
 </p>
 <h2>Tinkering</h2>
-<p>
-    Have just finished setting up some self hosted software.
-    Firefly for budgeting and personal finance.
-    Pihole for local network addblocking and as a DNS server.
-    Syncthing to keep all my devices synchronized.
-    Slowly working to have more and more of my digital life hosted myself, and it feels good to have control over these things even though it is more work.
-</p>
 <p>
    This website is the main thing that I have been working with.
-   I rebuilt it using HTMX and a Rust backend.
    Added a <a href="/uses">uses page</a> recently with just a list of the common things that I use every day.
    Going to add links and other curated stuff next.
    I love these pages on other personal websites and want to contribute to that.
@@ -79,6 +68,13 @@
 <p>
     Set up my own code forge to be able to share my code without having to post it to github.
     Can see it <a href="https://code.achubb.com">here</a>.
+</p>
+<p>
+    I dove hard down the custom keyboard rabbit hole this past week.
+    Going to be making a second one for myself to keep at work, and making one for each of my brothers.
+    Can (and have somewhat been) getting lost in the minutiae of layouts, switches, design.
+    It has been a lot of fun (and I apologise to my fiance for the constant clicking as I test out different switches).
+</p>
 <p>
     Awstin
 </p>