nutomic/ibis
1
0
Fork 0
mirror of https://github.com/Nutomic/ibis.git synced 2024-11-22 07:31:09 +00:00
Code Projects Releases Packages Activity

Upgrade deps (#60)

Browse source 
* Upgrade dependencies

* fix tests

* ci config
This commit is contained in:
Nutomic 2024-10-02 14:47:44 +02:00 committed by GitHub
parent 706713be9d
commit fdda0f584a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 1689 additions and 1330 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.woodpecker.yml
View file

@ -1,5 +1,5 @@
variables:
- &rust_image "rust:1.75"
- &rust_image "rust:1.81"
- &install_binstall "wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz && tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz && cp cargo-binstall /usr/local/cargo/bin"
steps:
@ -11,6 +11,8 @@ steps:
commands:
- rustup component add rustfmt
- cargo +nightly fmt -- --check
when:
- event: pull_request
leptos_fmt:
image: *rust_image

1537
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

67
Cargo.toml
View file

@ -26,60 +26,61 @@ dbg_macro = "deny"
unwrap_used = "deny"
[dependencies]
activitypub_federation = { version = "0.5.2", features = [
activitypub_federation = { version = "0.6.0-alpha2", features = [
"axum",
"diesel",
], default-features = false, optional = true }
anyhow = "1.0.75"
async-trait = "0.1.74"
axum = { version = "0.6.20", optional = true }
axum-macros = { version = "0.3.8", optional = true }
axum-extra = { version = "0.7.7", features = ["cookie"], optional = true }
leptos = "0.5.4"
leptos_meta = "0.5.4"
leptos_router = "0.5.4"
leptos_axum = { version = "0.5.4", optional = true }
bcrypt = "0.15.0"
chrono = { version = "0.4.31", features = ["serde"] }
diesel = { version = "2.1.4", features = [
anyhow = "1.0.89"
async-trait = "0.1.83"
axum = { version = "0.7.7", optional = true }
axum-macros = { version = "0.4.2", optional = true }
axum-extra = { version = "0.9.4", features = ["cookie"], optional = true }
leptos = "0.6.15"
leptos_meta = "0.6.15"
leptos_router = "0.6.15"
leptos_axum = { version = "0.6.15", optional = true }
bcrypt = "0.15.1"
chrono = { version = "0.4.38", features = ["serde"] }
diesel = { version = "2.2.4", features = [
"postgres",
"chrono",
"uuid",
"r2d2",
], optional = true }
diesel-derive-newtype = { version = "2.1.0", optional = true }
diesel_migrations = { version = "2.1.0", optional = true }
diffy = "0.3.0"
diesel-derive-newtype = { version = "2.1.2", optional = true }
diesel_migrations = { version = "2.2.0", optional = true }
diffy = "0.4.0"
enum_delegate = "0.2.0"
env_logger = { version = "0.10.1", default-features = false }
futures = "0.3.29"
env_logger = { version = "0.11.5", default-features = false }
futures = "0.3.30"
hex = "0.4.3"
jsonwebtoken = { version = "9.2.0", optional = true }
jsonwebtoken = { version = "9.3.0", optional = true }
rand = "0.8.5"
serde_json = "1.0.108"
serde_json = "1.0.128"
sha2 = "0.10.8"
tokio = { version = "1.34.0", features = ["full"], optional = true }
uuid = { version = "1.6.1", features = ["serde"] }
tower-http = { version = "0.4.0", features = ["cors", "fs"], optional = true }
serde = { version = "1.0.192", features = ["derive"] }
url = { version = "2.4.1", features = ["serde"] }
reqwest = { version = "0.11.22", features = ["json", "cookies"] }
tokio = { version = "1.40.0", features = ["full"], optional = true }
uuid = { version = "1.10.0", features = ["serde"] }
tower-http = { version = "0.6.1", features = ["cors", "fs"], optional = true }
serde = { version = "1.0.210", features = ["derive"] }
url = { version = "2.5.2", features = ["serde"] }
reqwest = { version = "0.12.8", features = ["json", "cookies"] }
log = "0.4"
tracing = "0.1.40"
once_cell = "1.18.0"
wasm-bindgen = "0.2.89"
once_cell = "1.20.1"
wasm-bindgen = "0.2.93"
console_error_panic_hook = "0.1.7"
console_log = "1.0.0"
time = "0.3.31"
tower = "0.4.13"
markdown-it = "0.6.0"
web-sys = "0.3.68"
time = "0.3.36"
tower = "0.5.1"
markdown-it = "0.6.1"
web-sys = "0.3.70"
config = { version = "0.14.0", features = ["toml"] }
doku = "0.21.1"
smart-default = "0.7.1"
tower-layer = "0.3.3"
[dev-dependencies]
pretty_assertions = "1.4.0"
pretty_assertions = "1.4.1"
[package.metadata.leptos]
output-name = "ibis"

2
scripts/watch.sh
View file

@ -9,5 +9,5 @@ IBIS__BIND="${IBIS_BIND:-"127.0.0.1:8081"}"
# start frontend
CARGO_TARGET_DIR=target/frontend trunk serve -w src/frontend/ --proxy-backend http://$IBIS__BIND &
# start backend, with separate target folder to avoid rebuilds from arch change
cargo watch -x run
bacon -j run
)

9
src/backend/api/mod.rs
View file

@ -29,6 +29,7 @@ use crate::{
};
use activitypub_federation::config::Data;
use axum::{
body::Body,
http::{Request, StatusCode},
middleware::{self, Next},
response::Response,
@ -45,7 +46,7 @@ pub mod article;
pub mod instance;
pub mod user;
pub fn api_routes() -> Router {
pub fn api_routes() -> Router<()> {
Router::new()
.route(
"/article",
@ -68,11 +69,11 @@ pub fn api_routes() -> Router {
.route_layer(middleware::from_fn(auth))
}
async fn auth<B>(
async fn auth(
data: Data<IbisData>,
jar: CookieJar,
mut request: Request<B>,
next: Next<B>,
mut request: Request<Body>,
next: Next,
) -> Result<Response, StatusCode> {
if let Some(auth) = jar.get(AUTH_COOKIE) {
if let Ok(user) = validate(auth.value(), &data).await {

4
src/backend/api/user.rs
View file

@ -98,7 +98,7 @@ fn create_cookie(jwt: String, data: &Data<IbisData>) -> Cookie<'static> {
if domain.contains(':') {
domain = domain.split(':').collect::<Vec<_>>()[0].to_string();
}
Cookie::build(AUTH_COOKIE, jwt)
Cookie::build((AUTH_COOKIE, jwt))
.domain(domain)
.same_site(SameSite::Strict)
.path("/")
@ -107,7 +107,7 @@ fn create_cookie(jwt: String, data: &Data<IbisData>) -> Cookie<'static> {
.expires(Expiration::DateTime(
OffsetDateTime::now_utc() + Duration::weeks(52),
))
.finish()
.build()
}
#[debug_handler]

2
src/backend/federation/routes.rs
View file

@ -42,7 +42,7 @@ use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use url::Url;
pub fn federation_routes() -> Router {
pub fn federation_routes() -> Router<()> {
Router::new()
.route("/", get(http_get_instance))
.route("/user/:name", get(http_get_person))

30
src/backend/mod.rs
View file

@ -23,27 +23,28 @@ use activitypub_federation::{
};
use api::api_routes;
use axum::{
debug_handler,
headers::HeaderMap,
body::Body,
http::{HeaderValue, Request},
middleware::Next,
response::{IntoResponse, Response},
routing::get,
Router,
Server,
ServiceExt,
};
use axum_macros::{debug_handler, debug_middleware};
use chrono::Local;
use diesel::{
r2d2::{ConnectionManager, Pool},
PgConnection,
};
use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
use leptos::{leptos_config::get_config_from_str, *};
use leptos::leptos_config::get_config_from_str;
use leptos_axum::{generate_route_list, LeptosRoutes};
use log::info;
use tower::Layer;
use reqwest::header::HeaderMap;
use tokio::net::TcpListener;
use tower_http::cors::CorsLayer;
use tower_layer::Layer;
pub mod api;
pub mod config;
@ -81,15 +82,14 @@ pub async fn start(config: IbisConfig) -> MyResult<()> {
setup(&data.to_request_data()).await?;
}
let conf = get_config_from_str(include_str!("../../Cargo.toml"))?;
let mut leptos_options = conf.leptos_options;
leptos_options.site_addr = data.config.bind;
let mut conf = get_config_from_str(include_str!("../../Cargo.toml"))?;
conf.site_addr = data.config.bind;
let routes = generate_route_list(App);
let config = data.clone();
let app = Router::new()
.leptos_routes(&leptos_options, routes, || view! { <App/> })
.with_state(leptos_options)
.leptos_routes(&conf, routes, App)
.with_state(conf)
.nest("", asset_routes()?)
.nest(FEDERATION_ROUTES_PREFIX, federation_routes())
.nest("/api/v1", api_routes())
@ -103,14 +103,13 @@ pub async fn start(config: IbisConfig) -> MyResult<()> {
let app_with_middleware = middleware.layer(app);
info!("Listening on {}", &data.config.bind);
Server::bind(&data.config.bind)
.serve(app_with_middleware.into_make_service())
.await?;
let listener = TcpListener::bind(&data.config.bind).await?;
axum::serve(listener, app_with_middleware.into_make_service()).await?;
Ok(())
}
pub fn asset_routes() -> MyResult<Router> {
pub fn asset_routes() -> MyResult<Router<()>> {
let mut css_headers = HeaderMap::new();
css_headers.insert("Content-Type", "text/css".parse()?);
Ok(Router::new()
@ -209,7 +208,8 @@ async fn setup(data: &Data<IbisData>) -> Result<(), Error> {
/// with frontend routes. If a request is an Activitypub fetch as indicated by
/// `Accept: application/activity+json` header, use the federation routes. Otherwise
/// leave the path unchanged so it can go to frontend.
async fn federation_routes_middleware<B>(request: Request<B>, next: Next<B>) -> Response {
#[debug_middleware]
async fn federation_routes_middleware(request: Request<Body>, next: Next) -> Response {
let (mut parts, body) = request.into_parts();
// rewrite uri based on accept header
let mut uri = parts.uri.to_string();

2
src/backend/nodeinfo.rs
View file

@ -7,7 +7,7 @@ use axum::{routing::get, Json, Router};
use serde::{Deserialize, Serialize};
use url::Url;
pub fn config() -> Router {
pub fn config() -> Router<()> {
Router::new()
.route("/nodeinfo/2.0.json", get(node_info))
.route("/.well-known/nodeinfo", get(node_info_well_known))

50
src/frontend/app.rs
View file

@ -90,30 +90,30 @@ pub fn App() -> impl IntoView {
provide_context(create_rw_signal(global_state));
view! {
<>
<Stylesheet id="simple" href="/assets/simple.css"/>
<Stylesheet id="ibis" href="/assets/ibis.css"/>
<Router>
<Nav/>
<main>
<Routes>
<Route path="/" view=ReadArticle/>
<Route path="/article/:title" view=ReadArticle/>
<Route path="/article/:title/history" view=ArticleHistory/>
<Route path="/article/:title/edit/:conflict_id?" view=EditArticle/>
<Route path="/article/:title/actions" view=ArticleActions/>
<Route path="/article/:title/diff/:hash" view=EditDiff/>
<Route path="/article/create" view=CreateArticle/>
<Route path="/article/list" view=ListArticles/>
<Route path="/instance/:hostname" view=InstanceDetails/>
<Route path="/user/:name" view=UserProfile/>
<Route path="/login" view=Login/>
<Route path="/register" view=Register/>
<Route path="/search" view=Search/>
<Route path="/conflicts" view=Conflicts/>
</Routes>
</main>
</Router>
</>
<>
<Stylesheet id="simple" href="/assets/simple.css" />
<Stylesheet id="ibis" href="/assets/ibis.css" />
<Router>
<Nav />
<main>
<Routes>
<Route path="/" view=ReadArticle />
<Route path="/article/:title" view=ReadArticle />
<Route path="/article/:title/history" view=ArticleHistory />
<Route path="/article/:title/edit/:conflict_id?" view=EditArticle />
<Route path="/article/:title/actions" view=ArticleActions />
<Route path="/article/:title/diff/:hash" view=EditDiff />
<Route path="/article/create" view=CreateArticle />
<Route path="/article/list" view=ListArticles />
<Route path="/instance/:hostname" view=InstanceDetails />
<Route path="/user/:name" view=UserProfile />
<Route path="/login" view=Login />
<Route path="/register" view=Register />
<Route path="/search" view=Search />
<Route path="/conflicts" view=Conflicts />
</Routes>
</main>
</Router>
</>
}
}

112
src/frontend/components/article_nav.rs
View file

@ -12,61 +12,65 @@ use leptos_router::*;
#[component]
pub fn ArticleNav(article: Resource<Option<String>, ArticleView>) -> impl IntoView {
view! {
<Suspense>
{move || {
article
.get()
.map(|article_| {
let instance = create_local_resource(
move || article_.article.instance_id,
move |instance_id| async move {
let form = GetInstance {
id: Some(instance_id),
};
GlobalState::api_client().get_instance(&form).await.unwrap()
},
);
let global_state = use_context::<RwSignal<GlobalState>>().unwrap();
let article_link = article_link(&article_.article);
let article_link_ = article_link.clone();
let protected = article_.article.protected;
view! {
<nav class="inner">
<A href=article_link.clone()>"Read"</A>
<A href=format!("{article_link}/history")>"History"</A>
<Show when=move || {
global_state
.with(|state| {
let is_admin = state
.my_profile
.as_ref()
.map(|p| p.local_user.admin)
.unwrap_or(false);
state.my_profile.is_some()
&& can_edit_article(&article_.article, is_admin).is_ok()
})
}>
<A href=format!("{article_link}/edit")>"Edit"</A>
</Show>
<Show when=move || global_state.with(|state| state.my_profile.is_some())>
<A href=format!("{article_link_}/actions")>"Actions"</A>
{instance
.get()
.map(|i| {
view! { <InstanceFollowButton instance=i.instance.clone()/> }
})}
<Suspense>
{move || {
article
.get()
.map(|article_| {
let instance = create_local_resource(
move || article_.article.instance_id,
move |instance_id| async move {
let form = GetInstance {
id: Some(instance_id),
};
GlobalState::api_client().get_instance(&form).await.unwrap()
},
);
let global_state = use_context::<RwSignal<GlobalState>>().unwrap();
let article_link = article_link(&article_.article);
let article_link_ = article_link.clone();
let protected = article_.article.protected;
view! {
<nav class="inner">
<A href=article_link.clone()>"Read"</A>
<A href=format!("{article_link}/history")>"History"</A>
<Show when=move || {
global_state
.with(|state| {
let is_admin = state
.my_profile
.as_ref()
.map(|p| p.local_user.admin)
.unwrap_or(false);
state.my_profile.is_some()
&& can_edit_article(&article_.article, is_admin).is_ok()
})
}>
<A href=format!("{article_link}/edit")>"Edit"</A>
</Show>
<Show when=move || {
global_state.with(|state| state.my_profile.is_some())
}>
<A href=format!("{article_link_}/actions")>"Actions"</A>
{instance
.get()
.map(|i| {
view! {
<InstanceFollowButton instance=i.instance.clone() />
}
})}
</Show>
<Show when=move || protected>
<span title="Article can only be edited by local admins">
"Protected"
</span>
</Show>
</nav>
}
})
}}
</Show>
<Show when=move || protected>
<span title="Article can only be edited by local admins">
"Protected"
</span>
</Show>
</nav>
}
})
}}
</Suspense>
</Suspense>
}
}

106
src/frontend/components/credentials.rs
View file

@ -18,63 +18,63 @@ pub fn CredentialsForm(
});
view! {
<form on:submit=|ev| ev.prevent_default()>
<p>{title}</p>
{move || {
error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<form on:submit=|ev| ev.prevent_default()>
<p>{title}</p>
{move || {
error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<input
type="text"
required
placeholder="Username"
prop:disabled=move || disabled.get()
on:keyup=move |ev: ev::KeyboardEvent| {
let val = event_target_value(&ev);
set_username.update(|v| *v = val);
}
<input
type="text"
required
placeholder="Username"
prop:disabled=move || disabled.get()
on:keyup=move |ev: ev::KeyboardEvent| {
let val = event_target_value(&ev);
set_username.update(|v| *v = val);
}
on:change=move |ev| {
let val = event_target_value(&ev);
set_username.update(|v| *v = val);
}
/>
on:change=move |ev| {
let val = event_target_value(&ev);
set_username.update(|v| *v = val);
}
/>
<input
type="password"
required
placeholder="Password"
prop:disabled=move || disabled.get()
on:keyup=move |ev: ev::KeyboardEvent| {
match &*ev.key() {
"Enter" => {
dispatch_action();
}
_ => {
let val = event_target_value(&ev);
set_password.update(|p| *p = val);
}
}
}
<input
type="password"
required
placeholder="Password"
prop:disabled=move || disabled.get()
on:keyup=move |ev: ev::KeyboardEvent| {
match &*ev.key() {
"Enter" => {
dispatch_action();
}
_ => {
let val = event_target_value(&ev);
set_password.update(|p| *p = val);
}
}
}
on:change=move |ev| {
let val = event_target_value(&ev);
set_password.update(|p| *p = val);
}
/>
on:change=move |ev| {
let val = event_target_value(&ev);
set_password.update(|p| *p = val);
}
/>
<div>
<button
prop:disabled=move || button_is_disabled.get()
on:click=move |_| dispatch_action()
>
{action_label}
</button>
</div>
</form>
<div>
<button
prop:disabled=move || button_is_disabled.get()
on:click=move |_| dispatch_action()
>
{action_label}
</button>
</div>
</form>
}
}

14
src/frontend/components/instance_follow_button.rs
View file

@ -30,12 +30,12 @@ pub fn InstanceFollowButton(instance: DbInstance) -> impl IntoView {
};
view! {
<button
on:click=move |_| follow_action.dispatch(instance.id)
prop:disabled=move || is_following
prop:hidden=move || instance.local
>
{follow_text}
</button>
<button
on:click=move |_| follow_action.dispatch(instance.id)
prop:disabled=move || is_following
prop:hidden=move || instance.local
>
{follow_text}
</button>
}
}

136
src/frontend/components/nav.rs
View file

@ -22,77 +22,77 @@ pub fn Nav() -> impl IntoView {
let (search_query, set_search_query) = create_signal(String::new());
view! {
<nav class="inner" style="min-width: 250px;">
<li>
<A href="/">"Main Page"</A>
</li>
<li>
<A href="/article/list">"List Articles"</A>
</li>
<Show when=move || global_state.with(|state| state.my_profile.is_some())>
<li>
<A href="/article/create">"Create Article"</A>
</li>
<li>
<A href="/conflicts">"Edit Conflicts"</A>
</li>
</Show>
<li>
<form on:submit=move |ev| {
ev.prevent_default();
let navigate = leptos_router::use_navigate();
let query = search_query.get();
if !query.is_empty() {
navigate(&format!("/search?query={query}"), Default::default());
}
}>
<input
type="text"
placeholder="Search"
prop:value=search_query
on:keyup=move |ev: ev::KeyboardEvent| {
let val = event_target_value(&ev);
set_search_query.update(|v| *v = val);
}
/>
<button>Go</button>
</form>
</li>
<Show
when=move || global_state.with(|state| state.my_profile.is_some())
fallback=move || {
view! {
<nav class="inner" style="min-width: 250px;">
<li>
<A href="/">"Main Page"</A>
</li>
<li>
<A href="/article/list">"List Articles"</A>
</li>
<Show when=move || global_state.with(|state| state.my_profile.is_some())>
<li>
<A href="/login">"Login"</A>
<A href="/article/create">"Create Article"</A>
</li>
<Show when=move || registration_open.get().unwrap_or_default()>
<li>
<A href="/register">"Register"</A>
</li>
</Show>
}
}
>
<li>
<A href="/conflicts">"Edit Conflicts"</A>
</li>
</Show>
<li>
<form on:submit=move |ev| {
ev.prevent_default();
let navigate = leptos_router::use_navigate();
let query = search_query.get();
if !query.is_empty() {
navigate(&format!("/search?query={query}"), Default::default());
}
}>
<input
type="text"
placeholder="Search"
prop:value=search_query
on:keyup=move |ev: ev::KeyboardEvent| {
let val = event_target_value(&ev);
set_search_query.update(|v| *v = val);
}
/>
{
let my_profile = global_state.with(|state| state.my_profile.clone().unwrap());
let profile_link = format!("/user/{}", my_profile.person.username);
view! {
<p>
"Logged in as "
<a
href=profile_link
style="border: none; padding: 0; color: var(--accent) !important;"
>
{my_profile.person.username}
</a>
</p>
<button on:click=move |_| logout_action.dispatch(())>Logout</button>
}
}
<button>Go</button>
</form>
</li>
<Show
when=move || global_state.with(|state| state.my_profile.is_some())
fallback=move || {
view! {
<li>
<A href="/login">"Login"</A>
</li>
<Show when=move || registration_open.get().unwrap_or_default()>
<li>
<A href="/register">"Register"</A>
</li>
</Show>
}
}
>
</Show>
</nav>
{
let my_profile = global_state.with(|state| state.my_profile.clone().unwrap());
let profile_link = format!("/user/{}", my_profile.person.username);
view! {
<p>
"Logged in as "
<a
href=profile_link
style="border: none; padding: 0; color: var(--accent) !important;"
>
{my_profile.person.username}
</a>
</p>
<button on:click=move |_| logout_action.dispatch(())>Logout</button>
}
}
</Show>
</nav>
}
}

128
src/frontend/pages/article/actions.rs
View file

@ -52,73 +52,73 @@ pub fn ArticleActions() -> impl IntoView {
}
});
view! {
<ArticleNav article=article/>
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
article
.get()
.map(|article| {
view! {
<div class="item-view">
<h1>{article_title(&article.article)}</h1>
{move || {
error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<ArticleNav article=article />
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
article
.get()
.map(|article| {
view! {
<div class="item-view">
<h1>{article_title(&article.article)}</h1>
{move || {
error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<Show when=move || {
global_state
.with(|state| {
state
.my_profile
.as_ref()
.map(|p| p.local_user.admin)
.unwrap_or_default() && article.article.local
})
}>
<button on:click=move |_| {
protect_action
.dispatch((article.article.id, article.article.protected))
}>Toggle Article Protection</button>
<p>"Protect a local article so that only admins can edit it"</p>
</Show>
<Show when=move || !article.article.local>
<input
placeholder="New Title"
on:keyup=move |ev: ev::KeyboardEvent| {
let val = event_target_value(&ev);
set_new_title.update(|v| *v = val);
}
/>
<Show when=move || {
global_state
.with(|state| {
state
.my_profile
.as_ref()
.map(|p| p.local_user.admin)
.unwrap_or_default() && article.article.local
})
}>
<button on:click=move |_| {
protect_action
.dispatch((article.article.id, article.article.protected))
}>Toggle Article Protection</button>
<p>"Protect a local article so that only admins can edit it"</p>
</Show>
<Show when=move || !article.article.local>
<input
placeholder="New Title"
on:keyup=move |ev: ev::KeyboardEvent| {
let val = event_target_value(&ev);
set_new_title.update(|v| *v = val);
}
/>
<button
disabled=move || new_title.get().is_empty()
on:click=move |_| {
fork_action.dispatch((article.article.id, new_title.get()))
}
>
<button
disabled=move || new_title.get().is_empty()
on:click=move |_| {
fork_action.dispatch((article.article.id, new_title.get()))
}
>
Fork Article
</button>
<p>
"You can fork a remote article to the local instance. This is useful if the original
instance is dead, or if there are disagreements how the article should be written."
</p>
</Show>
</div>
}
})
}}
Fork Article
</button>
<p>
"You can fork a remote article to the local instance. This is useful if the original
instance is dead, or if there are disagreements how the article should be written."
</p>
</Show>
</div>
}
})
}}
</Suspense>
<Show when=move || fork_response.get().is_some()>
<Redirect path=article_link(&fork_response.get().unwrap())/>
</Show>
<p>"TODO: add option for admin to delete article etc"</p>
</Suspense>
<Show when=move || fork_response.get().is_some()>
<Redirect path=article_link(&fork_response.get().unwrap()) />
</Show>
<p>"TODO: add option for admin to delete article etc"</p>
}
}

113
src/frontend/pages/article/create.rs
View file

@ -40,66 +40,67 @@ pub fn CreateArticle() -> impl IntoView {
});
view! {
<h1>Create new Article</h1>
<Show
when=move || create_response.get().is_some()
fallback=move || {
view! {
<div class="item-view">
<input
type="text"
required
placeholder="Title"
prop:disabled=move || wait_for_response.get()
on:keyup=move |ev| {
let val = event_target_value(&ev);
set_title.update(|v| *v = val);
}
/>
<h1>Create new Article</h1>
<Show
when=move || create_response.get().is_some()
fallback=move || {
view! {
<div class="item-view">
<input
type="text"
required
placeholder="Title"
prop:disabled=move || wait_for_response.get()
on:keyup=move |ev| {
let val = event_target_value(&ev);
set_title.update(|v| *v = val);
}
/>
<textarea
placeholder="Article text..."
on:keyup=move |ev| {
let val = event_target_value(&ev);
set_text.update(|p| *p = val);
}
>
</textarea>
<div>
<a href="https://commonmark.org/help/" target="blank_">
Markdown
</a>
" formatting is supported"
</div>
{move || {
create_error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<textarea
placeholder="Article text..."
on:keyup=move |ev| {
let val = event_target_value(&ev);
set_text.update(|p| *p = val);
}
></textarea>
<div>
<a href="https://commonmark.org/help/" target="blank_">
Markdown
</a>
" formatting is supported"
</div>
{move || {
create_error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<input
type="text"
placeholder="Edit summary"
on:keyup=move |ev| {
let val = event_target_value(&ev);
set_summary.update(|p| *p = val);
}
/>
<input
type="text"
placeholder="Edit summary"
on:keyup=move |ev| {
let val = event_target_value(&ev);
set_summary.update(|p| *p = val);
}
/>
<button
prop:disabled=move || button_is_disabled.get()
on:click=move |_| submit_action.dispatch((title.get(), text.get(), summary.get()))
>
Submit
</button>
</div>
<button
prop:disabled=move || button_is_disabled.get()
on:click=move |_| {
submit_action.dispatch((title.get(), text.get(), summary.get()))
}
>
Submit
</button>
</div>
}
}
}
>
>
<Redirect path=format!("/article/{}", title.get().replace(' ', "_"))/>
</Show>
<Redirect path=format!("/article/{}", title.get().replace(' ', "_")) />
</Show>
}
}

142
src/frontend/pages/article/edit.rs
View file

@ -100,82 +100,82 @@ pub fn EditArticle() -> impl IntoView {
);
view! {
<ArticleNav article=article/>
<Show
when=move || edit_response.get() == EditResponse::Success
fallback=move || {
view! {
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
article
.get()
.map(|mut article| {
if let EditResponse::Conflict(conflict) = edit_response.get() {
article.article.text = conflict.three_way_merge;
set_summary.set(conflict.summary);
}
set_text.set(article.article.text.clone());
let article_ = article.clone();
view! {
// set initial text, otherwise submit with no changes results in empty text
<div class="item-view">
<h1>{article_title(&article.article)}</h1>
{move || {
edit_error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<ArticleNav article=article />
<Show
when=move || edit_response.get() == EditResponse::Success
fallback=move || {
view! {
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
article
.get()
.map(|mut article| {
if let EditResponse::Conflict(conflict) = edit_response.get() {
article.article.text = conflict.three_way_merge;
set_summary.set(conflict.summary);
}
set_text.set(article.article.text.clone());
let article_ = article.clone();
view! {
// set initial text, otherwise submit with no changes results in empty text
<div class="item-view">
<h1>{article_title(&article.article)}</h1>
{move || {
edit_error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<textarea on:keyup=move |ev| {
let val = event_target_value(&ev);
set_text.update(|p| *p = val);
}>{article.article.text.clone()}</textarea>
<div>
<a href="https://commonmark.org/help/" target="blank_">
Markdown
</a>
" formatting is supported"
</div>
<input
type="text"
placeholder="Edit summary"
value=summary.get_untracked()
on:keyup=move |ev| {
let val = event_target_value(&ev);
set_summary.update(|p| *p = val);
}
/>
<textarea on:keyup=move |ev| {
let val = event_target_value(&ev);
set_text.update(|p| *p = val);
}>{article.article.text.clone()}</textarea>
<div>
<a href="https://commonmark.org/help/" target="blank_">
Markdown
</a>
" formatting is supported"
</div>
<input
type="text"
placeholder="Edit summary"
value=summary.get_untracked()
on:keyup=move |ev| {
let val = event_target_value(&ev);
set_summary.update(|p| *p = val);
}
/>
<button
prop:disabled=move || button_is_disabled.get()
on:click=move |_| {
submit_action
.dispatch((
text.get(),
summary.get(),
article_.clone(),
edit_response.get(),
))
}
>
<button
prop:disabled=move || button_is_disabled.get()
on:click=move |_| {
submit_action
.dispatch((
text.get(),
summary.get(),
article_.clone(),
edit_response.get(),
))
}
>
Submit
</button>
</div>
}
})
}}
Submit
</button>
</div>
}
})
}}
</Suspense>
</Suspense>
}
}
}
>
>
Edit successful!
</Show>
Edit successful!
</Show>
}
}

82
src/frontend/pages/article/history.rs
View file

@ -12,49 +12,49 @@ pub fn ArticleHistory() -> impl IntoView {
let article = article_resource();
view! {
<ArticleNav article=article/>
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
article
.get()
.map(|article| {
view! {
<div class="item-view">
<h1>{article_title(&article.article)}</h1>
<ArticleNav article=article />
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
article
.get()
.map(|article| {
view! {
<div class="item-view">
<h1>{article_title(&article.article)}</h1>
{article
.edits
.into_iter()
.rev()
.map(|edit| {
let path = format!(
"/article/{}@{}/diff/{}",
article.article.title,
extract_domain(&article.article.ap_id),
edit.edit.hash.0,
);
let label = format!(
"{} ({})",
edit.edit.summary,
edit.edit.created.to_rfc2822(),
);
view! {
<li>
<a href=path>{label}</a>
" by "
{user_link(&edit.creator)}
</li>
}
})
.collect::<Vec<_>>()}
{article
.edits
.into_iter()
.rev()
.map(|edit| {
let path = format!(
"/article/{}@{}/diff/{}",
article.article.title,
extract_domain(&article.article.ap_id),
edit.edit.hash.0,
);
let label = format!(
"{} ({})",
edit.edit.summary,
edit.edit.created.to_rfc2822(),
);
view! {
<li>
<a href=path>{label}</a>
" by "
{user_link(&edit.creator)}
</li>
}
})
.collect::<Vec<_>>()}
</div>
}
})
}}
</div>
}
})
}}
</Suspense>
</Suspense>
}
}

60
src/frontend/pages/article/list.rs
View file

@ -21,36 +21,36 @@ pub fn ListArticles() -> impl IntoView {
);
view! {
<h1>Most recently edited Articles</h1>
<Suspense fallback=|| view! { "Loading..." }>
<fieldset on:input=move |ev| {
let val = ev.target().unwrap().unchecked_into::<web_sys::HtmlInputElement>().id();
let is_local_only = val == "only-local";
set_only_local.update(|p| *p = is_local_only);
}>
<input type="radio" name="listing-type" id="only-local"/>
<label for="only-local">Only Local</label>
<input type="radio" name="listing-type" id="all" checked/>
<label for="all">All</label>
</fieldset>
<ul>
{move || {
articles
.get()
.map(|a| {
a.into_iter()
.map(|a| {
view! {
<li>
<a href=article_link(&a)>{article_title(&a)}</a>
</li>
}
})
.collect::<Vec<_>>()
})
}}
<h1>Most recently edited Articles</h1>
<Suspense fallback=|| view! { "Loading..." }>
<fieldset on:input=move |ev| {
let val = ev.target().unwrap().unchecked_into::<web_sys::HtmlInputElement>().id();
let is_local_only = val == "only-local";
set_only_local.update(|p| *p = is_local_only);
}>
<input type="radio" name="listing-type" id="only-local" />
<label for="only-local">Only Local</label>
<input type="radio" name="listing-type" id="all" checked />
<label for="all">All</label>
</fieldset>
<ul>
{move || {
articles
.get()
.map(|a| {
a.into_iter()
.map(|a| {
view! {
<li>
<a href=article_link(&a)>{article_title(&a)}</a>
</li>
}
})
.collect::<Vec<_>>()
})
}}
</ul>
</Suspense>
</ul>
</Suspense>
}
}

40
src/frontend/pages/article/read.rs
View file

@ -11,27 +11,29 @@ pub fn ReadArticle() -> impl IntoView {
let article = article_resource();
view! {
<ArticleNav article=article/>
<Suspense fallback=|| {
view! { "Loading..." }
}>
<ArticleNav article=article />
<Suspense fallback=|| {
view! { "Loading..." }
}>
{
let parser = markdown_parser();
move || {
article
.get()
.map(|article| {
view! {
<div class="item-view">
<h1>{article_title(&article.article)}</h1>
<div inner_html=parser.parse(&article.article.text).render()></div>
</div>
}
})
{
let parser = markdown_parser();
move || {
article
.get()
.map(|article| {
view! {
<div class="item-view">
<h1>{article_title(&article.article)}</h1>
<div inner_html=parser
.parse(&article.article.text)
.render()></div>
</div>
}
})
}
}
}
</Suspense>
</Suspense>
}
}

48
src/frontend/pages/conflicts.rs
View file

@ -9,27 +9,33 @@ pub fn Conflicts() -> impl IntoView {
);
view! {
<h1>Your unresolved edit conflicts</h1>
<Suspense fallback=|| view! { "Loading..." }>
<ul>
{move || {
conflicts
.get()
.map(|c| {
c.into_iter()
.map(|c| {
let link = format!("{}/edit/{}", article_link(&c.article), c.id);
view! {
<li>
<a href=link>{article_title(&c.article)} " - " {c.summary}</a>
</li>
}
})
.collect::<Vec<_>>()
})
}}
<h1>Your unresolved edit conflicts</h1>
<Suspense fallback=|| view! { "Loading..." }>
<ul>
{move || {
conflicts
.get()
.map(|c| {
c.into_iter()
.map(|c| {
let link = format!(
"{}/edit/{}",
article_link(&c.article),
c.id,
);
view! {
<li>
<a href=link>
{article_title(&c.article)} " - " {c.summary}
</a>
</li>
}
})
.collect::<Vec<_>>()
})
}}
</ul>
</Suspense>
</ul>
</Suspense>
}
}

60
src/frontend/pages/diff.rs
View file

@ -8,36 +8,36 @@ pub fn EditDiff() -> impl IntoView {
let article = article_resource();
view! {
<ArticleNav article=article/>
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
article
.get()
.map(|article| {
let hash = params.get_untracked().get("hash").cloned().unwrap();
let edit = article
.edits
.iter()
.find(|e| e.edit.hash.0.to_string() == hash)
.unwrap();
let label = format!(
"{} ({})",
edit.edit.summary,
edit.edit.created.to_rfc2822(),
);
view! {
<div class="item-view">
<h1>{article.article.title.replace('_', " ")}</h1>
<h2>{label}</h2>
<p>"by " {user_link(&edit.creator)}</p>
<pre>{edit.edit.diff.clone()}</pre>
</div>
}
})
}}
<ArticleNav article=article />
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
article
.get()
.map(|article| {
let hash = params.get_untracked().get("hash").cloned().unwrap();
let edit = article
.edits
.iter()
.find(|e| e.edit.hash.0.to_string() == hash)
.unwrap();
let label = format!(
"{} ({})",
edit.edit.summary,
edit.edit.created.to_rfc2822(),
);
view! {
<div class="item-view">
<h1>{article.article.title.replace('_', " ")}</h1>
<h2>{label}</h2>
<p>"by " {user_link(&edit.creator)}</p>
<pre>{edit.edit.diff.clone()}</pre>
</div>
}
})
}}
</Suspense>
</Suspense>
}
}

54
src/frontend/pages/instance_details.rs
View file

@ -20,32 +20,36 @@ pub fn InstanceDetails() -> impl IntoView {
});
view! {
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
instance_profile
.get()
.map(|instance: DbInstance| {
let instance_ = instance.clone();
view! {
<h1>{instance.domain}</h1>
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
instance_profile
.get()
.map(|instance: DbInstance| {
let instance_ = instance.clone();
view! {
<h1>{instance.domain}</h1>
<Show when=move || global_state.with(|state| state.my_profile.is_some())>
<InstanceFollowButton instance=instance_.clone()/>
</Show>
<p>Follow the instance so that new edits are federated to your instance.</p>
<p>
"TODO: show a list of articles from the instance. For now you can use the "
<a href="/article/list">Article list</a> .
</p>
<hr/>
<h2>"Description:"</h2>
<div>{instance.description}</div>
}
})
}}
<Show when=move || {
global_state.with(|state| state.my_profile.is_some())
}>
<InstanceFollowButton instance=instance_.clone() />
</Show>
<p>
Follow the instance so that new edits are federated to your instance.
</p>
<p>
"TODO: show a list of articles from the instance. For now you can use the "
<a href="/article/list">Article list</a>.
</p>
<hr />
<h2>"Description:"</h2>
<div>{instance.description}</div>
}
})
}}
</Suspense>
</Suspense>
}
}

30
src/frontend/pages/login.rs
View file

@ -38,22 +38,22 @@ pub fn Login() -> impl IntoView {
let disabled = Signal::derive(move || wait_for_response.get());
view! {
<Show
when=move || login_response.get().is_some()
fallback=move || {
view! {
<CredentialsForm
title="Please enter the desired credentials"
action_label="Login"
action=login_action
error=login_error.into()
disabled
/>
<Show
when=move || login_response.get().is_some()
fallback=move || {
view! {
<CredentialsForm
title="Please enter the desired credentials"
action_label="Login"
action=login_action
error=login_error.into()
disabled
/>
}
}
}
>
>
<Redirect path="/"/>
</Show>
<Redirect path="/" />
</Show>
}
}

30
src/frontend/pages/register.rs
View file

@ -39,22 +39,22 @@ pub fn Register() -> impl IntoView {
let disabled = Signal::derive(move || wait_for_response.get());
view! {
<Show
when=move || register_response.get().is_some()
fallback=move || {
view! {
<CredentialsForm
title="Please enter the desired credentials"
action_label="Register"
action=register_action
error=register_error.into()
disabled
/>
<Show
when=move || register_response.get().is_some()
fallback=move || {
view! {
<CredentialsForm
title="Please enter the desired credentials"
action_label="Register"
action=register_action
error=register_error.into()
disabled
/>
}
}
}
>
>
<p>"You have successfully registered."</p>
</Show>
<p>"You have successfully registered."</p>
</Show>
}
}

119
src/frontend/pages/search.rs
View file

@ -52,67 +52,66 @@ pub fn Search() -> impl IntoView {
});
view! {
<h1>"Search results for " {query}</h1>
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
search_results
.get()
.map(move |search_results| {
let is_empty = search_results.is_empty();
view! {
<Show
when=move || !is_empty
fallback=move || {
let error_view = move || {
error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
};
view! {
{error_view}
<p>No results found</p>
}
<h1>"Search results for " {query}</h1>
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
search_results
.get()
.map(move |search_results| {
let is_empty = search_results.is_empty();
view! {
<Show
when=move || !is_empty
fallback=move || {
let error_view = move || {
error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
};
view! {
{error_view}
<p>No results found</p>
}
}
>
<ul>
// render resolved instance
{if let Some(instance) = &search_results.instance {
let domain = &instance.domain;
vec![
view! {
<li>
<a href=format!("/instance/{domain}")>{domain}</a>
</li>
},
]
} else {
vec![]
}} // render articles from resolve/search
{search_results
.articles
.iter()
.map(|a| {
view! {
<li>
<a href=article_link(a)>{article_title(a)}</a>
</li>
}
})
.collect::<Vec<_>>()}
</ul>
</Show>
}
>
})
}}
<ul>
// render resolved instance
{if let Some(instance) = &search_results.instance {
let domain = &instance.domain;
vec![
view! {
<li>
<a href=format!("/instance/{domain}")>{domain}</a>
</li>
},
]
} else {
vec![]
}}
// render articles from resolve/search
{search_results
.articles
.iter()
.map(|a| {
view! {
<li>
<a href=article_link(a)>{article_title(a)}</a>
</li>
}
})
.collect::<Vec<_>>()}
</ul>
</Show>
}
})
}}
</Suspense>
</Suspense>
}
}

36
src/frontend/pages/user_profile.rs
View file

@ -22,28 +22,28 @@ pub fn UserProfile() -> impl IntoView {
});
view! {
{move || {
error
.get()
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
user_profile
error
.get()
.map(|person: DbPerson| {
view! {
<h1>{user_title(&person)}</h1>
<p>TODO: create actual user profile</p>
}
.map(|err| {
view! { <p style="color:red;">{err}</p> }
})
}}
</Suspense>
<Suspense fallback=|| {
view! { "Loading..." }
}>
{move || {
user_profile
.get()
.map(|person: DbPerson| {
view! {
<h1>{user_title(&person)}</h1>
<p>TODO: create actual user profile</p>
}
})
}}
</Suspense>
}
}

2
src/main.rs
View file

@ -28,6 +28,6 @@ fn main() {
_ = console_log::init_with_level(log::Level::Debug);
console_error_panic_hook::set_once();
mount_to_body(|| {
view! { <App/> }
view! { <App /> }
});
}