Pre site redesign

Cargo.lock

@@ -2,12 +2,61 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
 [[package]]
 name = "maud"
 version = "0.26.0"
@@ -35,8 +84,24 @@ name = "me"
 version = "0.1.0"
 dependencies = [
  "maud",
+ "sysinfo",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -78,6 +143,26 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.71"
@@ -89,6 +174,21 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.30.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
+dependencies = [
+ "cfg-if",
+ "core-foundation-sys",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "rayon",
+ "windows",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -100,3 +200,108 @@ name = "version_check"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+dependencies = [
+ "windows-core",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

Cargo.toml

@@ -5,3 +5,4 @@ edition = "2021"
 
 [dependencies]
 maud = "0.26"
+sysinfo = "0.30"

dist/index.html

@@ -3,10 +3,16 @@
   src: url(/res/merriweather-regular.ttf);
 }
 
+@font-face {
+  font-family: 'cascadia';
+  src: url(/res/cascadiacode.woff2);
+}
+
 
 body {
   font-family: merriweather;
-  background-color: #141013;
+  background-image: url("/res/grey.png");
+  background-repeat: repeat;
   height: 100%;
   padding: 5px;
   line-height: 1.75em;
@@ -17,7 +23,7 @@ main {
   padding: 15px;
   background-color: #ffeedd;
   margin: auto;
-  max-width: 750px;
+  max-width: 1000px;
 }
 
 .bg {
@@ -30,6 +36,20 @@ main {
   z-index: -9999;
 }
 
+code {
+  font-family: cascadia;
+}
+
+.monospace {
+  font-family: cascadia;
+  align-content: center;
+}
+
+.flex {
+  display: flex;
+  margin: auto;
+}
+
 table {
   margin-left: auto;
   margin-right: auto;
@@ -57,11 +77,11 @@ a:visited {
 }
 
 h1:before {
-  content: "> ";
+  content: "";
 }
 
 h2:before {
-  content: "=> ";
+  content: "";
 }
 
 </style><script>let bg;
@@ -79,9 +99,9 @@ window.onload = function() {
         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>my interests</h2><ul><li>music</li><li>books</li><li>websites</li><li>you!</li></ul></p><hr><h2>writeups</h2><ul><li>dependency paranoia</li><li>on build systems</li></ul><hr><h2>programming</h2><p>
+      <hr><h2>likes</h2><ul><li>music</li><li>books</li><li>websites</li><li>you!</li></ul></p><hr><h2>writeups</h2><ul><li>[dependency paranoia]</li><li>[on build systems]</li></ul><hr><h2>programming</h2><p>
-      i have been making things for much longer than i have bothered 
+      I have been making things for much longer than i have bothered 
-      to document (or finish) my work. i work on whatever happens to
+      to document (or finish) my work. I work on whatever happens to
-      catch my interest, using whatever tools and languages i fancy at
+      catch my interest, using whatever tools and languages I fancy at
-      the time. here are some of my favorite projects i've worked on:
+      the time. Here are some of my favorite projects I've worked on:
-      </p><table><tr><th>project</th><th>summary</th><th>date</th></tr><tr><td><a href="">web server</a></td><td>https server implementation</td><td>2024</td></tr><tr><td><a href="">html templater</a></td><td>interpreter and inline templating language for html</td><td>2024</td></tr><tr><td><a href="">forte</a></td><td>safety focused stack machine emulator and assembly language</td><td>2024</td></tr><tr><td><a href="">nrange</a></td><td>cartesian product for N vectors in O(N) time/space</td><td>2023</td></tr><tr><td><a href="">fishbowl</a></td><td>kinematic image processing on the web</td><td>2022</td></tr><tr><td><a href="">stocks</a></td><td>play money stock trading algorithm</td><td>2021</td></tr><tr><td><a href="">the crypt</a></td><td>platforming video game in Godot</td><td>2020</td></tr></table><hr><h2>sites i manage</h2><ul><li><a href="https://utsa-rowdysub.org">UTSA Advanced Robotics RoboSub team website (2024)</a></li></ul></main></body><canvas class="bg" id="bg"></html>
+      </p><table><tr><th>project</th><th>summary</th><th>date</th></tr><tr><td><a href="">web server</a></td><td>https server implementation</td><td>2024</td></tr><tr><td><a href="">html templater</a></td><td>interpreter and inline templating language for html</td><td>2024</td></tr><tr><td><a href="">forte</a></td><td>safety focused stack machine emulator and assembly language</td><td>2024</td></tr><tr><td><a href="">nrange</a></td><td>cartesian product for N vectors in O(N) time/space</td><td>2023</td></tr><tr><td><a href="">fishbowl</a></td><td>kinematic image processing on the web</td><td>2022</td></tr><tr><td><a href="">stocks</a></td><td>play money stock trading algorithm</td><td>2021</td></tr><tr><td><a href="">the crypt</a></td><td>platforming video game in Godot</td><td>2020</td></tr></table><hr><h2>sites i manage</h2><ul><li><a href="https://utsa-rowdysub.org">UTSA Advanced Robotics RoboSub team website (2024)</a></li></ul><hr><h2>server status</h2><table class="monospace"><tr><td>Hello from Arch Linux</td></tr><tr><td>Apache Web Server 2.4.61</td></tr><tr><td>CPU: 1.08% (15 minute average)</td></tr><tr><td>MEM: 8743/15907 MB</td></tr></table></main></body></html>

src/main.css

@@ -3,10 +3,16 @@
   src: url(/res/merriweather-regular.ttf);
 }
 
+@font-face {
+  font-family: 'cascadia';
+  src: url(/res/cascadiacode.woff2);
+}
+
 
 body {
   font-family: merriweather;
-  background-color: #141013;
+  background-image: url("/res/grey.png");
+  background-repeat: repeat;
   height: 100%;
   padding: 5px;
   line-height: 1.75em;
@@ -17,7 +23,7 @@ main {
   padding: 15px;
   background-color: #ffeedd;
   margin: auto;
-  max-width: 750px;
+  max-width: 1000px;
 }
 
 .bg {
@@ -30,6 +36,20 @@ main {
   z-index: -9999;
 }
 
+code {
+  font-family: cascadia;
+}
+
+.monospace {
+  font-family: cascadia;
+  align-content: center;
+}
+
+.flex {
+  display: flex;
+  margin: auto;
+}
+
 table {
   margin-left: auto;
   margin-right: auto;
@@ -57,10 +77,10 @@ a:visited {
 }
 
 h1:before {
-  content: "> ";
+  content: "";
 }
 
 h2:before {
-  content: "=> ";
+  content: "";
 }
 

src/main.rs

@@ -1,6 +1,9 @@
 use maud::*;
 use std::fs::File;
 use std::io::prelude::*;
+use sysinfo::*;
+
+const MB: u64 = 1048576;
 
 fn head() -> Markup {
   html! {
@@ -27,7 +30,6 @@ fn template(inner: Markup) -> Markup {
           (inner)
         }
       }
-      canvas .bg #bg;
     }
   }
 }
@@ -43,6 +45,12 @@ fn project(name: &str, desc: &str, language: &str, link: &str) -> Markup {
 }
 
 fn index() -> Markup {
+  let mut sys = System::new_all();
+  let system_name = System::name().unwrap();
+  let used_mem = sys.used_memory() / MB;
+  let total_mem = sys.total_memory() / MB;
+  let load_avg = System::load_average();
+  sys.refresh_all();
   template(html! {
     h1 {"logan's site"}
     hr;
@@ -56,7 +64,7 @@ fn index() -> Markup {
         world wide web!
       " 
       hr;
-      h2 {"my interests"}
+      h2 {"likes"}
       ul {
         li {"music"}
         li {"books"}
@@ -67,17 +75,17 @@ fn index() -> Markup {
     hr;
     h2 {"writeups"}
     ul {
-      li { "dependency paranoia" }
+      li { "[dependency paranoia]" }
-      li { "on build systems" }
+      li { "[on build systems]" }
     }
     hr;
     h2 {"programming"}
     p {
       "
-      i have been making things for much longer than i have bothered 
+      I have been making things for much longer than i have bothered 
-      to document (or finish) my work. i work on whatever happens to
+      to document (or finish) my work. I work on whatever happens to
-      catch my interest, using whatever tools and languages i fancy at
+      catch my interest, using whatever tools and languages I fancy at
-      the time. here are some of my favorite projects i've worked on:
+      the time. Here are some of my favorite projects I've worked on:
       "
     }
     table {
@@ -99,6 +107,14 @@ fn index() -> Markup {
     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)) } }
+    }
   })
 }