diff --git a/desktop/components/Header.vue b/desktop/components/Header.vue index eeb5d655..731582d3 100644 --- a/desktop/components/Header.vue +++ b/desktop/components/Header.vue @@ -1,24 +1,24 @@ diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs index 2a8960c2..7c1d5a8b 100644 --- a/desktop/src-tauri/src/lib.rs +++ b/desktop/src-tauri/src/lib.rs @@ -25,12 +25,13 @@ pub enum AppStatus { SignedInNeedsReauth, } #[derive(Clone, Serialize, Deserialize)] +#[serde(rename_all="camelCase")] pub struct User { id: String, username: String, admin: bool, - displayName: String, - profilePicture: String, + display_name: String, + profile_picture: String, } #[derive(Clone, Serialize)] @@ -41,14 +42,14 @@ pub struct AppState { } #[tauri::command] -fn fetch_state<'a>(state: tauri::State<'_, Mutex>) -> Result { +fn fetch_state(state: tauri::State<'_, Mutex>) -> Result { let guard = state.lock().unwrap(); let cloned_state = guard.clone(); drop(guard); Ok(cloned_state) } -fn setup<'a>() -> AppState { +fn setup() -> AppState { env_logger::Builder::from_env(Env::default().default_filter_or("info")).init(); let is_set_up = db::is_set_up();