From 3e1d2a1d4a2b3cb2cf25b20bcb454166e87cb26b Mon Sep 17 00:00:00 2001
From: Felix Ableitner
Date: Wed, 2 Oct 2024 14:35:32 +0200
Subject: [PATCH] fmt
---
src/frontend/app.rs | 50 +++---
src/frontend/components/article_nav.rs | 112 +++++++-------
src/frontend/components/credentials.rs | 106 ++++++-------
.../components/instance_follow_button.rs | 14 +-
src/frontend/components/nav.rs | 136 ++++++++---------
src/frontend/pages/article/actions.rs | 128 ++++++++--------
src/frontend/pages/article/create.rs | 113 +++++++-------
src/frontend/pages/article/edit.rs | 142 +++++++++---------
src/frontend/pages/article/history.rs | 82 +++++-----
src/frontend/pages/article/list.rs | 60 ++++----
src/frontend/pages/article/read.rs | 40 ++---
src/frontend/pages/conflicts.rs | 48 +++---
src/frontend/pages/diff.rs | 60 ++++----
src/frontend/pages/instance_details.rs | 54 ++++---
src/frontend/pages/login.rs | 30 ++--
src/frontend/pages/register.rs | 30 ++--
src/frontend/pages/search.rs | 119 ++++++++-------
src/frontend/pages/user_profile.rs | 36 ++---
src/main.rs | 2 +-
19 files changed, 689 insertions(+), 673 deletions(-)
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index 0df1bfb..35f18ff 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -90,30 +90,30 @@ pub fn App() -> impl IntoView {
provide_context(create_rw_signal(global_state));
view! {
- <>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- >
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
}
}
diff --git a/src/frontend/components/article_nav.rs b/src/frontend/components/article_nav.rs
index 4afdbee..5b24ec2 100644
--- a/src/frontend/components/article_nav.rs
+++ b/src/frontend/components/article_nav.rs
@@ -12,61 +12,65 @@ use leptos_router::*;
#[component]
pub fn ArticleNav(article: Resource
}
- })
- };
- view! {
- {error_view}
- No results found
- }
+ "Search results for " {query}
+
+ {move || {
+ search_results
+ .get()
+ .map(move |search_results| {
+ let is_empty = search_results.is_empty();
+ view! {
+ {err} }
+ })
+ };
+ view! {
+ {error_view}
+ No results found
+ }
+ }
+ >
+
+
+
+ // render resolved instance
+ {if let Some(instance) = &search_results.instance {
+ let domain = &instance.domain;
+ vec![
+ view! {
+ -
+ {domain}
+
+ },
+ ]
+ } else {
+ vec![]
+ }} // render articles from resolve/search
+ {search_results
+ .articles
+ .iter()
+ .map(|a| {
+ view! {
+ -
+ {article_title(a)}
+
+ }
+ })
+ .collect::>()}
+
+
+
}
- >
+ })
+ }}
-
-
- // render resolved instance
- {if let Some(instance) = &search_results.instance {
- let domain = &instance.domain;
- vec![
- view! {
- -
- {domain}
-
- },
- ]
- } else {
- vec![]
- }}
- // render articles from resolve/search
- {search_results
- .articles
- .iter()
- .map(|a| {
- view! {
- -
- {article_title(a)}
-
- }
- })
- .collect::>()}
-
-
-
- }
- })
- }}
-
-
+
}
}
diff --git a/src/frontend/pages/user_profile.rs b/src/frontend/pages/user_profile.rs
index ca7a36e..660e6be 100644
--- a/src/frontend/pages/user_profile.rs
+++ b/src/frontend/pages/user_profile.rs
@@ -22,28 +22,28 @@ pub fn UserProfile() -> impl IntoView {
});
view! {
- {move || {
- error
- .get()
- .map(|err| {
- view! { {err}
}
- })
- }}
-
-
{move || {
- user_profile
+ error
.get()
- .map(|person: DbPerson| {
- view! {
- {user_title(&person)}
- TODO: create actual user profile
- }
+ .map(|err| {
+ view! { {err}
}
})
}}
-
+
+ {move || {
+ user_profile
+ .get()
+ .map(|person: DbPerson| {
+ view! {
+ {user_title(&person)}
+ TODO: create actual user profile
+ }
+ })
+ }}
+
+
}
}
diff --git a/src/main.rs b/src/main.rs
index b4a3743..15d0362 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,6 +28,6 @@ fn main() {
_ = console_log::init_with_level(log::Level::Debug);
console_error_panic_hook::set_once();
mount_to_body(|| {
- view! { }
+ view! { }
});
}