- Are you sure you want to remove {{ Array.from(projects.values()).filter(x => x.disabled).length }} disabled project(s) from
- {{ instance.metadata.name }}?
+ Are you sure you want to remove
+ {{ Array.from(projects.values()).filter((x) => x.disabled).length }} disabled
+ project(s)
+ from {{ instance.metadata.name }}?
This action cannot be undone.
@@ -317,7 +344,7 @@ import { handleError } from '@/store/notifications.js'
import mixpanel from 'mixpanel-browser'
import { open } from '@tauri-apps/api/dialog'
import { listen } from '@tauri-apps/api/event'
-import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage } from "@/assets/icons";
+import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage } from '@/assets/icons'
const router = useRouter()
@@ -388,7 +415,13 @@ const initProjects = (initInstance) => {
const newSelectionMap = new Map()
for (const project of projects.value) {
- newSelectionMap.set(project.path, selectionMap.value.get(project.path) ?? selectionMap.value.get(project.path.slice(0, -9)) ?? selectionMap.value.get(project.path + '.disabled') ?? false)
+ newSelectionMap.set(
+ project.path,
+ selectionMap.value.get(project.path) ??
+ selectionMap.value.get(project.path.slice(0, -9)) ??
+ selectionMap.value.get(project.path + '.disabled') ??
+ false
+ )
}
selectionMap.value = newSelectionMap
}
@@ -413,13 +446,19 @@ const shareModal = ref(null)
const ascending = ref(true)
const sortColumn = ref('Name')
-const selected = computed(() => Array.from(selectionMap.value).filter((args) => {
- return args[1]
-}).map((args) => {
- return projects.value.find((x) => x.path === args[0])
-}))
+const selected = computed(() =>
+ Array.from(selectionMap.value)
+ .filter((args) => {
+ return args[1]
+ })
+ .map((args) => {
+ return projects.value.find((x) => x.path === args[0])
+ })
+)
-const functionValues = computed(() => selected.value.length > 0 ? selected.value : Array.from(projects.value.values()))
+const functionValues = computed(() =>
+ selected.value.length > 0 ? selected.value : Array.from(projects.value.values())
+)
const selectableProjectTypes = computed(() => {
const obj = { All: 'all' }
@@ -885,8 +924,9 @@ listen('tauri://file-drop', async (event) => {
}
}
- p, h3 {
- margin: 0
+ p,
+ h3 {
+ margin: 0;
}
}
From 9fa3d12ba3f4f8e18bd651652f3bce7b2c531201 Mon Sep 17 00:00:00 2001
From: CodexAdrian <83074853+CodexAdrian@users.noreply.github.com>
Date: Thu, 20 Jul 2023 06:36:38 -0400
Subject: [PATCH 6/6] Addressed changes
---
theseus_gui/package.json | 4 +-
theseus_gui/pnpm-lock.yaml | 27 ++--
theseus_gui/src/assets/icons/add-project.svg | 122 ++++++++++++++-
theseus_gui/src/assets/icons/new-instance.svg | 139 +++++++++++++++++-
theseus_gui/src/pages/instance/Mods.vue | 4 +-
5 files changed, 281 insertions(+), 15 deletions(-)
diff --git a/theseus_gui/package.json b/theseus_gui/package.json
index 15fbba456..6797f2b76 100644
--- a/theseus_gui/package.json
+++ b/theseus_gui/package.json
@@ -18,7 +18,7 @@
"floating-vue": "^2.0.0-beta.20",
"mixpanel-browser": "^2.47.0",
"ofetch": "^1.0.1",
- "omorphia": "^0.4.32",
+ "omorphia": "^0.4.33",
"pinia": "^2.1.3",
"tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",
"vite-svg-loader": "^4.0.0",
@@ -38,5 +38,5 @@
"vite": "^4.3.9",
"vite-plugin-eslint": "^1.8.1"
},
- "packageManager": "pnpm@8.5.1"
+ "packageManager": "pnpm@8.6.0"
}
diff --git a/theseus_gui/pnpm-lock.yaml b/theseus_gui/pnpm-lock.yaml
index 5375c71e9..1051f77d7 100644
--- a/theseus_gui/pnpm-lock.yaml
+++ b/theseus_gui/pnpm-lock.yaml
@@ -1,4 +1,8 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
+
+settings:
+ autoInstallPeers: true
+ excludeLinksFromLockfile: false
dependencies:
'@tauri-apps/api':
@@ -17,14 +21,14 @@ dependencies:
specifier: ^1.0.1
version: 1.0.1
omorphia:
- specifier: ^0.4.32
- version: 0.4.32
+ specifier: ^0.4.33
+ version: 0.4.33
pinia:
specifier: ^2.1.3
version: 2.1.3(vue@3.3.4)
tauri-plugin-window-state-api:
specifier: github:tauri-apps/tauri-plugin-window-state#v1
- version: github.com/tauri-apps/tauri-plugin-window-state/56fd671f8d5ac2d8b826a358af486f220a125c3d
+ version: github.com/tauri-apps/tauri-plugin-window-state/347c792535d2623fc21f66590d06f4c8dadd85ba
vite-svg-loader:
specifier: ^4.0.0
version: 4.0.0
@@ -409,6 +413,11 @@ packages:
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
+ /@tauri-apps/api@1.4.0:
+ resolution: {integrity: sha512-Jd6HPoTM1PZSFIzq7FB8VmMu3qSSyo/3lSwLpoapW+lQ41CL5Dow2KryLg+gyazA/58DRWI9vu/XpEeHK4uMdw==}
+ engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
+ dev: false
+
/@tauri-apps/cli-darwin-arm64@1.3.1:
resolution: {integrity: sha512-QlepYVPgOgspcwA/u4kGG4ZUijlXfdRtno00zEy+LxinN/IRXtk+6ErVtsmoLi1ZC9WbuMwzAcsRvqsD+RtNAg==}
engines: {node: '>= 10'}
@@ -1336,8 +1345,8 @@ packages:
ufo: 1.1.2
dev: false
- /omorphia@0.4.32:
- resolution: {integrity: sha512-VpHnihQBlXTZYi6gl1/cphNKRY05Gs4kaMRlILB1R4VRMU+pfK2NSmC8yhMGLJ6qyytk9pjXuANdvJ38+YEzlg==}
+ /omorphia@0.4.33:
+ resolution: {integrity: sha512-Wo0t16zRL8ZLJSKVAYv6pdYhL4YXYjDYs18shO7V5cfxjcynvd5j0sui6uBR8ghVMWFEJH994AEC/urLwcHiBA==}
dependencies:
dayjs: 1.11.7
floating-vue: 2.0.0-beta.20(vue@3.3.4)
@@ -1800,10 +1809,10 @@ packages:
engines: {node: '>=10'}
dev: true
- github.com/tauri-apps/tauri-plugin-window-state/56fd671f8d5ac2d8b826a358af486f220a125c3d:
- resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/56fd671f8d5ac2d8b826a358af486f220a125c3d}
+ github.com/tauri-apps/tauri-plugin-window-state/347c792535d2623fc21f66590d06f4c8dadd85ba:
+ resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/347c792535d2623fc21f66590d06f4c8dadd85ba}
name: tauri-plugin-window-state-api
version: 0.0.0
dependencies:
- '@tauri-apps/api': 1.3.0
+ '@tauri-apps/api': 1.4.0
dev: false
diff --git a/theseus_gui/src/assets/icons/add-project.svg b/theseus_gui/src/assets/icons/add-project.svg
index 62bf880c5..8a1665368 100644
--- a/theseus_gui/src/assets/icons/add-project.svg
+++ b/theseus_gui/src/assets/icons/add-project.svg
@@ -1 +1,121 @@
-
\ No newline at end of file
+
diff --git a/theseus_gui/src/assets/icons/new-instance.svg b/theseus_gui/src/assets/icons/new-instance.svg
index eb0477559..b526f23ce 100644
--- a/theseus_gui/src/assets/icons/new-instance.svg
+++ b/theseus_gui/src/assets/icons/new-instance.svg
@@ -1 +1,138 @@
-
\ No newline at end of file
+
diff --git a/theseus_gui/src/pages/instance/Mods.vue b/theseus_gui/src/pages/instance/Mods.vue
index c6abb85c4..d408e787d 100644
--- a/theseus_gui/src/pages/instance/Mods.vue
+++ b/theseus_gui/src/pages/instance/Mods.vue
@@ -155,7 +155,7 @@
-