Dolls (UI WIP)
This commit is contained in:
@@ -4,6 +4,7 @@ use crate::{
|
||||
FriendRemote, FriendRequestResponseDto, FriendshipResponseDto, SendFriendRequestDto,
|
||||
UserBasicDto,
|
||||
},
|
||||
remotes::dolls::{DollsRemote, CreateDollDto, UpdateDollDto, DollDto},
|
||||
services::cursor::start_cursor_tracking,
|
||||
state::{init_app_data, FDOLL},
|
||||
};
|
||||
@@ -159,6 +160,38 @@ async fn unfriend(friend_id: String) -> Result<(), String> {
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
async fn get_dolls() -> Result<Vec<DollDto>, String> {
|
||||
DollsRemote::new()
|
||||
.get_dolls()
|
||||
.await
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
async fn create_doll(dto: CreateDollDto) -> Result<DollDto, String> {
|
||||
DollsRemote::new()
|
||||
.create_doll(dto)
|
||||
.await
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
async fn update_doll(id: String, dto: UpdateDollDto) -> Result<DollDto, String> {
|
||||
DollsRemote::new()
|
||||
.update_doll(&id, dto)
|
||||
.await
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
async fn delete_doll(id: String) -> Result<(), String> {
|
||||
DollsRemote::new()
|
||||
.delete_doll(&id)
|
||||
.await
|
||||
.map_err(|e| e.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
fn quit_app() -> Result<(), String> {
|
||||
let app_handle = get_app_handle();
|
||||
@@ -184,6 +217,10 @@ pub fn run() {
|
||||
accept_friend_request,
|
||||
deny_friend_request,
|
||||
unfriend,
|
||||
get_dolls,
|
||||
create_doll,
|
||||
update_doll,
|
||||
delete_doll,
|
||||
quit_app
|
||||
])
|
||||
.setup(|app| {
|
||||
|
||||
177
src-tauri/src/remotes/dolls.rs
Normal file
177
src-tauri/src/remotes/dolls.rs
Normal file
@@ -0,0 +1,177 @@
|
||||
use reqwest::Client;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use thiserror::Error;
|
||||
use ts_rs::TS;
|
||||
|
||||
use crate::{lock_r, services::auth::with_auth, state::FDOLL};
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum RemoteError {
|
||||
#[error("HTTP error: {0}")]
|
||||
Http(#[from] reqwest::Error),
|
||||
#[error("JSON parse error: {0}")]
|
||||
Json(#[from] serde_json::Error),
|
||||
#[error("{0}")]
|
||||
Api(String),
|
||||
}
|
||||
|
||||
#[derive(Default, Serialize, Deserialize, Clone, Debug, TS)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[ts(export)]
|
||||
pub struct DollColorSchemeDto {
|
||||
pub outline: String,
|
||||
pub body: String,
|
||||
}
|
||||
|
||||
#[derive(Default, Serialize, Deserialize, Clone, Debug, TS)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[ts(export)]
|
||||
pub struct DollConfigurationDto {
|
||||
pub color_scheme: DollColorSchemeDto,
|
||||
}
|
||||
|
||||
#[derive(Default, Serialize, Deserialize, Clone, Debug, TS)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[ts(export)]
|
||||
pub struct CreateDollDto {
|
||||
pub name: String,
|
||||
pub configuration: Option<DollConfigurationDto>,
|
||||
}
|
||||
|
||||
#[derive(Default, Serialize, Deserialize, Clone, Debug, TS)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[ts(export)]
|
||||
pub struct UpdateDollDto {
|
||||
pub name: Option<String>,
|
||||
pub configuration: Option<DollConfigurationDto>,
|
||||
}
|
||||
|
||||
#[derive(Default, Serialize, Deserialize, Clone, Debug, TS)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[ts(export)]
|
||||
pub struct DollDto {
|
||||
pub id: String,
|
||||
pub name: String,
|
||||
pub configuration: DollConfigurationDto,
|
||||
pub created_at: String,
|
||||
pub updated_at: String,
|
||||
}
|
||||
|
||||
pub struct DollsRemote {
|
||||
pub base_url: String,
|
||||
pub client: Client,
|
||||
}
|
||||
|
||||
impl DollsRemote {
|
||||
pub fn new() -> Self {
|
||||
let guard = lock_r!(FDOLL);
|
||||
Self {
|
||||
base_url: guard
|
||||
.app_config
|
||||
.api_base_url
|
||||
.as_ref()
|
||||
.expect("App configuration error")
|
||||
.clone(),
|
||||
client: guard
|
||||
.clients
|
||||
.as_ref()
|
||||
.expect("App configuration error")
|
||||
.http_client
|
||||
.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_dolls(&self) -> Result<Vec<DollDto>, RemoteError> {
|
||||
let url = format!("{}/dolls", self.base_url);
|
||||
tracing::info!("DollsRemote::get_dolls - Sending GET request to URL: {}", url);
|
||||
let resp = with_auth(self.client.get(url)).await.send().await?;
|
||||
|
||||
let resp = resp.error_for_status().map_err(|e| {
|
||||
tracing::error!("DollsRemote::get_dolls - HTTP error: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
let text = resp.text().await.map_err(|e| {
|
||||
tracing::error!("DollsRemote::get_dolls - Failed to read response text: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
let dolls: Vec<DollDto> = serde_json::from_str(&text).map_err(|e| {
|
||||
tracing::error!("DollsRemote::get_dolls - Failed to parse JSON: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
tracing::info!("DollsRemote::get_dolls - Successfully parsed {} dolls", dolls.len());
|
||||
Ok(dolls)
|
||||
}
|
||||
|
||||
pub async fn create_doll(&self, dto: CreateDollDto) -> Result<DollDto, RemoteError> {
|
||||
let url = format!("{}/dolls", self.base_url);
|
||||
tracing::info!("DollsRemote::create_doll - Sending POST request to URL: {}", url);
|
||||
|
||||
let resp = with_auth(self.client.post(url))
|
||||
.await
|
||||
.json(&dto)
|
||||
.send()
|
||||
.await?;
|
||||
|
||||
let resp = resp.error_for_status().map_err(|e| {
|
||||
tracing::error!("DollsRemote::create_doll - HTTP error: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
let text = resp.text().await.map_err(|e| {
|
||||
tracing::error!("DollsRemote::create_doll - Failed to read response text: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
let doll: DollDto = serde_json::from_str(&text).map_err(|e| {
|
||||
tracing::error!("DollsRemote::create_doll - Failed to parse JSON: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
Ok(doll)
|
||||
}
|
||||
|
||||
pub async fn update_doll(&self, id: &str, dto: UpdateDollDto) -> Result<DollDto, RemoteError> {
|
||||
let url = format!("{}/dolls/{}", self.base_url, id);
|
||||
tracing::info!("DollsRemote::update_doll - Sending PATCH request to URL: {}", url);
|
||||
|
||||
let resp = with_auth(self.client.patch(url))
|
||||
.await
|
||||
.json(&dto)
|
||||
.send()
|
||||
.await?;
|
||||
|
||||
let resp = resp.error_for_status().map_err(|e| {
|
||||
tracing::error!("DollsRemote::update_doll - HTTP error: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
let text = resp.text().await.map_err(|e| {
|
||||
tracing::error!("DollsRemote::update_doll - Failed to read response text: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
let doll: DollDto = serde_json::from_str(&text).map_err(|e| {
|
||||
tracing::error!("DollsRemote::update_doll - Failed to parse JSON: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
Ok(doll)
|
||||
}
|
||||
|
||||
pub async fn delete_doll(&self, id: &str) -> Result<(), RemoteError> {
|
||||
let url = format!("{}/dolls/{}", self.base_url, id);
|
||||
tracing::info!("DollsRemote::delete_doll - Sending DELETE request to URL: {}", url);
|
||||
|
||||
let resp = with_auth(self.client.delete(url)).await.send().await?;
|
||||
|
||||
resp.error_for_status().map_err(|e| {
|
||||
tracing::error!("DollsRemote::delete_doll - HTTP error: {}", e);
|
||||
e
|
||||
})?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
@@ -1,2 +1,3 @@
|
||||
pub mod friends;
|
||||
pub mod user;
|
||||
pub mod dolls;
|
||||
|
||||
Reference in New Issue
Block a user