From f35a8d25921b695a446cf28f824337ae35e791c8 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 29 Mar 2024 09:51:52 -0400 Subject: [PATCH] Another run. --- src/frontend/components/nav.rs | 1 + src/frontend/pages/article/actions.rs | 2 ++ src/frontend/pages/article/create.rs | 5 ++++- src/frontend/pages/article/edit.rs | 3 +++ src/frontend/pages/article/list.rs | 4 ++-- src/frontend/pages/article/read.rs | 1 + src/frontend/pages/conflicts.rs | 4 ++-- src/frontend/pages/search.rs | 9 +++++---- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/frontend/components/nav.rs b/src/frontend/components/nav.rs index 248717f..06a91e5 100644 --- a/src/frontend/components/nav.rs +++ b/src/frontend/components/nav.rs @@ -55,6 +55,7 @@ pub fn Nav() -> impl IntoView { set_search_query.update(|v| *v = val); } /> + diff --git a/src/frontend/pages/article/actions.rs b/src/frontend/pages/article/actions.rs index 3a3e060..50636f5 100644 --- a/src/frontend/pages/article/actions.rs +++ b/src/frontend/pages/article/actions.rs @@ -95,12 +95,14 @@ pub fn ArticleActions() -> impl IntoView { set_new_title.update(|v| *v = val); } /> +

diff --git a/src/frontend/pages/article/create.rs b/src/frontend/pages/article/create.rs index ade7a81..201fb05 100644 --- a/src/frontend/pages/article/create.rs +++ b/src/frontend/pages/article/create.rs @@ -63,7 +63,8 @@ pub fn CreateArticle() -> impl IntoView { let val = event_target_value(&ev); set_text.update(|p| *p = val); } - > + > +

Markdown @@ -86,6 +87,7 @@ pub fn CreateArticle() -> impl IntoView { set_summary.update(|p| *p = val); } /> +
@@ -172,6 +174,7 @@ pub fn EditArticle() -> impl IntoView { } } > + Edit successful! } diff --git a/src/frontend/pages/article/list.rs b/src/frontend/pages/article/list.rs index 729e325..6c0d036 100644 --- a/src/frontend/pages/article/list.rs +++ b/src/frontend/pages/article/list.rs @@ -38,8 +38,7 @@ pub fn ListArticles() -> impl IntoView { articles .get() .map(|a| { - a - .into_iter() + a.into_iter() .map(|a| { view! {
  • @@ -50,6 +49,7 @@ pub fn ListArticles() -> impl IntoView { .collect::>() }) }} + } diff --git a/src/frontend/pages/article/read.rs b/src/frontend/pages/article/read.rs index 6f6caef..d161a7b 100644 --- a/src/frontend/pages/article/read.rs +++ b/src/frontend/pages/article/read.rs @@ -15,6 +15,7 @@ pub fn ReadArticle() -> impl IntoView { + { let parser = markdown_parser(); move || { diff --git a/src/frontend/pages/conflicts.rs b/src/frontend/pages/conflicts.rs index 203bf18..7412b1b 100644 --- a/src/frontend/pages/conflicts.rs +++ b/src/frontend/pages/conflicts.rs @@ -16,8 +16,7 @@ pub fn Conflicts() -> impl IntoView { conflicts .get() .map(|c| { - c - .into_iter() + c.into_iter() .map(|c| { let link = format!("{}/edit/{}", article_link(&c.article), c.id); view! { @@ -29,6 +28,7 @@ pub fn Conflicts() -> impl IntoView { .collect::>() }) }} + } diff --git a/src/frontend/pages/search.rs b/src/frontend/pages/search.rs index 079cced..eccdf2a 100644 --- a/src/frontend/pages/search.rs +++ b/src/frontend/pages/search.rs @@ -78,10 +78,11 @@ pub fn Search() -> impl IntoView { } } > +
      - {// render resolved instance - if let Some(instance) = &search_results.instance { + // render resolved instance + {if let Some(instance) = &search_results.instance { let domain = &instance.domain; vec![ view! { @@ -93,8 +94,8 @@ pub fn Search() -> impl IntoView { } else { vec![] }} - {// render articles from resolve/search - search_results + // render articles from resolve/search + {search_results .articles .iter() .map(|a| {