eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Merge commit '07712e3ed494a64a61c96df277f06a8d87144d24' into feature-clean

Browse Source
This commit is contained in:
DIDIRUS4
2024-09-01 20:54:12 +03:00
parent 1e0e927789 07712e3ed4
commit 81174306fe
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app-frontend/src/components/ui/AccountsCard.vue
View File

@@ -54,9 +54,9 @@
</div> </div>
</Card> </Card>
</transition> </transition>
<ModalWrapper ref="loginOfflineModal" class="modal" header="Offline auth"> <ModalWrapper ref="loginOfflineModal" class="modal" header="Add new offline account">
<div class="modal-body"> <div class="modal-body">
<div class="label">Offline account</div> <div class="label">Enter offline username</div>
<input type="text" v-model="playerName" placeholder="Provide offline player name" /> <input type="text" v-model="playerName" placeholder="Provide offline player name" />
<Button icon-only color="secondary" @click="offlineLoginFinally()"> <Button icon-only color="secondary" @click="offlineLoginFinally()">
Continue Continue

2
apps/app-frontend/src/components/ui/InstanceCreationModal.vue
View File

@@ -379,7 +379,7 @@ const upload_icon = async () => {
], ],
}) })
icon.value = res ? res.path : null icon.value = res ? res : null
if (!icon.value) return if (!icon.value) return
display_icon.value = convertFileSrc(icon.value) display_icon.value = convertFileSrc(icon.value)

2
apps/app-frontend/src/pages/instance/Options.vue
View File

@@ -581,7 +581,7 @@ async function setIcon() {
if (!value) return if (!value) return
icon.value = value.path icon.value = value
await edit_icon(props.instance.path, icon.value).catch(handleError) await edit_icon(props.instance.path, icon.value).catch(handleError)
trackEvent('InstanceSetIcon') trackEvent('InstanceSetIcon')

26
patches/icon-selection-fix.patch Normal file
View File

@@ -0,0 +1,26 @@
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
index 9333a75a..e439c203 100644
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
@@ -379,7 +379,7 @@ const upload_icon = async () => {
],
})
- icon.value = res ? res.path : null
+ icon.value = res ? res : null
if (!icon.value) return
display_icon.value = convertFileSrc(icon.value)
diff --git a/apps/app-frontend/src/pages/instance/Options.vue b/apps/app-frontend/src/pages/instance/Options.vue
index e4166eab..9ca84390 100644
--- a/apps/app-frontend/src/pages/instance/Options.vue
+++ b/apps/app-frontend/src/pages/instance/Options.vue
@@ -581,7 +581,7 @@ async function setIcon() {
if (!value) return
- icon.value = value.path
+ icon.value = value
await edit_icon(props.instance.path, icon.value).catch(handleError)
trackEvent('InstanceSetIcon')