From 905f1981f4b6b08f231318338b5ed55dd26d74fa Mon Sep 17 00:00:00 2001 From: Logan Date: Mon, 22 Jul 2024 05:50:53 -0500 Subject: [PATCH] post redesign --- dist/index.html | 77 ++++++++++++++++++----------- src/index.js | 9 ---- src/main.css | 48 ++++++++++++++++--- src/main.rs | 125 +++++++++++++++++++++--------------------------- 4 files changed, 146 insertions(+), 113 deletions(-) diff --git a/dist/index.html b/dist/index.html index 1b271f6..7782063 100644 --- a/dist/index.html +++ b/dist/index.html @@ -18,12 +18,26 @@ body { line-height: 1.75em; } -main { +.container { + max-width: 1000px; +} + +.tile { border-radius: 15px; padding: 15px; background-color: #ffeedd; - margin: auto; - max-width: 1000px; + margin: 2px; + width: 100% +} + +.third { + flex: 30%; +} + +.half { + padding-left: 15px; + padding-right: 15px; + flex: 50%; } .bg { @@ -50,6 +64,17 @@ code { margin: auto; } +.text_center { + text-align: center; +} + +ul { + display: inline-block; + columns: 2; + -webkit-columns: 2; + -moz-columns: 2; +} + table { margin-left: auto; margin-right: auto; @@ -76,32 +101,30 @@ a:visited { text-decoration: none; } -h1:before { - content: ""; +a:before { + content: "["; + font-style: normal; + color: black; } -h2:before { - content: ""; +a:after { + content: "]"; + font-style: normal; + color: black; } -

logan's site

me

- I am a programming and philosophy enthusiast. Once upon a time i was a - competitive debater on a few local and state circuits. After over 10 - years of doing robotics I'm finally starting to get the hang of it. - Currently in the process of discovering my love for hypertext and the - world wide web! -

likes

writeups

programming

- I have been making things for much longer than i have bothered - to document (or finish) my work. I work on whatever happens to - catch my interest, using whatever tools and languages I fancy at - the time. Here are some of my favorite projects I've worked on: -

projectsummarydate
web serverhttps server implementation2024
html templaterinterpreter and inline templating language for html2024
fortesafety focused stack machine emulator and assembly language2024
nrangecartesian product for N vectors in O(N) time/space2023
fishbowlkinematic image processing on the web2022
stocksplay money stock trading algorithm2021
the cryptplatforming video game in Godot2020

sites i manage

server status

Hello from Arch Linux
Apache Web Server 2.4.61
CPU: 1.08% (15 minute average)
MEM: 8743/15907 MB
\ No newline at end of file + + +

logan's site

me

+ I am a programming and philosophy + enthusiast. Once upon a time i was a + competitive debater on a few local and + state circuits. After over 10 years of + doing robotics I'm finally starting to + get the hang of it. Currently in the + process of discovering my love for + hypertext and the world wide web! +

interests

programming

projectsummary
web serverhttps server implementation
html templaterinline html templating language
fortesafety focused stack machine and assembly language
nrangecartesian product for N vectors in O(N) time/space
fishbowlkinematic image processing on the web
stocksplay money stock trading algorithm
the cryptplatforming video game in Godot

blog

\ No newline at end of file diff --git a/src/index.js b/src/index.js index 78b3753..e69de29 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +0,0 @@ -let bg; -let ctd; -window.onload = function() { - bg = document.getElementById("bg"); - ctx = bg.getContext("2d"); - - ctx.fillStyle = "#141013"; - ctx.fillRect(0, 0, bg.width, bg.height); -} diff --git a/src/main.css b/src/main.css index 49aa74e..99cba4a 100644 --- a/src/main.css +++ b/src/main.css @@ -18,12 +18,26 @@ body { line-height: 1.75em; } -main { +.container { + max-width: 1000px; +} + +.tile { border-radius: 15px; padding: 15px; background-color: #ffeedd; - margin: auto; - max-width: 1000px; + margin: 2px; + width: 100% +} + +.third { + flex: 30%; +} + +.half { + padding-left: 15px; + padding-right: 15px; + flex: 50%; } .bg { @@ -50,6 +64,17 @@ code { margin: auto; } +.text_center { + text-align: center; +} + +ul { + display: inline-block; + columns: 2; + -webkit-columns: 2; + -moz-columns: 2; +} + table { margin-left: auto; margin-right: auto; @@ -76,11 +101,20 @@ a:visited { text-decoration: none; } -h1:before { - content: ""; +a:before { + content: "["; + font-style: normal; + color: black; } -h2:before { - content: ""; +a:after { + content: "]"; + font-style: normal; + color: black; } +h1,h2 { + text-align: center; +} + + diff --git a/src/main.rs b/src/main.rs index adf1757..9f40e23 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,7 +14,6 @@ fn head() -> Markup { title { "logan's site" }; // style { (include_str!("normalize.css")) } style { (PreEscaped(include_str!("main.css"))) } - script { (PreEscaped(include_str!("index.js"))) } } } } @@ -25,21 +24,18 @@ fn template(inner: Markup) -> Markup { html { (head()) - body { - main { - (inner) - } + body { + (inner) } } } } -fn project(name: &str, desc: &str, language: &str, link: &str) -> Markup { +fn prow(name: &str, desc: &str, date: &str, link: &str) -> Markup { html! { tr { - td { a href=(link) {(name)}} - td {(desc)} - td {(language)} + td { a href=(link) { (name) } } + td { (desc) } } } } @@ -52,69 +48,58 @@ fn index() -> Markup { let load_avg = System::load_average(); sys.refresh_all(); template(html! { - h1 {"logan's site"} - hr; - h2 {"me"} - p { - " - I am a programming and philosophy enthusiast. Once upon a time i was a - competitive debater on a few local and state circuits. After over 10 - years of doing robotics I'm finally starting to get the hang of it. - Currently in the process of discovering my love for hypertext and the - world wide web! - " - hr; - h2 {"likes"} - ul { - li {"music"} - li {"books"} - li {"websites"} - li {"you!"} + div .container .flex { + main .tile .big { + h1 {"logan's site"} + hr; + div .flex { + div .half { + h2 {"me"} + " + I am a programming and philosophy + enthusiast. Once upon a time i was a + competitive debater on a few local and + state circuits. After over 10 years of + doing robotics I'm finally starting to + get the hang of it. Currently in the + process of discovering my love for + hypertext and the world wide web! + " + } + div .half .text_center { + h2 {"interests"} + ul .twocol { + li { a { "books" } } + li { a { "music" } } + li { a { "software" } } + li { a { "websites" } } + } + } + + } + div .flex { + dif .half { + h2 {"programming"} + table { + tr { + th { "project" } + th { "summary" } + } + (prow("web server", "https server implementation", "2024", "")) + (prow("html templater", "inline html templating language", "2024", "")) + (prow("forte", "safety focused stack machine and assembly language", "2024", "")) + (prow("nrange", "cartesian product for N vectors in O(N) time/space", "2024", "")) + (prow("fishbowl", "kinematic image processing on the web", "2023", "")) + (prow("stocks", "play money stock trading algorithm", "2021", "")) + (prow("the crypt", "platforming video game in Godot", "2020", "")) + } + } + dif .half { + h2 {"blog"} + } + } } } - hr; - h2 {"writeups"} - ul { - li { "[dependency paranoia]" } - li { "[on build systems]" } - } - hr; - h2 {"programming"} - p { - " - I have been making things for much longer than i have bothered - to document (or finish) my work. I work on whatever happens to - catch my interest, using whatever tools and languages I fancy at - the time. Here are some of my favorite projects I've worked on: - " - } - table { - tr { - th {"project"} - th {"summary"} - th {"date"} - } - (project("web server", "https server implementation", "2024", "")) - (project("html templater", "interpreter and inline templating language for html", "2024", "")) - (project("forte", "safety focused stack machine emulator and assembly language", "2024", "")) - (project("nrange", "cartesian product for N vectors in O(N) time/space", "2023", "")) - (project("fishbowl", "kinematic image processing on the web", "2022", "")) - (project("stocks", "play money stock trading algorithm", "2021", "")) - (project("the crypt", "platforming video game in Godot", "2020", "")) - } - hr; - h2 {"sites i manage"} - ul { - li { a href="https://utsa-rowdysub.org" {"UTSA Advanced Robotics RoboSub team website (2024)"}} - } - hr; - h2 { "server status" } - table .monospace { - tr { td { (format!("Hello from {}", system_name)) } } - tr { td { "Apache Web Server 2.4.61" } } - tr { td { (format!("CPU: {}% (15 minute average)", load_avg.fifteen)) } } - tr { td { (format!("MEM: {}/{} MB", used_mem, total_mem)) } } - } }) }