From 06ace174e6ba135978fbb94b0a2a95a80ff5b5f4 Mon Sep 17 00:00:00 2001 From: "Adrian O.V" <83074853+CodexAdrian@users.noreply.github.com> Date: Tue, 11 Apr 2023 18:21:10 -0400 Subject: [PATCH] MC Authentication + Account switching (#78) * Popup, login * Fix Lint * Switch to UUID for avatars * Fix issues * Fixed logging out bug * Update AccountsCard.vue * Revert experiment * Fix button clicking * Addressed Changes --- theseus_gui/src-tauri/Cargo.toml | 2 +- theseus_gui/src-tauri/tauri.conf.json | 4 + theseus_gui/src/App.vue | 6 +- theseus_gui/src/assets/icons/index.js | 1 + theseus_gui/src/assets/icons/log-in.svg | 1 + .../src/assets/stylesheets/global.scss | 7 + .../src/components/ui/AccountsCard.vue | 243 ++++++++++++++++++ theseus_gui/src/components/ui/Instance.vue | 1 + 8 files changed, 262 insertions(+), 3 deletions(-) create mode 100644 theseus_gui/src/assets/icons/log-in.svg create mode 100644 theseus_gui/src/components/ui/AccountsCard.vue diff --git a/theseus_gui/src-tauri/Cargo.toml b/theseus_gui/src-tauri/Cargo.toml index d44785cdf..622a8bd48 100644 --- a/theseus_gui/src-tauri/Cargo.toml +++ b/theseus_gui/src-tauri/Cargo.toml @@ -19,7 +19,7 @@ theseus = { path = "../../theseus" } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.2", features = ["protocol-asset"] } +tauri = { version = "1.2", features = ["protocol-asset", "window-close", "window-create"] } tokio = { version = "1", features = ["full"] } thiserror = "1.0" tokio-stream = { version = "0.1", features = ["fs"] } diff --git a/theseus_gui/src-tauri/tauri.conf.json b/theseus_gui/src-tauri/tauri.conf.json index 078fd4f3f..8e9e8ac62 100644 --- a/theseus_gui/src-tauri/tauri.conf.json +++ b/theseus_gui/src-tauri/tauri.conf.json @@ -16,6 +16,10 @@ "protocol": { "asset": true, "assetScope": ["$APPDATA/caches/icons/*"] + }, + "window": { + "create": true, + "close": true } }, "bundle": { diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue index 6a805b693..4689b66ba 100644 --- a/theseus_gui/src/App.vue +++ b/theseus_gui/src/App.vue @@ -9,9 +9,9 @@ import { ClientIcon, PlusIcon, SettingsIcon, - Avatar, } from 'omorphia' import { useTheming } from '@/store/state' +import AccountsCard from '@/components/ui/AccountsCard.vue' import { toggleTheme } from '@/helpers/theme' import { list } from '@/helpers/profile' @@ -38,7 +38,9 @@ list().then(