();
+
+ let (name, set_name) = create_signal(String::from(""));
+ let (error, set_error) = create_signal(String::from(""));
+
+ let on_submit = move |ev: leptos::ev::SubmitEvent| {
+ ev.prevent_default();
+ set_error.set(String::from(""));
+ /*
+ match websocket.add_person(name.get(), group.get()) {
+ Ok(_) => set_name.set(String::from("")),
+ Err(err) => set_error.set(err),
+ }
+ */
+ };
+
view! {
- "Deelnemer toevoegen"
+ "Tijd toevoegen"
+ { move || format!("{:?}", participants.read.get()) }
+
+
+ { error }
+
}
}
diff --git a/application/src/util/surrealdb.rs b/application/src/util/surrealdb.rs
index bb64120..dae8df8 100644
--- a/application/src/util/surrealdb.rs
+++ b/application/src/util/surrealdb.rs
@@ -3,11 +3,18 @@ use leptos::*;
use leptos_use::{core::ConnectionReadyState, use_websocket, UseWebsocketReturn};
use serde::{Deserialize, Serialize};
use serde_json::json;
-use std::rc::Rc;
+use std::{alloc::handle_alloc_error, rc::Rc};
+
+#[derive(Serialize)]
+#[serde(untagged)]
+enum SurrealId {
+ String(String),
+ Integer(u32),
+}
#[derive(Serialize)]
struct SurrealRequest {
- id: u32,
+ id: SurrealId,
method: String,
params: Vec,
}
@@ -33,14 +40,18 @@ struct CreatePersonParam {
group: String,
}
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Participant {
+ id: String,
name: String,
group: String,
}
#[derive(Clone, Debug)]
-pub struct ParticipantsContext(pub ReadSignal>);
+pub struct ParticipantsContext {
+ pub read: ReadSignal>,
+ write: WriteSignal>,
+}
#[derive(Clone)]
pub struct SurrealContext {
@@ -51,16 +62,25 @@ pub struct SurrealContext {
pub set_authenticated: WriteSignal,
}
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
struct SurrealResponse {
- id: u32,
+ id: Option,
result: SurrealResult,
}
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
+struct SurrealAction {
+ id: String,
+ action: String,
+ result: Participant,
+}
+
+#[derive(Serialize, Deserialize, Clone)]
#[serde(untagged)]
enum SurrealResult {
String(String),
+ Participants(Vec),
+ Action(SurrealAction),
Null,
}
@@ -92,7 +112,7 @@ impl SurrealContext {
log::debug!("Signing into surrealdb");
let request = SurrealRequest {
- id: 0,
+ id: SurrealId::Integer(0),
method: String::from("signin"),
params: vec![SurrealParams::SigninParam(SigninParam {
user: String::from("root"),
@@ -109,7 +129,7 @@ impl SurrealContext {
}
let request = SurrealRequest {
- id: 1,
+ id: SurrealId::Integer(10),
method: String::from("create"),
params: vec![
SurrealParams::String(String::from("person")),
@@ -134,7 +154,7 @@ pub fn init_surrealdb() {
} = use_websocket("ws://localhost:80/rpc");
// Create reactive signals for the websocket connection to surrealDB
- let (participants, _set_participants) = create_signal::>(vec![]);
+ let (participants, set_participants) = create_signal::>(vec![]);
let (authenticated, set_authenticated) = create_signal::(false);
// Bind the websocket connection to a context
@@ -147,7 +167,10 @@ pub fn init_surrealdb() {
);
provide_context(websocket);
- provide_context(ParticipantsContext(participants));
+ provide_context(ParticipantsContext {
+ read: participants,
+ write: set_participants,
+ });
// Watch for a message recieved from the surrealDB connection
create_effect(move |prev_value| {
@@ -178,9 +201,17 @@ fn surrealdb_response(response: String) {
};
match response.id {
- 0 => use_surrealdb(response),
- 1 => log::debug!("Succesfully execute use wrb timings"),
- _ => return,
+ Some(0) => use_surrealdb(response.clone()),
+ Some(1) => get_participants(),
+ Some(2) => log::debug!("Subscribed to live timings"),
+ Some(5) => got_participants(response.result.clone()),
+ Some(_) => (),
+ None => (),
+ }
+
+ match response.result {
+ SurrealResult::Action(action) => handle_action(action),
+ _ => (),
}
}
@@ -196,7 +227,7 @@ fn use_surrealdb(_response: SurrealResponse) {
websocket.set_authenticated.set(true);
let request = SurrealRequest {
- id: 1,
+ id: SurrealId::Integer(1),
method: String::from("use"),
params: vec![
SurrealParams::String(String::from("wrb")),
@@ -206,3 +237,44 @@ fn use_surrealdb(_response: SurrealResponse) {
websocket.send(&json!(request).to_string())
}
+
+/// Function to get all participants and subscribe to changes
+fn get_participants() {
+ let websocket = expect_context::();
+
+ let request = SurrealRequest {
+ id: SurrealId::Integer(5),
+ method: String::from("select"),
+ params: vec![SurrealParams::String(String::from("person"))],
+ };
+
+ websocket.send(&json!(request).to_string());
+
+ let request = SurrealRequest {
+ id: SurrealId::Integer(2),
+ method: String::from("live"),
+ params: vec![SurrealParams::String(String::from("person"))],
+ };
+
+ websocket.send(&json!(request).to_string());
+}
+
+/// Function that will execute when participants are recieved
+fn got_participants(result: SurrealResult) {
+ let participants_context = expect_context::();
+
+ if let SurrealResult::Participants(mut value) = result {
+ let mut participants = participants_context.read.get();
+ participants.append(&mut value);
+ participants_context.write.set(participants);
+ }
+}
+
+/// Function to call when an action is recieved from surrealDB
+fn handle_action(action: SurrealAction) {
+ let participants_context = expect_context::();
+
+ let mut participants = participants_context.read.get();
+ participants.push(action.result);
+ participants_context.write.set(participants);
+}