Upgraded to dx 0.6

Author: baxterjo

Cargo.lock

@@ -16,7 +16,7 @@ thiserror = "1.0.56"
 anyhow = "1.0.79"
 urlencoding = "2.1.3"
 include_dir = "0.7.3"
-pulldown-cmark = "0.9.3"
+pulldown-cmark = "0.13.0"
 web-sys = { version = "0.3.66", features = ["Window", "Document"] }
 
 [dev-dependencies]

Cargo.toml

@@ -27,19 +27,7 @@ watch_path = ["src", "public", "site_content"]
 # Include style or script assets
 [web.resource]
 
-# CSS style file
-style = [
-  "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css",
-  "https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/fontawesome.min.css",
-  "https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700",
-  "/assets/css/font-awesome/css/font-awesome.min.css",
-  "/assets/css/style.css",
-]
-
-# Javascript code file
-script = [
-  "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js",
-]
+# style = ["assets/css/font-awesome/css/font-awesome.min.css"]
 
 [web.resource.dev]
 

Dioxus.toml

@@ -9,6 +9,11 @@ pub fn app() -> Element {
     info!("Initialized site with content: {site_content:#?}");
     use_context_provider(|| Signal::new(site_content));
     rsx! {
+        document::Script { src: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" }
+        document::Stylesheet { href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" }
+        document::Stylesheet { href: "https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700" }
+        document::Stylesheet { href: asset!("public/css/style.css") }
+        document::Stylesheet { href: asset!("public/css/font-awesome/css/font-awesome.min.css") }
         Router::<Route> {}
     }
 }

src/app.rs

@@ -96,7 +96,7 @@ pub fn Gallery(max_cards: Option<usize>, gallery_type: GalleryType, show_title:
                 div { class: "row",
                     div { class: "card-group justify-content-left", {cards_rendered} }
                 }
-
+            
 
             }
         }

src/components/gallery.rs

@@ -12,7 +12,7 @@ pub fn Layout() -> Element {
     let route_split: Vec<&str> = route_str.split("/").collect();
     debug!("Got string split: {route_split:?}");
 
-    let title = if route_split[1] == "" {
+    let title = if route_split[1].is_empty() {
         "Jordan Baxter".to_string()
     } else {
         format!("Jordan Baxter - {}", capitalize(route_split[1]))

src/components/layout.rs

@@ -22,7 +22,6 @@ pub fn NavBar() -> Element {
                         span { class: "navbar-toggler-icon" }
                     }
                     Link { class: "navbar-brand ms-2", to: Route::Home {}, "JORDAN BAXTER" }
-                
                 }
                 div { class: "navbar-collapse collapse",
                     ul { class: "navbar-nav ms-auto",
@@ -46,7 +45,6 @@ pub fn NavBar() -> Element {
             }
 
 
-
         }
     }
 }

src/components/nav_bar.rs

@@ -1,7 +1,7 @@
 #![allow(non_snake_case)]
 
 use dioxus::prelude::*;
-use pulldown_cmark::Parser;
+use pulldown_cmark::{Options, Parser};
 
 #[derive(Props, Clone, PartialEq)]
 pub struct MarkdownProps {
@@ -16,7 +16,7 @@ pub struct MarkdownProps {
 /// Render some text as markdown.
 pub fn Markdown(props: MarkdownProps) -> Element {
     let content = &*props.content.read();
-    let parser = Parser::new(content);
+    let parser = Parser::new_ext(content, Options::ENABLE_TABLES);
 
     let mut html_buf = String::new();
     pulldown_cmark::html::push_html(&mut html_buf, parser);

src/markdown.rs

@@ -17,7 +17,7 @@ pub fn About() -> Element {
                         class: "img-fluid",
                         src: "/assets/img/about/headshot_cropped.jpg",
                     }
-
+                
                 }
             }
             div { class: "row justify-content-center my-3",
@@ -26,7 +26,7 @@ pub fn About() -> Element {
                         class: "content centered img-lg container",
                         content: "{ABOUT_MD}",
                     }
-
+                
                 }
             }
         }
@@ -42,7 +42,7 @@ fn AboutHeaderWrap() -> Element {
                     div { class: "col-lg-6",
                         h4 { "SO YOU'RE CURIOUS" }
                         h1 { "ABOUT ME" }
-
+                    
                     }
                 }
             }

src/pages/about.rs

@@ -20,9 +20,7 @@ pub fn Contact() -> Element {
                         margin_width: "0",
                         "Loading…"
                     }
-                
                 }
-            
             }
         }
     }
@@ -37,7 +35,6 @@ fn ContactHeaderWrap() -> Element {
                     div { class: "col-lg-6",
                         h4 { "INTERESTED IN WORKING WITH ME?" }
                         h1 { "LET'S GET IN TOUCH" }
-                    
                     }
                 }
             }