Skip to content

Commit dfb6814

Browse files
authored
feat: add unknown .mrpack install warning modal (#5942)
* Update modpack button copy * Change outlined button style for standard buttons * add unknown pack warning modal * implementation * Redo download toasts * prepr * improve hit area of window controls * implement "don't show again" * prepr * duplicate modal ref declarations * increase spacing of progress items * address truman review
1 parent a80cc7e commit dfb6814

24 files changed

Lines changed: 1208 additions & 587 deletions

File tree

apps/app-frontend/src/App.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,13 @@ import { RouterView, useRoute, useRouter } from 'vue-router'
6868
6969
import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
7070
import AccountsCard from '@/components/ui/AccountsCard.vue'
71+
import AppActionBar from '@/components/ui/AppActionBar.vue'
7172
import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
7273
import ErrorModal from '@/components/ui/ErrorModal.vue'
7374
import FriendsList from '@/components/ui/friends/FriendsList.vue'
7475
import AddServerToInstanceModal from '@/components/ui/install_flow/AddServerToInstanceModal.vue'
7576
import IncompatibilityWarningModal from '@/components/ui/install_flow/IncompatibilityWarningModal.vue'
77+
import UnknownPackWarningModal from '@/components/ui/install_flow/UnknownPackWarningModal.vue'
7678
import MinecraftAuthErrorModal from '@/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue'
7779
import AppSettingsModal from '@/components/ui/modal/AppSettingsModal.vue'
7880
import AuthGrantFlowWaitModal from '@/components/ui/modal/AuthGrantFlowWaitModal.vue'
@@ -82,7 +84,6 @@ import UpdateToPlayModal from '@/components/ui/modal/UpdateToPlayModal.vue'
8284
import NavButton from '@/components/ui/NavButton.vue'
8385
import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
8486
import QuickInstanceSwitcher from '@/components/ui/QuickInstanceSwitcher.vue'
85-
import RunningAppBar from '@/components/ui/RunningAppBar.vue'
8687
import SplashScreen from '@/components/ui/SplashScreen.vue'
8788
import WindowControls from '@/components/ui/WindowControls.vue'
8889
import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
@@ -172,6 +173,7 @@ provideModalBehavior({
172173
173174
const {
174175
installationModal,
176+
unknownPackWarningModal,
175177
fetchExistingInstanceNames,
176178
handleCreate,
177179
handleBrowseModpacks,
@@ -181,7 +183,7 @@ const {
181183
setModpackAlreadyInstalledModal,
182184
handleModpackDuplicateCreateAnyway,
183185
handleModpackDuplicateGoToInstance,
184-
} = setupProviders(notificationManager)
186+
} = setupProviders(notificationManager, popupNotificationManager)
185187
186188
const news = ref([])
187189
const availableSurvey = ref(false)
@@ -784,7 +786,9 @@ async function handleCommand(e) {
784786
if (e.event === 'RunMRPack') {
785787
// RunMRPack should directly install a local mrpack given a path
786788
if (e.path.endsWith('.mrpack')) {
787-
await create_profile_and_install_from_file(e.path).catch(handleError)
789+
await create_profile_and_install_from_file(e.path, (createProfile, fileName) =>
790+
unknownPackWarningModal.value?.show(createProfile, fileName),
791+
).catch(handleError)
788792
trackEvent('InstanceCreate', {
789793
source: 'CreationModalFileDrop',
790794
})
@@ -1171,7 +1175,6 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
11711175
</script>
11721176
11731177
<template>
1174-
<WindowControls />
11751178
<SplashScreen v-if="!stateFailed" ref="splashScreen" data-tauri-drag-region />
11761179
<div id="teleports"></div>
11771180
<div
@@ -1211,6 +1214,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
12111214
@create="handleCreate"
12121215
@browse-modpacks="handleBrowseModpacks"
12131216
/>
1217+
<UnknownPackWarningModal ref="unknownPackWarningModal" />
12141218
<div
12151219
class="app-grid-navbar bg-bg-raised flex flex-col p-[0.5rem] pt-0 gap-[0.5rem] w-[--left-bar-width]"
12161220
>
@@ -1367,9 +1371,10 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
13671371
</ButtonStyled>
13681372
<div class="flex mr-3">
13691373
<Suspense>
1370-
<RunningAppBar />
1374+
<AppActionBar />
13711375
</Suspense>
13721376
</div>
1377+
<WindowControls />
13731378
</section>
13741379
</div>
13751380
</div>

0 commit comments

Comments
 (0)