You've already forked AstralRinth
forked from didirus/AstralRinth
Fixes and enhancements (#350)
* Fixes #147 * Fixes #149 and #151 * Fixed #153 * Fixes #154 * Update ContextMenu.vue * Revert temp change to test windows * More bug fixes * Fixed modpack install bug * Fixes #314 * Lint * Fix #261
This commit is contained in:
@@ -29,7 +29,7 @@ import mixpanel from 'mixpanel-browser'
|
||||
import { saveWindowState, StateFlags } from 'tauri-plugin-window-state-api'
|
||||
import OnboardingModal from '@/components/OnboardingModal.vue'
|
||||
import { getVersion } from '@tauri-apps/api/app'
|
||||
import { window } from '@tauri-apps/api'
|
||||
import { window as TauriWindow } from '@tauri-apps/api'
|
||||
import { TauriEvent } from '@tauri-apps/api/event'
|
||||
import { await_sync, check_safe_loading_bars_complete } from './helpers/state'
|
||||
import { confirm } from '@tauri-apps/api/dialog'
|
||||
@@ -93,10 +93,10 @@ const handleClose = async () => {
|
||||
}
|
||||
}
|
||||
await await_sync()
|
||||
window.getCurrent().close()
|
||||
await TauriWindow.getCurrent().close()
|
||||
}
|
||||
|
||||
window.getCurrent().listen(TauriEvent.WINDOW_CLOSE_REQUESTED, async () => {
|
||||
TauriWindow.getCurrent().listen(TauriEvent.WINDOW_CLOSE_REQUESTED, async () => {
|
||||
await handleClose()
|
||||
})
|
||||
|
||||
@@ -136,8 +136,8 @@ document.querySelector('body').addEventListener('click', function (e) {
|
||||
path: target.href,
|
||||
},
|
||||
})
|
||||
e.preventDefault()
|
||||
}
|
||||
e.preventDefault()
|
||||
break
|
||||
}
|
||||
target = target.parentElement
|
||||
@@ -153,24 +153,13 @@ const accounts = ref(null)
|
||||
<suspense>
|
||||
<OnboardingModal ref="testModal" :accounts="accounts" />
|
||||
</suspense>
|
||||
<div class="nav-container" :class="{ expanded: !themeStore.collapsedNavigation }">
|
||||
<div class="nav-container">
|
||||
<div class="nav-section">
|
||||
<suspense>
|
||||
<AccountsCard
|
||||
ref="accounts"
|
||||
:mode="themeStore.collapsedNavigation ? 'small' : 'expanded'"
|
||||
/>
|
||||
<AccountsCard ref="accounts" mode="small" />
|
||||
</suspense>
|
||||
<div class="pages-list">
|
||||
<RouterLink
|
||||
to="/"
|
||||
class="btn"
|
||||
:class="{
|
||||
'icon-only': themeStore.collapsedNavigation,
|
||||
'collapsed-button': themeStore.collapsedNavigation,
|
||||
'expanded-button': !themeStore.collapsedNavigation,
|
||||
}"
|
||||
>
|
||||
<RouterLink to="/" class="btn icon-only collapsed-button">
|
||||
<HomeIcon />
|
||||
<span v-if="!themeStore.collapsedNavigation">Home</span>
|
||||
</RouterLink>
|
||||
@@ -232,15 +221,17 @@ const accounts = ref(null)
|
||||
</div>
|
||||
</div>
|
||||
<div class="view" :class="{ expanded: !themeStore.collapsedNavigation }">
|
||||
<div data-tauri-drag-region class="appbar">
|
||||
<section class="navigation-controls">
|
||||
<Breadcrumbs data-tauri-drag-region />
|
||||
</section>
|
||||
<section class="mod-stats">
|
||||
<Suspense>
|
||||
<RunningAppBar data-tauri-drag-region />
|
||||
</Suspense>
|
||||
</section>
|
||||
<div class="appbar-row">
|
||||
<div data-tauri-drag-region class="appbar">
|
||||
<section class="navigation-controls">
|
||||
<Breadcrumbs data-tauri-drag-region />
|
||||
</section>
|
||||
<section class="mod-stats">
|
||||
<Suspense>
|
||||
<RunningAppBar data-tauri-drag-region />
|
||||
</Suspense>
|
||||
</section>
|
||||
</div>
|
||||
<section class="window-controls">
|
||||
<Button class="titlebar-button" icon-only @click="() => appWindow.minimize()">
|
||||
<MinimizeIcon />
|
||||
@@ -291,12 +282,16 @@ const accounts = ref(null)
|
||||
width: min-content;
|
||||
}
|
||||
|
||||
.appbar-row {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.window-controls {
|
||||
z-index: 20;
|
||||
display: none;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
gap: 0.25rem;
|
||||
|
||||
.titlebar-button {
|
||||
display: flex;
|
||||
@@ -306,6 +301,8 @@ const accounts = ref(null)
|
||||
transition: all ease-in-out 0.1s;
|
||||
background-color: var(--color-raised-bg);
|
||||
color: var(--color-base);
|
||||
border-radius: 0;
|
||||
height: 3.25rem;
|
||||
|
||||
&.close {
|
||||
&:hover,
|
||||
@@ -342,6 +339,7 @@ const accounts = ref(null)
|
||||
.appbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-grow: 1;
|
||||
background: var(--color-raised-bg);
|
||||
box-shadow: inset 0px -3px 0px black;
|
||||
text-align: center;
|
||||
|
||||
Reference in New Issue
Block a user