From 1404a0b618bd023a870c19c3f7c9f40cbcfea2a1 Mon Sep 17 00:00:00 2001 From: awstin Date: Sun, 15 Dec 2024 20:35:53 -0500 Subject: [PATCH] Adding technology page and updating books + now pages --- assets/main.css | 114 +++++++++++++++++++------------------- src/html/garden.rs | 9 ++- src/html/templates.rs | 4 ++ templates/base.html | 14 ++--- templates/books.html | 14 ++++- templates/interests.html | 1 + templates/now.html | 36 ++++++------ templates/technology.html | 47 ++++++++++++++++ 8 files changed, 154 insertions(+), 85 deletions(-) create mode 100644 templates/technology.html diff --git a/assets/main.css b/assets/main.css index 59343fe..bf1b52d 100644 --- a/assets/main.css +++ b/assets/main.css @@ -1,74 +1,72 @@ /* @link https://utopia.fyi/type/calculator?c=320,14,1.067,1240,20,1.125,5,2,&s=0.75|0.5|0.25,1.5|2|3|4|6,s-l&g=s,l,xl,12 */ :root { - --step--2: clamp(0.7686rem, 0.6924rem + 0.381vi, 0.9877rem); - --step--1: clamp(0.8201rem, 0.7188rem + 0.5062vi, 1.1111rem); - --step-0: clamp(0.875rem, 0.7446rem + 0.6522vi, 1.25rem); - --step-1: clamp(0.9336rem, 0.7692rem + 0.822vi, 1.4063rem); - --step-2: clamp(0.9962rem, 0.7924rem + 1.0189vi, 1.582rem); - --step-3: clamp(1.0629rem, 0.8136rem + 1.2467vi, 1.7798rem); - --step-4: clamp(1.1341rem, 0.8322rem + 1.5098vi, 2.0023rem); - --step-5: clamp(1.2101rem, 0.8475rem + 1.8129vi, 2.2525rem); - --step-6: clamp(1.2912rem, 0.8589rem + 2.1616vi, 2.5341rem); + --step--2: clamp(0.7686rem, 0.6924rem + 0.381vi, 0.9877rem); + --step--1: clamp(0.8201rem, 0.7188rem + 0.5062vi, 1.1111rem); + --step-0: clamp(0.875rem, 0.7446rem + 0.6522vi, 1.25rem); + --step-1: clamp(0.9336rem, 0.7692rem + 0.822vi, 1.4063rem); + --step-2: clamp(0.9962rem, 0.7924rem + 1.0189vi, 1.582rem); + --step-3: clamp(1.0629rem, 0.8136rem + 1.2467vi, 1.7798rem); + --step-4: clamp(1.1341rem, 0.8322rem + 1.5098vi, 2.0023rem); + --step-5: clamp(1.2101rem, 0.8475rem + 1.8129vi, 2.2525rem); + --step-6: clamp(1.2912rem, 0.8589rem + 2.1616vi, 2.5341rem); - --fluid-288-744: clamp(18rem, 8.087rem + 49.5652cqi, 46.5rem); + --fluid-288-744: clamp(18rem, 8.087rem + 49.5652cqi, 46.5rem); - --bg_h: #1d2021; - --bg: #282828; - --bg_s: #32302f; - --bg1: #3c3836; - --bg2: #504945; - --bg3: #665c54; - --bg4: #7c6f64; + --bg: #222436; - --fg: #fbf1c7; - --fg1: #ebdbb2; - --fg2: #d5c4a1; - --fg3: #bdae93; - --fg4: #a89984; + --fg: #c8d3f5; - --red: #fb4934; - --green: #b8bb26; - --yellow: #fabd2f; - --blue: #83a598; - --purple: #d3869b; - --aqua: #8ec07c; - --gray: #928374; - --orange: #fe8019; + --black: #444a73; + --red: #ff757f; + --green: #c3e88d; + --yellow: #ffc777; + --blue: #82aaff; + --magenta: #c099ff; + --cyan: #86e1fc; + --white: #c8d3f5; - --red-dim: #cc2412; - --green-dim: #98971a; - --yellow-dim: #d79921; - --blue-dim: #458588; - --purple-dim: #b16286; - --aqua-dim: #689d6a; - --gray-dim: #a89984; - --orange-dim: #d65d0e; + --black-dim: #1b1d2b; + --red-dim: #ff757f; + --green-dim: #c3e88d; + --yellow-dim: #ffc777; + --blue-dim: #82aaff; + --magenta-dim: #c099ff; + --cyan-dim: #86e1fc; + --white-dim: #828bb8; } html { font-family: monospace; background-color: var(--bg); color: var(--fg); - font-size: var(--step-1); /* 20px */ - line-height: var(--step-2); /* 28px */ + font-size: var(--step-1); + /* 20px */ + line-height: var(--step-2); + /* 28px */ padding: 0.25rem; } h1 { - font-size: var(--step-5); /* 36px */ - line-height: var(--step-6); /* 40px */ + font-size: var(--step-5); + /* 36px */ + line-height: var(--step-6); + /* 40px */ text-align: center; } h2 { - font-size: var(--step-4); /* 30px */ - line-height: var(--step-5); /* 36px */ + font-size: var(--step-4); + /* 30px */ + line-height: var(--step-5); + /* 36px */ } h3 { - font-size: var(--step-3); /* 24px */ - line-height: var(--step-4); /* 32px */ + font-size: var(--step-3); + /* 24px */ + line-height: var(--step-4); + /* 32px */ } a { @@ -81,8 +79,10 @@ a:hover { } p { - padding-top: 0.5rem; /* 8px */ - padding-bottom: 0.5rem; /* 8px */ + padding-top: 0.5rem; + /* 8px */ + padding-bottom: 0.5rem; + /* 8px */ } code { @@ -99,27 +99,27 @@ img { } .container { - display: flex; + display: flex; } .sidebar { - width: 250px; - height: 100vh; - padding-top: 20px; - position: fixed; + width: 250px; + height: 100vh; + padding-top: 20px; + position: fixed; } .sidebar ul { - list-style-type: none; - padding: 0; + list-style-type: none; + padding: 0; } .sidebar ul li { - padding: 10px; + padding: 10px; } .sidebar ul li a { - text-decoration: none; + text-decoration: none; } .content { diff --git a/src/html/garden.rs b/src/html/garden.rs index 70c72e2..a89c2f1 100644 --- a/src/html/garden.rs +++ b/src/html/garden.rs @@ -4,8 +4,7 @@ use axum::{ }; use super::templates::{ - ArchServerTemplate, BooksTemplate, CookingTemplate, CreationTemplate, EdgeDetectionTemplate, - GardenTemplate, HtmlTemplate, TakTemplate, TimeTemplate, + ArchServerTemplate, BooksTemplate, CookingTemplate, CreationTemplate, EdgeDetectionTemplate, GardenTemplate, HtmlTemplate, TakTemplate, TechnologyTemplate, TimeTemplate }; pub fn get_router() -> Router { @@ -18,6 +17,7 @@ pub fn get_router() -> Router { .route("/archserver", get(arch_server)) .route("/cooking", get(cooking)) .route("/creation", get(creation)) + .route("/technology", get(technology)) } async fn garden() -> impl IntoResponse { @@ -59,3 +59,8 @@ 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 c185fdc..5417e94 100644 --- a/src/html/templates.rs +++ b/src/html/templates.rs @@ -140,3 +140,7 @@ pub struct ResumeTemplate {} #[derive(Template)] #[template(path = "work.html")] pub struct WorkTemplate {} + +#[derive(Template)] +#[template(path = "technology.html")] +pub struct TechnologyTemplate {} diff --git a/templates/base.html b/templates/base.html index 9027525..e0c862d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -18,7 +18,7 @@ - + @@ -29,7 +29,7 @@ - +
  • @@ -39,7 +39,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -72,7 +72,7 @@ - +
    • @@ -82,7 +82,7 @@ - + diff --git a/templates/books.html b/templates/books.html index 388b910..3635f2a 100755 --- a/templates/books.html +++ b/templates/books.html @@ -14,12 +14,22 @@

    Currently Reading

    - Just finished King Rat last night. - Get to pick a new book today. + 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. +

    +

    + River of Gods by Ian McDonald for fiction. + A science ficton book taking place in India and through their cultural lens. + The author is British so was unsure, but he seems to be approaching the background with respect and I am enjoying the book.

    Read so far in 2024