feat(blogs): Started on blogs page and reading blogs
This commit is contained in:
parent
ff6b56d8c6
commit
0ec9ee66f2
3
Cargo.lock
generated
3
Cargo.lock
generated
@ -3178,10 +3178,11 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "personal_site"
|
name = "personal_site"
|
||||||
version = "1.5.0"
|
version = "1.6.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dioxus",
|
"dioxus",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "personal_site"
|
name = "personal_site"
|
||||||
version = "1.5.0"
|
version = "1.6.0"
|
||||||
authors = ["darkicewolf50 <brock.tomlinson@ucalgary.ca>"]
|
authors = ["darkicewolf50 <brock.tomlinson@ucalgary.ca>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
@ -9,6 +9,7 @@ edition = "2021"
|
|||||||
dioxus = { version = "0.6.0", features = ["router"] }
|
dioxus = { version = "0.6.0", features = ["router"] }
|
||||||
reqwest = { version = "0.12.15", features = ["json"] }
|
reqwest = { version = "0.12.15", features = ["json"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["web"]
|
default = ["web"]
|
||||||
|
@ -28,10 +28,10 @@ pub enum Route {
|
|||||||
Home {},
|
Home {},
|
||||||
// The route attribute can include dynamic parameters that implement [`std::str::FromStr`] and [`std::fmt::Display`] with the `:` syntax.
|
// The route attribute can include dynamic parameters that implement [`std::str::FromStr`] and [`std::fmt::Display`] with the `:` syntax.
|
||||||
// In this case, id will match any integer like `/blog/123` or `/blog/-456`.
|
// In this case, id will match any integer like `/blog/123` or `/blog/-456`.
|
||||||
#[route("/blogs/:id")]
|
#[route("/blogs/:page_num")]
|
||||||
// Fields of the route variant will be passed to the component as props. In this case, the blog component must accept
|
// Fields of the route variant will be passed to the component as props. In this case, the blog component must accept
|
||||||
// an `id` prop of type `i32`.
|
// an `id` prop of type `i32`.
|
||||||
Blogs { id: i32 },
|
Blogs { page_num: u32 },
|
||||||
|
|
||||||
#[route("/blogs/:blog_title")]
|
#[route("/blogs/:blog_title")]
|
||||||
Blog {blog_title: String},
|
Blog {blog_title: String},
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
|
use std::thread::Scope;
|
||||||
|
|
||||||
use crate::Route;
|
use crate::Route;
|
||||||
use dioxus::{logger::tracing, prelude::*};
|
use dioxus::{html::script::r#async, logger::tracing, prelude::*};
|
||||||
use reqwest;
|
use reqwest;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
const BLOG_CSS: Asset = asset!("/assets/styling/blog.css");
|
const BLOG_CSS: Asset = asset!("/assets/styling/blog.css");
|
||||||
|
|
||||||
@ -40,8 +43,7 @@ pub fn Blog(blog_title: String) -> Element {
|
|||||||
// "Previous"
|
// "Previous"
|
||||||
// }
|
// }
|
||||||
// span { " <---> " }
|
// span { " <---> " }
|
||||||
// Link { to: Route::Blog { id: id + 1 }, "Next" }
|
Link { to: Route::Blogs { page_num: 0 }, "Go Back" }
|
||||||
Link { to: Route::Blogs { id: 0 }, "Go Back" }
|
|
||||||
div { dangerous_inner_html: blog_content }
|
div { dangerous_inner_html: blog_content }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -58,21 +60,92 @@ async fn get_blog(blog_name: String) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn Blogs(id: i32) -> Element {
|
pub fn Blogs(page_num: u32) -> Element {
|
||||||
|
let mut _num_limit: Signal<u8> = use_signal(|| 10);
|
||||||
|
|
||||||
|
let blogs_resource: Resource<Vec<BlogPreview>> =
|
||||||
|
use_resource(move || async move { get_blogs_preview(_num_limit(), page_num).await });
|
||||||
|
|
||||||
rsx! {
|
rsx! {
|
||||||
document::Link { rel: "stylesheet", href: BLOG_CSS }
|
document::Link { rel: "stylesheet", href: BLOG_CSS }
|
||||||
div { id: "blogs",
|
div { id: "blogs",
|
||||||
h1 { "Page Under Development" }
|
title { "Blogs" }
|
||||||
p { "Please Try Again Later" }
|
h1 { "Blogs" }
|
||||||
|
p {
|
||||||
|
"This is a collection of blog posts, ranging from tutorials, technologies I found interesting, and opinion pieces"
|
||||||
|
}
|
||||||
Link { to: Route::Home {},
|
Link { to: Route::Home {},
|
||||||
button { "Home" }
|
button { "Home" }
|
||||||
}
|
}
|
||||||
// Link {
|
// Link {
|
||||||
// to: Route::Blog {
|
// to: Route::Blog {
|
||||||
// blog_title: "Test_Blog".to_string(),
|
// blog_title: "Test_Blog".to_string(),
|
||||||
// },
|
// },
|
||||||
// button { "To Test Blog" }
|
// button { "To Test Blog" }
|
||||||
// }
|
// }
|
||||||
|
div {
|
||||||
|
if let Some(blogs) = &*blogs_resource.read() {
|
||||||
|
for blog in blogs.iter() {
|
||||||
|
|
||||||
|
Link {
|
||||||
|
to: Route::Blog {
|
||||||
|
blog_title: blog.blog_file_name.clone(),
|
||||||
|
},
|
||||||
|
div { dangerous_inner_html: blog.html_preview.as_str() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
div { "Loading blogs..." }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
div {
|
||||||
|
Link {
|
||||||
|
to: Route::Blogs {
|
||||||
|
page_num: page_num + 1,
|
||||||
|
},
|
||||||
|
"Next"
|
||||||
|
}
|
||||||
|
if page_num > 0 {
|
||||||
|
Link {
|
||||||
|
to: Route::Blogs {
|
||||||
|
page_num: page_num - 1,
|
||||||
|
},
|
||||||
|
"Go Back"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Serialize, Debug)]
|
||||||
|
struct BlogPreview {
|
||||||
|
pub blog_file_name: String,
|
||||||
|
pub date_last_edit: String,
|
||||||
|
pub html_preview: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_blogs_preview(_num_limit: u8, page_num: u32) -> Vec<BlogPreview> {
|
||||||
|
let res = reqwest::get(format!(
|
||||||
|
"http://localhost:8000/blogs/{}/{}",
|
||||||
|
_num_limit, page_num
|
||||||
|
))
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.text()
|
||||||
|
.await
|
||||||
|
.unwrap_or("".to_string());
|
||||||
|
|
||||||
|
let json: serde_json::Value = serde_json::from_str(&res).unwrap();
|
||||||
|
|
||||||
|
// Extract the "Blogs" array and deserialize it into Vec<BlogPreview>
|
||||||
|
let blogs: Vec<BlogPreview> = serde_json::from_value(
|
||||||
|
json.get("Blogs")
|
||||||
|
.cloned()
|
||||||
|
.unwrap_or(serde_json::Value::Null),
|
||||||
|
)
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
// tracing::info!("{:?}", blogs);
|
||||||
|
blogs
|
||||||
|
}
|
||||||
|
@ -76,7 +76,7 @@ pub fn Home() -> Element {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Contact {}
|
Contact {}
|
||||||
Projects { display_title: false }
|
Projects { independent_page: false }
|
||||||
div { id: "experience",
|
div { id: "experience",
|
||||||
h2 { "Experience" }
|
h2 { "Experience" }
|
||||||
div {
|
div {
|
||||||
|
@ -19,7 +19,7 @@ pub fn Navbar() -> Element {
|
|||||||
div { id: "navbar",
|
div { id: "navbar",
|
||||||
Link { to: Route::Home {}, "Home" }
|
Link { to: Route::Home {}, "Home" }
|
||||||
Link { to: Route::Projects {}, "Projects" }
|
Link { to: Route::Projects {}, "Projects" }
|
||||||
Link { to: Route::Blogs { id: 0 }, "Blogs" }
|
Link { to: Route::Blogs { page_num: 0 }, "Blogs" }
|
||||||
Link { to: Route::ContactMe {}, "Contact" }
|
Link { to: Route::ContactMe {}, "Contact" }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,9 +2,9 @@ use crate::helper_fun::get_tech_logos_from_str;
|
|||||||
use dioxus::prelude::*;
|
use dioxus::prelude::*;
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn Projects(#[props(default = true)] display_title: bool) -> Element {
|
pub fn Projects(#[props(default = true)] independent_page: bool) -> Element {
|
||||||
rsx! {
|
rsx! {
|
||||||
if display_title {
|
if independent_page {
|
||||||
title { "Brock Tomlinson - Projects" }
|
title { "Brock Tomlinson - Projects" }
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user