Revert "[Desktop] Fix server start view layout (#2226)"

This reverts commit 4461067.
Comfy-Org · Jan 11, 2025 · ad87080 · ad87080
1 parent 4461067
commit ad87080
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 40 deletions.
diff --git a/src/views/ServerStartView.vue b/src/views/ServerStartView.vue
@@ -1,45 +1,43 @@
 <template>
   <BaseViewTemplate dark class="flex-col">
-    <div class="flex flex-col w-full h-full items-center">
-      <h2 class="text-2xl font-bold">
-        {{ t(`serverStart.process.${status}`) }}
-        <span v-if="status === ProgressStatus.ERROR">
-          v{{ electronVersion }}
-        </span>
-      </h2>
-      <div
-        v-if="status === ProgressStatus.ERROR"
-        class="flex flex-col items-center gap-4"
-      >
-        <div class="flex items-center my-4 gap-2">
-          <Button
-            icon="pi pi-flag"
-            severity="secondary"
-            :label="t('serverStart.reportIssue')"
-            @click="reportIssue"
-          />
-          <Button
-            icon="pi pi-file"
-            severity="secondary"
-            :label="t('serverStart.openLogs')"
-            @click="openLogs"
-          />
-          <Button
-            icon="pi pi-refresh"
-            :label="t('serverStart.reinstall')"
-            @click="reinstall"
-          />
-        </div>
+    <h2 class="text-2xl font-bold">
+      {{ t(`serverStart.process.${status}`) }}
+      <span v-if="status === ProgressStatus.ERROR">
+        v{{ electronVersion }}
+      </span>
+    </h2>
+    <div
+      v-if="status === ProgressStatus.ERROR"
+      class="flex flex-col items-center gap-4"
+    >
+      <div class="flex items-center my-4 gap-2">
         <Button
-          v-if="!terminalVisible"
-          icon="pi pi-search"
+          icon="pi pi-flag"
           severity="secondary"
-          :label="t('serverStart.showTerminal')"
-          @click="terminalVisible = true"
+          :label="t('serverStart.reportIssue')"
+          @click="reportIssue"
+        />
+        <Button
+          icon="pi pi-file"
+          severity="secondary"
+          :label="t('serverStart.openLogs')"
+          @click="openLogs"
+        />
+        <Button
+          icon="pi pi-refresh"
+          :label="t('serverStart.reinstall')"
+          @click="reinstall"
         />
       </div>
-      <BaseTerminal v-show="terminalVisible" @created="terminalCreated" />
+      <Button
+        v-if="!terminalVisible"
+        icon="pi pi-search"
+        severity="secondary"
+        :label="t('serverStart.showTerminal')"
+        @click="terminalVisible = true"
+      />
     </div>
+    <BaseTerminal v-show="terminalVisible" @created="terminalCreated" />
   </BaseViewTemplate>
 </template>
 

diff --git a/vite.electron.config.mts b/vite.electron.config.mts
@@ -54,11 +54,7 @@ const mockElectronAPI: Plugin = {
           getElectronVersion: () => Promise.resolve('1.0.0'),
           getComfyUIVersion: () => '9.9.9',
           getPlatform: () => 'win32',
-          changeTheme: () => {},
-          Config: {
-            setWindowStyle: () => {},
-            getWindowStyle: () => Promise.resolve('default')
-          }
+          changeTheme: () => {}
         };`
       }
     ]