display App version in settings (#801)

Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
This commit is contained in:
ToBinio
2023-11-21 16:38:22 +01:00
committed by GitHub
parent fd299aabe8
commit 531b38e562
3 changed files with 28 additions and 3 deletions

View File

@@ -24,7 +24,10 @@
:class="{ expanded: mode === 'expanded', isolated: mode === 'isolated' }" :class="{ expanded: mode === 'expanded', isolated: mode === 'isolated' }"
> >
<div v-if="selectedAccount" class="selected account"> <div v-if="selectedAccount" class="selected account">
<Avatar size="xs" :src="`https://mc-heads.net/avatar/${selectedAccount.id}/128`" /> <Avatar
size="xs"
:src="`https://crafatar.com/avatars/${selectedAccount.id}?size=128&overlay`"
/>
<div> <div>
<h4>{{ selectedAccount.username }}</h4> <h4>{{ selectedAccount.username }}</h4>
<p>Selected</p> <p>Selected</p>

View File

@@ -292,9 +292,11 @@ const exportPack = async () => {
.textarea-wrapper { .textarea-wrapper {
// margin-top: 1rem; // margin-top: 1rem;
height: 12rem; height: 12rem;
textarea { textarea {
max-height: 12rem; max-height: 12rem;
} }
.preview { .preview {
overflow-y: auto; overflow-y: auto;
} }

View File

@@ -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 { mixpanel_opt_out_tracking, mixpanel_opt_in_tracking } from '@/helpers/mixpanel'
import { open } from '@tauri-apps/api/dialog' import { open } from '@tauri-apps/api/dialog'
import { getOS } from '@/helpers/utils.js' import { getOS } from '@/helpers/utils.js'
import { version } from '../../package.json'
const pageOptions = ['Home', 'Library'] const pageOptions = ['Home', 'Library']
@@ -39,6 +40,8 @@ const accessSettings = async () => {
return settings return settings
} }
// const launcherVersion = await get_launcher_version().catch(handleError)
const fetchSettings = await accessSettings().catch(handleError) const fetchSettings = await accessSettings().catch(handleError)
const settings = ref(fetchSettings) const settings = ref(fetchSettings)
@@ -165,9 +168,13 @@ async function refreshDir() {
</span> </span>
<span v-else> Sign in to your Modrinth account. </span> <span v-else> Sign in to your Modrinth account. </span>
</label> </label>
<button v-if="credentials" class="btn" @click="logOut"><LogOutIcon /> Sign out</button> <button v-if="credentials" class="btn" @click="logOut">
<LogOutIcon />
Sign out
</button>
<button v-else class="btn" @click="$refs.loginScreenModal.show()"> <button v-else class="btn" @click="$refs.loginScreenModal.show()">
<LogInIcon /> Sign in <LogInIcon />
Sign in
</button> </button>
</div> </div>
<label for="theme"> <label for="theme">
@@ -528,6 +535,19 @@ async function refreshDir() {
/> />
</div> </div>
</Card> </Card>
<Card>
<div class="label">
<h3>
<span class="label__title size-card-header">About</span>
</h3>
</div>
<div>
<label>
<span class="label__title">App version</span>
<span class="label__description">Theseus v{{ version }} </span>
</label>
</div>
</Card>
</div> </div>
</template> </template>