From 217b5700a2332a0f7b855e1cb93350801f0af208 Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Sat, 14 Dec 2024 21:36:00 -0700
Subject: [PATCH] Fix advanced rendering, ads showing over modals (#3029)

---
 apps/app-frontend/src/App.vue                 |  4 ++--
 .../src/components/ui/JavaDetectionModal.vue  |  2 +-
 .../src/components/ui/friends/FriendsList.vue | 16 +++++++--------
 .../components/ui/modal/AppSettingsModal.vue  |  6 +++---
 .../src/components/ui/modal/ModalWrapper.vue  |  9 +++++++--
 .../ui/settings/AppearanceSettings.vue        | 19 +++++++++---------
 .../ui/settings/PrivacySettings.vue           | 20 +++++++++++--------
 .../settings/ResourceManagementSettings.vue   | 18 ++++++++++-------
 8 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 817a333b1..694830756 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -133,8 +133,8 @@ async function setupApp() {
     default_page,
   } = await get()
 
-  if (default_page && default_page !== 'Home') {
-    await router.push({ name: default_page })
+  if (default_page === 'Library') {
+    await router.push('/library')
   }
 
   os.value = await getOS()
diff --git a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
index c5a7aca53..bbb2a86ca 100644
--- a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
+++ b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <ModalWrapper ref="detectJavaModal" header="Select java version">
+  <ModalWrapper ref="detectJavaModal" header="Select java version" :show-ad-on-close="false">
     <div class="auto-detect-modal">
       <div class="table">
         <div class="table-row table-head">
diff --git a/apps/app-frontend/src/components/ui/friends/FriendsList.vue b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
index 958da5b7e..71570e404 100644
--- a/apps/app-frontend/src/components/ui/friends/FriendsList.vue
+++ b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Avatar, ButtonStyled, NewModal, OverflowMenu } from '@modrinth/ui'
+import { Avatar, ButtonStyled, OverflowMenu } from '@modrinth/ui'
 import {
   UserPlusIcon,
   MoreVerticalIcon,
@@ -16,6 +16,7 @@ import { handleError } from '@/store/notifications.js'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import type { Dayjs } from 'dayjs'
 import dayjs from 'dayjs'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const props = defineProps<{
   credentials: unknown | null
@@ -140,7 +141,6 @@ async function loadFriends(timeout = false) {
 watch(
   userCredentials,
   () => {
-    console.log('watch', userCredentials.value)
     if (userCredentials.value === undefined) {
       userFriends.value = []
     } else if (userCredentials.value === null) {
@@ -160,7 +160,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <NewModal ref="manageFriendsModal" header="Manage friends">
+  <ModalWrapper ref="manageFriendsModal" header="Manage friends">
     <p v-if="acceptedFriends.length === 0">You have no friends :C</p>
     <div v-else class="flex flex-col gap-4 min-w-[20rem]">
       <input v-model="search" type="text" placeholder="Search friends..." class="w-full" />
@@ -189,8 +189,8 @@ onUnmounted(() => {
         </div>
       </div>
     </div>
-  </NewModal>
-  <NewModal ref="friendInvitesModal" header="View friend requests">
+  </ModalWrapper>
+  <ModalWrapper ref="friendInvitesModal" header="View friend requests">
     <p v-if="pendingFriends.length === 0">You have no pending friend requests :C</p>
     <div v-else class="flex flex-col gap-4">
       <div v-for="friend in pendingFriends" :key="friend.username" class="flex gap-2">
@@ -234,8 +234,8 @@ onUnmounted(() => {
         </div>
       </div>
     </div>
-  </NewModal>
-  <NewModal ref="addFriendModal" header="Add a friend">
+  </ModalWrapper>
+  <ModalWrapper ref="addFriendModal" header="Add a friend">
     <div class="mb-4">
       <h2 class="m-0 text-xl">Username</h2>
       <p class="m-0 mt-1 leading-tight">You can add friends with their Modrinth username.</p>
@@ -247,7 +247,7 @@ onUnmounted(() => {
         Add friend
       </button>
     </ButtonStyled>
-  </NewModal>
+  </ModalWrapper>
   <div class="flex justify-between items-center">
     <h3 class="text-lg m-0">Friends</h3>
     <ButtonStyled type="transparent" circular>
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
index b6a23ec02..d5c6bd5a3 100644
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { NewModal } from '@modrinth/ui'
 import {
   ReportIcon,
   ModrinthIcon,
@@ -21,6 +20,7 @@ import { getVersion } from '@tauri-apps/api/app'
 import { version as getOsVersion, platform as getOsPlatform } from '@tauri-apps/plugin-os'
 import { useTheming } from '@/store/state'
 import FeatureFlagSettings from '@/components/ui/settings/FeatureFlagSettings.vue'
+import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const themeStore = useTheming()
 
@@ -100,7 +100,7 @@ const osVersion = getOsVersion()
 </script>
 /
 <template>
-  <NewModal ref="modal">
+  <ModalWrapper ref="modal">
     <template #title>
       <span class="flex items-center gap-2 text-lg font-extrabold text-contrast">
         <SettingsIcon /> Settings
@@ -157,5 +157,5 @@ const osVersion = getOsVersion()
         <component :is="tabs[selectedTab].content" />
       </div>
     </div>
-  </NewModal>
+  </ModalWrapper>
 </template>
diff --git a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
index 20cbaf6ac..53cc0a7c0 100644
--- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
@@ -21,8 +21,11 @@ const props = defineProps({
       return () => {}
     },
   },
+  showAdOnClose: {
+    type: Boolean,
+    default: true,
+  },
 })
-
 const modal = ref(null)
 
 defineExpose({
@@ -37,7 +40,9 @@ defineExpose({
 })
 
 function onModalHide() {
-  show_ads_window()
+  if (props.showAdOnClose) {
+    show_ads_window()
+  }
   props.onHide()
 }
 </script>
diff --git a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
index a2b81fe6d..0f9104743 100644
--- a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
@@ -10,9 +10,13 @@ const themeStore = useTheming()
 const os = ref(await getOS())
 const settings = ref(await get())
 
-watch(settings, async () => {
-  await set(settings.value)
-})
+watch(
+  settings,
+  async () => {
+    await set(settings.value)
+  },
+  { deep: true },
+)
 </script>
 <template>
   <h2 class="m-0 text-2xl">Color theme</h2>
@@ -88,16 +92,11 @@ watch(settings, async () => {
     </div>
     <DropdownSelect
       id="opening-page"
+      v-model="settings.default_page"
       name="Opening page dropdown"
       :options="['Home', 'Library']"
-      :default-value="settings.default_page"
-      :model-value="settings.default_page"
       class="opening-page"
-      @change="
-        (e) => {
-          settings.default_page = e.option
-        }
-      "
+      @change="updateDefaultPage"
     />
   </div>
 </template>
diff --git a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
index 4303af14d..5fcc906c6 100644
--- a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
@@ -6,15 +6,19 @@ import { optInAnalytics, optOutAnalytics } from '@/helpers/analytics'
 
 const settings = ref(await get())
 
-watch(settings, async () => {
-  if (settings.value.telemetry) {
-    optInAnalytics()
-  } else {
-    optOutAnalytics()
-  }
+watch(
+  settings,
+  async () => {
+    if (settings.value.telemetry) {
+      optInAnalytics()
+    } else {
+      optOutAnalytics()
+    }
 
-  await set(settings.value)
-})
+    await set(settings.value)
+  },
+  { deep: true },
+)
 </script>
 
 <template>
diff --git a/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue b/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
index a016de3a1..2a22f43c6 100644
--- a/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
@@ -10,15 +10,19 @@ import { open } from '@tauri-apps/plugin-dialog'
 
 const settings = ref(await get())
 
-watch(settings, async () => {
-  const setSettings = JSON.parse(JSON.stringify(settings.value))
+watch(
+  settings,
+  async () => {
+    const setSettings = JSON.parse(JSON.stringify(settings.value))
 
-  if (!setSettings.custom_dir) {
-    setSettings.custom_dir = null
-  }
+    if (!setSettings.custom_dir) {
+      setSettings.custom_dir = null
+    }
 
-  await set(setSettings)
-})
+    await set(setSettings)
+  },
+  { deep: true },
+)
 
 async function purgeCache() {
   await purge_cache_types([