From 53599642e69e4f4de9947a4236de987d05b068f3 Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Wed, 3 May 2023 14:48:04 -0400
Subject: [PATCH] LoadingBar

---
 theseus_gui/src/components/ui/ProgressBar.vue | 33 +++++++++++
 .../src/components/ui/RunningAppBar.vue       | 55 ++++++++++++++-----
 theseus_gui/src/pages/instance/Index.vue      |  8 ++-
 3 files changed, 82 insertions(+), 14 deletions(-)
 create mode 100644 theseus_gui/src/components/ui/ProgressBar.vue

diff --git a/theseus_gui/src/components/ui/ProgressBar.vue b/theseus_gui/src/components/ui/ProgressBar.vue
new file mode 100644
index 000000000..fe8b05ba6
--- /dev/null
+++ b/theseus_gui/src/components/ui/ProgressBar.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="progress-bar">
+    <div class="progress-bar__fill" :style="{ width: `${progress}%` }"></div>
+  </div>
+</template>
+
+<script setup>
+defineProps({
+  progress: {
+    type: Number,
+    required: true,
+    validator(value) {
+      return value >= 0 && value <= 100;
+    },
+  },
+});
+</script>
+
+<style scoped>
+.progress-bar {
+  width: 100%;
+  height: 0.5rem;
+  background-color: var(--color-button-bg);
+  border-radius: var(--radius-lg);
+  overflow: hidden;
+}
+
+.progress-bar__fill {
+  height: 100%;
+  background-color: var(--color-brand);
+  transition: width 0.3s;
+}
+</style>
diff --git a/theseus_gui/src/components/ui/RunningAppBar.vue b/theseus_gui/src/components/ui/RunningAppBar.vue
index 54557e406..cd49f7505 100644
--- a/theseus_gui/src/components/ui/RunningAppBar.vue
+++ b/theseus_gui/src/components/ui/RunningAppBar.vue
@@ -33,21 +33,21 @@
       <DownloadIcon />
     </Button>
   </div>
-  <Card v-if="showCard === true" ref="card" class="info-card">
-    <div v-for="loadingBar in currentLoadingBars" :key="loadingBar.id" class="loading-option">
-      <AnimatedLogo class="loading-icon" />
-      <div class="loading-text">
-        <div class="row">
+  <transition name="download">
+    <Card v-if="showCard === true" ref="card" class="info-card">
+      <div v-for="loadingBar in currentLoadingBars" :key="loadingBar.id" class="info-text">
+        <h3 class="info-title">
           {{ loadingBar.bar_type.PackDownload.pack_name }}
-        </div>
-        <div class="row">{{ Math.round(loadingBar.current) }} % {{ loadingBar.message }}</div>
+        </h3>
+        <ProgressBar :progress="Math.round(loadingBar.current)" />
+        <div class="row">{{ loadingBar.message }}</div>
       </div>
-    </div>
-  </Card>
+    </Card>
+  </transition>
 </template>
 
 <script setup>
-import { Button, DownloadIcon, Card, AnimatedLogo } from 'omorphia'
+import { Button, DownloadIcon, Card } from 'omorphia'
 import { StopIcon, TerminalIcon } from '@/assets/icons'
 import { onBeforeUnmount, onMounted, ref } from 'vue'
 import {
@@ -58,6 +58,7 @@ import {
 import { loading_listener, process_listener } from '@/helpers/events'
 import { useRouter } from 'vue-router'
 import { progress_bars_list } from '@/helpers/state.js'
+import ProgressBar from "@/components/ui/ProgressBar.vue";
 
 const router = useRouter()
 const card = ref(null)
@@ -81,7 +82,6 @@ const stop = async () => {
   } catch (e) {
     console.error(e)
   }
-
   await refresh()
 }
 
@@ -101,11 +101,14 @@ await loading_listener(async (event) => {
 })
 
 const refreshInfo = async () => {
+  const currentLoadingBarCount = currentLoadingBars.value.length
   currentLoadingBars.value = Object.values(await progress_bars_list()).filter(
     (bar) => bar.bar_type !== 'StateInit' && Object.keys(bar.bar_type)[0] === 'PackDownload'
   )
   if (currentLoadingBars.value.length === 0) {
     showCard.value = false
+  } else if (currentLoadingBarCount < currentLoadingBars.value.length) {
+    showCard.value = true
   }
 }
 
@@ -182,13 +185,12 @@ onBeforeUnmount(() => {
 
 .info-card {
   position: absolute;
-  top: 3.25rem;
+  top: 3.5rem;
   right: 0;
   z-index: 100;
   width: 20rem;
   background-color: var(--color-raised-bg);
   box-shadow: var(--shadow-raised);
-  padding: 1rem;
   display: flex;
   flex-direction: column;
   gap: 1rem;
@@ -243,4 +245,31 @@ onBeforeUnmount(() => {
 .show-card-icon {
   color: var(--color-brand);
 }
+
+.download-enter-active,
+.download-leave-active {
+  transition: opacity 0.3s ease;
+}
+
+.download-enter-from,
+.download-leave-to {
+  opacity: 0;
+}
+
+.progress-bar {
+  width: 100%;
+}
+
+.info-text {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 0.5rem;
+  margin: 0;
+  padding: 0;
+}
+
+.info-title {
+  margin: 0;
+}
 </style>
diff --git a/theseus_gui/src/pages/instance/Index.vue b/theseus_gui/src/pages/instance/Index.vue
index e985dbfd1..eb1c2d60d 100644
--- a/theseus_gui/src/pages/instance/Index.vue
+++ b/theseus_gui/src/pages/instance/Index.vue
@@ -301,12 +301,18 @@ Button {
   width: 1.5rem;
   height: 1.5rem;
   animation: spin 1s linear infinite;
+  color: var(--color-base);
 
   :deep(svg) {
+    color: var(--color-base);
+    fill: var(--color-base);
     left: 2rem;
     width: 1.5rem;
     height: 1.5rem;
-    fill: var(--color-contrast);
+  }
+
+  :deep(path) {
+    fill: var(--color-base) !important;
   }
 }
 </style>