+
-
-
-
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index 521bcf5a..1d51e2f2 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -1,14 +1,13 @@
@@ -105,6 +107,7 @@ onUnmounted(() => {
label: 'Jump back in',
route: '/library',
instances: recentInstances,
+ instance: true,
downloaded: true,
},
{
diff --git a/apps/app-frontend/src/pages/Library.vue b/apps/app-frontend/src/pages/Library.vue
index e10a521b..03b8970a 100644
--- a/apps/app-frontend/src/pages/Library.vue
+++ b/apps/app-frontend/src/pages/Library.vue
@@ -4,34 +4,33 @@ import GridDisplay from '@/components/GridDisplay.vue'
import { list } from '@/helpers/profile.js'
import { useRoute } from 'vue-router'
import { useBreadcrumbs } from '@/store/breadcrumbs'
-import { offline_listener, profile_listener } from '@/helpers/events.js'
+import { profile_listener } from '@/helpers/events.js'
import { handleError } from '@/store/notifications.js'
import { Button } from '@modrinth/ui'
import { PlusIcon } from '@modrinth/assets'
import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
import { NewInstanceImage } from '@/assets/icons'
-import { isOffline } from '@/helpers/utils'
const route = useRoute()
const breadcrumbs = useBreadcrumbs()
breadcrumbs.setRootContext({ name: 'Library', link: route.path })
-const profiles = await list(true).catch(handleError)
-const instances = shallowRef(Object.values(profiles))
+const instances = shallowRef(await list().catch(handleError))
-const offline = ref(await isOffline())
-const unlistenOffline = await offline_listener((b) => {
- offline.value = b
+const offline = ref(!navigator.onLine)
+window.addEventListener('offline', () => {
+ offline.value = true
+})
+window.addEventListener('online', () => {
+ offline.value = false
})
const unlistenProfile = await profile_listener(async () => {
- const profiles = await list(true).catch(handleError)
- instances.value = Object.values(profiles)
+ instances.value = await list().catch(handleError)
})
onUnmounted(() => {
unlistenProfile()
- unlistenOffline()
})
diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue
index 8d576b68..d1ee7606 100644
--- a/apps/app-frontend/src/pages/Settings.vue
+++ b/apps/app-frontend/src/pages/Settings.vue
@@ -4,7 +4,7 @@ import { LogOutIcon, LogInIcon, BoxIcon, FolderSearchIcon, UpdatedIcon } from '@
import { Card, Slider, DropdownSelect, Toggle, Modal, Button } from '@modrinth/ui'
import { handleError, useTheming } from '@/store/state'
import { is_dir_writeable, change_config_dir, get, set } from '@/helpers/settings'
-import { get_max_memory } from '@/helpers/jre'
+import { get_java_versions, get_max_memory, set_java_version } from '@/helpers/jre'
import { get as getCreds, logout } from '@/helpers/mr_auth.js'
import JavaSelector from '@/components/ui/JavaSelector.vue'
import ModrinthLoginScreen from '@/components/ui/tutorial/ModrinthLoginScreen.vue'
@@ -12,6 +12,7 @@ import { mixpanel_opt_out_tracking, mixpanel_opt_in_tracking } from '@/helpers/m
import { open } from '@tauri-apps/api/dialog'
import { getOS } from '@/helpers/utils.js'
import { getVersion } from '@tauri-apps/api/app'
+import { get_user } from '@/helpers/cache.js'
const pageOptions = ['Home', 'Library']
@@ -22,8 +23,8 @@ const version = await getVersion()
const accessSettings = async () => {
const settings = await get()
- settings.javaArgs = settings.custom_java_args.join(' ')
- settings.envArgs = settings.custom_env_args.map((x) => x.join('=')).join(' ')
+ settings.launchArgs = settings.extra_launch_args.join(' ')
+ settings.envVars = settings.custom_env_vars.map((x) => x.join('=')).join(' ')
return settings
}
@@ -31,7 +32,8 @@ const accessSettings = async () => {
const fetchSettings = await accessSettings().catch(handleError)
const settings = ref(fetchSettings)
-const settingsDir = ref(settings.value.loaded_config_dir)
+// const settingsDir = ref(settings.value.loaded_config_dir)
+
const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
watch(
@@ -43,26 +45,14 @@ watch(
const setSettings = JSON.parse(JSON.stringify(newSettings))
- if (setSettings.opt_out_analytics) {
+ if (setSettings.telemetry) {
mixpanel_opt_out_tracking()
} else {
mixpanel_opt_in_tracking()
}
- for (const [key, value] of Object.entries(setSettings.java_globals)) {
- if (value?.path === '') {
- value.path = undefined
- }
-
- if (value?.path) {
- value.path = value.path.replace('java.exe', 'javaw.exe')
- }
-
- console.log(`${key}: ${value}`)
- }
-
- setSettings.custom_java_args = setSettings.javaArgs.trim().split(/\s+/).filter(Boolean)
- setSettings.custom_env_args = setSettings.envArgs
+ setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
+ setSettings.custom_env_vars = setSettings.envVars
.trim()
.split(/\s+/)
.filter(Boolean)
@@ -78,22 +68,49 @@ watch(
setSettings.hooks.post_exit = null
}
+ if (!setSettings.custom_dir) {
+ setSettings.custom_dir = null
+ }
+
await set(setSettings)
},
{ deep: true },
)
-const credentials = ref(await getCreds().catch(handleError))
+const javaVersions = ref(await get_java_versions().catch(handleError))
+async function updateJavaVersion(version) {
+ if (version?.path === '') {
+ version.path = undefined
+ }
+
+ if (version?.path) {
+ version.path = version.path.replace('java.exe', 'javaw.exe')
+ }
+
+ await set_java_version(version).catch(handleError)
+}
+
+async function fetchCredentials() {
+ const creds = await getCreds().catch(handleError)
+ console.log(creds)
+ if (creds && creds.user_id) {
+ creds.user = await get_user(creds.user_id).catch(handleError)
+ }
+ credentials.value = creds
+}
+
+const credentials = ref()
+await fetchCredentials()
+
const loginScreenModal = ref()
async function logOut() {
await logout().catch(handleError)
- credentials.value = await getCreds().catch(handleError)
+ await fetchCredentials()
}
async function signInAfter() {
- loginScreenModal.value.hide()
- credentials.value = await getCreds().catch(handleError)
+ await fetchCredentials()
}
async function findLauncherDir() {
@@ -103,24 +120,10 @@ async function findLauncherDir() {
title: 'Select a new app directory',
})
- const writeable = await is_dir_writeable(newDir)
-
- if (!writeable) {
- handleError('The selected directory does not have proper permissions for write access.')
- return
- }
-
if (newDir) {
- settingsDir.value = newDir
- await refreshDir()
+ settings.value.custom_dir = newDir
}
}
-
-async function refreshDir() {
- await change_config_dir(settingsDir.value).catch(handleError)
- settings.value = await accessSettings().catch(handleError)
- settingsDir.value = settings.value.loaded_config_dir
-}
@@ -131,13 +134,7 @@ async function refreshDir() {