From f1713647cfa7da7d2a5ce029260d4e72c9be5505 Mon Sep 17 00:00:00 2001 From: Norbiros Date: Thu, 18 Jul 2024 07:01:58 +0200 Subject: [PATCH] More monorepo migration fixes (#1257) * fix: More monorepo migration fixes * fix: Corrected icon sizes & other fixes * fix(theseus): Change color of mod installation button * fix(theseus): More Turborepo fixes * chore: Prettier --------- Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com> --- apps/app-frontend/package.json | 1 - .../src/components/GridDisplay.vue | 2 +- .../src/components/ui/AddContentButton.vue | 64 ++++++++++++++ .../src/components/ui/ExportModal.vue | 4 +- .../components/ui/InstanceCreationModal.vue | 2 +- .../src/components/ui/ModInstallModal.vue | 2 +- .../src/components/ui/RunningAppBar.vue | 6 +- apps/app-frontend/src/pages/Browse.vue | 2 +- apps/app-frontend/src/pages/Settings.vue | 2 +- apps/app-frontend/src/pages/instance/Mods.vue | 81 ++++------------- apps/app/tauri.conf.json | 2 +- package.json | 5 +- packages/assets/styles/variables.scss | 17 ++-- packages/ui/src/components/base/Button.vue | 88 ++++++------------- pnpm-lock.yaml | 55 ------------ turbo.json | 5 +- 16 files changed, 141 insertions(+), 197 deletions(-) create mode 100644 apps/app-frontend/src/components/ui/AddContentButton.vue 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 f2f28e933..1597f3f20 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..17984be14 --- /dev/null +++ b/apps/app-frontend/src/components/ui/AddContentButton.vue @@ -0,0 +1,64 @@ + + + diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue index f94a4c2df..93903066a 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 cd8e61296..cdd3a3fc6 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/ModInstallModal.vue b/apps/app-frontend/src/components/ui/ModInstallModal.vue index ab87b101e..dd09f974c 100644 --- a/apps/app-frontend/src/components/ui/ModInstallModal.vue +++ b/apps/app-frontend/src/components/ui/ModInstallModal.vue @@ -228,7 +228,7 @@ const check_valid = computed(() => {
diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue index f5f226609..25a6e1742 100644 --- a/apps/app-frontend/src/pages/Settings.vue +++ b/apps/app-frontend/src/pages/Settings.vue @@ -165,7 +165,7 @@ async function refreshDir() {
-
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue index 9870fb705..5b11d866c 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.metadata.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) { @@ -967,13 +912,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%; @@ -1159,8 +1112,12 @@ onUnmounted(() => {