From 1a48f2dee9c0ee83f6f1f24b2d21a722e6c57847 Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Wed, 10 May 2023 00:32:27 -0400
Subject: [PATCH] initial revert

---
 theseus_gui/src/components/ui/AccountsCard.vue |  2 +-
 theseus_gui/src/components/ui/Instance.vue     |  4 +++-
 theseus_gui/src/pages/Browse.vue               | 15 +++------------
 theseus_gui/src/pages/Index.vue                | 10 ----------
 theseus_gui/src/pages/Settings.vue             | 16 +---------------
 theseus_gui/src/pages/instance/Index.vue       | 10 ----------
 theseus_gui/src/pages/project/Index.vue        | 16 +---------------
 7 files changed, 9 insertions(+), 64 deletions(-)

diff --git a/theseus_gui/src/components/ui/AccountsCard.vue b/theseus_gui/src/components/ui/AccountsCard.vue
index 073d75714..c9b6d9250 100644
--- a/theseus_gui/src/components/ui/AccountsCard.vue
+++ b/theseus_gui/src/components/ui/AccountsCard.vue
@@ -248,7 +248,7 @@ onBeforeUnmount(() => {
   padding-right: 1rem;
 }
 
-.fade-enter-active,
+.initializing-icon-active,
 .fade-leave-active {
   transition: opacity 0.3s ease;
 }
diff --git a/theseus_gui/src/components/ui/Instance.vue b/theseus_gui/src/components/ui/Instance.vue
index 55503b835..e04c2448b 100644
--- a/theseus_gui/src/components/ui/Instance.vue
+++ b/theseus_gui/src/components/ui/Instance.vue
@@ -85,7 +85,7 @@ const install = async (e) => {
         .map((value) => value.metadata)
         .find((pack) => pack.linked_data?.project_id === data.value.id)
     ) {
-      await pack_install(versions.value[0].id)
+      await pack_install(versions.value[0].id, data.value.title)
     } else confirmModal.value.show(versions.value[0].id)
   }
 
@@ -357,11 +357,13 @@ await process_listener((e) => {
       box-shadow: var(--shadow-floating);
     }
   }
+
   img {
     width: 100%;
     border-radius: var(--radius-sm);
     filter: none !important;
     aspect-ratio: 1;
+  }
 
   .project-info {
     margin-top: 1rem;
diff --git a/theseus_gui/src/pages/Browse.vue b/theseus_gui/src/pages/Browse.vue
index c350e59e6..4bbef4d9a 100644
--- a/theseus_gui/src/pages/Browse.vue
+++ b/theseus_gui/src/pages/Browse.vue
@@ -129,8 +129,7 @@ watch(
 
 <template>
   <transition name="fade">
-    <SplashScreen v-if="loading" />
-    <div v-else class="search-container">
+    <div class="search-container">
       <aside class="filter-panel">
         <Instance
           v-if="searchStore.instanceContext"
@@ -312,7 +311,8 @@ watch(
           :count="searchStore.pageCount"
           @switch-page="switchPage"
         />
-        <section class="project-list display-mode--list instance-results" role="list">
+        <SplashScreen v-if="loading"/>
+        <section v-else class="project-list display-mode--list instance-results" role="list">
           <ProjectCard
             v-for="result in searchStore.searchResults"
             :id="`${result?.project_id}/`"
@@ -461,13 +461,4 @@ watch(
   }
 }
 
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.3s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}
 </style>
diff --git a/theseus_gui/src/pages/Index.vue b/theseus_gui/src/pages/Index.vue
index e58222836..6097552f8 100644
--- a/theseus_gui/src/pages/Index.vue
+++ b/theseus_gui/src/pages/Index.vue
@@ -72,14 +72,4 @@ onUnmounted(() => unlisten())
   justify-content: center;
   width: 100%;
 }
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.3s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}
 </style>
diff --git a/theseus_gui/src/pages/Settings.vue b/theseus_gui/src/pages/Settings.vue
index d977cd7e4..88b9d4e09 100644
--- a/theseus_gui/src/pages/Settings.vue
+++ b/theseus_gui/src/pages/Settings.vue
@@ -19,7 +19,6 @@ import { useTheming } from '@/store/state'
 import { get, set } from '@/helpers/settings'
 import { find_jre_8_jres, find_jre_17_jres, get_jre } from '@/helpers/jre'
 import { open } from '@tauri-apps/api/dialog'
-import SplashScreen from '@/components/ui/SplashScreen.vue'
 
 const themeStore = useTheming()
 
@@ -126,9 +125,7 @@ const setJavaInstall = (javaInstall) => {
 </script>
 
 <template>
-  <transition name="fade">
-    <SplashScreen v-if="loading" />
-    <div v-else>
+    <div>
       <Modal ref="detectJavaModal" header="Select java version">
         <div class="auto-detect-modal">
           <div class="table">
@@ -357,7 +354,6 @@ const setJavaInstall = (javaInstall) => {
         </div>
       </Card>
     </div>
-  </transition>
 </template>
 
 <style lang="scss">
@@ -480,14 +476,4 @@ const setJavaInstall = (javaInstall) => {
 .test-fail {
   color: var(--color-red);
 }
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.3s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}
 </style>
diff --git a/theseus_gui/src/pages/instance/Index.vue b/theseus_gui/src/pages/instance/Index.vue
index e4f13093a..4de4f7582 100644
--- a/theseus_gui/src/pages/instance/Index.vue
+++ b/theseus_gui/src/pages/instance/Index.vue
@@ -375,14 +375,4 @@ Button {
     fill: var(--color-base) !important;
   }
 }
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.3s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}
 </style>
diff --git a/theseus_gui/src/pages/project/Index.vue b/theseus_gui/src/pages/project/Index.vue
index b2f433c5e..a943df959 100644
--- a/theseus_gui/src/pages/project/Index.vue
+++ b/theseus_gui/src/pages/project/Index.vue
@@ -1,7 +1,5 @@
 <template>
-  <transition name="fade">
-    <SplashScreen v-if="loading" />
-    <div v-else class="root-container">
+    <div class="root-container">
       <div v-if="data" class="project-sidebar">
         <Instance v-if="instance" :instance="instance" small />
         <Card class="sidebar-card">
@@ -195,7 +193,6 @@
         />
       </div>
     </div>
-  </transition>
   <InstallConfirmModal ref="confirmModal" />
   <InstanceInstallModal ref="modInstallModal" />
 </template>
@@ -244,7 +241,6 @@ import InstanceInstallModal from '@/components/ui/InstanceInstallModal.vue'
 import Instance from '@/components/ui/Instance.vue'
 import { useSearch } from '@/store/search'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
-import SplashScreen from '@/components/ui/SplashScreen.vue'
 
 const searchStore = useSearch()
 
@@ -512,14 +508,4 @@ async function install(version) {
     color: var(--color-contrast);
   }
 }
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.3s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}
 </style>