Updated packages + Resume

+ Clippy + fmt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsite"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Joey Hines <joey@ahines.net>"]
 edition = "2021"
 
@@ -14,13 +14,14 @@ tokio = { version = "1", features = ["full"] }
 axum = "0.6.1"
 tera = "1.17.1"
 tower = { version = "0.4", features = ["util", "timeout", "load-shed", "limit"] }
-tower-http = { version = "0.3.0", features = [
+tower-http = { version = "0.4.4", features = [
     "add-extension",
     "compression-full",
     "limit",
     "trace",
+    "fs"
 ] }
 tower-layer = "0.3.2"
-axum-extra = { version = "0.4.2", features = ["spa"]}
+axum-extra = "0.8.0"
 structopt = "0.3.26"
-pulldown-cmark = "0.9.2"
+pulldown-cmark = "0.9.3"

README.md

@@ -1,6 +1,6 @@
 # My Website
 
-A simplistic website written in Rust built using [Rocket](https://rocket.rs/) and [Tera](https://tera.netlify.com/)
+A simplistic website written in Rust built using [Tower](https://github.com/tower-rs/tower) and [Tera](https://tera.netlify.com/)
 templates.
 
 View the website at www.ahines.net 

src/main.rs

@@ -7,7 +7,6 @@ use axum::http::StatusCode;
 use axum::response::{Html, IntoResponse};
 use axum::routing::get;
 use axum::{BoxError, Router};
-use axum_extra::routing::SpaRouter;
 use error::{JSiteError, PageResult};
 use pulldown_cmark::html::push_html;
 use pulldown_cmark::{Options, Parser};
@@ -20,7 +19,7 @@ use std::time::Duration;
 use structopt::StructOpt;
 use tera::{Context, Tera};
 use tower::ServiceBuilder;
-use tower_http::trace::TraceLayer;
+use tower_http::services::ServeDir;
 
 use crate::config::SiteArgs;
 
@@ -241,15 +240,14 @@ async fn main() {
     let app = Router::new()
         .route("/", get(index))
         .route("/about/*path", get(md_page))
-        .merge(SpaRouter::new("/static", "static"))
+        .nest_service("/static", ServeDir::new("static"))
         .layer(
             ServiceBuilder::new()
                 // Handle errors from middleware
                 .layer(HandleErrorLayer::new(handle_error))
                 .load_shed()
                 .concurrency_limit(1024)
-                .timeout(Duration::from_secs(10))
-                .layer(TraceLayer::new_for_http()),
+                .timeout(Duration::from_secs(10)),
         )
         .with_state(tera);
 

static/raw_md/1resume.md

@@ -1,4 +1,4 @@
-# Joey Hines - joey@ahines.net - Westminster, CO
+# Joey Hines - joey@ahines.net - Lafayette, CO
 
 ## Education
 * Masters of Science in Electrical and Computer Engineering
@@ -12,11 +12,12 @@
 * Version Control: Git, SVN
 
 ## Work Experience
-Blue Canyon Technologies - Flight Software Engineer - May 2021 to Present
+Loft Orbital Federal - Mission Specific Software Engineer - October 2023 - Now
+
+Blue Canyon Technologies - Flight Software Engineer - May 2021 to September 2023
 * Developed flight software for multiple small satellite missions across the BCT product line range
-* Collaborated with mission operations to improve ground station capabilities
-* Improved test infrastructure and scripting
-* Supported the summer internship program as a mentor
+* Supported AI&T diagnosing and resolving issues
+* Improved the common FSW product and testing infrastructure 
 
 Auburn University - Graduate Research and Teaching Assistant - August 2019 to May 2021
 * Command and Data Handling (CDHS) team lead for a cube satellite project

templates/index.html.tera

@@ -6,7 +6,7 @@
 
 {% block content %}
     <br/>
-    > Embedded Software Engineer at <a class="link" href="https://www.bluecanyontech.com/">Blue Canyon Technologies</a><br/>
+    > Mission Specific Software Engineer at <a class="link" href="https://www.loftorbital.com/">Loft Orbital</a> <br/>
     > Masters of Electrical and Computer Engineering from Auburn University <br/>
     > Bachelors of Computer Engineering from The University of Texas at Dallas <br/>
     > Maker of Basic Websites <br/>