From feafe5a94f2c604013a24743bca3aff1bf858c0b Mon Sep 17 00:00:00 2001 From: Ada Werefox Date: Wed, 1 May 2024 00:32:26 -0500 Subject: [PATCH] Updates to have things running on the latest Dioxus build, and with the correct parameters for each toml file (because they changed, again). --- Cargo.toml | 18 +++++++++--------- Dioxus.toml | 26 +++++++++++++------------- src/components/home_page.rs | 4 ++-- src/lib.rs | 4 ++-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index beea512..4cbbba6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,20 +7,20 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dioxus-autofmt = "0.5.0-alpha.0" +dioxus-autofmt = "0.5.1" console_error_panic_hook = "0.1.7" log = "0.4.17" manganis = "0.2.2" -serde = "1.0.197" +serde = "1.0.199" toml = "0.8.12" [dependencies.dioxus-router] -version = "0.5.0-alpha.0" -features = ["web"] +version = "0.5.0" +features = ["fullstack"] [dependencies.dioxus] -version = "0.5.0-alpha.0" -features = ["web", "fullstack"] +version = "0.5.1" +features = ["fullstack", "router"] [features] default = [] @@ -32,9 +32,9 @@ verison = "0.3.34" features = ["wasm-bindgen", "macros", "local-offset"] [dependencies.megalodon] -version = "0.13.2" +version = "0.13.4" optional = true [dependencies.tokio] -version = "1.36.0" -optional = true \ No newline at end of file +version = "1.37.0" +optional = true diff --git a/Dioxus.toml b/Dioxus.toml index 617860a..963fd14 100644 --- a/Dioxus.toml +++ b/Dioxus.toml @@ -24,25 +24,25 @@ title = "About A Werefox" reload_html = true # which files or dirs will be watcher monitoring -watch_path = ["src", "public", "tailwind.config.js", "Dioxus.toml", "Cargo.toml"] +watch_path = ["src", "public", "tailwind.config.js"] # implement redirect on 404 index_on_404 = true -# # include `assets` in web platform -# [web.resource] +# include `assets` in web platform +[web.resource] -# # CSS style file -# style = ["/styles/tailwind.min.css"] +# CSS style file +style = ["tailwind.css"] -# # Javascript code file -# script = [] +# Javascript code file +script = [] -# [web.resource.dev] +[web.resource.dev] -# # CSS style file -# style = ["/styles/tailwind.min.css"] +# CSS style file +style = ["tailwind.css"] -# # Javascript code file -# # serve: [dev-server] only -# script = [] +# Javascript code file +# serve: [dev-server] only +script = [] diff --git a/src/components/home_page.rs b/src/components/home_page.rs index d74fe09..e21ed7d 100644 --- a/src/components/home_page.rs +++ b/src/components/home_page.rs @@ -9,11 +9,11 @@ pub fn HomePage(page_title: String, card_title: String, children: Element) -> El head { title { "{page_title}" } link { rel: "icon", href: "/favicon.ico" } - link { rel: "me", href: "https://bark.lgbt/@alicew" } + link { rel: "me", href: "https://yiff.life/@werefox" } link { rel: "me", href: "https://dragon.style/@alice" } link { rel: "me", href: "https://mspsocial.net/@alice" } } - div { class: "container space-y-4 mx-auto px-4 py-4", + div { class: "container px-4 py-4 mx-auto space-y-4", TitleCard { card_title: card_title } {children}, FooterCard {} diff --git a/src/lib.rs b/src/lib.rs index fb072f4..4b6032c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -29,7 +29,7 @@ pub mod info_app { use crate::components::werefox_card::*; use crate::utils::prop_structs::*; - use dioxus_router::prelude::*; + // use dioxus_router::prelude::*; #[derive(Routable, PartialEq, Clone)] pub enum Route { @@ -401,7 +401,7 @@ pub mod info_app { async fn get_account_avatars() -> Result, ServerFnError> { let client = megalodon::generator( megalodon::SNS::Mastodon, - String::from("https://bark.lgbt"), + String::from("https://yiff.life"), Some(tokio::fs::read_to_string("access_token.key").await?), None, );