oiupoyt/OneLauncher-Cracked
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

chore: Some small things

Browse source
This commit is contained in:
LynithDev 2024-08-07 11:52:12 +02:00
parent 87a447ed9e
commit a199d4a80b
4 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -3493,6 +3493,7 @@ dependencies = [
"objc",
"once_cell",
"onelauncher",
"onelauncher_macros",
"serde",
"serde_json",
"specta",

1
apps/desktop/Cargo.toml
View file

@ -24,6 +24,7 @@ tauri-build = { workspace = true, features = [ "isolation" ] }
[dependencies]
onelauncher = { workspace = true, features = [ "tauri" ] }
onelauncher_macros = { workspace = true }
tauri-plugin-shell = { workspace = true }
tauri-plugin-window-state = { workspace = true }

22
apps/desktop/src/api/commands/users.rs
View file

@ -1,4 +1,4 @@
use onelauncher::data::MinecraftCredentials;
use onelauncher::{data::MinecraftCredentials, store::MinecraftLogin};
use onelauncher::minecraft;
use tauri::{AppHandle, Manager};
use uuid::Uuid;
@ -43,6 +43,16 @@ pub async fn set_default_user(uuid: Uuid) -> Result<(), String> {
#[tauri::command]
pub async fn auth_login(handle: AppHandle) -> Result<Option<MinecraftCredentials>, String> {
let flow = minecraft::begin().await?;
// let result = (*(tokio::spawn(async {
// Box::pin(spawn_webview(handle, flow).await)
// }).await.map_err(|err| err.to_string())?)).clone()?;
let result = spawn_webview(handle, flow).await?;
Ok(result)
}
async fn spawn_webview(handle: AppHandle, flow: MinecraftLogin) -> Result<Option<MinecraftCredentials>, String> {
let now = chrono::Utc::now();
if let Some(win) = handle.get_webview_window("login") {
@ -59,11 +69,11 @@ pub async fn auth_login(handle: AppHandle) -> Result<Option<MinecraftCredentials
.map_err(|err| err.to_string())?,
),
)
.title("Log into OneLauncher")
.always_on_top(true)
.center()
.build()
.map_err(|err| err.to_string())?;
.title("Log into OneLauncher")
.always_on_top(true)
.center()
.build()
.map_err(|err| err.to_string())?;
win.request_user_attention(Some(tauri::UserAttentionType::Critical))
.map_err(|err| err.to_string())?;

1
apps/frontend/src/ui/hooks/useSettings.tsx
View file

@ -38,7 +38,6 @@ export function SettingsProvider(props: ParentProps) {
});
},
save: (settings) => {
console.log('saving settings');
bridge.commands.setSettings(settings).then(() => {
syncSettings(settings);
refetch();