diff --git a/apps/app-frontend/package.json b/apps/app-frontend/package.json index 81a6b909b..4a6eef784 100644 --- a/apps/app-frontend/package.json +++ b/apps/app-frontend/package.json @@ -19,7 +19,6 @@ "floating-vue": "^5.2.2", "mixpanel-browser": "^2.49.0", "ofetch": "^1.3.4", - "omorphia": "^0.4.41", "pinia": "^2.1.7", "tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1", "vite-svg-loader": "^5.1.0", diff --git a/apps/app-frontend/src/components/GridDisplay.vue b/apps/app-frontend/src/components/GridDisplay.vue index 39eb61a9d..3fe50e72a 100644 --- a/apps/app-frontend/src/components/GridDisplay.vue +++ b/apps/app-frontend/src/components/GridDisplay.vue @@ -243,7 +243,7 @@ const filteredResults = computed(() => {
-
diff --git a/apps/app-frontend/src/components/ui/AddContentButton.vue b/apps/app-frontend/src/components/ui/AddContentButton.vue new file mode 100644 index 000000000..ff1497f66 --- /dev/null +++ b/apps/app-frontend/src/components/ui/AddContentButton.vue @@ -0,0 +1,63 @@ + + + diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue index 449f25b13..dd609c047 100644 --- a/apps/app-frontend/src/components/ui/ExportModal.vue +++ b/apps/app-frontend/src/components/ui/ExportModal.vue @@ -113,7 +113,7 @@ const exportPack = async () => {
-
@@ -123,7 +123,7 @@ const exportPack = async () => {
-
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue index 3efcd5cc2..e796a7e0c 100644 --- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue +++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue @@ -110,7 +110,7 @@ placeholder="Path to launcher" @change="setPath" /> - diff --git a/apps/app-frontend/src/components/ui/RunningAppBar.vue b/apps/app-frontend/src/components/ui/RunningAppBar.vue index 13c059ab4..99bec5a0a 100644 --- a/apps/app-frontend/src/components/ui/RunningAppBar.vue +++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue @@ -331,8 +331,12 @@ onBeforeUnmount(() => { width: 1.25rem !important; height: 1.25rem !important; + svg { + min-width: 1.25rem; + } + &.stop { - --text-color: var(--color-red) !important; + color: var(--color-red); } } diff --git a/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue b/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue index 97fb639dd..a1a65eef3 100644 --- a/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue +++ b/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue @@ -230,7 +230,7 @@ const createInstance = async () => {
diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue index 1eb780afb..f40dd2a87 100644 --- a/apps/app-frontend/src/pages/Settings.vue +++ b/apps/app-frontend/src/pages/Settings.vue @@ -31,14 +31,13 @@ const accessSettings = async () => { const fetchSettings = await accessSettings().catch(handleError) const settings = ref(fetchSettings) -console.log(fetchSettings) // const settingsDir = ref(settings.value.loaded_config_dir) -// const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024)) -const maxMemory = ref(100000) + +const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024)) + watch( settings, async (oldSettings, newSettings) => { - console.log('hellooo') if (oldSettings.loaded_config_dir !== newSettings.loaded_config_dir) { return } @@ -85,17 +84,14 @@ watch( { deep: true }, ) -console.log('hellooo') const credentials = ref(await getCreds().catch(handleError)) const loginScreenModal = ref() -console.log('hellooo') async function logOut() { await logout().catch(handleError) credentials.value = await getCreds().catch(handleError) } -console.log('hellooo') async function signInAfter() { loginScreenModal.value.hide() credentials.value = await getCreds().catch(handleError) @@ -170,7 +166,7 @@ async function signInAfter() { - + diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue index 034b8c755..493e2f34a 100644 --- a/apps/app-frontend/src/pages/instance/Mods.vue +++ b/apps/app-frontend/src/pages/instance/Mods.vue @@ -20,7 +20,7 @@ class="text-input" autocomplete="off" /> -
@@ -42,24 +42,7 @@ Update all - - - - - - - - - - - - - - - - - - + - +

No projects found

Add a project to get started

-
- - - - -
+
{ } } -const handleContentOptionClick = async (args) => { - if (args.option === 'search') { - await router.push({ - path: `/browse/${props.instance.loader === 'vanilla' ? 'datapack' : 'mod'}`, - query: { i: props.instance.path }, - }) - } else if (args.option === 'from_file') { - const newProject = await open({ multiple: true }) - if (!newProject) return - - for (const project of newProject) { - await add_project_from_path(props.instance.path, project, 'mod').catch(handleError) - } - initProjects(await get(props.instance.path).catch(handleError)) - } -} - watch(selectAll, () => { for (const [key, value] of Array.from(selectionMap.value)) { if (value !== selectAll.value) { @@ -903,7 +848,7 @@ watch(selectAll, () => { const unlisten = await listen('tauri://file-drop', async (event) => { for (const file of event.payload) { if (file.endsWith('.mrpack')) continue - await add_project_from_path(props.instance.path, file, 'mod').catch(handleError) + await add_project_from_path(props.instance.path, file).catch(handleError) } initProjects(await get(props.instance.path).catch(handleError)) }) @@ -996,13 +941,21 @@ onUnmounted(() => { } } - .btn { + :deep(.btn) { height: 2.5rem; } .dropdown-input { flex-grow: 1; + .animated-dropdown { + width: unset; + + :deep(.selected) { + border-radius: var(--radius-md) 0 0 var(--radius-md); + } + } + .iconified-input { width: 100%; @@ -1188,8 +1141,12 @@ onUnmounted(() => {