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>
This commit is contained in:
Norbiros
2024-07-18 07:01:58 +02:00
committed by GitHub
parent 8704d3acb3
commit f1713647cf
16 changed files with 141 additions and 197 deletions

View File

@@ -20,7 +20,7 @@
class="text-input"
autocomplete="off"
/>
<Button @click="() => (searchFilter = '')">
<Button class="r-btn" @click="() => (searchFilter = '')">
<XIcon />
</Button>
</div>
@@ -42,24 +42,7 @@
<UpdatedIcon />
Update all
</Button>
<!-- <DropdownButton-->
<!-- v-if="!isPackLocked"-->
<!-- :options="['search', 'from_file']"-->
<!-- default-value="search"-->
<!-- name="add-content-dropdown"-->
<!-- color="primary"-->
<!-- @option-click="handleContentOptionClick"-->
<!-- >-->
<!-- <template #search>-->
<!-- <SearchIcon />-->
<!-- <span class="no-wrap"> Add content </span>-->
<!-- </template>-->
<!-- <template #from_file>-->
<!-- <FolderOpenIcon />-->
<!-- <span class="no-wrap"> Add from file </span>-->
<!-- </template>-->
<!-- </DropdownButton>-->
<AddContentButton v-if="!isPackLocked" :instance="instance" />
</Card>
<Pagination
v-if="projects.length > 0"
@@ -241,7 +224,7 @@
<TrashIcon />
</Button>
</div>
<AnimatedLogo v-if="mod.updating" class="btn icon-only updating-indicator"></AnimatedLogo>
<AnimatedLogo v-if="mod.updating" class="btn icon-only updating-indicator" />
<div
v-else
v-tooltip="isPackLocked ? 'Unlock this instance to update mods.' : 'Update project'"
@@ -283,24 +266,7 @@
</div>
<h3>No projects found</h3>
<p class="empty-subtitle">Add a project to get started</p>
<div class="empty-action">
<DropdownButton
:options="['search', 'from_file']"
default-value="search"
name="add-content-dropdown-from-empty"
color="primary"
@option-click="handleContentOptionClick"
>
<template #search>
<SearchIcon />
<span class="no-wrap"> Add content </span>
</template>
<template #from_file>
<FolderOpenIcon />
<span class="no-wrap"> Add from file </span>
</template>
</DropdownButton>
</div>
<AddContentButton :instance="instance" />
</div>
<Pagination
v-if="projects.length > 0"
@@ -372,7 +338,6 @@ import {
SearchIcon,
UpdatedIcon,
FolderOpenIcon,
// DropdownButton,
XIcon,
ShareIcon,
DropdownIcon,
@@ -395,7 +360,6 @@ import {
} from '@modrinth/ui'
import { formatProjectType } from '@modrinth/utils'
import { computed, onUnmounted, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import {
add_project_from_path,
get,
@@ -406,15 +370,13 @@ import {
} from '@/helpers/profile.js'
import { handleError } from '@/store/notifications.js'
import { mixpanel_track } from '@/helpers/mixpanel'
import { open } from '@tauri-apps/api/dialog'
import { listen } from '@tauri-apps/api/event'
import { convertFileSrc } from '@tauri-apps/api/tauri'
import { highlightModInProfile } from '@/helpers/utils.js'
import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage, PackageIcon } from '@/assets/icons'
import ExportModal from '@/components/ui/ExportModal.vue'
import ModpackVersionModal from '@/components/ui/ModpackVersionModal.vue'
const router = useRouter()
import AddContentButton from '@/components/ui/AddContentButton.vue'
const props = defineProps({
instance: {
@@ -846,23 +808,6 @@ const handleRightClick = (event, mod) => {
}
}
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(() => {
</style>
<style lang="scss">
.updating-indicator {
height: 2.25rem !important;
width: 2.25rem !important;
svg {
margin-left: 0.5rem !important;
height: 1.25rem !important;
width: 1.25rem !important;
}
}