Merge branch 'process' into user
This commit is contained in:
commit
162cdd49af
@ -1,4 +1,4 @@
|
|||||||
use bitcoin::PublicKey;
|
use sp_backend::bitcoin::PublicKey;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::{json, Value};
|
use serde_json::{json, Value};
|
||||||
//use sp_backend::silentpayments::sending::SilentPaymentAddress;
|
//use sp_backend::silentpayments::sending::SilentPaymentAddress;
|
||||||
|
@ -21,6 +21,8 @@ use web_sys::js_sys::JsString;
|
|||||||
|
|
||||||
use crate::user::{User, UserKeys, CONNECTED_USERS};
|
use crate::user::{User, UserKeys, CONNECTED_USERS};
|
||||||
|
|
||||||
|
use crate::process::{ItemMember, Process, Role};
|
||||||
|
|
||||||
type ApiResult<T: FromWasmAbi> = Result<T, ApiError>;
|
type ApiResult<T: FromWasmAbi> = Result<T, ApiError>;
|
||||||
|
|
||||||
const IS_TESTNET: bool = true;
|
const IS_TESTNET: bool = true;
|
||||||
@ -157,3 +159,39 @@ pub fn create_user(
|
|||||||
|
|
||||||
Ok(generate_user)
|
Ok(generate_user)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Tsify, Serialize, Deserialize)]
|
||||||
|
#[tsify(into_wasm_abi)]
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
pub struct get_process_return(Vec<Process>);
|
||||||
|
|
||||||
|
#[wasm_bindgen]
|
||||||
|
pub fn get_processes() -> ApiResult<get_process_return> {
|
||||||
|
let member1 = ItemMember::new(Role::Manager, String::from(""));
|
||||||
|
let member2 = ItemMember::new(Role::Manager, String::from(""));
|
||||||
|
let member3 = ItemMember::new(Role::Manager, String::from(""));
|
||||||
|
|
||||||
|
//instances of process
|
||||||
|
let process1 = Process {
|
||||||
|
id: String::from("1"),
|
||||||
|
version: String::from("1.0"),
|
||||||
|
gestionnaires: vec![member1.clone(), member2.clone()],
|
||||||
|
};
|
||||||
|
let process2 = Process {
|
||||||
|
id: String::from("2"),
|
||||||
|
version: String::from("2.0"),
|
||||||
|
gestionnaires: vec![member2.clone(), member3.clone()],
|
||||||
|
};
|
||||||
|
let process3 = Process {
|
||||||
|
id: String::from("3"),
|
||||||
|
version: String::from("1.0"),
|
||||||
|
gestionnaires: vec![member3.clone(), member1.clone()],
|
||||||
|
};
|
||||||
|
|
||||||
|
// vec with the instances of processes
|
||||||
|
let mut data_process: Vec<Process> = Vec::new();
|
||||||
|
data_process.push(process1);
|
||||||
|
data_process.push(process2);
|
||||||
|
data_process.push(process3);
|
||||||
|
Ok(get_process_return(data_process))
|
||||||
|
}
|
||||||
|
@ -3,6 +3,6 @@ pub mod api;
|
|||||||
mod injecteurhtml;
|
mod injecteurhtml;
|
||||||
mod user;
|
mod user;
|
||||||
mod aesgcm;
|
mod aesgcm;
|
||||||
mod secretdata;
|
|
||||||
mod Prd_list;
|
mod Prd_list;
|
||||||
|
mod process;
|
||||||
|
|
||||||
|
@ -1,10 +1,38 @@
|
|||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use serde_json::{json, Value};
|
||||||
|
use tsify::Tsify;
|
||||||
use wasm_bindgen::prelude::*;
|
use wasm_bindgen::prelude::*;
|
||||||
|
|
||||||
#[wasm_bindgen]
|
// process member (gestionnaire for now)
|
||||||
pub fn get_process() -> Vec<String> {
|
#[derive(Debug, Default, Serialize, Deserialize, Clone)]
|
||||||
let mut data_process: Vec<String> = Vec::new();
|
pub enum Role {
|
||||||
data_process.push(String::from("process1"));
|
Manager,
|
||||||
data_process.push(String::from("process2"));
|
#[default]
|
||||||
data_process.push(String::from("process3"));
|
User,
|
||||||
data_process
|
}
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default, Tsify, Clone)]
|
||||||
|
#[tsify(into_wasm_abi)]
|
||||||
|
pub struct ItemMember {
|
||||||
|
pub role: Role, //gestionnaire
|
||||||
|
pub sp_address: String,
|
||||||
|
//pre_id
|
||||||
|
//shard
|
||||||
|
//priv_key_mainnet_spend
|
||||||
|
//priv_key_mainnet_scan
|
||||||
|
//priv_key_signet_scan
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ItemMember {
|
||||||
|
pub fn new(role: Role, sp_address: String) -> Self {
|
||||||
|
ItemMember { role, sp_address }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize, Default, Tsify)]
|
||||||
|
#[tsify(into_wasm_abi, from_wasm_abi)]
|
||||||
|
pub struct Process {
|
||||||
|
pub id: String,
|
||||||
|
pub version: String,
|
||||||
|
pub gestionnaires: Vec<ItemMember>,
|
||||||
|
//item_name : String,
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user