bump omorphia to 0.6.0

modrinth · Oct 17, 2023 · 222638d · 222638d
1 parent 7fb8850
commit 222638d
Show file tree

Hide file tree

Showing 7 changed files with 230 additions and 118 deletions.
diff --git 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.38",
+    "omorphia": "^0.6.0",
     "pinia": "^2.1.3",
     "qrcode.vue": "^3.4.0",
     "tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",

diff --git a/theseus_gui/pnpm-lock.yaml b/theseus_gui/pnpm-lock.yaml
diff --git a/theseus_gui/src/components/GridDisplay.vue b/theseus_gui/src/components/GridDisplay.vue
@@ -2,20 +2,20 @@
 import Instance from '@/components/ui/Instance.vue'
 import { computed, ref } from 'vue'
 import {
+  Button,
+  Card,
   ClipboardCopyIcon,
+  ConfirmModal,
+  DropdownSelect,
+  EyeIcon,
   FolderOpenIcon,
+  formatCategoryHeader,
   PlayIcon,
   PlusIcon,
-  TrashIcon,
-  StopCircleIcon,
-  EyeIcon,
-  Card,
-  DropdownSelect,
   SearchIcon,
+  StopCircleIcon,
+  TrashIcon,
   XIcon,
-  Button,
-  formatCategoryHeader,
-  ModalConfirm,
 } from 'omorphia'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import dayjs from 'dayjs'
@@ -233,7 +233,7 @@ const filteredResults = computed(() => {
 })
 </script>
 <template>
-  <ModalConfirm
+  <ConfirmModal
     ref="confirmModal"
     title="Are you sure you want to delete this instance?"
     description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
@@ -304,14 +304,38 @@ const filteredResults = computed(() => {
     </section>
   </div>
   <ContextMenu ref="instanceOptions" @option-clicked="handleOptionsClick">
-    <template #play> <PlayIcon /> Play </template>
-    <template #stop> <StopCircleIcon /> Stop </template>
-    <template #add_content> <PlusIcon /> Add content </template>
-    <template #edit> <EyeIcon /> View instance </template>
-    <template #duplicate> <ClipboardCopyIcon /> Duplicate instance</template>
-    <template #delete> <TrashIcon /> Delete </template>
-    <template #open> <FolderOpenIcon /> Open folder </template>
-    <template #copy> <ClipboardCopyIcon /> Copy path </template>
+    <template #play>
+      <PlayIcon />
+      Play
+    </template>
+    <template #stop>
+      <StopCircleIcon />
+      Stop
+    </template>
+    <template #add_content>
+      <PlusIcon />
+      Add content
+    </template>
+    <template #edit>
+      <EyeIcon />
+      View instance
+    </template>
+    <template #duplicate>
+      <ClipboardCopyIcon />
+      Duplicate instance
+    </template>
+    <template #delete>
+      <TrashIcon />
+      Delete
+    </template>
+    <template #open>
+      <FolderOpenIcon />
+      Open folder
+    </template>
+    <template #copy>
+      <ClipboardCopyIcon />
+      Copy path
+    </template>
   </ContextMenu>
 </template>
 <style lang="scss" scoped>

diff --git a/theseus_gui/src/components/RowDisplay.vue b/theseus_gui/src/components/RowDisplay.vue
@@ -1,17 +1,17 @@
 <script setup>
 import {
+  ChevronRightIcon,
   ClipboardCopyIcon,
+  ConfirmModal,
+  DownloadIcon,
+  ExternalIcon,
+  EyeIcon,
   FolderOpenIcon,
+  GlobeIcon,
   PlayIcon,
   PlusIcon,
-  TrashIcon,
-  DownloadIcon,
-  GlobeIcon,
   StopCircleIcon,
-  ExternalIcon,
-  EyeIcon,
-  ChevronRightIcon,
-  ModalConfirm,
+  TrashIcon,
 } from 'omorphia'
 import Instance from '@/components/ui/Instance.vue'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
@@ -227,7 +227,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <ModalConfirm
+  <ConfirmModal
     ref="deleteConfirmModal"
     title="Are you sure you want to delete this instance?"
     description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
@@ -265,17 +265,51 @@ onUnmounted(() => {
     </div>
   </div>
   <ContextMenu ref="instanceOptions" @option-clicked="handleOptionsClick">
-    <template #play> <PlayIcon /> Play </template>
-    <template #stop> <StopCircleIcon /> Stop </template>
-    <template #add_content> <PlusIcon /> Add content </template>
-    <template #edit> <EyeIcon /> View instance </template>
-    <template #delete> <TrashIcon /> Delete </template>
-    <template #open_folder> <FolderOpenIcon /> Open folder </template>
-    <template #duplicate> <ClipboardCopyIcon /> Duplicate instance</template>
-    <template #copy_path> <ClipboardCopyIcon /> Copy path </template>
-    <template #install> <DownloadIcon /> Install </template>
-    <template #open_link> <GlobeIcon /> Open in Modrinth <ExternalIcon /> </template>
-    <template #copy_link> <ClipboardCopyIcon /> Copy link </template>
+    <template #play>
+      <PlayIcon />
+      Play
+    </template>
+    <template #stop>
+      <StopCircleIcon />
+      Stop
+    </template>
+    <template #add_content>
+      <PlusIcon />
+      Add content
+    </template>
+    <template #edit>
+      <EyeIcon />
+      View instance
+    </template>
+    <template #delete>
+      <TrashIcon />
+      Delete
+    </template>
+    <template #open_folder>
+      <FolderOpenIcon />
+      Open folder
+    </template>
+    <template #duplicate>
+      <ClipboardCopyIcon />
+      Duplicate instance
+    </template>
+    <template #copy_path>
+      <ClipboardCopyIcon />
+      Copy path
+    </template>
+    <template #install>
+      <DownloadIcon />
+      Install
+    </template>
+    <template #open_link>
+      <GlobeIcon />
+      Open in Modrinth
+      <ExternalIcon />
+    </template>
+    <template #copy_link>
+      <ClipboardCopyIcon />
+      Copy link
+    </template>
   </ContextMenu>
   <InstallConfirmModal ref="confirmModal" />
   <ModInstallModal ref="modInstallModal" />

diff --git a/theseus_gui/src/components/ui/ExportModal.vue b/theseus_gui/src/components/ui/ExportModal.vue
@@ -33,7 +33,7 @@ const themeStore = useTheming()
 
 const initFiles = async () => {
   const newFolders = new Map()
-  const sep = '/';
+  const sep = '/'
   files.value = []
   await get_pack_export_candidates(props.instance.path).then((filePaths) =>
     filePaths