Discord and playtime (#462)

* initial

* Fixed java thing

* fixes

* internet check change

* some fix/test commit

* Fix render issues on windows

* bump version

---------

Co-authored-by: Jai A <jaiagr+gpg@pm.me>
Co-authored-by: Jai A <jai@modrinth.com>

theseus_gui/src/assets/external/google.svg

@@ -1,6 +1,5 @@
 <svg
   data-v-8c2610d6=""
-  xmlns="http://www.w3.org/2000/svg"
   xml:space="preserve"
   viewBox="0 0 100 100"
   style="fill-rule: evenodd; clip-rule: evenodd; stroke-linejoin: round; stroke-miterlimit: 2;"><circle cx="50" cy="50" r="50" style="fill:#fff;"

theseus_gui/src/components/ui/tutorial/ModrinthLoginScreen.vue

@@ -211,7 +211,7 @@ onMounted(() => {
       <div class="link-row">
         <a v-if="loggingIn" class="button-base" @click="loggingIn = false"> Create account </a>
         <a v-else class="button-base" @click="loggingIn = true">Sign in</a>
-        <a class="button-base" href="https://staging.modrinth.com/auth/reset-password">
+        <a class="button-base" href="https://modrinth.com/auth/reset-password">
           Forgot password?
         </a>
       </div>

theseus_gui/src/components/ui/tutorial/OnboardingScreen.vue

@@ -83,15 +83,18 @@ const finishOnboarding = async () => {
 
 async function fetchSettings() {
   const fetchSettings = await get().catch(handleError)
+  if (!fetchSettings.java_globals) {
+    fetchSettings.java_globals = {}
+  }
 
   if (!fetchSettings.java_globals.JAVA_17) {
-    const path = await auto_install_java(17).catch(handleError)
-    fetchSettings.java_globals.JAVA_17 = await get_jre(path).catch(handleError)
+    const path1 = await auto_install_java(17).catch(handleError)
+    fetchSettings.java_globals.JAVA_17 = await get_jre(path1).catch(handleError)
   }
 
   if (!fetchSettings.java_globals.JAVA_8) {
-    const path = await auto_install_java(8).catch(handleError)
-    fetchSettings.java_globals.JAVA_8 = await get_jre(path).catch(handleError)
+    const path2 = await auto_install_java(8).catch(handleError)
+    fetchSettings.java_globals.JAVA_8 = await get_jre(path2).catch(handleError)
   }
 
   await set(fetchSettings).catch(handleError)

theseus_gui/src/helpers/fetch.js

@@ -2,7 +2,7 @@ import { ofetch } from 'ofetch'
 import { handleError } from '@/store/state.js'
 import { getVersion } from '@tauri-apps/api/app'
 
-export const useFetch = async (url, item) => {
+export const useFetch = async (url, item, isSilent) => {
   try {
     const version = await getVersion()
 
@@ -10,7 +10,9 @@ export const useFetch = async (url, item) => {
       headers: { 'User-Agent': `modrinth/theseus/${version} (support@modrinth.com)` },
     })
   } catch (err) {
-    handleError({ message: `Error fetching ${item}` })
+    if (!isSilent) {
+      handleError({ message: `Error fetching ${item}` })
+    }
     console.error(err)
   }
 }

theseus_gui/src/pages/Browse.vue

@@ -237,15 +237,22 @@ async function refreshSearch() {
 
   let val = `${base}${url}`
 
-  const rawResults = await useFetch(val, 'search results')
+  const rawResults = await useFetch(val, 'search results', offline.value)
+  results.value = rawResults
+  if (!rawResults) {
+    results.value = {
+      hits: [],
+      total_hits: 0,
+      limit: 1,
+    }
+  }
   if (instanceContext.value) {
-    for (let val of rawResults.hits) {
+    for (let val of results.value) {
       val.installed = await check_installed(instanceContext.value.path, val.project_id).then(
         (x) => (val.installed = x)
       )
     }
   }
-  results.value = rawResults
 }
 
 async function onSearchChange(newPageNumber) {
@@ -510,7 +517,7 @@ onUnmounted(() => unlistenOffline())
 </script>
 
 <template>
-  <div v-if="!offline" ref="searchWrapper" class="search-container">
+  <div ref="searchWrapper" class="search-container">
     <aside class="filter-panel">
       <Card v-if="instanceContext" class="small-instance">
         <router-link :to="`/instance/${encodeURIComponent(instanceContext.path)}`" class="instance">
@@ -704,7 +711,10 @@ onUnmounted(() => unlistenOffline())
         class="pagination-before"
         @switch-page="onSearchChange"
       />
-      <SplashScreen v-if="loading || offline" />
+      <SplashScreen v-if="loading" />
+      <section v-else-if="offline && results.total_hits == 0" class="offline">
+        You are currently offline. Connect to the internet to browse Modrinth!
+      </section>
       <section v-else class="project-list display-mode--list instance-results" role="list">
         <SearchCard
           v-for="result in results.hits"
@@ -890,6 +900,11 @@ onUnmounted(() => unlistenOffline())
     margin: 0 1rem 0.5rem 20.5rem;
     width: calc(100% - 20.5rem);
 
+    .offline {
+      margin: 1rem;
+      text-align: center;
+    }
+
     .loading {
       margin: 2rem;
       text-align: center;

theseus_gui/src/pages/Index.vue

@@ -41,23 +41,31 @@ const getInstances = async () => {
 const getFeaturedModpacks = async () => {
   const response = await useFetch(
     `https://api.modrinth.com/v2/search?facets=[["project_type:modpack"]]&limit=10&index=follows&filters=${filter.value}`,
-    'featured modpacks'
+    'featured modpacks',
+    offline.value
   )
-  if (response) featuredModpacks.value = response.hits
+  if (response) {
+    featuredModpacks.value = response.hits
+  } else {
+    featuredModpacks.value = []
+  }
 }
 const getFeaturedMods = async () => {
   const response = await useFetch(
     'https://api.modrinth.com/v2/search?facets=[["project_type:mod"]]&limit=10&index=follows',
-    'featured mods'
+    'featured mods',
+    offline.value
   )
-  if (response) featuredMods.value = response.hits
+  if (response) {
+    featuredMods.value = response.hits
+  } else {
+    featuredModpacks.value = []
+  }
 }
 
 await getInstances()
 
-if (!offline.value) {
-  await Promise.all([getFeaturedModpacks(), getFeaturedMods()])
-}
+await Promise.all([getFeaturedModpacks(), getFeaturedMods()])
 
 const unlistenProfile = await profile_listener(async (e) => {
   await getInstances()