Install issues

This commit is contained in:
Prospector
2025-06-03 11:25:31 -07:00
parent 6ca8a4e5fd
commit 4e093131f3
4 changed files with 32 additions and 16 deletions

View File

@@ -127,7 +127,10 @@
</div> </div>
</div> </div>
<div class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4"> <div
v-if="!initialSetup"
class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4"
>
<div class="flex w-full flex-row items-center justify-between"> <div class="flex w-full flex-row items-center justify-between">
<label class="w-full text-lg font-bold text-contrast" for="hard-reset"> <label class="w-full text-lg font-bold text-contrast" for="hard-reset">
Erase all data Erase all data
@@ -146,7 +149,10 @@
<div class="font-bold">This does not affect your backups, which are stored off-site.</div> <div class="font-bold">This does not affect your backups, which are stored off-site.</div>
</div> </div>
<BackupWarning :backup-link="`/servers/manage/${props.server?.serverId}/backups`" /> <BackupWarning
v-if="!initialSetup"
:backup-link="`/servers/manage/${props.server?.serverId}/backups`"
/>
</div> </div>
<div class="mt-4 flex justify-start gap-4"> <div class="mt-4 flex justify-start gap-4">
@@ -217,6 +223,7 @@ const props = defineProps<{
server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>; server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
currentLoader: Loaders | undefined; currentLoader: Loaders | undefined;
backupInProgress?: BackupInProgressReason; backupInProgress?: BackupInProgressReason;
initialSetup?: boolean;
}>(); }>();
const emit = defineEmits<{ const emit = defineEmits<{
@@ -456,7 +463,7 @@ const handleReinstall = async () => {
selectedLoader.value, selectedLoader.value,
selectedMCVersion.value, selectedMCVersion.value,
selectedLoader.value === "Vanilla" ? "" : selectedLoaderVersion.value, selectedLoader.value === "Vanilla" ? "" : selectedLoaderVersion.value,
hardReset.value, props.initialSetup ? true : hardReset.value,
); );
emit("reinstall", { emit("reinstall", {

View File

@@ -2,8 +2,9 @@
<LazyUiServersPlatformVersionSelectModal <LazyUiServersPlatformVersionSelectModal
ref="versionSelectModal" ref="versionSelectModal"
:server="props.server" :server="props.server"
:current-loader="ignoreCurrentInstallation ? null : (data?.loader as Loaders)" :current-loader="ignoreCurrentInstallation ? undefined : (data?.loader as Loaders)"
:backup-in-progress="backupInProgress" :backup-in-progress="backupInProgress"
:initial-setup="ignoreCurrentInstallation"
@reinstall="emit('reinstall', $event)" @reinstall="emit('reinstall', $event)"
/> />

View File

@@ -239,18 +239,26 @@
</div> </div>
</div> </div>
<div v-if="serverData.flows?.intro"> <template v-if="serverData.flows?.intro">
<h2 class="my-4 text-xl font-extrabold"> <div
What would you like to install on your new server? v-if="serverData?.status === 'installing'"
</h2> class="w-50 h-50 flex items-center justify-center gap-2 text-center text-lg font-bold"
>
<LazyUiServersPanelSpinner class="size-10 animate-spin" /> Setting up your server...
</div>
<div v-else>
<h2 class="my-4 text-xl font-extrabold">
What would you like to install on your new server?
</h2>
<ServerInstallation <ServerInstallation
:server="server" :server="server"
:backup-in-progress="backupInProgress" :backup-in-progress="backupInProgress"
ignore-current-installation ignore-current-installation
@reinstall="onReinstall" @reinstall="onReinstall"
/> />
</div> </div>
</template>
<template v-else> <template v-else>
<div <div

View File

@@ -1,7 +1,7 @@
<template> <template>
<div <div
data-pyro-server-list-root data-pyro-server-list-root
class="experimental-styles-within relative mx-auto flex min-h-screen w-full max-w-[1280px] flex-col px-6" class="experimental-styles-within relative mx-auto mb-6 flex min-h-screen w-full max-w-[1280px] flex-col px-6"
> >
<div <div
v-if="hasError || fetchError" v-if="hasError || fetchError"