Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions apps/app-frontend/src/components/ui/ErrorModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import {
WrenchIcon,
XIcon,
} from '@modrinth/assets'
import { ButtonStyled, Collapsible, injectNotificationManager } from '@modrinth/ui'
import { ButtonStyled, Collapsible, injectNotificationManager, Modal } from '@modrinth/ui'
import { computed, ref } from 'vue'

import { ChatIcon } from '@/assets/icons'
import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import { trackEvent } from '@/helpers/analytics'
import { login as login_flow, set_default_user } from '@/helpers/auth.js'
import { install_existing_instance } from '@/helpers/install'
Expand Down Expand Up @@ -151,7 +150,7 @@ async function copyToClipboard(text) {
</script>

<template>
<ModalWrapper ref="errorModal" :header="title" :closable="closable">
<Modal ref="errorModal" :header="title" :closable="closable">
<div class="modal-body max-w-[550px]">
<div class="markdown-body">
<template v-if="errorType === 'minecraft_auth'">
Expand Down Expand Up @@ -323,7 +322,7 @@ async function copyToClipboard(text) {
</div>
</template>
</div>
</ModalWrapper>
</Modal>
</template>

<style>
Expand Down
6 changes: 3 additions & 3 deletions apps/app-frontend/src/components/ui/ExportModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
defineMessages,
FileTreeSelect,
injectNotificationManager,
NewModal,
Modal,
StyledInput,
useVIntl,
} from '@modrinth/ui'
Expand Down Expand Up @@ -233,7 +233,7 @@ function isExportCandidateDisabled(path) {
</script>

<template>
<NewModal
<Modal
ref="exportModal"
:header="formatMessage(messages.header)"
scrollable
Expand Down Expand Up @@ -300,5 +300,5 @@ function isExportCandidateDisabled(path) {
</ButtonStyled>
</div>
</template>
</NewModal>
</Modal>
</template>
10 changes: 3 additions & 7 deletions apps/app-frontend/src/components/ui/JavaDetectionModal.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<template>
<ModalWrapper
ref="detectJavaModal"
:header="formatMessage(messages.title)"
:show-ad-on-close="false"
>
<Modal ref="detectJavaModal" :header="formatMessage(messages.title)">
<div class="flex flex-col gap-4">
<Table :columns="javaInstallColumns" :data="chosenInstallOptions" row-key="path">
<template #cell-version="{ value }">
Expand Down Expand Up @@ -46,20 +42,20 @@
</ButtonStyled>
</div>
</div>
</ModalWrapper>
</Modal>
</template>
<script setup>
import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
import {
ButtonStyled,
defineMessages,
injectNotificationManager,
Modal,
Table,
useVIntl,
} from '@modrinth/ui'
import { computed, ref } from 'vue'

import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import { trackEvent } from '@/helpers/analytics'
import { find_filtered_jres } from '@/helpers/jre.js'

Expand Down
7 changes: 3 additions & 4 deletions apps/app-frontend/src/components/ui/ModpackVersionModal.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<script setup>
import { CheckIcon } from '@modrinth/assets'
import { Badge, ButtonStyled } from '@modrinth/ui'
import { Badge, ButtonStyled, Modal } from '@modrinth/ui'
import { computed, ref } from 'vue'

import { SwapIcon } from '@/assets/icons/index.js'
import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import { update_managed_modrinth_version } from '@/helpers/instance'
import { releaseColor } from '@/helpers/utils'

Expand Down Expand Up @@ -52,7 +51,7 @@ const onHide = () => {
</script>

<template>
<ModalWrapper
<Modal
ref="modpackVersionModal"
class="modpack-version-modal"
header="Change modpack version"
Expand Down Expand Up @@ -123,7 +122,7 @@ const onHide = () => {
</div>
</div>
</div>
</ModalWrapper>
</Modal>
</template>

<style scoped lang="scss">
Expand Down
7 changes: 3 additions & 4 deletions apps/app-frontend/src/components/ui/URLConfirmModal.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<script setup>
import { ButtonStyled, injectNotificationManager, ProjectCard } from '@modrinth/ui'
import { ButtonStyled, injectNotificationManager, Modal, ProjectCard } from '@modrinth/ui'
import { ref } from 'vue'

import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import { get_project_v3, get_version } from '@/helpers/cache.js'
import { injectContentInstall } from '@/providers/content-install'

Expand Down Expand Up @@ -45,7 +44,7 @@ async function install() {
</script>

<template>
<ModalWrapper ref="confirmModal" :header="`Install ${project?.name}`">
<Modal ref="confirmModal" :header="`Install ${project?.name}`">
<div class="modal-body">
<ProjectCard
:title="project.name"
Expand Down Expand Up @@ -75,7 +74,7 @@ async function install() {
</div>
</div>
</div>
</ModalWrapper>
</Modal>
</template>

<style scoped lang="scss">
Expand Down
10 changes: 5 additions & 5 deletions apps/app-frontend/src/components/ui/friends/FriendsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import {
defineMessages,
injectNotificationManager,
IntlFormatted,
Modal,
StyledInput,
useRelativeTime,
useVIntl,
} from '@modrinth/ui'
import { computed, ref } from 'vue'

import FriendsSection from '@/components/ui/friends/FriendsSection.vue'
import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import { useFriends } from '@/composables/use-friends'
import type { FriendWithUserData } from '@/helpers/friends.ts'
import type { ModrinthCredentials } from '@/helpers/mr_auth'
Expand Down Expand Up @@ -176,7 +176,7 @@ const messages = defineMessages({
</script>

<template>
<ModalWrapper ref="friendInvitesModal" header="View friend requests">
<Modal ref="friendInvitesModal" header="View friend requests">
<p v-if="incomingRequests.length === 0">You have no pending friend requests :C</p>
<div v-else class="flex flex-col gap-4 min-w-[40rem]">
<div v-for="friend in incomingRequests" :key="friend.username" class="flex gap-2">
Expand Down Expand Up @@ -222,8 +222,8 @@ const messages = defineMessages({
</div>
</div>
</div>
</ModalWrapper>
<ModalWrapper ref="addFriendModal" :header="formatMessage(messages.addingAFriend)">
</Modal>
<Modal ref="addFriendModal" :header="formatMessage(messages.addingAFriend)">
<div class="min-w-[30rem]">
<h2 class="m-0 text-base font-medium text-primary">
{{ formatMessage(messages.usernameTitle) }}
Expand All @@ -248,7 +248,7 @@ const messages = defineMessages({
</ButtonStyled>
</div>
</div>
</ModalWrapper>
</Modal>
<div v-if="userCredentials && !loading" class="flex gap-1 items-center mb-3 -ml-1">
<template v-if="sortedFriends.length > 0">
<ButtonStyled circular type="transparent">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import {
Avatar,
ButtonStyled,
injectNotificationManager,
Modal,
StyledInput,
} from '@modrinth/ui'
import { useQueryClient } from '@tanstack/vue-query'
import { convertFileSrc } from '@tauri-apps/api/core'
import { computed, ref } from 'vue'

import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
import { trackEvent } from '@/helpers/analytics'
import { list } from '@/helpers/instance'
import { add_server_to_instance, get_instance_worlds } from '@/helpers/worlds.ts'
Expand Down Expand Up @@ -82,7 +82,7 @@ async function addServer(instance) {
</script>

<template>
<ModalWrapper ref="modal" header="Add server to instance">
<Modal ref="modal" header="Add server to instance">
<div class="flex flex-col gap-4 min-w-[350px]">
<Admonition type="warning" body="This server may not be compatible with all instances." />
<StyledInput
Expand Down Expand Up @@ -124,5 +124,5 @@ async function addServer(instance) {
</ButtonStyled>
</div>
</div>
</ModalWrapper>
</Modal>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
MessagesSquareIcon,
WrenchIcon,
} from '@modrinth/assets'
import { Admonition, ButtonStyled, Collapsible, NewModal } from '@modrinth/ui'
import { Admonition, ButtonStyled, Collapsible, Modal } from '@modrinth/ui'
import { computed, ref } from 'vue'

import { hide_ads_window, show_ads_window } from '@/helpers/ads.js'
Expand All @@ -16,7 +16,7 @@ import { handleSevereError } from '@/store/error.js'

import { findMinecraftAuthError, type MinecraftAuthError } from './minecraft-auth-errors'

const modal = ref<InstanceType<typeof NewModal>>()
const modal = ref<InstanceType<typeof Modal>>()
const rawError = ref<string>('')
const matchedError = ref<MinecraftAuthError | null>(null)
const debugCollapsed = ref(true)
Expand Down Expand Up @@ -74,7 +74,7 @@ async function copyToClipboard(text: string) {
</script>

<template>
<NewModal ref="modal" header="Sign in Failed" :max-width="'548px'" @hide="onModalHide">
<Modal ref="modal" header="Sign in Failed" :max-width="'548px'" @hide="onModalHide">
<div class="flex flex-col gap-6">
<Admonition
type="warning"
Expand Down Expand Up @@ -191,5 +191,5 @@ async function copyToClipboard(text: string) {
</div>
</div>
</div>
</NewModal>
</Modal>
</template>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<NewModal ref="modal" :header="formatMessage(messages.header)" max-width="544px" no-padding>
<Modal ref="modal" :header="formatMessage(messages.header)" max-width="544px" no-padding>
<div class="grid grid-cols-[1fr_auto] gap-2.5 h-[154px] px-7 pt-4 pb-1 pr-9">
<div class="flex flex-col gap-2.5 items-start justify-center h-min mt-5">
<div class="font-semibold text-xl text-contrast">
Expand Down Expand Up @@ -64,12 +64,12 @@
</a>
</p>
</div>
</NewModal>
</Modal>
</template>

<script setup lang="ts">
import { MessagesSquareIcon, SpinnerIcon } from '@modrinth/assets'
import { ButtonStyled, defineMessages, NewModal, useVIntl } from '@modrinth/ui'
import { ButtonStyled, defineMessages, Modal, useVIntl } from '@modrinth/ui'
import { inject, type Ref, ref } from 'vue'

import steveImage from '@/assets/steve-look-up-left.webp'
Expand Down Expand Up @@ -113,7 +113,7 @@ const messages = defineMessages({
},
})

const modal = ref<InstanceType<typeof NewModal>>()
const modal = ref<InstanceType<typeof Modal>>()
const loadingSignIn = ref(false)

function show() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<NewModal ref="modal" :header="formatMessage(messages.header)" fade="danger" max-width="500px">
<Modal ref="modal" :header="formatMessage(messages.header)" fade="danger" max-width="500px">
<Admonition type="critical" :header="formatMessage(messages.admonitionHeader)">
{{ formatMessage(messages.admonitionBody) }}
</Admonition>
Expand All @@ -20,7 +20,7 @@
</ButtonStyled>
</div>
</template>
</NewModal>
</Modal>
</template>

<script setup lang="ts">
Expand All @@ -30,7 +30,7 @@ import {
ButtonStyled,
commonMessages,
defineMessages,
NewModal,
Modal,
useVIntl,
} from '@modrinth/ui'
import { ref } from 'vue'
Expand Down Expand Up @@ -61,7 +61,7 @@ const emit = defineEmits<{
(e: 'delete'): void
}>()

const modal = ref<InstanceType<typeof NewModal>>()
const modal = ref<InstanceType<typeof Modal>>()

function show() {
modal.value?.show()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<NewModal
<Modal
ref="modal"
:header="formatMessage(messages.installToPlay)"
:closable="true"
Expand Down Expand Up @@ -151,7 +151,7 @@
</div>
</div>
</div>
</NewModal>
</Modal>

<ModpackContentModal
ref="modpackContentModal"
Expand All @@ -171,8 +171,8 @@ import {
type ContentItem,
defineMessages,
formatLoader,
Modal,
ModpackContentModal,
NewModal,
Table,
type TableColumn,
useScrollIndicator,
Expand All @@ -191,7 +191,7 @@ type ExternalFileRow = {
name: string
}

const modal = ref<InstanceType<typeof NewModal>>()
const modal = ref<InstanceType<typeof Modal>>()
const modpackVersionId = ref<string | null>(null)
const modpackVersion = ref<Labrinth.Versions.v2.Version | null>(null)
const project = ref<Labrinth.Projects.v3.Project | null>(null)
Expand Down
Loading
Loading