wip
This commit is contained in:
parent
5deba2fdb1
commit
9fe5d3c70e
45 changed files with 5311 additions and 815 deletions
2
webui/.cargo/config.toml
Normal file
2
webui/.cargo/config.toml
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
[build]
|
||||
target = "wasm32-unknown-unknown"
|
||||
27
webui/Cargo.toml
Normal file
27
webui/Cargo.toml
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
cargo-features = ["per-package-target"]
|
||||
|
||||
[package]
|
||||
name = "webcomment-webui"
|
||||
version = "0.1.0"
|
||||
authors = ["tuxmain <tuxmain@zettascript.org>"]
|
||||
license = "AGPL-3.0-only"
|
||||
repository = "https://git.txmn.tk/tuxmain/webcomment"
|
||||
description = "Comment web client"
|
||||
edition = "2021"
|
||||
forced-target = "wasm32-unknown-unknown"
|
||||
|
||||
[lib]
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
[dependencies]
|
||||
webcomment-common = { path = "../common" }
|
||||
|
||||
getrandom = { version = "0.2.8", features = ["js"] }
|
||||
gloo = "0.8"
|
||||
js-sys = "0.3"
|
||||
parking_lot = "0.12.1"
|
||||
serde = { version = "1.0.154", features = ["derive", "rc"] }
|
||||
serde_json = "1.0.94"
|
||||
yew = { version = "0.20.0", features = ["csr"] }
|
||||
wasm-bindgen = "0.2"
|
||||
wasm-bindgen-futures = "0.4.34"
|
||||
8
webui/index.html
Normal file
8
webui/index.html
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<title>Webcomment</title>
|
||||
</head>
|
||||
<body></body>
|
||||
</html>
|
||||
57
webui/src/api.rs
Normal file
57
webui/src/api.rs
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
use crate::types::*;
|
||||
|
||||
use webcomment_common::{api::*, types::*};
|
||||
|
||||
use gloo::{console, net::http};
|
||||
use parking_lot::RwLock;
|
||||
use std::collections::HashMap;
|
||||
|
||||
pub struct ApiInner {
|
||||
pub admin_psw: Option<String>,
|
||||
pub comments: HashMap<CommentId, StoredComment>,
|
||||
pub url: String,
|
||||
}
|
||||
|
||||
pub struct Api {
|
||||
pub inner: RwLock<ApiInner>,
|
||||
}
|
||||
|
||||
impl Api {
|
||||
pub async fn get_comments_by_topic(&self, topic: String) {
|
||||
match http::Request::post(&format!("{}/api/comments_by_topic", &self.inner.read().url))
|
||||
.body(
|
||||
serde_json::to_string(&queries::CommentsByTopic {
|
||||
mutation_token: None,
|
||||
topic,
|
||||
})
|
||||
.unwrap(),
|
||||
)
|
||||
.send()
|
||||
.await
|
||||
{
|
||||
Ok(resp) => {
|
||||
let Ok(Ok(resps::Response::CommentsByTopic(resp))) = resp.json::<resps::Result>().await else {
|
||||
// TODO error
|
||||
return;
|
||||
};
|
||||
let mut inner = self.inner.write();
|
||||
for comment in resp.approved_comments {
|
||||
let Ok(comment_id) = CommentId::from_base64(&comment.id) else {
|
||||
continue
|
||||
};
|
||||
inner.comments.insert(
|
||||
comment_id,
|
||||
StoredComment {
|
||||
author: comment.author,
|
||||
email: comment.email,
|
||||
last_edit_time: comment.last_edit_time,
|
||||
post_time: comment.post_time,
|
||||
text: comment.text,
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
Err(e) => console::log!("get_comments_by_topic: {e:?}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
3
webui/src/components.rs
Normal file
3
webui/src/components.rs
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
pub mod comment;
|
||||
|
||||
pub use comment::*;
|
||||
47
webui/src/components/comment.rs
Normal file
47
webui/src/components/comment.rs
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
use crate::types::*;
|
||||
|
||||
use yew::{html, Component, Context, Html, Properties};
|
||||
|
||||
pub struct CommentComponent {}
|
||||
|
||||
#[derive(Properties, PartialEq)]
|
||||
pub struct CommentProps {
|
||||
pub root_id: String, // TODO maybe opti
|
||||
pub comment: FullComment,
|
||||
}
|
||||
|
||||
impl Component for CommentComponent {
|
||||
type Message = ();
|
||||
type Properties = CommentProps;
|
||||
|
||||
fn create(_ctx: &Context<Self>) -> Self {
|
||||
Self {}
|
||||
}
|
||||
|
||||
fn update(&mut self, _ctx: &Context<Self>, msg: Self::Message) -> bool {
|
||||
false
|
||||
}
|
||||
|
||||
fn view(&self, ctx: &Context<Self>) -> Html {
|
||||
let props = ctx.props();
|
||||
let comment_id = props.comment.id.to_base64();
|
||||
let elem_id = format!("{}-{}", props.root_id, comment_id);
|
||||
html! {
|
||||
<div class={ format!("comment comment-{}", comment_id) } id={ elem_id.clone() }>
|
||||
<p class="comment-meta">
|
||||
<a class="comment-post_time" aria-label="Permalink" title="Permalink" href={ format!("#{elem_id}") }>{ props.comment.post_time }</a>
|
||||
<span class="comment-author"></span>
|
||||
{
|
||||
if let Some(email) = &props.comment.email {
|
||||
html! { <span class="comment-email">{ email }</span> }
|
||||
} else {
|
||||
html! {}
|
||||
}
|
||||
}
|
||||
<a class="comment-edition comment-edition-remove" href="#">{ "Remove" }</a>
|
||||
</p>
|
||||
<p class="comment-text">{ &props.comment.text }</p>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
}
|
||||
89
webui/src/lib.rs
Normal file
89
webui/src/lib.rs
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
mod api;
|
||||
mod components;
|
||||
mod types;
|
||||
|
||||
use gloo::console;
|
||||
use js_sys::Date;
|
||||
use parking_lot::RwLock;
|
||||
use wasm_bindgen::prelude::*;
|
||||
use webcomment_common::types::*;
|
||||
use yew::{html, Component, Context, Html, Properties};
|
||||
|
||||
use crate::{components::*, types::*};
|
||||
|
||||
pub enum Msg {
|
||||
Increment,
|
||||
Decrement,
|
||||
}
|
||||
|
||||
#[derive(Properties, PartialEq)]
|
||||
pub struct AppProps {
|
||||
root_id: String,
|
||||
}
|
||||
|
||||
impl Default for AppProps {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
root_id: String::from("comments"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct App {
|
||||
value: i64,
|
||||
}
|
||||
|
||||
impl Component for App {
|
||||
type Message = Msg;
|
||||
type Properties = AppProps;
|
||||
|
||||
fn create(_ctx: &Context<Self>) -> Self {
|
||||
Self { value: 0 }
|
||||
}
|
||||
|
||||
fn update(&mut self, _ctx: &Context<Self>, msg: Self::Message) -> bool {
|
||||
match msg {
|
||||
Msg::Increment => {
|
||||
self.value += 1;
|
||||
console::log!("plus one"); // Will output a string to the browser console
|
||||
true // Return true to cause the displayed change to update
|
||||
}
|
||||
Msg::Decrement => {
|
||||
self.value -= 1;
|
||||
console::log!("minus one");
|
||||
true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn view(&self, ctx: &Context<Self>) -> Html {
|
||||
let props = ctx.props();
|
||||
let comment_props = CommentProps {
|
||||
root_id: String::from("comments"),
|
||||
comment: FullComment {
|
||||
author: String::from("Toto"),
|
||||
email: Some(String::from("toto@fai.tld")),
|
||||
id: CommentId::new(),
|
||||
last_edit_time: Some(123),
|
||||
post_time: 42,
|
||||
text: String::from("Bonjour"),
|
||||
},
|
||||
};
|
||||
html! {
|
||||
<div id={ props.root_id.clone() }>
|
||||
<CommentComponent ..comment_props />
|
||||
</div>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[wasm_bindgen(start)]
|
||||
async fn main_js() {
|
||||
/*let api = api::Api {
|
||||
inner: RwLock::new(api::ApiInner { admin_psw: None, comments: Default::default(), url: "http://127.0.0.1:31720".into() })
|
||||
};
|
||||
api.get_comments_by_topic("test".into()).await;*/
|
||||
yew::Renderer::<App>::new().render();
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
22
webui/src/types.rs
Normal file
22
webui/src/types.rs
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
use webcomment_common::types::*;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
|
||||
pub struct StoredComment {
|
||||
pub author: String,
|
||||
pub email: Option<String>,
|
||||
pub last_edit_time: Option<u64>,
|
||||
pub post_time: u64,
|
||||
pub text: String,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
|
||||
pub struct FullComment {
|
||||
pub author: String,
|
||||
pub email: Option<String>,
|
||||
pub id: CommentId,
|
||||
pub last_edit_time: Option<u64>,
|
||||
pub post_time: u64,
|
||||
pub text: String,
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue