From 531b38e56225a7b31fb4dc461bf3de58f62c34c5 Mon Sep 17 00:00:00 2001 From: ToBinio <81473300+ToBinio@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:38:22 +0100 Subject: [PATCH] display App version in settings (#801) Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com> --- .../src/components/ui/AccountsCard.vue | 5 +++- theseus_gui/src/components/ui/ExportModal.vue | 2 ++ theseus_gui/src/pages/Settings.vue | 24 +++++++++++++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/theseus_gui/src/components/ui/AccountsCard.vue b/theseus_gui/src/components/ui/AccountsCard.vue index 7c2860056..f0d0eeb0f 100644 --- a/theseus_gui/src/components/ui/AccountsCard.vue +++ b/theseus_gui/src/components/ui/AccountsCard.vue @@ -24,7 +24,10 @@ :class="{ expanded: mode === 'expanded', isolated: mode === 'isolated' }" >
- +

{{ selectedAccount.username }}

Selected

diff --git a/theseus_gui/src/components/ui/ExportModal.vue b/theseus_gui/src/components/ui/ExportModal.vue index 4b8b9e5af..29684fae0 100644 --- a/theseus_gui/src/components/ui/ExportModal.vue +++ b/theseus_gui/src/components/ui/ExportModal.vue @@ -292,9 +292,11 @@ const exportPack = async () => { .textarea-wrapper { // margin-top: 1rem; height: 12rem; + textarea { max-height: 12rem; } + .preview { overflow-y: auto; } diff --git a/theseus_gui/src/pages/Settings.vue b/theseus_gui/src/pages/Settings.vue index 9fa66e2cd..59ff2376b 100644 --- a/theseus_gui/src/pages/Settings.vue +++ b/theseus_gui/src/pages/Settings.vue @@ -22,6 +22,7 @@ import ModrinthLoginScreen from '@/components/ui/tutorial/ModrinthLoginScreen.vu import { mixpanel_opt_out_tracking, mixpanel_opt_in_tracking } from '@/helpers/mixpanel' import { open } from '@tauri-apps/api/dialog' import { getOS } from '@/helpers/utils.js' +import { version } from '../../package.json' const pageOptions = ['Home', 'Library'] @@ -39,6 +40,8 @@ const accessSettings = async () => { return settings } +// const launcherVersion = await get_launcher_version().catch(handleError) + const fetchSettings = await accessSettings().catch(handleError) const settings = ref(fetchSettings) @@ -165,9 +168,13 @@ async function refreshDir() { Sign in to your Modrinth account. - +
+ +
+

+ About +

+
+
+ +
+