From 4e093131f3d23bf6f1799927f2f937275b1b9e71 Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Tue, 3 Jun 2025 11:25:31 -0700
Subject: [PATCH] Install issues

---
 .../ui/servers/PlatformVersionSelectModal.vue | 13 ++++++--
 .../ui/servers/ServerInstallation.vue         |  3 +-
 .../src/pages/servers/manage/[id].vue         | 30 ++++++++++++-------
 .../src/pages/servers/manage/index.vue        |  2 +-
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
index ed281e08..a89c37fe 100644
--- a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
@@ -127,7 +127,10 @@
           </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">
             <label class="w-full text-lg font-bold text-contrast" for="hard-reset">
               Erase all data
@@ -146,7 +149,10 @@
           <div class="font-bold">This does not affect your backups, which are stored off-site.</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 class="mt-4 flex justify-start gap-4">
@@ -217,6 +223,7 @@ const props = defineProps<{
   server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
   currentLoader: Loaders | undefined;
   backupInProgress?: BackupInProgressReason;
+  initialSetup?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -456,7 +463,7 @@ const handleReinstall = async () => {
       selectedLoader.value,
       selectedMCVersion.value,
       selectedLoader.value === "Vanilla" ? "" : selectedLoaderVersion.value,
-      hardReset.value,
+      props.initialSetup ? true : hardReset.value,
     );
 
     emit("reinstall", {
diff --git a/apps/frontend/src/components/ui/servers/ServerInstallation.vue b/apps/frontend/src/components/ui/servers/ServerInstallation.vue
index cd11fec3..3493a997 100644
--- a/apps/frontend/src/components/ui/servers/ServerInstallation.vue
+++ b/apps/frontend/src/components/ui/servers/ServerInstallation.vue
@@ -2,8 +2,9 @@
   <LazyUiServersPlatformVersionSelectModal
     ref="versionSelectModal"
     :server="props.server"
-    :current-loader="ignoreCurrentInstallation ? null : (data?.loader as Loaders)"
+    :current-loader="ignoreCurrentInstallation ? undefined : (data?.loader as Loaders)"
     :backup-in-progress="backupInProgress"
+    :initial-setup="ignoreCurrentInstallation"
     @reinstall="emit('reinstall', $event)"
   />
 
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 8caac43c..224caa37 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -239,18 +239,26 @@
       </div>
     </div>
 
-    <div v-if="serverData.flows?.intro">
-      <h2 class="my-4 text-xl font-extrabold">
-        What would you like to install on your new server?
-      </h2>
+    <template v-if="serverData.flows?.intro">
+      <div
+        v-if="serverData?.status === 'installing'"
+        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
-        :server="server"
-        :backup-in-progress="backupInProgress"
-        ignore-current-installation
-        @reinstall="onReinstall"
-      />
-    </div>
+        <ServerInstallation
+          :server="server"
+          :backup-in-progress="backupInProgress"
+          ignore-current-installation
+          @reinstall="onReinstall"
+        />
+      </div>
+    </template>
 
     <template v-else>
       <div
diff --git a/apps/frontend/src/pages/servers/manage/index.vue b/apps/frontend/src/pages/servers/manage/index.vue
index 32b69676..ebd232dc 100644
--- a/apps/frontend/src/pages/servers/manage/index.vue
+++ b/apps/frontend/src/pages/servers/manage/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     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
       v-if="hasError || fetchError"