diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue index 0fbc724f6e..dbdc2a35dc 100644 --- a/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue @@ -31,6 +31,7 @@ import { Button, ButtonStyled, commonMessages, + CreationFlowModal, defineMessages, I18nDebugPanel, NewsArticleCard, @@ -65,7 +66,6 @@ import FriendsList from '@/components/ui/friends/FriendsList.vue' import IncompatibilityWarningModal from '@/components/ui/install_flow/IncompatibilityWarningModal.vue' import InstallConfirmModal from '@/components/ui/install_flow/InstallConfirmModal.vue' import ModInstallModal from '@/components/ui/install_flow/ModInstallModal.vue' -import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue' import AppSettingsModal from '@/components/ui/modal/AppSettingsModal.vue' import AuthGrantFlowWaitModal from '@/components/ui/modal/AuthGrantFlowWaitModal.vue' import NavButton from '@/components/ui/NavButton.vue' @@ -84,6 +84,7 @@ import { get_user } from '@/helpers/cache.js' import { command_listener, warning_listener } from '@/helpers/events.js' import { useFetch } from '@/helpers/fetch.js' import { cancelLogin, get as getCreds, login, logout } from '@/helpers/mr_auth.ts' +import { create_profile_and_install_from_file } from '@/helpers/pack' import { list } from '@/helpers/profile.js' import { get as getSettings, set as setSettings } from '@/helpers/settings.ts' import { get_opening_command, initialize_state } from '@/helpers/state' @@ -100,11 +101,11 @@ import { provideAppUpdateDownloadProgress, subscribeToDownloadProgress, } from '@/providers/download-progress.ts' +import { setupProviders } from '@/providers/setup' import { useError } from '@/store/error.js' import { useInstall } from '@/store/install.js' import { useLoading, useTheming } from '@/store/state' -import { create_profile_and_install_from_file } from './helpers/pack' import { generateSkinPreviews } from './helpers/rendering/batch-skin-renderer' import { get_available_capes, get_available_skins } from './helpers/skins' import { AppNotificationManager } from './providers/app-notifications' @@ -134,6 +135,10 @@ provideModalBehavior({ onShow: () => hide_ads_window(), onHide: () => show_ads_window(), }) + +const { installationModal, handleCreate, handleBrowseModpacks } = + setupProviders(notificationManager) + const news = ref([]) const availableSurvey = ref(false) @@ -804,9 +809,13 @@ provideAppUpdateDownloadProgress(appUpdateDownload) - - - +
@@ -852,7 +861,7 @@ provideAppUpdateDownloadProgress(appUpdateDownload) diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue deleted file mode 100644 index b2920fbb5e..0000000000 --- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue +++ /dev/null @@ -1,662 +0,0 @@ -