From f8426e97dca05cfc2a3d8ea4edfcd43d05bb1644 Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Tue, 30 May 2023 08:42:23 -0400
Subject: [PATCH 01/13] Initial onboarding

---
 theseus_gui/src/App.vue                       |   2 +-
 .../src/components/OnboardingModal.vue        | 180 ++++++++++++++++++
 .../src/components/ui/AccountsCard.vue        |  20 +-
 .../src/components/ui/JavaSelector.vue        |  17 +-
 .../src/components/ui/RunningAppBar.vue       |  15 +-
 5 files changed, 220 insertions(+), 14 deletions(-)
 create mode 100644 theseus_gui/src/components/OnboardingModal.vue

diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue
index 7f590efaf..9f92efe81 100644
--- a/theseus_gui/src/App.vue
+++ b/theseus_gui/src/App.vue
@@ -61,7 +61,7 @@ watch(notificationsWrapper, () => {
     <div class="nav-container" :class="{ expanded: !themeStore.collapsedNavigation }">
       <div class="nav-section">
         <suspense>
-          <AccountsCard ref="accounts" :expanded="!themeStore.collapsedNavigation" />
+          <AccountsCard ref="accounts" :mode="themeStore.collapsedNavigation ? 'small' : 'expanded'" />
         </suspense>
         <div class="pages-list">
           <RouterLink
diff --git a/theseus_gui/src/components/OnboardingModal.vue b/theseus_gui/src/components/OnboardingModal.vue
new file mode 100644
index 000000000..ba5c881e9
--- /dev/null
+++ b/theseus_gui/src/components/OnboardingModal.vue
@@ -0,0 +1,180 @@
+  <Modal ref="onboardingModal" header="Getting started">
+    <div class="modal-body">
+      <transition name="page">
+        <div class="swapped-page">
+          <div v-if="page === 1" class="banner-content">
+            <TextLogo class="text-logo" />
+            <h2>Getting started</h2>
+            <p>
+              The Modrinth App is a desktop application that allows you to easily install and manage
+              Minecraft modpacks.
+            </p>
+            <Button color="primary" @click="page = 2"> Continue </Button>
+          </div>
+          <div v-else-if="page === 2" class="content">
+            <h2>Sign into Minecraft</h2>
+            <AccountsCard mode="isolated"/>
+          </div>
+          <div v-else-if="page === 3" class="content">
+            <h2>Setting up Java</h2>
+            <div class="settings-group">
+              <h3>Java 17 location</h3>
+              <JavaSelector v-model="settings.java_globals.JAVA_17" :version="17" compact/>
+            </div>
+            <div class="settings-group">
+              <h3>Java 8 location</h3>
+              <JavaSelector v-model="settings.java_globals.JAVA_8" :version="8" compact/>
+            </div>
+          </div>
+        </div>
+      </transition>
+      <div class="button-row">
+        <Button v-if="page !== 1" @click="page--"> Back </Button>
+        <div class="page-indicator">
+          <span class="circle" :class="{'active': page === 1}"/>
+          <span class="circle" :class="{'active': page === 2}"/>
+          <span class="circle" :class="{'active': page === 3}"/>
+        </div>
+        <Button v-if="page !== 1" @click="page++"> Next </Button>
+      </div>
+    </div>
+  </Modal>
+</template>
+
+<script setup>
+import {Modal, TextLogo, Button} from 'omorphia'
+import {ref, watch} from 'vue'
+import AccountsCard from '@/components/ui/AccountsCard.vue'
+import JavaSelector from "@/components/ui/JavaSelector.vue";
+import {handleError} from "@/store/notifications.js";
+import {get, set} from "@/helpers/settings.js";
+
+const onboardingModal = ref(null)
+const page = ref(1)
+
+defineExpose({
+  show: () => {
+    onboardingModal.value.show()
+  },
+})
+
+const fetchSettings = await get().catch(handleError)
+
+if (!fetchSettings.java_globals.JAVA_8)
+  fetchSettings.java_globals.JAVA_8 = { path: '', version: '' }
+if (!fetchSettings.java_globals.JAVA_17)
+  fetchSettings.java_globals.JAVA_17 = { path: '', version: '' }
+
+const settings = ref(fetchSettings)
+
+watch(settings.value, async (oldSettings, newSettings) => {
+  const setSettings = JSON.parse(JSON.stringify(newSettings))
+
+  if (setSettings.java_globals.JAVA_8?.path === '') {
+    setSettings.java_globals.JAVA_8 = undefined
+  }
+  if (setSettings.java_globals.JAVA_17?.path === '') {
+    setSettings.java_globals.JAVA_17 = undefined
+  }
+
+  await set(setSettings)
+})
+</script>
+
+<style scoped lang="scss">
+.modal-body {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 1rem;
+  padding: var(--gap-lg);
+
+  h2 {
+    margin-bottom: 0;
+    margin-top: 0;
+  }
+}
+
+.swapped-page {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.settings-group {
+  width: 100%;
+  text-align: left;
+}
+
+.button-row {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: row;
+  align-items: center;
+  width: 100%;
+
+  .page-indicator {
+    flex-grow: 1;
+    margin: 0 auto;
+  }
+}
+
+.text-logo {
+  width: 100%;
+  height: 100%;
+}
+
+.banner-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 1rem;
+  padding: 4rem;
+}
+
+.content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 1rem;
+  width: 100%;
+}
+
+.page-enter-active,
+.page-leave-active {
+  transition: opacity 0.3s ease;
+}
+
+.page-enter-from,
+.page-leave-to {
+  opacity: 0;
+}
+
+.circle {
+  width: 0.5rem;
+  height: 0.5rem;
+  border-radius: 50%;
+  display: inline-block;
+  margin-right: 0.25rem;
+  background-color: var(--color-base);
+  transition: all 0.3s ease-in-out;
+
+  &.active {
+    background-color: var(--color-brand);
+  }
+}
+
+.table {
+  .table-row {
+    grid-template-columns: 1fr 4fr 1.5fr;
+  }
+
+  span {
+    display: inherit;
+    align-items: center;
+    justify-content: center;
+  }
+}
+</style>
diff --git a/theseus_gui/src/components/ui/AccountsCard.vue b/theseus_gui/src/components/ui/AccountsCard.vue
index 418a29203..5dec8b858 100644
--- a/theseus_gui/src/components/ui/AccountsCard.vue
+++ b/theseus_gui/src/components/ui/AccountsCard.vue
@@ -1,12 +1,13 @@
 <template>
   <div
+    v-if="mode !== 'isolated'"
     ref="button"
     class="button-base avatar-button"
-    :class="{ expanded: expanded }"
+    :class="{ expanded: mode === 'expanded' }"
     @click="toggle()"
   >
-    <Avatar :size="expanded ? 'xs' : 'sm'" :src="selectedAccount?.profile_picture ?? ''" />
-    <div v-show="expanded" class="avatar-text">
+    <Avatar :size="mode === 'expanded' ? 'xs' : 'sm'" :src="selectedAccount?.profile_picture ?? ''" />
+    <div v-show="mode === 'expanded'" class="avatar-text">
       <div class="text no-select">
         {{ selectedAccount ? selectedAccount.username : 'Offline' }}
       </div>
@@ -17,7 +18,7 @@
     </div>
   </div>
   <transition name="fade">
-    <Card v-if="showCard" ref="card" class="account-card" :class="{ expanded: expanded }">
+    <Card v-if="showCard || mode === 'isolated'" ref="card" class="account-card" :class="{ expanded: mode === 'expanded', 'isolated': mode === 'isolated' }">
       <div v-if="selectedAccount" class="selected account">
         <Avatar size="xs" :src="selectedAccount.profile_picture" />
         <div>
@@ -67,9 +68,10 @@ import { WebviewWindow } from '@tauri-apps/api/window'
 import { handleError } from '@/store/state.js'
 
 defineProps({
-  expanded: {
-    type: Boolean,
+  mode: {
+    type: String,
     required: true,
+    default: 'normal',
   },
 })
 
@@ -211,6 +213,12 @@ onBeforeUnmount(() => {
   &.expanded {
     left: 13.5rem;
   }
+
+  &.isolated {
+    position: relative;
+    left: 0;
+    top: 0;
+  }
 }
 
 .accounts-title {
diff --git a/theseus_gui/src/components/ui/JavaSelector.vue b/theseus_gui/src/components/ui/JavaSelector.vue
index 3e668ea18..5bf2732dd 100644
--- a/theseus_gui/src/components/ui/JavaSelector.vue
+++ b/theseus_gui/src/components/ui/JavaSelector.vue
@@ -19,18 +19,19 @@
     <span class="installation-buttons">
       <Button
         :disabled="props.disabled"
+        :icon-only="compact"
         @click="$refs.detectJavaModal.show(props.version, props.modelValue)"
       >
         <SearchIcon />
-        Auto detect
+        {{ compact ? '' : 'Auto detect' }}
       </Button>
-      <Button :disabled="props.disabled" @click="handleJavaFileInput()">
+      <Button :disabled="props.disabled" :icon-only="compact" @click="handleJavaFileInput()">
         <FolderSearchIcon />
-        Browse
+        {{ compact ? '' : 'Browse' }}
       </Button>
-      <Button :disabled="props.disabled" @click="testJava">
+      <Button :disabled="props.disabled" :icon-only="compact" @click="testJava">
         <PlayIcon />
-        Test
+        {{ compact ? '' : 'Test' }}
       </Button>
       <AnimatedLogo v-if="testingJava === true" class="testing-loader" />
       <CheckIcon
@@ -77,6 +78,11 @@ const props = defineProps({
     required: false,
     default: null,
   },
+  compact: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['update:modelValue'])
@@ -129,7 +135,6 @@ async function handleJavaFileInput() {
 .installation-buttons {
   display: flex;
   flex-direction: row;
-  flex-wrap: wrap;
   align-items: center;
   gap: 0.5rem;
   margin: 0;
diff --git a/theseus_gui/src/components/ui/RunningAppBar.vue b/theseus_gui/src/components/ui/RunningAppBar.vue
index e71b810a0..3a4507177 100644
--- a/theseus_gui/src/components/ui/RunningAppBar.vue
+++ b/theseus_gui/src/components/ui/RunningAppBar.vue
@@ -32,6 +32,9 @@
     >
       <DownloadIcon />
     </Button>
+    <Button icon-only class="icon-button" @click="modal.show()">
+      <DashboardIcon />
+    </Button>
   </div>
   <transition name="download">
     <Card v-if="showCard === true" ref="card" class="info-card">
@@ -44,10 +47,18 @@
       </div>
     </Card>
   </transition>
+  <OnboardingModal ref="modal" />
 </template>
 
 <script setup>
-import { Button, DownloadIcon, Card, StopCircleIcon, TerminalSquareIcon } from 'omorphia'
+import {
+  Button,
+  DownloadIcon,
+  Card,
+  StopCircleIcon,
+  TerminalSquareIcon,
+  DashboardIcon,
+} from 'omorphia'
 import { onBeforeUnmount, onMounted, ref } from 'vue'
 import {
   get_all_running_profiles as getRunningProfiles,
@@ -59,11 +70,13 @@ import { useRouter } from 'vue-router'
 import { progress_bars_list } from '@/helpers/state.js'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { handleError } from '@/store/notifications.js'
+import OnboardingModal from '@/components/OnboardingModal.vue'
 
 const router = useRouter()
 const card = ref(null)
 const infoButton = ref(null)
 const showCard = ref(false)
+const modal = ref(null)
 
 const currentProcesses = ref(await getRunningProfiles().catch(handleError))
 

From e13910ad121f233871d2fe012d9d26031dedfaa1 Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Tue, 30 May 2023 08:42:30 -0400
Subject: [PATCH 02/13] Update OnboardingModal.vue

---
 theseus_gui/src/components/OnboardingModal.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theseus_gui/src/components/OnboardingModal.vue b/theseus_gui/src/components/OnboardingModal.vue
index ba5c881e9..a55f11b5a 100644
--- a/theseus_gui/src/components/OnboardingModal.vue
+++ b/theseus_gui/src/components/OnboardingModal.vue
@@ -1,3 +1,4 @@
+<template>
   <Modal ref="onboardingModal" header="Getting started">
     <div class="modal-body">
       <transition name="page">

From 7b969c0f18a388b7c699280510efcc8565f824e3 Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Tue, 30 May 2023 08:48:29 -0400
Subject: [PATCH 03/13] Add finish

---
 theseus_gui/src/components/OnboardingModal.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/theseus_gui/src/components/OnboardingModal.vue b/theseus_gui/src/components/OnboardingModal.vue
index a55f11b5a..258214ece 100644
--- a/theseus_gui/src/components/OnboardingModal.vue
+++ b/theseus_gui/src/components/OnboardingModal.vue
@@ -36,7 +36,9 @@
           <span class="circle" :class="{'active': page === 2}"/>
           <span class="circle" :class="{'active': page === 3}"/>
         </div>
-        <Button v-if="page !== 1" @click="page++"> Next </Button>
+        <Button v-if="page !== 1" :color="page === 3 ? 'primary' : ''" @click="pageTurn()">
+          {{ page === 3 ? 'Finish' : 'Next'}}
+        </Button>
       </div>
     </div>
   </Modal>
@@ -80,6 +82,14 @@ watch(settings.value, async (oldSettings, newSettings) => {
 
   await set(setSettings)
 })
+
+const pageTurn = () => {
+  if (page.value === 3) {
+    onboardingModal.value.hide()
+    return
+  }
+  page.value++
+}
 </script>
 
 <style scoped lang="scss">

From 4a105549ef8c7e307c0dd405ee453a1d1fddf1a8 Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Tue, 30 May 2023 09:21:10 -0400
Subject: [PATCH 04/13] Animation

---
 .../src/components/OnboardingModal.vue        | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/theseus_gui/src/components/OnboardingModal.vue b/theseus_gui/src/components/OnboardingModal.vue
index 258214ece..3406139af 100644
--- a/theseus_gui/src/components/OnboardingModal.vue
+++ b/theseus_gui/src/components/OnboardingModal.vue
@@ -1,31 +1,29 @@
 <template>
   <Modal ref="onboardingModal" header="Getting started">
     <div class="modal-body">
-      <transition name="page">
-        <div class="swapped-page">
-          <div v-if="page === 1" class="banner-content">
-            <TextLogo class="text-logo" />
-            <h2>Getting started</h2>
-            <p>
-              The Modrinth App is a desktop application that allows you to easily install and manage
-              Minecraft modpacks.
-            </p>
-            <Button color="primary" @click="page = 2"> Continue </Button>
-          </div>
-          <div v-else-if="page === 2" class="content">
-            <h2>Sign into Minecraft</h2>
-            <AccountsCard mode="isolated"/>
+      <transition name="slide" mode="out-in">
+        <div v-if="page === 1" key="1" class="banner-content swapped-page">
+          <TextLogo class="text-logo" />
+          <h2>Getting started</h2>
+          <p>
+            The Modrinth App is a desktop application that allows you to easily install and manage
+            Minecraft modpacks.
+          </p>
+          <Button color="primary" @click="page = 2"> Continue </Button>
+        </div>
+        <div v-else-if="page === 2" key="2" class="content swapped-page">
+          <h2>Sign into Minecraft</h2>
+          <AccountsCard mode="isolated"/>
+        </div>
+        <div v-else-if="page === 3" key="3" class="content swapped-page">
+          <h2>Setting up Java</h2>
+          <div class="settings-group">
+            <h3>Java 17 location</h3>
+            <JavaSelector v-model="settings.java_globals.JAVA_17" :version="17" compact/>
           </div>
-          <div v-else-if="page === 3" class="content">
-            <h2>Setting up Java</h2>
-            <div class="settings-group">
-              <h3>Java 17 location</h3>
-              <JavaSelector v-model="settings.java_globals.JAVA_17" :version="17" compact/>
-            </div>
-            <div class="settings-group">
-              <h3>Java 8 location</h3>
-              <JavaSelector v-model="settings.java_globals.JAVA_8" :version="8" compact/>
-            </div>
+          <div class="settings-group">
+            <h3>Java 8 location</h3>
+            <JavaSelector v-model="settings.java_globals.JAVA_8" :version="8" compact/>
           </div>
         </div>
       </transition>
@@ -188,4 +186,12 @@ const pageTurn = () => {
     justify-content: center;
   }
 }
+
+.slide-enter-active, .slide-leave-active {
+  transition: transform .5s;
+}
+
+.slide-enter, .slide-leave-to {
+  transform: translateX(100%);
+}
 </style>

From c5545a0c4abbf7507c9d81ec4249cd532233782a Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Thu, 1 Jun 2023 00:32:24 -0400
Subject: [PATCH 05/13] Automatic opening

---
 theseus_gui/src/components/ui/RunningAppBar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theseus_gui/src/components/ui/RunningAppBar.vue b/theseus_gui/src/components/ui/RunningAppBar.vue
index 3a4507177..cbf80c287 100644
--- a/theseus_gui/src/components/ui/RunningAppBar.vue
+++ b/theseus_gui/src/components/ui/RunningAppBar.vue
@@ -137,6 +137,7 @@ const toggleCard = async () => {
 
 onMounted(() => {
   window.addEventListener('click', handleClickOutside)
+  modal.value.show()
 })
 
 onBeforeUnmount(() => {

From bdb63d9c1c0ff5acdb002d60785f9cab5f54f456 Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Thu, 1 Jun 2023 01:15:02 -0400
Subject: [PATCH 06/13] Move onboarding icon to outside of main appbar

---
 .../src/components/ui/RunningAppBar.vue       | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/theseus_gui/src/components/ui/RunningAppBar.vue b/theseus_gui/src/components/ui/RunningAppBar.vue
index cbf80c287..b715a7ef9 100644
--- a/theseus_gui/src/components/ui/RunningAppBar.vue
+++ b/theseus_gui/src/components/ui/RunningAppBar.vue
@@ -1,4 +1,9 @@
 <template>
+  <div class="external-buttons">
+    <Button icon-only class="icon-button" @click="modal.show()">
+      <DashboardIcon />
+    </Button>
+  </div>
   <div v-if="currentProcesses[0]" class="status">
     <span class="circle running" />
     <span class="running-text">
@@ -32,9 +37,6 @@
     >
       <DownloadIcon />
     </Button>
-    <Button icon-only class="icon-button" @click="modal.show()">
-      <DashboardIcon />
-    </Button>
   </div>
   <transition name="download">
     <Card v-if="showCard === true" ref="card" class="info-card">
@@ -78,6 +80,10 @@ const infoButton = ref(null)
 const showCard = ref(false)
 const modal = ref(null)
 
+defineExpose({
+  modal,
+})
+
 const currentProcesses = ref(await getRunningProfiles().catch(handleError))
 
 await process_listener(async () => {
@@ -146,6 +152,15 @@ onBeforeUnmount(() => {
 </script>
 
 <style scoped lang="scss">
+.external-buttons {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 0.5rem;
+  height: 100%;
+  padding: 0 1rem;
+}
+
 .status {
   height: 100%;
   display: flex;

From e136f98fa7a642a9f2c0fcaaf63e529c4c4c414f Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Thu, 1 Jun 2023 01:15:58 -0400
Subject: [PATCH 07/13] Run lint

---
 theseus_gui/src/App.vue                       |  5 ++-
 .../src/components/OnboardingModal.vue        | 32 ++++++++++---------
 .../src/components/ui/AccountsCard.vue        | 12 +++++--
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue
index 9f92efe81..59b619a05 100644
--- a/theseus_gui/src/App.vue
+++ b/theseus_gui/src/App.vue
@@ -61,7 +61,10 @@ watch(notificationsWrapper, () => {
     <div class="nav-container" :class="{ expanded: !themeStore.collapsedNavigation }">
       <div class="nav-section">
         <suspense>
-          <AccountsCard ref="accounts" :mode="themeStore.collapsedNavigation ? 'small' : 'expanded'" />
+          <AccountsCard
+            ref="accounts"
+            :mode="themeStore.collapsedNavigation ? 'small' : 'expanded'"
+          />
         </suspense>
         <div class="pages-list">
           <RouterLink
diff --git a/theseus_gui/src/components/OnboardingModal.vue b/theseus_gui/src/components/OnboardingModal.vue
index 3406139af..6a7de2f18 100644
--- a/theseus_gui/src/components/OnboardingModal.vue
+++ b/theseus_gui/src/components/OnboardingModal.vue
@@ -13,29 +13,29 @@
         </div>
         <div v-else-if="page === 2" key="2" class="content swapped-page">
           <h2>Sign into Minecraft</h2>
-          <AccountsCard mode="isolated"/>
+          <AccountsCard mode="isolated" />
         </div>
         <div v-else-if="page === 3" key="3" class="content swapped-page">
           <h2>Setting up Java</h2>
           <div class="settings-group">
             <h3>Java 17 location</h3>
-            <JavaSelector v-model="settings.java_globals.JAVA_17" :version="17" compact/>
+            <JavaSelector v-model="settings.java_globals.JAVA_17" :version="17" compact />
           </div>
           <div class="settings-group">
             <h3>Java 8 location</h3>
-            <JavaSelector v-model="settings.java_globals.JAVA_8" :version="8" compact/>
+            <JavaSelector v-model="settings.java_globals.JAVA_8" :version="8" compact />
           </div>
         </div>
       </transition>
       <div class="button-row">
         <Button v-if="page !== 1" @click="page--"> Back </Button>
         <div class="page-indicator">
-          <span class="circle" :class="{'active': page === 1}"/>
-          <span class="circle" :class="{'active': page === 2}"/>
-          <span class="circle" :class="{'active': page === 3}"/>
+          <span class="circle" :class="{ active: page === 1 }" />
+          <span class="circle" :class="{ active: page === 2 }" />
+          <span class="circle" :class="{ active: page === 3 }" />
         </div>
         <Button v-if="page !== 1" :color="page === 3 ? 'primary' : ''" @click="pageTurn()">
-          {{ page === 3 ? 'Finish' : 'Next'}}
+          {{ page === 3 ? 'Finish' : 'Next' }}
         </Button>
       </div>
     </div>
@@ -43,12 +43,12 @@
 </template>
 
 <script setup>
-import {Modal, TextLogo, Button} from 'omorphia'
-import {ref, watch} from 'vue'
+import { Modal, TextLogo, Button } from 'omorphia'
+import { ref, watch } from 'vue'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
-import JavaSelector from "@/components/ui/JavaSelector.vue";
-import {handleError} from "@/store/notifications.js";
-import {get, set} from "@/helpers/settings.js";
+import JavaSelector from '@/components/ui/JavaSelector.vue'
+import { handleError } from '@/store/notifications.js'
+import { get, set } from '@/helpers/settings.js'
 
 const onboardingModal = ref(null)
 const page = ref(1)
@@ -187,11 +187,13 @@ const pageTurn = () => {
   }
 }
 
-.slide-enter-active, .slide-leave-active {
-  transition: transform .5s;
+.slide-enter-active,
+.slide-leave-active {
+  transition: transform 0.5s;
 }
 
-.slide-enter, .slide-leave-to {
+.slide-enter,
+.slide-leave-to {
   transform: translateX(100%);
 }
 </style>
diff --git a/theseus_gui/src/components/ui/AccountsCard.vue b/theseus_gui/src/components/ui/AccountsCard.vue
index 5dec8b858..4f469a0fc 100644
--- a/theseus_gui/src/components/ui/AccountsCard.vue
+++ b/theseus_gui/src/components/ui/AccountsCard.vue
@@ -6,7 +6,10 @@
     :class="{ expanded: mode === 'expanded' }"
     @click="toggle()"
   >
-    <Avatar :size="mode === 'expanded' ? 'xs' : 'sm'" :src="selectedAccount?.profile_picture ?? ''" />
+    <Avatar
+      :size="mode === 'expanded' ? 'xs' : 'sm'"
+      :src="selectedAccount?.profile_picture ?? ''"
+    />
     <div v-show="mode === 'expanded'" class="avatar-text">
       <div class="text no-select">
         {{ selectedAccount ? selectedAccount.username : 'Offline' }}
@@ -18,7 +21,12 @@
     </div>
   </div>
   <transition name="fade">
-    <Card v-if="showCard || mode === 'isolated'" ref="card" class="account-card" :class="{ expanded: mode === 'expanded', 'isolated': mode === 'isolated' }">
+    <Card
+      v-if="showCard || mode === 'isolated'"
+      ref="card"
+      class="account-card"
+      :class="{ expanded: mode === 'expanded', isolated: mode === 'isolated' }"
+    >
       <div v-if="selectedAccount" class="selected account">
         <Avatar size="xs" :src="selectedAccount.profile_picture" />
         <div>

From 3a33178442011da76e8a7c664d2f48b2838fecbf Mon Sep 17 00:00:00 2001
From: Jai A <jaiagr+gpg@pm.me>
Date: Fri, 16 Jun 2023 13:51:48 -0700
Subject: [PATCH 08/13] run fmt

---
 theseus_gui/src/components/ui/JavaSelector.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theseus_gui/src/components/ui/JavaSelector.vue b/theseus_gui/src/components/ui/JavaSelector.vue
index 3cae234b3..ece876837 100644
--- a/theseus_gui/src/components/ui/JavaSelector.vue
+++ b/theseus_gui/src/components/ui/JavaSelector.vue
@@ -72,7 +72,7 @@ const props = defineProps({
     type: String,
     required: false,
     default: null,
-  }
+  },
 })
 
 const emit = defineEmits(['update:modelValue'])

From f06df83f1966359756ef909022cdeb2f7cdb7f5f Mon Sep 17 00:00:00 2001
From: Jai A <jai@modrinth.com>
Date: Tue, 20 Jun 2023 12:18:58 -0700
Subject: [PATCH 09/13] mostly finish

---
 theseus/src/api/jre.rs                        |  94 +++---
 theseus/src/state/settings.rs                 |   3 +
 theseus_gui/package.json                      |   3 +-
 theseus_gui/pnpm-lock.yaml                    |  19 +-
 theseus_gui/src-tauri/src/api/jre.rs          |   8 +-
 theseus_gui/src-tauri/src/main.rs             |   7 +-
 theseus_gui/src/App.vue                       |  47 +--
 .../src/components/OnboardingModal.vue        | 316 ++++++++++++------
 theseus_gui/src/components/ui/ContextMenu.vue |   1 -
 .../src/components/ui/JavaSelector.vue        |  30 +-
 .../src/components/ui/RunningAppBar.vue       |  52 ++-
 theseus_gui/src/helpers/jre.js                |   6 +-
 theseus_gui/src/pages/Index.vue               |   2 -
 theseus_gui/src/pages/instance/Index.vue      |   1 -
 14 files changed, 353 insertions(+), 236 deletions(-)

diff --git a/theseus/src/api/jre.rs b/theseus/src/api/jre.rs
index f8ac91fde..fadb32b98 100644
--- a/theseus/src/api/jre.rs
+++ b/theseus/src/api/jre.rs
@@ -18,9 +18,9 @@ pub const JAVA_18PLUS_KEY: &str = "JAVA_18PLUS";
 // Autodetect JavaSettings default
 // Make a guess for what the default Java global settings should be
 pub async fn autodetect_java_globals() -> crate::Result<JavaGlobals> {
-    let mut java_8 = find_java8_jres().await?;
-    let mut java_17 = find_java17_jres().await?;
-    let mut java_18plus = find_java18plus_jres().await?;
+    let mut java_8 = find_filtered_jres("1.8").await?;
+    let mut java_17 = find_filtered_jres("1.17").await?;
+    let mut java_18plus = find_filtered_jres("1.18").await?;
 
     // Simply select last one found for initial guess
     let mut java_globals = JavaGlobals::new();
@@ -37,55 +37,19 @@ pub async fn autodetect_java_globals() -> crate::Result<JavaGlobals> {
     Ok(java_globals)
 }
 
-// Searches for jres on the system that are 1.18 or higher
-pub async fn find_java18plus_jres() -> crate::Result<Vec<JavaVersion>> {
-    let version = extract_java_majorminor_version("1.18")?;
-    let jres = jre::get_all_jre().await?;
-    // Filter out JREs that are not 1.17 or higher
-    Ok(jres
-        .into_iter()
-        .filter(|jre| {
-            let jre_version = extract_java_majorminor_version(&jre.version);
-            if let Ok(jre_version) = jre_version {
-                jre_version >= version
-            } else {
-                false
-            }
-        })
-        .collect())
-}
-
-// Searches for jres on the system that are 1.8 exactly
-pub async fn find_java8_jres() -> crate::Result<Vec<JavaVersion>> {
-    let version = extract_java_majorminor_version("1.8")?;
+// Searches for jres on the system given a java version (ex: 1.8, 1.17, 1.18)
+pub async fn find_filtered_jres(
+    version: &str,
+) -> crate::Result<Vec<JavaVersion>> {
+    let version = extract_java_majorminor_version(version)?;
     let jres = jre::get_all_jre().await?;
 
-    // Filter out JREs that are not 1.8
     Ok(jres
         .into_iter()
         .filter(|jre| {
             let jre_version = extract_java_majorminor_version(&jre.version);
             if let Ok(jre_version) = jre_version {
-                jre_version == version
-            } else {
-                false
-            }
-        })
-        .collect())
-}
-
-// Searches for jres on the system that are 1.17 exactly
-pub async fn find_java17_jres() -> crate::Result<Vec<JavaVersion>> {
-    let version = extract_java_majorminor_version("1.17")?;
-    let jres = jre::get_all_jre().await?;
-
-    // Filter out JREs that are not 1.8
-    Ok(jres
-        .into_iter()
-        .filter(|jre| {
-            let jre_version = extract_java_majorminor_version(&jre.version);
-            if let Ok(jre_version) = jre_version {
-                jre_version == version
+                jre_version >= version
             } else {
                 false
             }
@@ -157,16 +121,36 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
             ))
         })?;
         emit_loading(&loading_bar, 10.0, Some("Done extracting java")).await?;
-        Ok(path
-            .join(
-                download
-                    .name
-                    .file_stem()
-                    .unwrap_or_default()
-                    .to_string_lossy()
-                    .to_string(),
-            )
-            .join(format!("zulu-{}.jre/Contents/Home/bin/java", java_version)))
+        let mut base_path = path.join(
+            download
+                .name
+                .file_stem()
+                .unwrap_or_default()
+                .to_string_lossy()
+                .to_string(),
+        );
+
+        #[cfg(target_os = "macos")]
+        {
+            base_path = base_path
+                .join(format!("zulu-{}.jre", java_version))
+                .join("Contents")
+                .join("Home")
+                .join("bin")
+                .join("java")
+        }
+
+        #[cfg(target_os = "windows")]
+        {
+            base_path = base_path.join("bin").join("javaw.exe")
+        }
+
+        #[cfg(target_os = "linux")]
+        {
+            base_path = base_path.join("bin").join("java")
+        }
+
+        Ok(base_path)
     } else {
         Err(crate::ErrorKind::LauncherError(format!(
                     "No Java Version found for Java version {}, OS {}, and Architecture {}",
diff --git a/theseus/src/state/settings.rs b/theseus/src/state/settings.rs
index b88702dc1..b99720bcf 100644
--- a/theseus/src/state/settings.rs
+++ b/theseus/src/state/settings.rs
@@ -32,6 +32,8 @@ pub struct Settings {
     pub opt_out_analytics: bool,
     #[serde(default)]
     pub advanced_rendering: bool,
+    #[serde(default)]
+    pub onboarded: bool,
 }
 
 impl Default for Settings {
@@ -52,6 +54,7 @@ impl Default for Settings {
             developer_mode: false,
             opt_out_analytics: false,
             advanced_rendering: true,
+            onboarded: false,
         }
     }
 }
diff --git a/theseus_gui/package.json b/theseus_gui/package.json
index bd845eb3c..41092d03c 100644
--- a/theseus_gui/package.json
+++ b/theseus_gui/package.json
@@ -18,8 +18,9 @@
     "floating-vue": "^2.0.0-beta.20",
     "mixpanel-browser": "^2.47.0",
     "ofetch": "^1.0.1",
-    "omorphia": "^0.4.28",
+    "omorphia": "^0.4.30",
     "pinia": "^2.1.3",
+    "tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",
     "vite-svg-loader": "^4.0.0",
     "vue": "^3.3.4",
     "vue-multiselect": "^3.0.0-beta.2",
diff --git a/theseus_gui/pnpm-lock.yaml b/theseus_gui/pnpm-lock.yaml
index 73e185d4c..2740c5907 100644
--- a/theseus_gui/pnpm-lock.yaml
+++ b/theseus_gui/pnpm-lock.yaml
@@ -17,11 +17,14 @@ dependencies:
     specifier: ^1.0.1
     version: 1.0.1
   omorphia:
-    specifier: ^0.4.28
-    version: 0.4.28
+    specifier: ^0.4.30
+    version: 0.4.30
   pinia:
     specifier: ^2.1.3
     version: 2.1.3(vue@3.3.4)
+  tauri-plugin-window-state-api:
+    specifier: github:tauri-apps/tauri-plugin-window-state#v1
+    version: github.com/tauri-apps/tauri-plugin-window-state/56fd671f8d5ac2d8b826a358af486f220a125c3d
   vite-svg-loader:
     specifier: ^4.0.0
     version: 4.0.0
@@ -1333,8 +1336,8 @@ packages:
       ufo: 1.1.2
     dev: false
 
-  /omorphia@0.4.28:
-    resolution: {integrity: sha512-ZTUgBD3ZL+aymS7u5pLaPo8I5FUI8fkoz2dZLtAS5ksGRI5wrWkwIi/kxjpC95A2oDxNQvZaylfwUTK3Z6a2Sw==}
+  /omorphia@0.4.30:
+    resolution: {integrity: sha512-dZqBD2wREiTviC6nReVvEnZHURv9GeQfM7ITeQ54cFIEycpkrqfCfPgGKfsZ3eM84CILmIFUrdS/UAKxYkNubg==}
     dependencies:
       dayjs: 1.11.7
       floating-vue: 2.0.0-beta.20(vue@3.3.4)
@@ -1787,3 +1790,11 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
     dev: true
+
+  github.com/tauri-apps/tauri-plugin-window-state/56fd671f8d5ac2d8b826a358af486f220a125c3d:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/56fd671f8d5ac2d8b826a358af486f220a125c3d}
+    name: tauri-plugin-window-state-api
+    version: 0.0.0
+    dependencies:
+      '@tauri-apps/api': 1.3.0
+    dev: false
diff --git a/theseus_gui/src-tauri/src/api/jre.rs b/theseus_gui/src-tauri/src/api/jre.rs
index e9bfe293e..e56486d3d 100644
--- a/theseus_gui/src-tauri/src/api/jre.rs
+++ b/theseus_gui/src-tauri/src/api/jre.rs
@@ -10,22 +10,22 @@ pub async fn jre_get_all_jre() -> Result<Vec<JavaVersion>> {
     Ok(jre::get_all_jre().await?)
 }
 
-// Finds the isntallation of Java 7, if it exists
+// Finds the installation of Java 8, if it exists
 #[tauri::command]
 pub async fn jre_find_jre_8_jres() -> Result<Vec<JavaVersion>> {
-    Ok(jre::find_java8_jres().await?)
+    Ok(jre::find_filtered_jres("1.8").await?)
 }
 
 // finds the installation of Java 17, if it exists
 #[tauri::command]
 pub async fn jre_find_jre_17_jres() -> Result<Vec<JavaVersion>> {
-    Ok(jre::find_java17_jres().await?)
+    Ok(jre::find_filtered_jres("1.17").await?)
 }
 
 // Finds the highest version of Java 18+, if it exists
 #[tauri::command]
 pub async fn jre_find_jre_18plus_jres() -> Result<Vec<JavaVersion>> {
-    Ok(jre::find_java18plus_jres().await?)
+    Ok(jre::find_filtered_jres("1.18").await?)
 }
 
 // Autodetect Java globals, by searching the users computer.
diff --git a/theseus_gui/src-tauri/src/main.rs b/theseus_gui/src-tauri/src/main.rs
index 880f63d59..6db32d3cb 100644
--- a/theseus_gui/src-tauri/src/main.rs
+++ b/theseus_gui/src-tauri/src/main.rs
@@ -5,7 +5,8 @@
 
 use theseus::prelude::*;
 
-use tauri::{Manager, WindowEvent};
+use tauri::Manager;
+
 use tracing_error::ErrorLayer;
 use tracing_subscriber::EnvFilter;
 
@@ -78,13 +79,15 @@ fn main() {
     {
         builder = builder.setup(|app| {
             let win = app.get_window("main").unwrap();
-            win.set_decorations(false);
+            win.set_decorations(false).unwrap();
             Ok(())
         })
     }
 
     #[cfg(target_os = "macos")]
     {
+        use tauri::WindowEvent;
+
         builder = builder
             .setup(|app| {
                 use api::window_ext::WindowExt;
diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue
index 4cc81bc1a..1dd79ed02 100644
--- a/theseus_gui/src/App.vue
+++ b/theseus_gui/src/App.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { handleError, onMounted, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { RouterView, RouterLink, useRouter } from 'vue-router'
 import {
   HomeIcon,
@@ -26,30 +26,12 @@ import { type } from '@tauri-apps/api/os'
 import { appWindow } from '@tauri-apps/api/window'
 import { isDev } from '@/helpers/utils.js'
 import mixpanel from 'mixpanel-browser'
+import { saveWindowState, StateFlags } from 'tauri-plugin-window-state-api'
+import OnboardingModal from '@/components/OnboardingModal.vue'
 
 const themeStore = useTheming()
 
 const isLoading = ref(true)
-onMounted(async () => {
-  const { settings, collapsed_navigation } = await get().catch(handleError)
-  themeStore.setThemeState(settings)
-  themeStore.collapsedNavigation = collapsed_navigation
-
-  await warning_listener((e) =>
-    notificationsWrapper.value.addNotification({
-      title: 'Warning',
-      text: e.message,
-      type: 'warn',
-    })
-  )
-
-  if ((await type()) === 'Darwin') {
-    document.getElementsByTagName('html')[0].classList.add('mac')
-  } else {
-    document.getElementsByTagName('html')[0].classList.add('windows')
-  }
-})
-
 defineExpose({
   initialize: async () => {
     isLoading.value = false
@@ -68,6 +50,12 @@ defineExpose({
 
     if (!dev) document.addEventListener('contextmenu', (event) => event.preventDefault())
 
+    if ((await type()) === 'Darwin') {
+      document.getElementsByTagName('html')[0].classList.add('mac')
+    } else {
+      document.getElementsByTagName('html')[0].classList.add('windows')
+    }
+
     await warning_listener((e) =>
       notificationsWrapper.value.addNotification({
         title: 'Warning',
@@ -124,6 +112,9 @@ document.querySelector('body').addEventListener('click', function (e) {
 <template>
   <SplashScreen v-if="isLoading" app-loading />
   <div v-else class="container">
+    <suspense>
+      <OnboardingModal ref="testModal" />
+    </suspense>
     <div class="nav-container" :class="{ expanded: !themeStore.collapsedNavigation }">
       <div class="nav-section">
         <suspense>
@@ -218,7 +209,16 @@ document.querySelector('body').addEventListener('click', function (e) {
           <Button class="titlebar-button" icon-only @click="() => appWindow.toggleMaximize()">
             <MaximizeIcon />
           </Button>
-          <Button class="titlebar-button close" icon-only @click="() => appWindow.close()">
+          <Button
+            class="titlebar-button close"
+            icon-only
+            @click="
+              () => {
+                saveWindowState(StateFlags.ALL)
+                appWindow.close()
+              }
+            "
+          >
             <XIcon />
           </Button>
         </section>
@@ -253,10 +253,11 @@ document.querySelector('body').addEventListener('click', function (e) {
 }
 
 .window-controls {
+  z-index: 20;
   display: none;
   flex-direction: row;
   align-items: center;
-  gap: 0;
+  gap: 0.25rem;
 
   .titlebar-button {
     display: flex;
diff --git a/theseus_gui/src/components/OnboardingModal.vue b/theseus_gui/src/components/OnboardingModal.vue
index 6a7de2f18..ca364411a 100644
--- a/theseus_gui/src/components/OnboardingModal.vue
+++ b/theseus_gui/src/components/OnboardingModal.vue
@@ -1,41 +1,152 @@
 <template>
-  <Modal ref="onboardingModal" header="Getting started">
+  <Modal
+    ref="onboardingModal"
+    :header="['Getting started', 'Sign into Minecraft', 'Install java'][page - 1]"
+    :closable="false"
+  >
     <div class="modal-body">
-      <transition name="slide" mode="out-in">
-        <div v-if="page === 1" key="1" class="banner-content swapped-page">
-          <TextLogo class="text-logo" />
-          <h2>Getting started</h2>
+      <div v-if="page === 1" key="1" class="content">
+        <svg
+          class="app-logo"
+          viewBox="0 0 1215 175"
+          xml:space="preserve"
+          style="
+            fill-rule: evenodd;
+            clip-rule: evenodd;
+            stroke-linejoin: round;
+            stroke-miterlimit: 2;
+          "
+          color="var(--color-contrast)"
+        >
+          <g transform="matrix(1,0,0,1,-3395.45,-1175)">
+            <g transform="matrix(0.632704,0,0,0.161619,3395.45,1175)">
+              <rect
+                id="modrinth-app-logo"
+                x="0"
+                y="0"
+                width="1920"
+                height="1080"
+                style="fill: none"
+              />
+              <g id="modrinth-app-logo1">
+                <g transform="matrix(1.26353,0,0,3.23025,-514.757,-837.171)">
+                  <g transform="matrix(1.25087,0,0,1.91545,-240.84,-608.008)">
+                    <g transform="matrix(0.273005,0,0,0.273005,523.782,459.389)">
+                      <path
+                        d="M1053.02,205.51C1088.61,205.51 1117.29,215.61 1138,236.32C1158.72,257.57 1169.34,288.37 1169.34,329.8L1169.34,492.33L1102.94,492.33L1102.94,338.3C1102.94,313.34 1097.64,294.75 1086.48,282C1075.33,269.78 1059.93,263.4 1039.21,263.4C1016.91,263.4 998.84,270.85 985.56,285.19C972.29,300.06 965.38,321.3 965.38,348.39L965.38,492.33L898.98,492.33L898.98,338.3C898.98,313.34 893.68,294.75 882.52,282C871.37,269.78 855.96,263.4 835.25,263.4C812.41,263.4 794.88,270.85 781.6,285.19C768.33,299.53 761.42,320.77 761.42,348.39L761.42,492.33L695.02,492.33L695.02,208.7L758.23,208.7L758.23,244.82C768.86,232.07 782.13,222.52 798.07,215.61C814,208.71 831.53,205.51 851.18,205.51C872.43,205.51 891.55,209.23 908.02,217.2C924.48,225.7 937.23,237.38 946.79,252.79C958.48,237.91 973.35,226.23 991.94,217.73C1010.53,209.76 1030.71,205.51 1053.02,205.51ZM1382.86,496.05C1354.18,496.05 1328.16,489.68 1305.32,477.46C1282.84,465.588 1264.22,447.523 1251.67,425.41C1238.39,403.63 1232.02,378.67 1232.02,350.51C1232.02,322.37 1238.39,297.41 1251.67,275.63C1264.39,253.783 1282.98,235.93 1305.32,224.1C1328.16,211.89 1354.18,205.51 1382.86,205.51C1412.08,205.51 1438.1,211.89 1460.94,224.11C1483.78,236.32 1501.84,253.85 1515.12,275.63C1527.87,297.4 1534.24,322.37 1534.24,350.52C1534.24,378.67 1527.87,403.63 1515.12,425.41C1501.84,447.71 1483.78,465.24 1460.94,477.46C1438.1,489.68 1412.08,496.06 1382.86,496.06L1382.86,496.05ZM1382.86,439.22C1407.3,439.22 1427.48,431.25 1443.41,414.79C1459.35,398.32 1467.31,377.07 1467.31,350.52C1467.31,323.96 1459.35,302.72 1443.41,286.25C1427.48,269.78 1407.3,261.82 1382.86,261.82C1358.43,261.82 1338.25,269.78 1322.84,286.25C1306.91,302.71 1298.94,323.96 1298.94,350.52C1298.94,377.07 1306.91,398.32 1322.84,414.79C1338.24,431.25 1358.44,439.22 1382.86,439.22ZM1874.18,98.22L1874.18,492.33L1810.44,492.33L1810.44,455.68C1799.56,468.819 1785.73,479.196 1770.07,485.96C1753.61,492.86 1736.07,496.06 1716.42,496.06C1689.34,496.06 1664.9,490.21 1643.12,477.99C1621.35,465.78 1603.82,448.78 1591.6,426.47C1579.39,404.69 1573.01,379.2 1573.01,350.52C1573.01,321.84 1579.39,296.34 1591.61,274.56C1603.82,252.79 1621.35,235.79 1643.13,223.57C1664.9,211.36 1689.33,205.51 1716.43,205.51C1735.02,205.51 1752.54,208.71 1767.95,215.07C1783.28,221.396 1796.92,231.222 1807.78,243.76L1807.78,98.22L1874.18,98.22ZM1724.39,439.22C1740.33,439.22 1754.67,435.5 1767.42,428.06C1780.16,421.16 1790.25,410.54 1797.69,397.26C1805.13,383.98 1808.84,368.05 1808.84,350.52C1808.84,332.99 1805.13,317.06 1797.69,303.78C1790.25,290.5 1780.16,279.88 1767.42,272.44C1754.67,265.54 1740.32,261.82 1724.39,261.82C1708.46,261.82 1694.12,265.53 1681.37,272.44C1668.62,279.87 1658.53,290.5 1651.09,303.78C1643.66,317.06 1639.94,332.98 1639.94,350.52C1639.94,368.05 1643.66,383.98 1651.09,397.26C1658.53,410.54 1668.62,421.16 1681.37,428.06C1694.12,435.5 1708.46,439.22 1724.39,439.22ZM2022.9,250.13C2042.02,220.39 2075.48,205.51 2123.82,205.51L2123.82,268.72C2118.75,267.715 2113.59,267.18 2108.42,267.12C2082.39,267.12 2062.2,274.56 2047.86,289.44C2033.52,304.84 2026.08,326.62 2026.08,354.77L2026.08,492.33L1959.69,492.33L1959.69,208.7L2022.89,208.7L2022.89,250.13L2022.9,250.13ZM2178.52,208.7L2244.92,208.7L2244.92,492.33L2178.52,492.33L2178.52,208.7ZM2211.99,161.96C2199.77,161.96 2189.68,158.24 2181.71,150.28C2173.8,143.08 2169.35,132.817 2169.5,122.12C2169.5,110.97 2173.75,101.41 2181.71,93.44C2189.68,86.01 2199.77,82.29 2211.99,82.29C2224.2,82.29 2234.29,86.01 2242.26,92.91C2250.23,100.35 2254.48,109.38 2254.48,120.53C2254.48,132.22 2250.76,141.78 2242.79,149.74C2234.83,157.71 2224.2,161.96 2211.99,161.96ZM2491.37,205.51C2526.96,205.51 2555.64,216.14 2577.42,236.85C2599.2,257.57 2609.82,288.9 2609.82,329.8L2609.82,492.33L2543.42,492.33L2543.42,338.3C2543.42,313.34 2537.58,294.75 2525.9,282C2514.21,269.78 2497.75,263.4 2475.97,263.4C2451.54,263.4 2432.42,270.85 2418.07,285.19C2403.73,300.06 2396.83,321.3 2396.83,348.92L2396.83,492.33L2330.43,492.33L2330.43,208.7L2393.64,208.7L2393.64,245.35C2404.8,232.07 2418.61,222.51 2435.07,215.61C2451.54,208.71 2470.66,205.51 2491.37,205.51ZM2863.18,476.93C2854.87,483.572 2845.29,488.451 2835.03,491.27C2823.44,494.492 2811.46,496.101 2799.43,496.05C2768.1,496.05 2744.2,488.08 2727.2,471.62C2710.2,455.15 2701.7,431.78 2701.7,400.45L2701.7,263.94L2654.97,263.94L2654.97,210.83L2701.71,210.83L2701.71,146.03L2768.11,146.03L2768.11,210.83L2844.06,210.83L2844.06,263.94L2768.1,263.94L2768.1,398.85C2768.1,412.66 2771.29,423.28 2778.2,430.19C2785.1,437.63 2794.66,441.34 2807.4,441.34C2822.28,441.34 2834.5,437.63 2844.59,429.66L2863.18,476.93ZM3077.23,205.51C3112.82,205.51 3141.5,216.14 3163.28,236.85C3185.05,257.57 3195.68,288.9 3195.68,329.8L3195.68,492.33L3129.28,492.33L3129.28,338.3C3129.28,313.34 3123.44,294.75 3111.75,282C3100.07,269.78 3083.6,263.4 3061.83,263.4C3037.39,263.4 3018.27,270.85 3003.93,285.19C2989.59,300.06 2982.69,321.3 2982.69,348.92L2982.69,492.33L2916.29,492.33L2916.29,98.23L2982.69,98.23L2982.69,241.63C2993.84,229.95 3007.12,220.92 3023.59,214.54C3039.52,208.7 3057.58,205.51 3077.23,205.51Z"
+                        style="fill: currentColor; fill-rule: nonzero"
+                      />
+                    </g>
+                    <g transform="matrix(0.273005,0,0,0.273005,523.782,459.389)">
+                      <path
+                        d="M29,424.4L217.2,311.45L200.05,265.97L253.8,210.76L321.73,196.12L341.4,220.33L310.08,252.05L282.78,260.65L263.26,280.7L272.82,307.3L292.22,327.9L319.58,320.62L339.05,299.24L381.56,285.77L394.23,314.27L350.36,368.05L276.86,391.32L243.89,354.62L55.06,467.94C46.1,456.41 35.67,440.08 29,424.4ZM572.03,194.15L422.53,234.47C430.77,256.39 433.48,269.27 435.76,283.47L584.99,243.21C582.61,227.27 578.34,211.04 572.03,194.15Z"
+                        style="fill: var(--color-brand)"
+                      />
+                      <path
+                        d="M51.28,316.13C61.87,441.13 166.82,539.43 294.55,539.43C391.06,539.43 474.57,483.31 514.18,401.97L562.79,418.8C516.01,520.14 413.44,590.55 294.55,590.55C138.6,590.55 10.71,469.38 0,316.13L51.28,316.13ZM0.78,265.24C15.86,116.36 141.73,0 294.56,0C457.53,0 589.84,132.31 589.84,295.28C589.84,321.42 586.44,346.77 580.04,370.91L531.56,354.13C536.324,334.876 538.725,315.114 538.71,295.28C538.71,160.53 429.31,51.13 294.56,51.13C169.98,51.13 67.07,144.63 52.24,265.24L0.78,265.24Z"
+                        style="fill: var(--color-brand)"
+                      />
+                      <path
+                        d="M293.77,153.17C215.28,153.24 151.57,217 151.57,295.51C151.57,374.07 215.36,437.85 293.92,437.85C297.9,437.85 301.85,437.69 305.75,437.36L319.97,487.12C311.335,488.282 302.632,488.864 293.92,488.86C187.2,488.86 100.56,402.22 100.56,295.51C100.56,188.79 187.2,102.16 293.92,102.16C296.56,102.16 299.2,102.21 301.82,102.32L293.77,153.17ZM351.97,111.04C430.36,135.71 487.27,209.02 487.27,295.51C487.27,375.58 438.5,444.34 369.07,473.69L354.9,424.14C402.98,401.29 436.26,352.25 436.26,295.51C436.26,234.52 397.82,182.44 343.87,162.19L351.97,111.04Z"
+                        style="fill: var(--color-brand)"
+                      />
+                    </g>
+                  </g>
+                  <g transform="matrix(1.25498,0,0,1.92174,1126.78,-2077.58)">
+                    <path
+                      d="M411.597,1355.36L411.597,1339.8L410.589,1336.49L410.589,1309.28C410.589,1304 409.005,1299.89 405.837,1296.96C402.669,1294.04 397.869,1292.57 391.437,1292.57C387.117,1292.57 382.869,1293.24 378.693,1294.59C374.517,1295.93 370.989,1297.8 368.109,1300.2L361.053,1287.1C365.181,1283.93 370.101,1281.56 375.813,1279.97C381.525,1278.39 387.453,1277.6 393.597,1277.6C404.733,1277.6 413.349,1280.26 419.445,1285.59C425.541,1290.91 428.589,1299.15 428.589,1310.28L428.589,1355.36L411.597,1355.36ZM387.405,1356.36C381.645,1356.36 376.605,1355.38 372.285,1353.41C367.965,1351.44 364.629,1348.71 362.277,1345.2C359.925,1341.7 358.749,1337.74 358.749,1333.32C358.749,1329 359.781,1325.12 361.845,1321.66C363.909,1318.2 367.293,1315.47 371.997,1313.45C376.701,1311.43 382.941,1310.43 390.717,1310.43L413.037,1310.43L413.037,1322.38L392.013,1322.38C385.869,1322.38 381.741,1323.36 379.629,1325.33C377.517,1327.3 376.461,1329.72 376.461,1332.6C376.461,1335.87 377.757,1338.46 380.349,1340.38C382.941,1342.3 386.541,1343.26 391.149,1343.26C395.565,1343.26 399.525,1342.25 403.029,1340.24C406.533,1338.22 409.053,1335.24 410.589,1331.31L413.613,1342.11C411.885,1346.62 408.789,1350.12 404.325,1352.62C399.861,1355.12 394.221,1356.36 387.405,1356.36Z"
+                      style="fill: var(--color-brand); fill-rule: nonzero"
+                    />
+                    <path
+                      d="M494.253,1356.36C488.013,1356.36 482.325,1354.92 477.189,1352.04C472.053,1349.16 467.973,1344.82 464.949,1339.01C461.925,1333.2 460.413,1325.84 460.413,1316.91C460.413,1307.88 461.877,1300.49 464.805,1294.73C467.733,1288.97 471.741,1284.67 476.829,1281.84C481.917,1279.01 487.725,1277.6 494.253,1277.6C501.837,1277.6 508.533,1279.23 514.341,1282.49C520.149,1285.76 524.757,1290.32 528.165,1296.17C531.573,1302.03 533.277,1308.94 533.277,1316.91C533.277,1324.88 531.573,1331.81 528.165,1337.71C524.757,1343.62 520.149,1348.2 514.341,1351.47C508.533,1354.73 501.837,1356.36 494.253,1356.36ZM451.629,1383.29L451.629,1278.46L468.765,1278.46L468.765,1296.6L468.189,1317.05L469.629,1337.5L469.629,1383.29L451.629,1383.29ZM492.237,1340.95C496.557,1340.95 500.421,1340 503.829,1338.08C507.237,1336.15 509.949,1333.37 511.965,1329.72C513.981,1326.08 514.989,1321.8 514.989,1316.91C514.989,1311.91 513.981,1307.62 511.965,1304.02C509.949,1300.42 507.237,1297.66 503.829,1295.74C500.421,1293.82 496.557,1292.86 492.237,1292.86C487.917,1292.86 484.029,1293.82 480.573,1295.74C477.117,1297.66 474.381,1300.42 472.365,1304.02C470.349,1307.62 469.341,1311.91 469.341,1316.91C469.341,1321.8 470.349,1326.08 472.365,1329.72C474.381,1333.37 477.117,1336.15 480.573,1338.08C484.029,1340 487.917,1340.95 492.237,1340.95Z"
+                      style="fill: var(--color-brand); fill-rule: nonzero"
+                    />
+                    <path
+                      d="M593.037,1356.36C586.797,1356.36 581.109,1354.92 575.973,1352.04C570.837,1349.16 566.757,1344.82 563.733,1339.01C560.709,1333.2 559.197,1325.84 559.197,1316.91C559.197,1307.88 560.661,1300.49 563.589,1294.73C566.517,1288.97 570.525,1284.67 575.613,1281.84C580.701,1279.01 586.509,1277.6 593.037,1277.6C600.621,1277.6 607.317,1279.23 613.125,1282.49C618.933,1285.76 623.541,1290.32 626.949,1296.17C630.357,1302.03 632.061,1308.94 632.061,1316.91C632.061,1324.88 630.357,1331.81 626.949,1337.71C623.541,1343.62 618.933,1348.2 613.125,1351.47C607.317,1354.73 600.621,1356.36 593.037,1356.36ZM550.413,1383.29L550.413,1278.46L567.549,1278.46L567.549,1296.6L566.973,1317.05L568.413,1337.5L568.413,1383.29L550.413,1383.29ZM591.021,1340.95C595.341,1340.95 599.205,1340 602.613,1338.08C606.021,1336.15 608.733,1333.37 610.749,1329.72C612.765,1326.08 613.773,1321.8 613.773,1316.91C613.773,1311.91 612.765,1307.62 610.749,1304.02C608.733,1300.42 606.021,1297.66 602.613,1295.74C599.205,1293.82 595.341,1292.86 591.021,1292.86C586.701,1292.86 582.813,1293.82 579.357,1295.74C575.901,1297.66 573.165,1300.42 571.149,1304.02C569.133,1307.62 568.125,1311.91 568.125,1316.91C568.125,1321.8 569.133,1326.08 571.149,1329.72C573.165,1333.37 575.901,1336.15 579.357,1338.08C582.813,1340 586.701,1340.95 591.021,1340.95Z"
+                      style="fill: var(--color-brand); fill-rule: nonzero"
+                    />
+                  </g>
+                </g>
+              </g>
+            </g>
+          </g>
+        </svg>
+        <div class="markdown-body">
           <p>
-            The Modrinth App is a desktop application that allows you to easily install and manage
-            Minecraft modpacks.
+            Welcome to the Modrinth App: a desktop application that allows you to easily install and
+            manage Minecraft modpacks.
+          </p>
+          <p>
+            Please keep in mind that this is an <strong>early alpha</strong>. Many features are
+            subject to change and there may be various issues you may come across.
+          </p>
+          <p>
+            If you do come across any issues or have a feature request, please report it on our
+            <a href="https://github.com/modrinth/theseus/issues">GitHub Issues page</a>. Please make
+            sure that your issue has not already been reported before creating a new issue!
+          </p>
+          <p>
+            For support, please join our <a href="https://discord.gg/EUHuJHt">Discord</a> and select
+            the Test Subject role. Ask your questions in the relevant thread and we will do our best
+            to help you!
           </p>
-          <Button color="primary" @click="page = 2"> Continue </Button>
         </div>
-        <div v-else-if="page === 2" key="2" class="content swapped-page">
-          <h2>Sign into Minecraft</h2>
+      </div>
+      <div v-else-if="page === 2" key="2" class="content">
+        <div class="markdown-body">
+          <p>
+            The Modrinth App requires a Minecraft account. Click the sign in button below and you
+            will be prompted to log into your Microsoft account.
+          </p>
+          <p>
+            <span>
+              If you do not have a Minecraft account already, visit
+              <a href="https://www.minecraft.net/en-us/store/minecraft-java-bedrock-edition-pc">
+                the Minecraft website
+              </a>
+              to purchase the game.
+            </span>
+          </p>
+        </div>
+
+        <div class="center-grow">
           <AccountsCard mode="isolated" />
         </div>
-        <div v-else-if="page === 3" key="3" class="content swapped-page">
-          <h2>Setting up Java</h2>
-          <div class="settings-group">
-            <h3>Java 17 location</h3>
-            <JavaSelector v-model="settings.java_globals.JAVA_17" :version="17" compact />
-          </div>
-          <div class="settings-group">
-            <h3>Java 8 location</h3>
-            <JavaSelector v-model="settings.java_globals.JAVA_8" :version="8" compact />
+      </div>
+      <div v-else-if="page === 3" key="3" class="content">
+        <div class="markdown-body">
+          <p>
+            The Modrinth App requires a Java installation to run Minecraft. You can let us
+            automatically install Java for you or select an existing installation below.
+          </p>
+        </div>
+        <Chips
+          v-model="javaSelectionType"
+          :items="['automatically install', 'use existing installation']"
+        />
+        <div v-if="javaSelectionType === 'use existing installation'" class="settings-group">
+          <h3>Java location</h3>
+          <JavaSelector v-model="settings.java_globals.JAVA_17" compact />
+        </div>
+        <div v-else class="center-grow">
+          <div v-if="javaLoadingEvent">
+            <ProgressBar :progress="Math.floor(javaLoadingEvent.fraction * 100)" />
+            <div class="row">
+              {{ Math.floor(javaLoadingEvent.fraction * 100) }}% {{ javaLoadingEvent.message }}
+            </div>
           </div>
+          <Button v-else @click="autoInstallJava"> <PlayIcon /> Begin java installation </Button>
         </div>
-      </transition>
+      </div>
       <div class="button-row">
         <Button v-if="page !== 1" @click="page--"> Back </Button>
         <div class="page-indicator">
-          <span class="circle" :class="{ active: page === 1 }" />
-          <span class="circle" :class="{ active: page === 2 }" />
-          <span class="circle" :class="{ active: page === 3 }" />
+          <span class="circle" :class="{ active: page === 1 }" @click="page = 1" />
+          <span class="circle" :class="{ active: page === 2 }" @click="page = 2" />
+          <span class="circle" :class="{ active: page === 3 }" @click="page = 3" />
         </div>
-        <Button v-if="page !== 1" :color="page === 3 ? 'primary' : ''" @click="pageTurn()">
-          {{ page === 3 ? 'Finish' : 'Next' }}
+        <Button class="forward" color="primary" @click="pageTurn()">
+          {{ page === 3 ? 'Finish' : 'Continue' }}
         </Button>
       </div>
     </div>
@@ -43,26 +154,27 @@
 </template>
 
 <script setup>
-import { Modal, TextLogo, Button } from 'omorphia'
-import { ref, watch } from 'vue'
+import { Button, Chips, Modal, PlayIcon } from 'omorphia'
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
 import JavaSelector from '@/components/ui/JavaSelector.vue'
 import { handleError } from '@/store/notifications.js'
 import { get, set } from '@/helpers/settings.js'
+import { auto_install_java, get_jre } from '@/helpers/jre.js'
+import { loading_listener } from '@/helpers/events.js'
+import ProgressBar from '@/components/ui/ProgressBar.vue'
 
 const onboardingModal = ref(null)
 const page = ref(1)
 
-defineExpose({
-  show: () => {
+const fetchSettings = await get().catch(handleError)
+
+onMounted(() => {
+  if (!fetchSettings.onboarded) {
     onboardingModal.value.show()
-  },
+  }
 })
 
-const fetchSettings = await get().catch(handleError)
-
-if (!fetchSettings.java_globals.JAVA_8)
-  fetchSettings.java_globals.JAVA_8 = { path: '', version: '' }
 if (!fetchSettings.java_globals.JAVA_17)
   fetchSettings.java_globals.JAVA_17 = { path: '', version: '' }
 
@@ -71,45 +183,80 @@ const settings = ref(fetchSettings)
 watch(settings.value, async (oldSettings, newSettings) => {
   const setSettings = JSON.parse(JSON.stringify(newSettings))
 
-  if (setSettings.java_globals.JAVA_8?.path === '') {
-    setSettings.java_globals.JAVA_8 = undefined
-  }
   if (setSettings.java_globals.JAVA_17?.path === '') {
     setSettings.java_globals.JAVA_17 = undefined
   }
+  if (setSettings.java_globals.JAVA_17?.path) {
+    setSettings.java_globals.JAVA_17.path = setSettings.java_globals.JAVA_17.path.replace(
+      'java.exe',
+      'javaw.exe'
+    )
+  }
 
   await set(setSettings)
 })
 
 const pageTurn = () => {
   if (page.value === 3) {
+    settings.value.onboarded = true
     onboardingModal.value.hide()
     return
   }
   page.value++
 }
+
+const javaSelectionType = ref('automatically install')
+
+async function autoInstallJava() {
+  const path = await auto_install_java(17).catch(handleError)
+  const version = await get_jre(path).catch(handleError)
+  settings.value.java_globals.JAVA_17 = version
+}
+
+const javaLoadingEvent = ref(null)
+const unlistenLoading = await loading_listener(async (event) => {
+  if (event.event.type === 'java_download') {
+    javaLoadingEvent.value = event
+    if (!event.fraction) {
+      javaLoadingEvent.value.fraction = 1
+    }
+  }
+})
+
+onBeforeUnmount(() => {
+  unlistenLoading()
+})
 </script>
 
 <style scoped lang="scss">
 .modal-body {
   display: flex;
   flex-direction: column;
-  align-items: center;
   gap: 1rem;
   padding: var(--gap-lg);
 
+  height: min(70vh, 450px);
+
   h2 {
     margin-bottom: 0;
     margin-top: 0;
   }
 }
 
-.swapped-page {
+.content {
   width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
-  align-items: center;
+  gap: 1rem;
+
+  .center-grow {
+    width: 100%;
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 }
 
 .settings-group {
@@ -119,81 +266,42 @@ const pageTurn = () => {
 
 .button-row {
   display: flex;
-  justify-content: space-between;
-  flex-direction: row;
   align-items: center;
+  position: relative;
   width: 100%;
 
-  .page-indicator {
-    flex-grow: 1;
-    margin: 0 auto;
+  .back {
+    margin-right: auto;
   }
-}
-
-.text-logo {
-  width: 100%;
-  height: 100%;
-}
-
-.banner-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 1rem;
-  padding: 4rem;
-}
 
-.content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 1rem;
-  width: 100%;
-}
-
-.page-enter-active,
-.page-leave-active {
-  transition: opacity 0.3s ease;
-}
+  .page-indicator {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
 
-.page-enter-from,
-.page-leave-to {
-  opacity: 0;
-}
+    .circle {
+      width: 0.75rem;
+      height: 0.75rem;
+      border-radius: 50%;
+      display: inline-block;
+      margin-right: 0.5rem;
+      background-color: var(--color-base);
+      transition: all 0.3s ease-in-out;
+      cursor: pointer !important;
 
-.circle {
-  width: 0.5rem;
-  height: 0.5rem;
-  border-radius: 50%;
-  display: inline-block;
-  margin-right: 0.25rem;
-  background-color: var(--color-base);
-  transition: all 0.3s ease-in-out;
-
-  &.active {
-    background-color: var(--color-brand);
+      &.active {
+        background-color: var(--color-brand);
+      }
+    }
   }
-}
 
-.table {
-  .table-row {
-    grid-template-columns: 1fr 4fr 1.5fr;
+  .forward {
+    margin-left: auto;
   }
-
-  span {
-    display: inherit;
-    align-items: center;
-    justify-content: center;
-  }
-}
-
-.slide-enter-active,
-.slide-leave-active {
-  transition: transform 0.5s;
 }
 
-.slide-enter,
-.slide-leave-to {
-  transform: translateX(100%);
+.app-logo {
+  width: 20rem;
+  height: auto;
 }
 </style>
diff --git a/theseus_gui/src/components/ui/ContextMenu.vue b/theseus_gui/src/components/ui/ContextMenu.vue
index 00a124649..3ae355024 100644
--- a/theseus_gui/src/components/ui/ContextMenu.vue
+++ b/theseus_gui/src/components/ui/ContextMenu.vue
@@ -61,7 +61,6 @@ const hideContextMenu = () => {
 }
 
 const optionClicked = (option) => {
-  console.log('item check', item.value)
   emit('option-clicked', {
     item: item.value,
     option: option,
diff --git a/theseus_gui/src/components/ui/JavaSelector.vue b/theseus_gui/src/components/ui/JavaSelector.vue
index 31015c577..32677f6a5 100644
--- a/theseus_gui/src/components/ui/JavaSelector.vue
+++ b/theseus_gui/src/components/ui/JavaSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <JavaDetectionModal ref="detectJavaModal" @submit="(val) => emit('update:modelValue', val)" />
-  <div class="toggle-setting">
+  <div class="toggle-setting" :class="{ compact }">
     <input
       autocomplete="off"
       :disabled="props.disabled"
@@ -18,10 +18,7 @@
       "
     />
     <span class="installation-buttons">
-      <Button
-        :disabled="props.disabled"
-        @click="$refs.detectJavaModal.show(props.version, props.modelValue)"
-      >
+      <Button :disabled="props.disabled" @click="autoDetect">
         <SearchIcon />
         Auto detect
       </Button>
@@ -48,11 +45,12 @@
 
 <script setup>
 import { Button, SearchIcon, PlayIcon, CheckIcon, XIcon, FolderSearchIcon } from 'omorphia'
-import { get_jre } from '@/helpers/jre.js'
+import { find_jre_17_jres, get_jre } from '@/helpers/jre.js'
 import { ref } from 'vue'
 import { open } from '@tauri-apps/api/dialog'
 import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
 import mixpanel from 'mixpanel-browser'
+import { handleError } from '@/store/state.js'
 
 const props = defineProps({
   version: {
@@ -74,6 +72,10 @@ const props = defineProps({
     required: false,
     default: null,
   },
+  compact: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['update:modelValue'])
@@ -117,6 +119,18 @@ async function handleJavaFileInput() {
     emit('update:modelValue', result)
   }
 }
+
+const detectJavaModal = ref(null)
+async function autoDetect() {
+  if (!props.compact) {
+    detectJavaModal.value.show(props.version, props.modelValue)
+  } else {
+    let versions = await find_jre_17_jres().catch(handleError)
+    if (versions.length > 0) {
+      emit('update:modelValue', versions[0])
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -131,6 +145,10 @@ async function handleJavaFileInput() {
   justify-content: space-between;
   align-items: center;
   gap: 0.5rem;
+
+  &.compact {
+    flex-wrap: wrap;
+  }
 }
 
 .installation-buttons {
diff --git a/theseus_gui/src/components/ui/RunningAppBar.vue b/theseus_gui/src/components/ui/RunningAppBar.vue
index 5eb584098..350097476 100644
--- a/theseus_gui/src/components/ui/RunningAppBar.vue
+++ b/theseus_gui/src/components/ui/RunningAppBar.vue
@@ -1,9 +1,4 @@
 <template>
-  <div class="external-buttons">
-    <Button icon-only class="icon-button" @click="modal.show()">
-      <DashboardIcon />
-    </Button>
-  </div>
   <div class="action-groups">
     <Button
       v-if="currentLoadingBars.length > 0"
@@ -52,7 +47,7 @@
     <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.pack_name ?? 'Installing Modpack' }}
+          {{ loadingBar.title }}
         </h3>
         <ProgressBar :progress="Math.floor(loadingBar.current)" />
         <div class="row">{{ Math.floor(loadingBar.current) }}% {{ loadingBar.message }}</div>
@@ -87,7 +82,6 @@
       </Button>
     </Card>
   </transition>
-  <OnboardingModal ref="modal" />
 </template>
 
 <script setup>
@@ -97,7 +91,6 @@ import {
   Card,
   StopCircleIcon,
   TerminalSquareIcon,
-  DashboardIcon,
   DropdownIcon,
 } from 'omorphia'
 import { onBeforeUnmount, onMounted, ref } from 'vue'
@@ -111,7 +104,6 @@ import { useRouter } from 'vue-router'
 import { progress_bars_list } from '@/helpers/state.js'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { handleError } from '@/store/notifications.js'
-import OnboardingModal from '@/components/OnboardingModal.vue'
 import mixpanel from 'mixpanel-browser'
 
 const router = useRouter()
@@ -120,11 +112,6 @@ const profiles = ref(null)
 const infoButton = ref(null)
 const profileButton = ref(null)
 const showCard = ref(false)
-const modal = ref(null)
-
-defineExpose({
-  modal,
-})
 
 const showProfiles = ref(false)
 
@@ -162,15 +149,25 @@ const goToTerminal = (path) => {
   router.push(`/instance/${encodeURIComponent(path ?? selectedProfile.value.path)}/logs`)
 }
 
-const currentLoadingBars = ref(Object.values(await progress_bars_list().catch(handleError)))
-
-const unlistenLoading = await loading_listener(async () => {
-  await refreshInfo()
-})
+const currentLoadingBars = ref([])
 
 const refreshInfo = async () => {
   const currentLoadingBarCount = currentLoadingBars.value.length
-  currentLoadingBars.value = Object.values(await progress_bars_list().catch(handleError))
+  currentLoadingBars.value = Object.values(await progress_bars_list().catch(handleError)).map(
+    (x) => {
+      if (x.bar_type.type === 'java_download') {
+        x.title = 'Downloading Java ' + x.bar_type.version
+      }
+      if (x.bar_type.profile_name) {
+        x.title = x.bar_type.profile_name
+      }
+      if (x.bar_type.pack_name) {
+        x.title = x.bar_type.pack_name
+      }
+
+      return x
+    }
+  )
   if (currentLoadingBars.value.length === 0) {
     showCard.value = false
   } else if (currentLoadingBarCount < currentLoadingBars.value.length) {
@@ -178,6 +175,11 @@ const refreshInfo = async () => {
   }
 }
 
+await refreshInfo()
+const unlistenLoading = await loading_listener(async () => {
+  await refreshInfo()
+})
+
 const selectProfile = (profile) => {
   selectedProfile.value = profile
   showProfiles.value = false
@@ -220,7 +222,6 @@ const toggleProfiles = async () => {
 }
 
 onMounted(() => {
-  modal.value.show()
   window.addEventListener('click', handleClickOutsideCard)
   window.addEventListener('click', handleClickOutsideProfile)
 })
@@ -234,15 +235,6 @@ onBeforeUnmount(() => {
 </script>
 
 <style scoped lang="scss">
-.external-buttons {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 0.5rem;
-  height: 100%;
-  padding: 0 1rem;
-}
-
 .action-groups {
   display: flex;
   flex-direction: row;
diff --git a/theseus_gui/src/helpers/jre.js b/theseus_gui/src/helpers/jre.js
index 2201ffc0f..176aac2d4 100644
--- a/theseus_gui/src/helpers/jre.js
+++ b/theseus_gui/src/helpers/jre.js
@@ -52,12 +52,12 @@ export async function get_jre(path) {
 
 // Autodetect Java globals, by searching the users computer.
 // Returns a *NEW* JavaGlobals that can be put into Settings
-export async function autodetect_java_globals(path) {
-  return await invoke('jre_autodetect_java_globals', { path })
+export async function autodetect_java_globals() {
+  return await invoke('jre_autodetect_java_globals')
 }
 
 // Automatically installs specified java version
-export async function jre_auto_install_java(javaVersion) {
+export async function auto_install_java(javaVersion) {
   return await invoke('jre_auto_install_java', { javaVersion })
 }
 
diff --git a/theseus_gui/src/pages/Index.vue b/theseus_gui/src/pages/Index.vue
index cdadcbb35..eb455325f 100644
--- a/theseus_gui/src/pages/Index.vue
+++ b/theseus_gui/src/pages/Index.vue
@@ -21,9 +21,7 @@ breadcrumbs.setRootContext({ name: 'Home', link: route.path })
 const recentInstances = shallowRef([])
 
 const getInstances = async () => {
-  console.log('aa')
   const profiles = await list(true).catch(handleError)
-  console.log(profiles)
   recentInstances.value = Object.values(profiles).sort((a, b) => {
     return dayjs(b.metadata.last_played ?? 0).diff(dayjs(a.metadata.last_played ?? 0))
   })
diff --git a/theseus_gui/src/pages/instance/Index.vue b/theseus_gui/src/pages/instance/Index.vue
index dfd160996..d0677da5f 100644
--- a/theseus_gui/src/pages/instance/Index.vue
+++ b/theseus_gui/src/pages/instance/Index.vue
@@ -221,7 +221,6 @@ const handleRightClick = (event) => {
 }
 
 const handleOptionsClick = async (args) => {
-  console.log(args)
   switch (args.option) {
     case 'play':
       await startInstance('InstancePageContextMenu')

From e5b68fcce3d6026904fdf26f962824d6e7aef2ea Mon Sep 17 00:00:00 2001
From: Jai A <jaiagr+gpg@pm.me>
Date: Tue, 20 Jun 2023 17:16:07 -0700
Subject: [PATCH 10/13] Finish onboarding

---
 Cargo.lock                                    |   6 +-
 theseus/Cargo.toml                            |   2 +-
 theseus/src/api/jre.rs                        |   9 +-
 theseus/src/util/jre.rs                       | 132 +++++++++---------
 theseus_cli/Cargo.toml                        |   2 +-
 theseus_gui/package.json                      |   2 +-
 theseus_gui/pnpm-lock.yaml                    |   8 +-
 theseus_gui/src-tauri/Cargo.toml              |   2 +-
 theseus_gui/src-tauri/tauri.conf.json         |   7 +-
 theseus_gui/src/App.vue                       |  11 +-
 .../src/components/OnboardingModal.vue        |  57 ++++++--
 .../src/components/ui/AccountsCard.vue        |  64 +++------
 .../ui/IncompatibilityWarningModal.vue        |   2 +-
 theseus_gui/src/helpers/fetch.js              |   5 +-
 theseus_gui/src/pages/project/Version.vue     |   2 +-
 theseus_playground/Cargo.toml                 |   2 +-
 16 files changed, 164 insertions(+), 149 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9801f9885..49264733e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4567,7 +4567,7 @@ dependencies = [
 
 [[package]]
 name = "theseus"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "async-tungstenite",
  "async_zip",
@@ -4608,7 +4608,7 @@ dependencies = [
 
 [[package]]
 name = "theseus_cli"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "argh",
  "color-eyre",
@@ -4672,7 +4672,7 @@ dependencies = [
 
 [[package]]
 name = "theseus_playground"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "daedalus",
  "dunce",
diff --git a/theseus/Cargo.toml b/theseus/Cargo.toml
index 40cae6412..2ff28c017 100644
--- a/theseus/Cargo.toml
+++ b/theseus/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Jai A <jaiagr+gpg@pm.me>"]
 edition = "2018"
 
diff --git a/theseus/src/api/jre.rs b/theseus/src/api/jre.rs
index fadb32b98..4729b75a0 100644
--- a/theseus/src/api/jre.rs
+++ b/theseus/src/api/jre.rs
@@ -140,14 +140,9 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
                 .join("java")
         }
 
-        #[cfg(target_os = "windows")]
+        #[cfg(not(target_os = "macos"))]
         {
-            base_path = base_path.join("bin").join("javaw.exe")
-        }
-
-        #[cfg(target_os = "linux")]
-        {
-            base_path = base_path.join("bin").join("java")
+            base_path = base_path.join("bin").join(jre::JAVA_BIN)
         }
 
         Ok(base_path)
diff --git a/theseus/src/util/jre.rs b/theseus/src/util/jre.rs
index e1da33078..a30b76868 100644
--- a/theseus/src/util/jre.rs
+++ b/theseus/src/util/jre.rs
@@ -31,7 +31,7 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
     let mut jre_paths = HashSet::new();
 
     // Add JRES directly on PATH
-    jre_paths.extend(get_all_jre_path().await?);
+    jre_paths.extend(get_all_jre_path().await);
     jre_paths.extend(get_all_autoinstalled_jre_path().await?);
     if let Ok(java_home) = env::var("JAVA_HOME") {
         jre_paths.insert(PathBuf::from(java_home));
@@ -47,8 +47,10 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
     for java_path in java_paths {
         let Ok(java_subpaths) = std::fs::read_dir(java_path) else {continue };
         for java_subpath in java_subpaths {
-            let path = java_subpath?.path();
-            jre_paths.insert(path.join("bin"));
+            if let Ok(java_subpath) = java_subpath {
+                let path = java_subpath.path();
+                jre_paths.insert(path.join("bin"));
+            }
         }
     }
 
@@ -68,18 +70,18 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
         if let Ok(jre_key) = RegKey::predef(HKEY_LOCAL_MACHINE)
             .open_subkey_with_flags(key, KEY_READ | KEY_WOW64_32KEY)
         {
-            jre_paths.extend(get_paths_from_jre_winregkey(jre_key)?);
+            jre_paths.extend(get_paths_from_jre_winregkey(jre_key));
         }
         if let Ok(jre_key) = RegKey::predef(HKEY_LOCAL_MACHINE)
             .open_subkey_with_flags(key, KEY_READ | KEY_WOW64_64KEY)
         {
-            jre_paths.extend(get_paths_from_jre_winregkey(jre_key)?);
+            jre_paths.extend(get_paths_from_jre_winregkey(jre_key));
         }
     }
 
     // Get JRE versions from potential paths concurrently
     let j = check_java_at_filepaths(jre_paths)
-        .await?
+        .await
         .into_iter()
         .collect();
     Ok(j)
@@ -88,27 +90,26 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
 // Gets paths rather than search directly as RegKeys should not be passed asynchronously (do not impl Send)
 #[cfg(target_os = "windows")]
 #[tracing::instrument]
-pub fn get_paths_from_jre_winregkey(
-    jre_key: RegKey,
-) -> Result<HashSet<PathBuf>, JREError> {
+pub fn get_paths_from_jre_winregkey(jre_key: RegKey) -> HashSet<PathBuf> {
     let mut jre_paths = HashSet::new();
 
     for subkey in jre_key.enum_keys() {
-        let subkey = subkey?;
-        let subkey = jre_key.open_subkey(subkey)?;
-
-        let subkey_value_names =
-            [r"JavaHome", r"InstallationPath", r"\\hotspot\\MSI"];
-
-        for subkey_value in subkey_value_names {
-            let path: Result<String, std::io::Error> =
-                subkey.get_value(subkey_value);
-            let Ok(path) = path else {continue};
-
-            jre_paths.insert(PathBuf::from(path).join("bin"));
+        if let Ok(subkey) = subkey {
+            if let Ok(subkey) = jre_key.open_subkey(subkey) {
+                let subkey_value_names =
+                    [r"JavaHome", r"InstallationPath", r"\\hotspot\\MSI"];
+
+                for subkey_value in subkey_value_names {
+                    let path: Result<String, std::io::Error> =
+                        subkey.get_value(subkey_value);
+                    let Ok(path) = path else {continue};
+
+                    jre_paths.insert(PathBuf::from(path).join("bin"));
+                }
+            }
         }
     }
-    Ok(jre_paths)
+    jre_paths
 }
 
 // Entrypoint function (Mac)
@@ -120,7 +121,7 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
     let mut jre_paths = HashSet::new();
 
     // Add JREs directly on PATH
-    jre_paths.extend(get_all_jre_path().await?);
+    jre_paths.extend(get_all_jre_path().await);
     jre_paths.extend(get_all_autoinstalled_jre_path().await?);
 
     // Hard paths for locations for commonly installed .exes
@@ -134,16 +135,18 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
     }
     // Iterate over JavaVirtualMachines/(something)/Contents/Home/bin
     let base_path = PathBuf::from("/Library/Java/JavaVirtualMachines/");
-    if base_path.is_dir() {
-        for entry in std::fs::read_dir(base_path)? {
-            let entry = entry?.path().join("Contents/Home/bin");
-            jre_paths.insert(entry);
+    if let Ok(dir) = std::fs::read_dir(base_path) {
+        for entry in dir {
+            if let Ok(entry) = entry {
+                let entry = entry.path().join("Contents/Home/bin");
+                jre_paths.insert(entry);
+            }
         }
     }
 
     // Get JRE versions from potential paths concurrently
     let j = check_java_at_filepaths(jre_paths)
-        .await?
+        .await
         .into_iter()
         .collect();
     Ok(j)
@@ -158,7 +161,7 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
     let mut jre_paths = HashSet::new();
 
     // Add JREs directly on PATH
-    jre_paths.extend(get_all_jre_path().await?);
+    jre_paths.extend(get_all_jre_path().await);
     jre_paths.extend(get_all_autoinstalled_jre_path().await?);
 
     // Hard paths for locations for commonly installed locations
@@ -174,18 +177,20 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
         let path = PathBuf::from(path);
         jre_paths.insert(PathBuf::from(&path).join("jre").join("bin"));
         jre_paths.insert(PathBuf::from(&path).join("bin"));
-        if path.is_dir() {
-            for entry in std::fs::read_dir(&path)? {
-                let entry_path = entry?.path();
-                jre_paths.insert(entry_path.join("jre").join("bin"));
-                jre_paths.insert(entry_path.join("bin"));
+        if let Ok(dir) = std::fs::read_dir(base_path) {
+            for entry in dir {
+                if let Ok(entry) = entry {
+                    let entry_path = entry.path();
+                    jre_paths.insert(entry_path.join("jre").join("bin"));
+                    jre_paths.insert(entry_path.join("bin"));
+                }
             }
         }
     }
 
     // Get JRE versions from potential paths concurrently
     let j = check_java_at_filepaths(jre_paths)
-        .await?
+        .await
         .into_iter()
         .collect();
     Ok(j)
@@ -203,13 +208,24 @@ async fn get_all_autoinstalled_jre_path() -> Result<HashSet<PathBuf>, JREError>
         let base_path = state.directories.java_versions_dir();
 
         if base_path.is_dir() {
-            for entry in std::fs::read_dir(base_path)? {
-                let entry = entry?;
-                let file_path = entry.path().join("bin");
-                let contents = std::fs::read_to_string(file_path)?;
-
-                let entry = entry.path().join(contents);
-                jre_paths.insert(entry);
+            if let Ok(dir) = std::fs::read_dir(base_path) {
+                for entry in dir {
+                    if let Ok(entry) = entry {
+                        let file_path = entry.path().join("bin");
+
+                        if let Ok(contents) = std::fs::read_to_string(file_path)
+                        {
+                            let entry = entry.path().join(contents);
+                            jre_paths.insert(entry);
+                        } else {
+                            #[cfg(not(target_os = "macos"))]
+                            {
+                                let file_path = file_path.join(JAVA_BIN);
+                                jre_paths.insert(file_path);
+                            }
+                        }
+                    }
+                }
             }
         }
 
@@ -220,26 +236,27 @@ async fn get_all_autoinstalled_jre_path() -> Result<HashSet<PathBuf>, JREError>
 
 // Gets all JREs from the PATH env variable
 #[tracing::instrument]
-async fn get_all_jre_path() -> Result<HashSet<PathBuf>, JREError> {
+async fn get_all_jre_path() -> HashSet<PathBuf> {
     // Iterate over values in PATH variable, where accessible JREs are referenced
-    let paths = env::var("PATH")?;
-    Ok(env::split_paths(&paths).collect())
+    let paths =
+        env::var("PATH").map(|x| env::split_paths(&x).collect::<HashSet<_>>());
+    paths.unwrap_or_else(|_| HashSet::new())
 }
 
 #[cfg(target_os = "windows")]
 #[allow(dead_code)]
-const JAVA_BIN: &str = "javaw.exe";
+pub const JAVA_BIN: &str = "javaw.exe";
 
 #[cfg(not(target_os = "windows"))]
 #[allow(dead_code)]
-const JAVA_BIN: &str = "java";
+pub const JAVA_BIN: &str = "java";
 
 // For each example filepath in 'paths', perform check_java_at_filepath, checking each one concurrently
 // and returning a JavaVersion for every valid path that points to a java bin
 #[tracing::instrument]
 pub async fn check_java_at_filepaths(
     paths: HashSet<PathBuf>,
-) -> Result<HashSet<JavaVersion>, JREError> {
+) -> HashSet<JavaVersion> {
     let jres = stream::iter(paths.into_iter())
         .map(|p: PathBuf| {
             tokio::task::spawn(async move { check_java_at_filepath(&p).await })
@@ -248,8 +265,7 @@ pub async fn check_java_at_filepaths(
         .collect::<Vec<_>>()
         .await;
 
-    let jres: Result<Vec<_>, JoinError> = jres.into_iter().collect();
-    Ok(jres?.into_iter().flatten().collect())
+    jres.into_iter().flat_map(|x| x.ok()).flatten().collect()
 }
 
 // For example filepath 'path', attempt to resolve it and get a Java version at this path
@@ -380,19 +396,3 @@ pub enum JREError {
     #[error("Error getting launcher sttae")]
     StateError,
 }
-
-#[cfg(test)]
-mod tests {
-    use super::extract_java_majorminor_version;
-
-    #[test]
-    pub fn java_version_parsing() {
-        assert_eq!(extract_java_majorminor_version("1.8").unwrap(), (1, 8));
-        assert_eq!(extract_java_majorminor_version("17.0.6").unwrap(), (1, 17));
-        assert_eq!(extract_java_majorminor_version("20").unwrap(), (1, 20));
-        assert_eq!(
-            extract_java_majorminor_version("1.8.0_361").unwrap(),
-            (1, 8)
-        );
-    }
-}
diff --git a/theseus_cli/Cargo.toml b/theseus_cli/Cargo.toml
index 46927e83f..6ef7fd903 100644
--- a/theseus_cli/Cargo.toml
+++ b/theseus_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus_cli"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Jai A <jaiagr+gpg@pm.me>"]
 edition = "2018"
 
diff --git a/theseus_gui/package.json b/theseus_gui/package.json
index 41092d03c..4f8d69f49 100644
--- a/theseus_gui/package.json
+++ b/theseus_gui/package.json
@@ -18,7 +18,7 @@
     "floating-vue": "^2.0.0-beta.20",
     "mixpanel-browser": "^2.47.0",
     "ofetch": "^1.0.1",
-    "omorphia": "^0.4.30",
+    "omorphia": "^0.4.31",
     "pinia": "^2.1.3",
     "tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",
     "vite-svg-loader": "^4.0.0",
diff --git a/theseus_gui/pnpm-lock.yaml b/theseus_gui/pnpm-lock.yaml
index 2740c5907..251c9dac2 100644
--- a/theseus_gui/pnpm-lock.yaml
+++ b/theseus_gui/pnpm-lock.yaml
@@ -17,8 +17,8 @@ dependencies:
     specifier: ^1.0.1
     version: 1.0.1
   omorphia:
-    specifier: ^0.4.30
-    version: 0.4.30
+    specifier: ^0.4.31
+    version: 0.4.31
   pinia:
     specifier: ^2.1.3
     version: 2.1.3(vue@3.3.4)
@@ -1336,8 +1336,8 @@ packages:
       ufo: 1.1.2
     dev: false
 
-  /omorphia@0.4.30:
-    resolution: {integrity: sha512-dZqBD2wREiTviC6nReVvEnZHURv9GeQfM7ITeQ54cFIEycpkrqfCfPgGKfsZ3eM84CILmIFUrdS/UAKxYkNubg==}
+  /omorphia@0.4.31:
+    resolution: {integrity: sha512-xeb9bD42VFRDKCkKz678hBYCIS//Atd4/hx6/YmboJLMEIjIJfS2Ocf9G53G52XkfS4DWs9CIzKz71NDh86kxQ==}
     dependencies:
       dayjs: 1.11.7
       floating-vue: 2.0.0-beta.20(vue@3.3.4)
diff --git a/theseus_gui/src-tauri/Cargo.toml b/theseus_gui/src-tauri/Cargo.toml
index 253a91e90..ab72e895d 100644
--- a/theseus_gui/src-tauri/Cargo.toml
+++ b/theseus_gui/src-tauri/Cargo.toml
@@ -18,7 +18,7 @@ theseus = { path = "../../theseus", features = ["tauri"] }
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.3", features = ["devtools", "dialog", "dialog-open", "macos-private-api", "os-all", "protocol-asset", "shell-open", "updater", "window-close", "window-create", "window-hide", "window-maximize", "window-minimize", "window-set-decorations", "window-show", "window-start-dragging", "window-unmaximize", "window-unminimize"] }
+tauri = { version = "1.3", features = ["app-all", "devtools", "dialog", "dialog-open", "macos-private-api", "os-all", "protocol-asset", "shell-open", "updater", "window-close", "window-create", "window-hide", "window-maximize", "window-minimize", "window-set-decorations", "window-show", "window-start-dragging", "window-unmaximize", "window-unminimize"] }
 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tokio = { version = "1", features = ["full"] }
diff --git a/theseus_gui/src-tauri/tauri.conf.json b/theseus_gui/src-tauri/tauri.conf.json
index 76c020741..548cf437c 100644
--- a/theseus_gui/src-tauri/tauri.conf.json
+++ b/theseus_gui/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Modrinth App",
-    "version": "0.0.1"
+    "version": "0.2.0"
   },
   "tauri": {
     "allowlist": {
@@ -40,6 +40,9 @@
       },
       "os": {
         "all": true
+      },
+      "app": {
+        "all": true
       }
     },
     "macOSPrivateApi": true,
@@ -92,7 +95,7 @@
         "height": 650,
         "resizable": true,
         "title": "Modrinth App",
-        "width": 1140,
+        "width": 1280,
         "minHeight": 630,
         "minWidth": 1100
       }
diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue
index 1dd79ed02..8dd49f0b8 100644
--- a/theseus_gui/src/App.vue
+++ b/theseus_gui/src/App.vue
@@ -28,6 +28,7 @@ import { isDev } from '@/helpers/utils.js'
 import mixpanel from 'mixpanel-browser'
 import { saveWindowState, StateFlags } from 'tauri-plugin-window-state-api'
 import OnboardingModal from '@/components/OnboardingModal.vue'
+import { getVersion } from '@tauri-apps/api/app'
 
 const themeStore = useTheming()
 
@@ -35,8 +36,10 @@ const isLoading = ref(true)
 defineExpose({
   initialize: async () => {
     isLoading.value = false
-    const { theme, opt_out_analytics, collapsed_navigation, advanced_rendering } = await get()
+    const { theme, opt_out_analytics, collapsed_navigation, advanced_rendering, onboarded } =
+      await get()
     const dev = await isDev()
+    const version = await getVersion()
 
     themeStore.setThemeState(theme)
     themeStore.collapsedNavigation = collapsed_navigation
@@ -46,7 +49,7 @@ defineExpose({
     if (opt_out_analytics) {
       mixpanel.opt_out_tracking()
     }
-    mixpanel.track('Launched')
+    mixpanel.track('Launched', { version, dev, onboarded })
 
     if (!dev) document.addEventListener('contextmenu', (event) => event.preventDefault())
 
@@ -107,13 +110,15 @@ document.querySelector('body').addEventListener('click', function (e) {
     target = target.parentElement
   }
 })
+
+const accounts = ref(null)
 </script>
 
 <template>
   <SplashScreen v-if="isLoading" app-loading />
   <div v-else class="container">
     <suspense>
-      <OnboardingModal ref="testModal" />
+      <OnboardingModal ref="testModal" :accounts="accounts" />
     </suspense>
     <div class="nav-container" :class="{ expanded: !themeStore.collapsedNavigation }">
       <div class="nav-section">
diff --git a/theseus_gui/src/components/OnboardingModal.vue b/theseus_gui/src/components/OnboardingModal.vue
index ca364411a..ee412a901 100644
--- a/theseus_gui/src/components/OnboardingModal.vue
+++ b/theseus_gui/src/components/OnboardingModal.vue
@@ -110,7 +110,7 @@
         </div>
 
         <div class="center-grow">
-          <AccountsCard mode="isolated" />
+          <AccountsCard ref="accountsCard" mode="isolated" @change="fetchSettings" />
         </div>
       </div>
       <div v-else-if="page === 3" key="3" class="content">
@@ -163,22 +163,32 @@ import { get, set } from '@/helpers/settings.js'
 import { auto_install_java, get_jre } from '@/helpers/jre.js'
 import { loading_listener } from '@/helpers/events.js'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
+import mixpanel from 'mixpanel-browser'
 
 const onboardingModal = ref(null)
+const accountsCard = ref(null)
 const page = ref(1)
 
-const fetchSettings = await get().catch(handleError)
-
-onMounted(() => {
-  if (!fetchSettings.onboarded) {
-    onboardingModal.value.show()
-  }
+const props = defineProps({
+  accounts: {
+    type: Object,
+    default: () => {},
+  },
 })
 
-if (!fetchSettings.java_globals.JAVA_17)
-  fetchSettings.java_globals.JAVA_17 = { path: '', version: '' }
+async function fetchSettings() {
+  const fetchSettings = await get().catch(handleError)
 
-const settings = ref(fetchSettings)
+  if (!fetchSettings.java_globals.JAVA_17)
+    fetchSettings.java_globals.JAVA_17 = { path: '', version: '' }
+
+  settings.value = fetchSettings
+  if (props.accounts) {
+    await props.accounts.refreshValues()
+  }
+}
+const settings = ref({})
+await fetchSettings()
 
 watch(settings.value, async (oldSettings, newSettings) => {
   const setSettings = JSON.parse(JSON.stringify(newSettings))
@@ -193,24 +203,43 @@ watch(settings.value, async (oldSettings, newSettings) => {
     )
   }
 
-  await set(setSettings)
+  const refresh = await get()
+  if (refresh !== setSettings) {
+    await set(setSettings)
+
+    if (accountsCard.value) {
+      await accountsCard.value.refreshValues()
+    }
+  }
+})
+
+onMounted(() => {
+  if (!settings.value.onboarded) {
+    onboardingModal.value.show()
+  }
 })
 
-const pageTurn = () => {
+async function pageTurn() {
   if (page.value === 3) {
     settings.value.onboarded = true
     onboardingModal.value.hide()
+    mixpanel.track('OnboardingFinish')
     return
   }
   page.value++
+  mixpanel.track('OnboardingPage', { page: page.value })
+
+  if (accountsCard.value) {
+    await accountsCard.value.refreshValues()
+  }
 }
 
 const javaSelectionType = ref('automatically install')
 
 async function autoInstallJava() {
   const path = await auto_install_java(17).catch(handleError)
-  const version = await get_jre(path).catch(handleError)
-  settings.value.java_globals.JAVA_17 = version
+  settings.value.java_globals.JAVA_17 = await get_jre(path).catch(handleError)
+  mixpanel.track('OnboardingAutoInstallJava')
 }
 
 const javaLoadingEvent = ref(null)
diff --git a/theseus_gui/src/components/ui/AccountsCard.vue b/theseus_gui/src/components/ui/AccountsCard.vue
index cebf220ff..b703377fa 100644
--- a/theseus_gui/src/components/ui/AccountsCard.vue
+++ b/theseus_gui/src/components/ui/AccountsCard.vue
@@ -4,11 +4,11 @@
     ref="button"
     class="button-base avatar-button"
     :class="{ expanded: mode === 'expanded' }"
-    @click="toggle()"
+    @click="showCard = !showCard"
   >
     <Avatar
       :size="mode === 'expanded' ? 'xs' : 'sm'"
-      :src="selectedAccount?.profile_picture ?? ''"
+      :src="selectedAccount ? `https://mc-heads.net/avatar/${selectedAccount.id}/128` : ''"
     />
     <div v-show="mode === 'expanded'" class="avatar-text">
       <div class="text no-select">
@@ -28,7 +28,7 @@
       :class="{ expanded: mode === 'expanded', isolated: mode === 'isolated' }"
     >
       <div v-if="selectedAccount" class="selected account">
-        <Avatar size="xs" :src="selectedAccount.profile_picture" />
+        <Avatar size="xs" :src="`https://mc-heads.net/avatar/${selectedAccount.id}/128`" />
         <div>
           <h4>{{ selectedAccount.username }}</h4>
           <p>Selected</p>
@@ -46,7 +46,7 @@
       <div v-if="displayAccounts.length > 0" class="account-group">
         <div v-for="account in displayAccounts" :key="account.id" class="account-row">
           <Button class="option account" @click="setAccount(account)">
-            <Avatar :src="account.profile_picture" class="icon" />
+            <Avatar :src="`https://mc-heads.net/avatar/${account.id}/128`" class="icon" />
             <p>{{ account.username }}</p>
           </Button>
           <Button v-tooltip="'Log out'" icon-only @click="logout(account.id)">
@@ -64,7 +64,7 @@
 
 <script setup>
 import { Avatar, Button, Card, PlusIcon, TrashIcon, UsersIcon, LogInIcon } from 'omorphia'
-import { ref, defineProps, computed, onMounted, onBeforeUnmount } from 'vue'
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
 import {
   users,
   remove_user,
@@ -84,45 +84,34 @@ defineProps({
   },
 })
 
-const settings = ref(await get().catch(handleError))
+const emit = defineEmits(['change'])
 
-const appendProfiles = (accounts) => {
-  return accounts.map((account) => {
-    return {
-      ...account,
-      profile_picture: `https://mc-heads.net/avatar/${account.id}/128`,
-    }
-  })
+const settings = ref({})
+const accounts = ref([])
+async function refreshValues() {
+  settings.value = await get().catch(handleError)
+  accounts.value = await users().catch(handleError)
 }
-
-const accounts = ref(await users().then(appendProfiles).catch(handleError))
+defineExpose({
+  refreshValues,
+})
+await refreshValues()
 
 const displayAccounts = computed(() =>
   accounts.value.filter((account) => settings.value.default_user !== account.id)
 )
 
-const selectedAccount = ref(
+const selectedAccount = computed(() =>
   accounts.value.find((account) => account.id === settings.value.default_user)
 )
 
-const refreshValues = async () => {
-  accounts.value = await users().then(appendProfiles).catch(handleError)
-  selectedAccount.value = accounts.value.find(
-    (account) => account.id === settings.value.default_user
-  )
-}
-
-let showCard = ref(false)
-let card = ref(null)
-let button = ref(null)
-
-const setAccount = async (account) => {
+async function setAccount(account) {
   settings.value.default_user = account.id
-  selectedAccount.value = account
   await set(settings.value).catch(handleError)
+  emit('change')
 }
 
-const login = async () => {
+async function login() {
   const url = await authenticate_begin_flow().catch(handleError)
 
   const window = new WebviewWindow('loginWindow', {
@@ -130,14 +119,6 @@ const login = async () => {
     url: url,
   })
 
-  window.once('tauri://created', function () {
-    console.log('webview created')
-  })
-
-  window.once('tauri://error', function (e) {
-    console.log('webview error', e)
-  })
-
   const loggedIn = await authenticate_await_completion().catch(handleError)
   await setAccount(loggedIn)
   await refreshValues()
@@ -155,10 +136,9 @@ const logout = async (id) => {
   mixpanel.track('AccountLogOut')
 }
 
-const toggle = () => {
-  showCard.value = !showCard.value
-}
-
+let showCard = ref(false)
+let card = ref(null)
+let button = ref(null)
 const handleClickOutside = (event) => {
   const elements = document.elementsFromPoint(event.clientX, event.clientY)
   if (
diff --git a/theseus_gui/src/components/ui/IncompatibilityWarningModal.vue b/theseus_gui/src/components/ui/IncompatibilityWarningModal.vue
index 9ec609de6..0fc90d3c5 100644
--- a/theseus_gui/src/components/ui/IncompatibilityWarningModal.vue
+++ b/theseus_gui/src/components/ui/IncompatibilityWarningModal.vue
@@ -57,7 +57,7 @@
 <script setup>
 import { Button, Modal, XIcon, DownloadIcon, DropdownSelect, formatCategory } from 'omorphia'
 import { add_project_from_version as installMod } from '@/helpers/profile'
-import { defineExpose, ref } from 'vue'
+import { ref } from 'vue'
 import { handleError, useTheming } from '@/store/state.js'
 import mixpanel from 'mixpanel-browser'
 
diff --git a/theseus_gui/src/helpers/fetch.js b/theseus_gui/src/helpers/fetch.js
index e3003cb4f..8c0870e08 100644
--- a/theseus_gui/src/helpers/fetch.js
+++ b/theseus_gui/src/helpers/fetch.js
@@ -1,10 +1,13 @@
 import { ofetch } from 'ofetch'
 import { handleError } from '@/store/state.js'
+import { getVersion } from '@tauri-apps/api/app'
 
 export const useFetch = async (url, item) => {
   try {
+    const version = await getVersion()
+
     return await ofetch(url, {
-      headers: { 'User-Agent': 'modrinth/theseus (support@modrinth.com)' },
+      headers: { 'User-Agent': `modrinth/theseus/${version} (support@modrinth.com)` },
     })
   } catch (err) {
     handleError({ message: `Error fetching ${item}` })
diff --git a/theseus_gui/src/pages/project/Version.vue b/theseus_gui/src/pages/project/Version.vue
index d602f03fe..8bcfdc066 100644
--- a/theseus_gui/src/pages/project/Version.vue
+++ b/theseus_gui/src/pages/project/Version.vue
@@ -192,7 +192,7 @@ import {
   renderString,
 } from 'omorphia'
 import { releaseColor } from '@/helpers/utils'
-import { ref, defineProps, watch, computed } from 'vue'
+import { ref, watch, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
 
diff --git a/theseus_playground/Cargo.toml b/theseus_playground/Cargo.toml
index 89848fd63..4cf585448 100644
--- a/theseus_playground/Cargo.toml
+++ b/theseus_playground/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus_playground"
-version = "0.1.0"
+version = "0.0.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

From df477f1efc95805b47ea1d31d99165fd16723d97 Mon Sep 17 00:00:00 2001
From: Jai A <jaiagr+gpg@pm.me>
Date: Tue, 20 Jun 2023 17:55:30 -0700
Subject: [PATCH 11/13] fix onboarding bug + linux build

---
 theseus/src/util/jre.rs                       |  2 +-
 .../src/components/OnboardingModal.vue        | 22 +++++++++----------
 .../src/components/ui/AccountsCard.vue        |  2 ++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/theseus/src/util/jre.rs b/theseus/src/util/jre.rs
index a30b76868..94eadaf0c 100644
--- a/theseus/src/util/jre.rs
+++ b/theseus/src/util/jre.rs
@@ -177,7 +177,7 @@ pub async fn get_all_jre() -> Result<Vec<JavaVersion>, JREError> {
         let path = PathBuf::from(path);
         jre_paths.insert(PathBuf::from(&path).join("jre").join("bin"));
         jre_paths.insert(PathBuf::from(&path).join("bin"));
-        if let Ok(dir) = std::fs::read_dir(base_path) {
+        if let Ok(dir) = std::fs::read_dir(path) {
             for entry in dir {
                 if let Ok(entry) = entry {
                     let entry_path = entry.path();
diff --git a/theseus_gui/src/components/OnboardingModal.vue b/theseus_gui/src/components/OnboardingModal.vue
index ee412a901..38dd06179 100644
--- a/theseus_gui/src/components/OnboardingModal.vue
+++ b/theseus_gui/src/components/OnboardingModal.vue
@@ -187,11 +187,11 @@ async function fetchSettings() {
     await props.accounts.refreshValues()
   }
 }
-const settings = ref({})
+const settings = ref(null)
 await fetchSettings()
 
-watch(settings.value, async (oldSettings, newSettings) => {
-  const setSettings = JSON.parse(JSON.stringify(newSettings))
+watch([settings, settings.value], async () => {
+  const setSettings = JSON.parse(JSON.stringify(settings.value))
 
   if (setSettings.java_globals.JAVA_17?.path === '') {
     setSettings.java_globals.JAVA_17 = undefined
@@ -203,13 +203,9 @@ watch(settings.value, async (oldSettings, newSettings) => {
     )
   }
 
-  const refresh = await get()
-  if (refresh !== setSettings) {
-    await set(setSettings)
-
-    if (accountsCard.value) {
-      await accountsCard.value.refreshValues()
-    }
+  await set(setSettings)
+  if (accountsCard.value) {
+    await accountsCard.value.refreshValues()
   }
 })
 
@@ -238,7 +234,11 @@ const javaSelectionType = ref('automatically install')
 
 async function autoInstallJava() {
   const path = await auto_install_java(17).catch(handleError)
-  settings.value.java_globals.JAVA_17 = await get_jre(path).catch(handleError)
+  if (!settings.value.java_globals) settings.value.java_globals = {}
+  const version = await get_jre(path).catch(handleError)
+  // weird vue bug, ignore
+  settings.value.java_globals.JAVA_17 = version
+  settings.value.java_globals.JAVA_17 = version
   mixpanel.track('OnboardingAutoInstallJava')
 }
 
diff --git a/theseus_gui/src/components/ui/AccountsCard.vue b/theseus_gui/src/components/ui/AccountsCard.vue
index b703377fa..635976bc7 100644
--- a/theseus_gui/src/components/ui/AccountsCard.vue
+++ b/theseus_gui/src/components/ui/AccountsCard.vue
@@ -132,6 +132,8 @@ const logout = async (id) => {
   if (!selectedAccount.value && accounts.value.length > 0) {
     await setAccount(accounts.value[0])
     await refreshValues()
+  } else {
+    emit('change')
   }
   mixpanel.track('AccountLogOut')
 }

From 4aa7b104df97dbbaf0ee723406d93d7b40ebe51f Mon Sep 17 00:00:00 2001
From: Jai A <jaiagr+gpg@pm.me>
Date: Tue, 20 Jun 2023 18:04:54 -0700
Subject: [PATCH 12/13] fix build again

---
 theseus/src/util/jre.rs                     |   3 ++-
 theseus_gui/src/assets/external/default.png | Bin 20587 -> 0 bytes
 theseus_gui/src/assets/external/index.js    |   1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 theseus_gui/src/assets/external/default.png

diff --git a/theseus/src/util/jre.rs b/theseus/src/util/jre.rs
index 94eadaf0c..d7318c516 100644
--- a/theseus/src/util/jre.rs
+++ b/theseus/src/util/jre.rs
@@ -213,7 +213,8 @@ async fn get_all_autoinstalled_jre_path() -> Result<HashSet<PathBuf>, JREError>
                     if let Ok(entry) = entry {
                         let file_path = entry.path().join("bin");
 
-                        if let Ok(contents) = std::fs::read_to_string(file_path)
+                        if let Ok(contents) =
+                            std::fs::read_to_string(file_path.clone())
                         {
                             let entry = entry.path().join(contents);
                             jre_paths.insert(entry);
diff --git a/theseus_gui/src/assets/external/default.png b/theseus_gui/src/assets/external/default.png
deleted file mode 100644
index dfda4ac42e34a6b29c0f04cd0985fc6bbf85be87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20587
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

diff --git a/theseus_gui/src/assets/external/index.js b/theseus_gui/src/assets/external/index.js
index 91249d138..b7aff27d4 100644
--- a/theseus_gui/src/assets/external/index.js
+++ b/theseus_gui/src/assets/external/index.js
@@ -4,4 +4,3 @@ export { default as KoFiIcon } from './kofi.svg'
 export { default as PatreonIcon } from './patreon.svg'
 export { default as PaypalIcon } from './paypal.svg'
 export { default as OpenCollectiveIcon } from './opencollective.svg'
-export { default as Default } from './default.png'

From 3894679c169dbcb6706fc9ee143b623c0ac0a6ad Mon Sep 17 00:00:00 2001
From: Jai A <jai@modrinth.com>
Date: Tue, 20 Jun 2023 18:40:49 -0700
Subject: [PATCH 13/13] Add back window shadows

---
 Cargo.lock                            | 13 +++++++++++++
 theseus_gui/src-tauri/Cargo.toml      |  2 ++
 theseus_gui/src-tauri/src/main.rs     |  8 ++++++++
 theseus_gui/src-tauri/tauri.conf.json |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 49264733e..17edd0a15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4660,6 +4660,7 @@ dependencies = [
  "tracing-subscriber 0.2.25",
  "url",
  "uuid",
+ "window-shadows",
 ]
 
 [[package]]
@@ -5484,6 +5485,18 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "window-shadows"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29d30320647cfc3dc45554c8ad825b84831def81f967a2f7589931328ff9b16d"
+dependencies = [
+ "cocoa",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "windows"
 version = "0.37.0"
diff --git a/theseus_gui/src-tauri/Cargo.toml b/theseus_gui/src-tauri/Cargo.toml
index ab72e895d..e93dfc13f 100644
--- a/theseus_gui/src-tauri/Cargo.toml
+++ b/theseus_gui/src-tauri/Cargo.toml
@@ -39,6 +39,8 @@ tracing-error = "0.1"
 sentry = "0.30"
 sentry-rust-minidump = "0.5"
 
+window-shadows = "0.2.1"
+
 [target.'cfg(target_os = "macos")'.dependencies]
 cocoa = "0.24.1"
 objc = "0.2.7"
diff --git a/theseus_gui/src-tauri/src/main.rs b/theseus_gui/src-tauri/src/main.rs
index 6db32d3cb..9f81fdea3 100644
--- a/theseus_gui/src-tauri/src/main.rs
+++ b/theseus_gui/src-tauri/src/main.rs
@@ -7,6 +7,8 @@ use theseus::prelude::*;
 
 use tauri::Manager;
 
+use window_shadows::set_shadow;
+
 use tracing_error::ErrorLayer;
 use tracing_subscriber::EnvFilter;
 
@@ -84,6 +86,12 @@ fn main() {
         })
     }
 
+  builder = builder.setup(|app| {
+    let win = app.get_window("main").unwrap();
+    set_shadow(&win, true).unwrap();
+    Ok(())
+  });
+
     #[cfg(target_os = "macos")]
     {
         use tauri::WindowEvent;
diff --git a/theseus_gui/src-tauri/tauri.conf.json b/theseus_gui/src-tauri/tauri.conf.json
index 548cf437c..439575f18 100644
--- a/theseus_gui/src-tauri/tauri.conf.json
+++ b/theseus_gui/src-tauri/tauri.conf.json
@@ -75,7 +75,7 @@
       "windows": {
         "certificateThumbprint": null,
         "digestAlgorithm": "sha256",
-        "timestampUrl": ""
+        "timestampUrl": "http://timestamp.digicert.com"
       }
     },
     "security": {