-
diff --git a/apps/frontend/src/providers/setup.ts b/apps/frontend/src/providers/setup.ts
new file mode 100644
index 0000000000..c558dc4c79
--- /dev/null
+++ b/apps/frontend/src/providers/setup.ts
@@ -0,0 +1,16 @@
+import { provideNotificationManager } from '@modrinth/ui'
+
+import { FrontendNotificationManager } from './frontend-notifications'
+import { setupFilePickerProvider } from './setup/file-picker'
+import { setupModrinthClientProvider } from './setup/modrinth-client'
+import { setupPageContextProvider } from './setup/page-context'
+import { setupTagsProvider } from './setup/tags'
+
+export function setupProviders(auth: Awaited
+
+
+
-
+
@@ -143,7 +178,7 @@ const exportPack = async () => {
-
-
-
-
-
-
-
diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
index 93cf9bc553..b18aa765d7 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -1,37 +1,34 @@
-
+
+
+ ()
+const { server, serverId } = injectModrinthServerContext()
+const client = injectModrinthClient()
+const queryClient = useQueryClient()
const isUpdating = ref(false)
-const data = computed(() => props.server.general)
+const data = server
const serverIP = ref(data?.value?.net?.ip ?? '')
const serverSubdomain = ref(data?.value?.net?.domain ?? '')
@@ -296,8 +298,15 @@ const serverPrimaryPort = ref(data?.value?.net?.port ?? 0)
const userDomain = ref('')
const exampleDomain = 'play.example.com'
-const network = computed(() => props.server.network)
-const allocations = computed(() => network.value?.allocations)
+const {
+ data: allocationsData,
+ error: allocationsError,
+ refetch: refetchAllocations,
+} = useQuery({
+ queryKey: ['servers', 'allocations', serverId] as const,
+ queryFn: () => client.archon.servers_v0.getAllocations(serverId),
+})
+const allocations = allocationsData
const newAllocationModal = ref()
const editAllocationModal = ref()
@@ -316,8 +325,8 @@ const addNewAllocation = async () => {
if (!newAllocationName.value) return
try {
- await props.server.network?.reserveAllocation(newAllocationName.value)
- await props.server.refresh(['network'])
+ await client.archon.servers_v0.reserveAllocation(serverId, newAllocationName.value)
+ await queryClient.invalidateQueries({ queryKey: ['servers', 'allocations', serverId] })
newAllocationModal.value?.hide()
newAllocationName.value = ''
@@ -360,8 +369,8 @@ const showConfirmDeleteModal = (port: number) => {
const confirmDeleteAllocation = async () => {
if (allocationToDelete.value === null) return
- await props.server.network?.deleteAllocation(allocationToDelete.value)
- await props.server.refresh(['network'])
+ await client.archon.servers_v0.deleteAllocation(serverId, allocationToDelete.value)
+ await queryClient.invalidateQueries({ queryKey: ['servers', 'allocations', serverId] })
addNotification({
type: 'success',
@@ -376,8 +385,12 @@ const editAllocation = async () => {
if (!newAllocationName.value) return
try {
- await props.server.network?.updateAllocation(newAllocationPort.value, newAllocationName.value)
- await props.server.refresh(['network'])
+ await client.archon.servers_v0.updateAllocation(
+ serverId,
+ newAllocationPort.value,
+ newAllocationName.value,
+ )
+ await queryClient.invalidateQueries({ queryKey: ['servers', 'allocations', serverId] })
editAllocationModal.value?.hide()
newAllocationName.value = ''
@@ -397,7 +410,8 @@ const saveNetwork = async () => {
try {
isUpdating.value = true
- const available = await props.server.network?.checkSubdomainAvailability(serverSubdomain.value)
+ const result = await client.archon.servers_v0.checkSubdomainAvailability(serverSubdomain.value)
+ const available = result.available
if (!available) {
addNotification({
type: 'error',
@@ -407,13 +421,18 @@ const saveNetwork = async () => {
return
}
if (serverSubdomain.value !== data?.value?.net?.domain) {
- await props.server.network?.changeSubdomain(serverSubdomain.value)
+ await client.archon.servers_v0.changeSubdomain(serverId, serverSubdomain.value)
}
if (serverPrimaryPort.value !== data?.value?.net?.port) {
- await props.server.network?.updateAllocation(serverPrimaryPort.value, newAllocationName.value)
+ await client.archon.servers_v0.updateAllocation(
+ serverId,
+ serverPrimaryPort.value,
+ newAllocationName.value,
+ )
}
await new Promise((resolve) => setTimeout(resolve, 500))
- await props.server.refresh()
+ await queryClient.invalidateQueries({ queryKey: ['servers', 'detail', serverId] })
+ await queryClient.invalidateQueries({ queryKey: ['servers', 'allocations', serverId] })
addNotification({
type: 'success',
title: 'Server settings updated',
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options/preferences.vue b/apps/frontend/src/pages/hosting/manage/[id]/options/preferences.vue
index 4102a6b5c7..d3c84bf5b0 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/options/preferences.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/options/preferences.vue
@@ -32,7 +32,7 @@
()
-
const preferences = {
ramAsNumber: {
displayName: 'RAM as bytes',
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options/properties.vue b/apps/frontend/src/pages/hosting/manage/[id]/options/properties.vue
index 4d2d524038..7fffab1586 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/options/properties.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/options/properties.vue
@@ -121,7 +121,7 @@
()
+const { server, serverId } = injectModrinthServerContext()
+const queryClient = useQueryClient()
const tags = useGeneratedState()
@@ -158,10 +157,8 @@ const isUpdating = ref(false)
const searchInput = ref('')
-const data = computed(() => props.server.general)
-const modulesLoaded = inject>('modulesLoaded')
+const data = server
const { data: propsData, status } = await useAsyncData('ServerProperties', async () => {
- await modulesLoaded
try {
const blob = await client.kyros.files_v0.downloadFile('/server.properties')
const rawProps = await blob.text()
@@ -292,7 +289,7 @@ const saveProperties = async () => {
await client.kyros.files_v0.updateFile('/server.properties', constructServerProperties())
await new Promise((resolve) => setTimeout(resolve, 500))
originalProperties.value = JSON.parse(JSON.stringify(liveProperties.value))
- await props.server.refresh()
+ await queryClient.invalidateQueries({ queryKey: ['servers', 'detail', serverId] })
addNotification({
type: 'success',
title: 'Server properties updated',
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options/startup.vue b/apps/frontend/src/pages/hosting/manage/[id]/options/startup.vue
index 6f90633822..e92ab956b4 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/options/startup.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/options/startup.vue
@@ -1,32 +1,6 @@
-
-
-
+
+
diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue
index 4966b1c7bd..fa605f3206 100644
--- a/apps/app-frontend/src/components/ui/ExportModal.vue
+++ b/apps/app-frontend/src/components/ui/ExportModal.vue
@@ -1,6 +1,14 @@
-
-
Modpack Name
+{{ formatMessage(messages.modpackNameLabel) }}
-
Version number
+{{ formatMessage(messages.versionNumberLabel) }}
-
Description
+{{ formatMessage(commonMessages.descriptionLabel) }}
- Select files and folders to include in pack
+ {{ formatMessage(messages.selectFilesLabel) }}
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
deleted file mode 100644
index b2920fbb5e..0000000000
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ /dev/null
@@ -1,662 +0,0 @@
-
-
-
- -
-
-
-
-
-
-
-
-
-
- Name
-
-
- Loader
-
-
- Game version
-
-
-
-
- Loader version
-
-
-
-
- Select version
-
-
- Select a game version before you select a loader version
-
-
-
-
-
-
-
-
-
-
-
- {{ selectedProfileType.name }} path
-
-
-
-
-
-
-
-
-
- Profile name
-
-
-
-
-
-
-
- {{ profile.name }}
-
- No profiles found
-
- > = {}
-
- readonly general: GeneralModule
- readonly content: ContentModule
- readonly network: NetworkModule
- readonly startup: StartupModule
-
- constructor(serverId: string) {
- this.serverId = serverId
-
- this.general = new GeneralModule(this)
- this.content = new ContentModule(this)
- this.network = new NetworkModule(this)
- this.startup = new StartupModule(this)
- }
-
- async fetchConfigFile(fileName: string): Promise {
- return await useServersFetch(`servers/${this.serverId}/config/${fileName}`)
- }
-
- constructServerProperties(properties: any): string {
- let fileContent = `#Minecraft server properties\n#${new Date().toUTCString()}\n`
-
- for (const [key, value] of Object.entries(properties)) {
- if (typeof value === 'object') {
- fileContent += `${key}=${JSON.stringify(value)}\n`
- } else if (typeof value === 'boolean') {
- fileContent += `${key}=${value ? 'true' : 'false'}\n`
- } else {
- fileContent += `${key}=${value}\n`
- }
- }
-
- return fileContent
- }
-
- async processImage(iconUrl: string | undefined): Promise {
- const sharedImage = useState(`server-icon-${this.serverId}`)
-
- if (sharedImage.value) {
- return sharedImage.value
- }
-
- try {
- const auth = await useServersFetch(`servers/${this.serverId}/fs`)
- try {
- const fileData = await useServersFetch(`/download?path=/server-icon-original.png`, {
- override: auth,
- retry: 1, // Reduce retries for optional resources
- })
-
- if (fileData instanceof Blob && import.meta.client) {
- const dataURL = await new Promise((resolve) => {
- const canvas = document.createElement('canvas')
- const ctx = canvas.getContext('2d')
- const img = new Image()
- img.onload = () => {
- canvas.width = 512
- canvas.height = 512
- ctx?.drawImage(img, 0, 0, 512, 512)
- const dataURL = canvas.toDataURL('image/png')
- sharedImage.value = dataURL
- resolve(dataURL)
- URL.revokeObjectURL(img.src)
- }
- img.src = URL.createObjectURL(fileData)
- })
- return dataURL
- }
- } catch (error) {
- if (error instanceof ModrinthServerError) {
- if (error.statusCode && error.statusCode >= 500) {
- console.debug('Service unavailable, skipping icon processing')
- sharedImage.value = undefined
- return undefined
- }
-
- if (error.statusCode === 404 && iconUrl) {
- try {
- const response = await fetch(iconUrl)
- if (!response.ok) throw new Error('Failed to fetch icon')
- const file = await response.blob()
- const originalFile = new File([file], 'server-icon-original.png', {
- type: 'image/png',
- })
-
- if (import.meta.client) {
- const dataURL = await new Promise((resolve) => {
- const canvas = document.createElement('canvas')
- const ctx = canvas.getContext('2d')
- const img = new Image()
- img.onload = () => {
- canvas.width = 64
- canvas.height = 64
- ctx?.drawImage(img, 0, 0, 64, 64)
- canvas.toBlob(async (blob) => {
- if (blob) {
- const scaledFile = new File([blob], 'server-icon.png', {
- type: 'image/png',
- })
- await useServersFetch(`/create?path=/server-icon.png&type=file`, {
- method: 'POST',
- contentType: 'application/octet-stream',
- body: scaledFile,
- override: auth,
- })
- await useServersFetch(`/create?path=/server-icon-original.png&type=file`, {
- method: 'POST',
- contentType: 'application/octet-stream',
- body: originalFile,
- override: auth,
- })
- }
- }, 'image/png')
- const dataURL = canvas.toDataURL('image/png')
- sharedImage.value = dataURL
- resolve(dataURL)
- URL.revokeObjectURL(img.src)
- }
- img.src = URL.createObjectURL(file)
- })
- return dataURL
- }
- } catch (externalError: any) {
- console.debug('Could not process external icon:', externalError.message)
- }
- }
- } else {
- throw error
- }
- }
- } catch (error: any) {
- console.debug('Icon processing failed:', error.message)
- }
-
- sharedImage.value = undefined
- return undefined
- }
-
- async testNodeReachability(): Promise {
- if (!this.general?.node?.instance) {
- console.warn('No node instance available for ping test')
- return false
- }
-
- const wsUrl = `wss://${this.general.node.instance}/pingtest`
-
- try {
- return await new Promise((resolve) => {
- const socket = new WebSocket(wsUrl)
- const timeout = setTimeout(() => {
- socket.close()
- resolve(false)
- }, 5000)
-
- socket.onopen = () => {
- clearTimeout(timeout)
- socket.send(performance.now().toString())
- }
-
- socket.onmessage = () => {
- clearTimeout(timeout)
- socket.close()
- resolve(true)
- }
-
- socket.onerror = () => {
- clearTimeout(timeout)
- resolve(false)
- }
- })
- } catch (error) {
- console.error(`Failed to ping node ${wsUrl}:`, error)
- return false
- }
- }
-
- async refresh(
- modules: ModuleName[] = [],
- options?: {
- preserveConnection?: boolean
- preserveInstallState?: boolean
- },
- ): Promise {
- const modulesToRefresh =
- modules.length > 0 ? modules : (['general', 'content', 'network', 'startup'] as ModuleName[])
-
- for (const module of modulesToRefresh) {
- this.errors[module] = undefined
-
- try {
- switch (module) {
- case 'general': {
- if (options?.preserveConnection) {
- const currentImage = this.general.image
- const currentMotd = this.general.motd
- const currentStatus = this.general.status
-
- await this.general.fetch()
-
- if (currentImage) {
- this.general.image = currentImage
- }
- if (currentMotd) {
- this.general.motd = currentMotd
- }
- if (options.preserveInstallState && currentStatus === 'installing') {
- this.general.status = 'installing'
- }
- } else {
- await this.general.fetch()
- }
- break
- }
- case 'content':
- await this.content.fetch()
- break
- case 'network':
- await this.network.fetch()
- break
- case 'startup':
- await this.startup.fetch()
- break
- }
- } catch (error) {
- if (error instanceof ModrinthServerError) {
- if (error.statusCode === 404 && module === 'content') {
- console.debug(`Optional ${module} resource not found:`, error.message)
- continue
- }
-
- if (error.statusCode && error.statusCode >= 500) {
- console.debug(`Temporary ${module} unavailable:`, error.message)
- continue
- }
- }
-
- this.errors[module] = {
- error:
- error instanceof ModrinthServerError
- ? error
- : new ModrinthServerError('Unknown error', undefined, error as Error),
- timestamp: Date.now(),
- }
- }
- }
- }
-
- get moduleErrors() {
- return this.errors
- }
-}
-
-export const useModrinthServers = async (
- serverId: string,
- includedModules: ModuleName[] = ['general'],
-) => {
- const server = new ModrinthServer(serverId)
- await server.refresh(includedModules)
- return reactive(server)
-}
diff --git a/apps/frontend/src/composables/servers/modules/backups.ts b/apps/frontend/src/composables/servers/modules/backups.ts
deleted file mode 100644
index 921b9a350e..0000000000
--- a/apps/frontend/src/composables/servers/modules/backups.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import type { AutoBackupSettings, Backup } from '@modrinth/utils'
-
-import { useServersFetch } from '../servers-fetch.ts'
-import { ServerModule } from './base.ts'
-
-export class BackupsModule extends ServerModule {
- data: Backup[] = []
-
- async fetch(): Promise {
- this.data = await useServersFetch(`servers/${this.serverId}/backups`, {}, 'backups')
- }
-
- async create(backupName: string): Promise {
- const tempId = `temp-${Date.now()}-${Math.random().toString(36).substring(7)}`
- const tempBackup: Backup = {
- id: tempId,
- name: backupName,
- created_at: new Date().toISOString(),
- locked: false,
- automated: false,
- interrupted: false,
- ongoing: true,
- task: { create: { progress: 0, state: 'ongoing' } },
- }
- this.data.push(tempBackup)
-
- try {
- const response = await useServersFetch<{ id: string }>(`servers/${this.serverId}/backups`, {
- method: 'POST',
- body: { name: backupName },
- })
-
- const backup = this.data.find((b) => b.id === tempId)
- if (backup) {
- backup.id = response.id
- }
-
- return response.id
- } catch (error) {
- this.data = this.data.filter((b) => b.id !== tempId)
- throw error
- }
- }
-
- async rename(backupId: string, newName: string): Promise {
- await useServersFetch(`servers/${this.serverId}/backups/${backupId}/rename`, {
- method: 'POST',
- body: { name: newName },
- })
- await this.fetch()
- }
-
- async delete(backupId: string): Promise {
- await useServersFetch(`servers/${this.serverId}/backups/${backupId}`, {
- method: 'DELETE',
- })
- await this.fetch()
- }
-
- async restore(backupId: string): Promise {
- const backup = this.data.find((b) => b.id === backupId)
- if (backup) {
- if (!backup.task) backup.task = {}
- backup.task.restore = { progress: 0, state: 'ongoing' }
- }
-
- try {
- await useServersFetch(`servers/${this.serverId}/backups/${backupId}/restore`, {
- method: 'POST',
- })
- } catch (error) {
- if (backup?.task?.restore) {
- delete backup.task.restore
- }
- throw error
- }
- }
-
- async lock(backupId: string): Promise {
- await useServersFetch(`servers/${this.serverId}/backups/${backupId}/lock`, {
- method: 'POST',
- })
- await this.fetch()
- }
-
- async unlock(backupId: string): Promise {
- await useServersFetch(`servers/${this.serverId}/backups/${backupId}/unlock`, {
- method: 'POST',
- })
- await this.fetch()
- }
-
- async retry(backupId: string): Promise {
- await useServersFetch(`servers/${this.serverId}/backups/${backupId}/retry`, {
- method: 'POST',
- })
- }
-
- async updateAutoBackup(autoBackup: 'enable' | 'disable', interval: number): Promise {
- await useServersFetch(`servers/${this.serverId}/autobackup`, {
- method: 'POST',
- body: { set: autoBackup, interval },
- })
- }
-
- async getAutoBackup(): Promise {
- return await useServersFetch(`servers/${this.serverId}/autobackup`)
- }
-}
diff --git a/apps/frontend/src/composables/servers/modules/base.ts b/apps/frontend/src/composables/servers/modules/base.ts
deleted file mode 100644
index 151fadf231..0000000000
--- a/apps/frontend/src/composables/servers/modules/base.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { ModrinthServer } from '../modrinth-servers.ts'
-
-export abstract class ServerModule {
- protected server: ModrinthServer
-
- constructor(server: ModrinthServer) {
- this.server = server
- }
-
- protected get serverId(): string {
- return this.server.serverId
- }
-
- abstract fetch(): Promise
-}
diff --git a/apps/frontend/src/composables/servers/modules/content.ts b/apps/frontend/src/composables/servers/modules/content.ts
deleted file mode 100644
index 2db34b7691..0000000000
--- a/apps/frontend/src/composables/servers/modules/content.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { ContentType, Mod } from '@modrinth/utils'
-
-import { useServersFetch } from '../servers-fetch.ts'
-import { ServerModule } from './base.ts'
-
-export class ContentModule extends ServerModule {
- data: Mod[] = []
-
- async fetch(): Promise {
- const mods = await useServersFetch(`servers/${this.serverId}/mods`, {}, 'content')
- this.data = mods.sort((a, b) => (a?.name ?? '').localeCompare(b?.name ?? ''))
- }
-
- async install(contentType: ContentType, projectId: string, versionId: string): Promise {
- await useServersFetch(`servers/${this.serverId}/mods`, {
- method: 'POST',
- body: {
- rinth_ids: { project_id: projectId, version_id: versionId },
- install_as: contentType,
- },
- })
- }
-
- async remove(path: string): Promise {
- await useServersFetch(`servers/${this.serverId}/deleteMod`, {
- method: 'POST',
- body: { path },
- })
- }
-
- async reinstall(replace: string, projectId: string, versionId: string): Promise {
- await useServersFetch(`servers/${this.serverId}/mods/update`, {
- method: 'POST',
- body: { replace, project_id: projectId, version_id: versionId },
- })
- }
-}
diff --git a/apps/frontend/src/composables/servers/modules/general.ts b/apps/frontend/src/composables/servers/modules/general.ts
deleted file mode 100644
index 77776b78d0..0000000000
--- a/apps/frontend/src/composables/servers/modules/general.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import type { JWTAuth, PowerAction, Project, ServerGeneral } from '@modrinth/utils'
-import { $fetch } from 'ofetch'
-
-import { useServersFetch } from '../servers-fetch.ts'
-import { ServerModule } from './base.ts'
-
-export class GeneralModule extends ServerModule implements ServerGeneral {
- server_id!: string
- name!: string
- owner_id!: string
- net!: { ip: string; port: number; domain: string }
- game!: string
- backup_quota!: number
- used_backup_quota!: number
- status!: string
- suspension_reason!: string
- loader!: string
- loader_version!: string
- mc_version!: string
- upstream!: {
- kind: 'modpack' | 'mod' | 'resourcepack'
- version_id: string
- project_id: string
- } | null
-
- motd?: string
- image?: string
- project?: Project
- sftp_username!: string
- sftp_password!: string
- sftp_host!: string
- datacenter?: string
- notices?: any[]
- node!: { token: string; instance: string }
- flows?: { intro?: boolean }
-
- is_medal?: boolean
-
- async fetch(): Promise {
- const data = await useServersFetch(`servers/${this.serverId}`, {}, 'general')
-
- if (data.upstream?.project_id) {
- const project = await $fetch(
- `https://api.modrinth.com/v2/project/${data.upstream.project_id}`,
- )
- data.project = project as Project
- }
-
- if (import.meta.client) {
- data.image = (await this.server.processImage(data.project?.icon_url)) ?? undefined
- }
-
- // Copy data to this module
- Object.assign(this, data)
- }
-
- async updateName(newName: string): Promise {
- await useServersFetch(`servers/${this.serverId}/name`, {
- method: 'POST',
- body: { name: newName },
- })
- }
-
- async power(action: PowerAction): Promise {
- await useServersFetch(`servers/${this.serverId}/power`, {
- method: 'POST',
- body: { action },
- })
- await new Promise((resolve) => setTimeout(resolve, 1000))
- await this.fetch() // Refresh this module
- }
-
- async reinstall(
- loader: boolean,
- projectId: string,
- versionId?: string,
- loaderVersionId?: string,
- hardReset: boolean = false,
- ): Promise {
- const hardResetParam = hardReset ? 'true' : 'false'
- if (loader) {
- if (projectId.toLowerCase() === 'neoforge') {
- projectId = 'NeoForge'
- }
- await useServersFetch(`servers/${this.serverId}/reinstall?hard=${hardResetParam}`, {
- method: 'POST',
- body: {
- loader: projectId,
- loader_version: loaderVersionId,
- game_version: versionId,
- },
- })
- } else {
- await useServersFetch(`servers/${this.serverId}/reinstall?hard=${hardResetParam}`, {
- method: 'POST',
- body: { project_id: projectId, version_id: versionId },
- })
- }
- }
-
- reinstallFromMrpack(
- mrpack: File,
- hardReset: boolean = false,
- ): {
- promise: Promise
- onProgress: (cb: (p: { loaded: number; total: number; progress: number }) => void) => void
- } {
- const hardResetParam = hardReset ? 'true' : 'false'
-
- const progressSubject = new EventTarget()
-
- const uploadPromise = (async () => {
- try {
- const auth = await useServersFetch(`servers/${this.serverId}/reinstallFromMrpack`)
-
- await new Promise((resolve, reject) => {
- const xhr = new XMLHttpRequest()
-
- xhr.upload.addEventListener('progress', (e) => {
- if (e.lengthComputable) {
- progressSubject.dispatchEvent(
- new CustomEvent('progress', {
- detail: {
- loaded: e.loaded,
- total: e.total,
- progress: (e.loaded / e.total) * 100,
- },
- }),
- )
- }
- })
-
- xhr.onload = () =>
- xhr.status >= 200 && xhr.status < 300
- ? resolve()
- : reject(new Error(`[pyroservers] XHR error status: ${xhr.status}`))
-
- xhr.onerror = () => reject(new Error('[pyroservers] .mrpack upload failed'))
- xhr.onabort = () => reject(new Error('[pyroservers] .mrpack upload cancelled'))
- xhr.ontimeout = () => reject(new Error('[pyroservers] .mrpack upload timed out'))
- xhr.timeout = 30 * 60 * 1000
-
- xhr.open('POST', `https://${auth.url}/reinstallMrpackMultiparted?hard=${hardResetParam}`)
- xhr.setRequestHeader('Authorization', `Bearer ${auth.token}`)
-
- const formData = new FormData()
- formData.append('file', mrpack)
- xhr.send(formData)
- })
- } catch (err) {
- console.error('Error reinstalling from mrpack:', err)
- throw err
- }
- })()
-
- return {
- promise: uploadPromise,
- onProgress: (cb: (p: { loaded: number; total: number; progress: number }) => void) =>
- progressSubject.addEventListener('progress', ((e: CustomEvent) =>
- cb(e.detail)) as EventListener),
- }
- }
-
- async suspend(status: boolean): Promise {
- await useServersFetch(`servers/${this.serverId}/suspend`, {
- method: 'POST',
- body: { suspended: status },
- })
- }
-
- async endIntro(): Promise {
- await useServersFetch(`servers/${this.serverId}/flows/intro`, {
- method: 'DELETE',
- version: 1,
- })
- await this.fetch() // Refresh this module
- }
-
- async setMotd(motd: string): Promise {
- try {
- const props = (await this.server.fetchConfigFile('ServerProperties')) as any
- if (props) {
- props.motd = motd
- const newProps = this.server.constructServerProperties(props)
- const octetStream = new Blob([newProps], { type: 'application/octet-stream' })
- const auth = await useServersFetch(`servers/${this.serverId}/fs`)
-
- await useServersFetch(`/update?path=/server.properties`, {
- method: 'PUT',
- contentType: 'application/octet-stream',
- body: octetStream,
- override: auth,
- })
- }
- } catch {
- console.error(
- '[Modrinth Hosting] [General] Failed to set MOTD due to lack of server properties file.',
- )
- }
- }
-}
diff --git a/apps/frontend/src/composables/servers/modules/index.ts b/apps/frontend/src/composables/servers/modules/index.ts
deleted file mode 100644
index 62fe2c45f8..0000000000
--- a/apps/frontend/src/composables/servers/modules/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './backups.ts'
-export * from './base.ts'
-export * from './content.ts'
-export * from './general.ts'
-export * from './network.ts'
-export * from './startup.ts'
-export * from './ws.ts'
diff --git a/apps/frontend/src/composables/servers/modules/network.ts b/apps/frontend/src/composables/servers/modules/network.ts
deleted file mode 100644
index d434f77001..0000000000
--- a/apps/frontend/src/composables/servers/modules/network.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { Allocation } from '@modrinth/utils'
-
-import { useServersFetch } from '../servers-fetch.ts'
-import { ServerModule } from './base.ts'
-
-export class NetworkModule extends ServerModule {
- allocations: Allocation[] = []
-
- async fetch(): Promise {
- this.allocations = await useServersFetch(
- `servers/${this.serverId}/allocations`,
- {},
- 'network',
- )
- }
-
- async reserveAllocation(name: string): Promise {
- return await useServersFetch(`servers/${this.serverId}/allocations?name=${name}`, {
- method: 'POST',
- })
- }
-
- async updateAllocation(port: number, name: string): Promise {
- await useServersFetch(`servers/${this.serverId}/allocations/${port}?name=${name}`, {
- method: 'PUT',
- })
- }
-
- async deleteAllocation(port: number): Promise {
- await useServersFetch(`servers/${this.serverId}/allocations/${port}`, {
- method: 'DELETE',
- })
- }
-
- async checkSubdomainAvailability(subdomain: string): Promise {
- const result = (await useServersFetch(`subdomains/${subdomain}/isavailable`)) as {
- available: boolean
- }
- return result.available
- }
-
- async changeSubdomain(subdomain: string): Promise {
- await useServersFetch(`servers/${this.serverId}/subdomain`, {
- method: 'POST',
- body: { subdomain },
- })
- }
-}
diff --git a/apps/frontend/src/composables/servers/modules/startup.ts b/apps/frontend/src/composables/servers/modules/startup.ts
deleted file mode 100644
index a47c031f69..0000000000
--- a/apps/frontend/src/composables/servers/modules/startup.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { JDKBuild, JDKVersion, Startup } from '@modrinth/utils'
-
-import { useServersFetch } from '../servers-fetch.ts'
-import { ServerModule } from './base.ts'
-
-export class StartupModule extends ServerModule implements Startup {
- invocation!: string
- original_invocation!: string
- jdk_version!: JDKVersion
- jdk_build!: JDKBuild
-
- async fetch(): Promise {
- const data = await useServersFetch(`servers/${this.serverId}/startup`, {}, 'startup')
- Object.assign(this, data)
- }
-
- async update(invocation: string, jdkVersion: JDKVersion, jdkBuild: JDKBuild): Promise {
- await useServersFetch(`servers/${this.serverId}/startup`, {
- method: 'POST',
- body: {
- invocation: invocation || null,
- jdk_version: jdkVersion || null,
- jdk_build: jdkBuild || null,
- },
- })
- }
-}
diff --git a/apps/frontend/src/composables/servers/modules/ws.ts b/apps/frontend/src/composables/servers/modules/ws.ts
deleted file mode 100644
index aa10a30294..0000000000
--- a/apps/frontend/src/composables/servers/modules/ws.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { JWTAuth } from '@modrinth/utils'
-
-import { useServersFetch } from '../servers-fetch.ts'
-import { ServerModule } from './base.ts'
-
-export class WSModule extends ServerModule implements JWTAuth {
- url!: string
- token!: string
-
- async fetch(): Promise {
- const data = await useServersFetch(`servers/${this.serverId}/ws`, {}, 'ws')
- Object.assign(this, data)
- }
-}
diff --git a/apps/frontend/src/composables/servers/use-server-image.ts b/apps/frontend/src/composables/servers/use-server-image.ts
new file mode 100644
index 0000000000..c613a79ae5
--- /dev/null
+++ b/apps/frontend/src/composables/servers/use-server-image.ts
@@ -0,0 +1,131 @@
+import type { Archon } from '@modrinth/api-client'
+import { injectModrinthClient } from '@modrinth/ui'
+import { type ComputedRef, ref, watch } from 'vue'
+
+// TODO: Remove and use V1 when available
+export function useServerImage(
+ serverId: string,
+ upstream: ComputedRef,
+) {
+ const client = injectModrinthClient()
+ const image = ref()
+
+ const sharedImage = useState(`server-icon-${serverId}`)
+ if (sharedImage.value) {
+ image.value = sharedImage.value
+ }
+
+ async function loadImage() {
+ if (sharedImage.value) {
+ image.value = sharedImage.value
+ return
+ }
+
+ if (import.meta.server) return
+
+ const cached = localStorage.getItem(`server-icon-${serverId}`)
+ if (cached) {
+ sharedImage.value = cached
+ image.value = cached
+ return
+ }
+
+ let projectIconUrl: string | undefined
+ const upstreamVal = upstream.value
+ if (upstreamVal?.project_id) {
+ try {
+ const project = await $fetch<{ icon_url?: string }>(
+ `https://api.modrinth.com/v2/project/${upstreamVal.project_id}`,
+ )
+ projectIconUrl = project.icon_url
+ } catch {
+ // project fetch failed, continue without icon url
+ }
+ }
+
+ try {
+ const fileData = await client.kyros.files_v0.downloadFile('/server-icon-original.png')
+
+ if (fileData instanceof Blob) {
+ const dataURL = await resizeImage(fileData, 512)
+ sharedImage.value = dataURL
+ localStorage.setItem(`server-icon-${serverId}`, dataURL)
+ image.value = dataURL
+ return
+ }
+ } catch (error: any) {
+ if (error?.statusCode >= 500) {
+ image.value = undefined
+ return
+ }
+
+ if (error?.statusCode === 404 && projectIconUrl) {
+ try {
+ const response = await fetch(projectIconUrl)
+ if (!response.ok) throw new Error('Failed to fetch icon')
+ const file = await response.blob()
+ const originalFile = new File([file], 'server-icon-original.png', {
+ type: 'image/png',
+ })
+
+ const dataURL = await new Promise((resolve) => {
+ const canvas = document.createElement('canvas')
+ const ctx = canvas.getContext('2d')
+ const img = new Image()
+ img.onload = () => {
+ canvas.width = 64
+ canvas.height = 64
+ ctx?.drawImage(img, 0, 0, 64, 64)
+ canvas.toBlob(async (blob) => {
+ if (blob) {
+ const scaledFile = new File([blob], 'server-icon.png', {
+ type: 'image/png',
+ })
+ client.kyros.files_v0
+ .uploadFile('/server-icon.png', scaledFile)
+ .promise.catch(() => {})
+ client.kyros.files_v0
+ .uploadFile('/server-icon-original.png', originalFile)
+ .promise.catch(() => {})
+ }
+ }, 'image/png')
+ const result = canvas.toDataURL('image/png')
+ sharedImage.value = result
+ localStorage.setItem(`server-icon-${serverId}`, result)
+ resolve(result)
+ URL.revokeObjectURL(img.src)
+ }
+ img.src = URL.createObjectURL(file)
+ })
+ image.value = dataURL
+ return
+ } catch (externalError: any) {
+ console.debug('Could not process external icon:', externalError.message)
+ }
+ }
+ }
+
+ image.value = undefined
+ }
+
+ watch(upstream, () => loadImage(), { immediate: true })
+
+ return image
+}
+
+function resizeImage(blob: Blob, size: number): Promise {
+ return new Promise((resolve) => {
+ const canvas = document.createElement('canvas')
+ const ctx = canvas.getContext('2d')
+ const img = new Image()
+ img.onload = () => {
+ canvas.width = size
+ canvas.height = size
+ ctx?.drawImage(img, 0, 0, size, size)
+ const dataURL = canvas.toDataURL('image/png')
+ resolve(dataURL)
+ URL.revokeObjectURL(img.src)
+ }
+ img.src = URL.createObjectURL(blob)
+ })
+}
diff --git a/apps/frontend/src/composables/servers/use-server-project.ts b/apps/frontend/src/composables/servers/use-server-project.ts
new file mode 100644
index 0000000000..eeb22a8b52
--- /dev/null
+++ b/apps/frontend/src/composables/servers/use-server-project.ts
@@ -0,0 +1,17 @@
+import type { Archon } from '@modrinth/api-client'
+import type { Project } from '@modrinth/utils'
+import { useQuery } from '@tanstack/vue-query'
+import { $fetch } from 'ofetch'
+import { computed, type ComputedRef } from 'vue'
+
+// TODO: Remove and use v1
+export function useServerProject(
+ upstream: ComputedRef,
+) {
+ return useQuery({
+ queryKey: computed(() => ['servers', 'project', upstream.value?.project_id ?? null]),
+ queryFn: () =>
+ $fetch(`https://api.modrinth.com/v2/project/${upstream.value!.project_id}`),
+ enabled: computed(() => !!upstream.value?.project_id),
+ })
+}
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/members.vue b/apps/frontend/src/pages/[type]/[id]/settings/members.vue
index a80d7cb676..962b1f10d8 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/members.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/members.vue
@@ -5,7 +5,6 @@
title="Are you sure you want to remove this project from the organization?"
description="If you proceed, this project will no longer be managed by the organization."
proceed-label="Remove"
- :noblur="!(cosmetics?.advancedRendering ?? true)"
@proceed="onRemoveFromOrg"
/>
@@ -352,7 +351,7 @@
- {{ formatMessage(messages.currentlyInstalled) }} -
-
-
-
-
-
-
{{ formatMessage(messages.debugInformation) }}
-
- {{ instance.linked_data }}
-
-
-
@@ -38,7 +33,6 @@
import { RightArrowIcon } from '@modrinth/assets'
import type { RouteLocationNormalized } from 'vue-router'
-import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
import type { BackupInProgressReason } from '~/pages/hosting/manage/[id].vue'
const emit = defineEmits(['reinstall'])
@@ -52,7 +46,6 @@ defineProps<{
shown?: boolean
}[]
route: RouteLocationNormalized
- server: ModrinthServer
backupInProgress?: BackupInProgressReason
}>()
diff --git a/apps/frontend/src/composables/featureFlags.ts b/apps/frontend/src/composables/featureFlags.ts
index 69195a8982..2e5f498640 100644
--- a/apps/frontend/src/composables/featureFlags.ts
+++ b/apps/frontend/src/composables/featureFlags.ts
@@ -43,6 +43,7 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({
hidePreviewBanner: false,
i18nDebug: false,
showDiscoverProjectButtons: false,
+ useV1ContentTabAPI: true,
} as const)
export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS
diff --git a/apps/frontend/src/composables/servers/modrinth-servers.ts b/apps/frontend/src/composables/servers/modrinth-servers.ts
deleted file mode 100644
index 2b02457a28..0000000000
--- a/apps/frontend/src/composables/servers/modrinth-servers.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-import type { AbstractWebNotificationManager } from '@modrinth/ui'
-import type { JWTAuth, ModuleError, ModuleName } from '@modrinth/utils'
-import { ModrinthServerError } from '@modrinth/utils'
-
-import { ContentModule, GeneralModule, NetworkModule, StartupModule } from './modules/index.ts'
-import { useServersFetch } from './servers-fetch.ts'
-
-export function handleServersError(err: any, notifications: AbstractWebNotificationManager) {
- if (err instanceof ModrinthServerError && err.v1Error) {
- notifications.addNotification({
- title: err.v1Error?.context ?? `An error occurred`,
- type: 'error',
- text: err.v1Error.description,
- errorCode: err.v1Error.error,
- })
- } else {
- notifications.addNotification({
- title: 'An error occurred',
- type: 'error',
- text: err.message ?? (err.data ? err.data.description : err),
- })
- }
-}
-
-export class ModrinthServer {
- readonly serverId: string
- private errors: Partial
-
-
-
-
-
-
-
- {{
- modpackProject
- ? modpackProject.title
- : formatMessage(messages.minecraftVersion, {
- version: instance.game_version,
+
+
+
+
-
+
+ {{ formatMessage(messages.repairInstanceTitle) }}
+
+
+ {{ formatMessage(messages.repairInstanceDescription) }}
+
+
+
-
-
-
-
-
-
-
-
-
- - {{ formatMessage(messages.platform) }} -
-- {{ formatMessage(messages.gameVersion) }} -
-
-
-
- - {{ - formatMessage(messages.loaderVersion, { - loader: formatLoader(formatMessage, loader), - }) - }} -
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
index 06e23d2e8e..3b63e07c26 100644
--- a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
@@ -1,13 +1,9 @@
+
} Array of version objects (without changelogs) or null
+ */
+export async function get_project_versions(projectId, cacheBehaviour) {
+ return await invoke('plugin:cache|get_project_versions', {
+ projectId,
+ cacheBehaviour,
+ })
+}
diff --git a/apps/app-frontend/src/helpers/pack.js b/apps/app-frontend/src/helpers/pack.js
deleted file mode 100644
index 312dfc62aa..0000000000
--- a/apps/app-frontend/src/helpers/pack.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
- * and deserialized into a usable JS object.
- */
-import { invoke } from '@tauri-apps/api/core'
-
-import { create } from './profile'
-
-// Installs pack from a version ID
-export async function create_profile_and_install(
- projectId,
- versionId,
- packTitle,
- iconUrl,
- createInstanceCallback = () => {},
-) {
- const location = {
- type: 'fromVersionId',
- project_id: projectId,
- version_id: versionId,
- title: packTitle,
- icon_url: iconUrl,
- }
- const profile_creator = await invoke('plugin:pack|pack_get_profile_from_pack', { location })
- const profile = await create(
- profile_creator.name,
- profile_creator.gameVersion,
- profile_creator.modloader,
- profile_creator.loaderVersion,
- null,
- true,
- )
- createInstanceCallback(profile)
-
- return await invoke('plugin:pack|pack_install', { location, profile })
-}
-
-export async function install_to_existing_profile(projectId, versionId, title, profilePath) {
- const location = {
- type: 'fromVersionId',
- project_id: projectId,
- version_id: versionId,
- title,
- }
- return await invoke('plugin:pack|pack_install', { location, profile: profilePath })
-}
-
-// Installs pack from a path
-export async function create_profile_and_install_from_file(path) {
- const location = {
- type: 'fromFile',
- path: path,
- }
- const profile_creator = await invoke('plugin:pack|pack_get_profile_from_pack', { location })
- const profile = await create(
- profile_creator.name,
- profile_creator.gameVersion,
- profile_creator.modloader,
- profile_creator.loaderVersion,
- null,
- true,
- )
- return await invoke('plugin:pack|pack_install', { location, profile })
-}
diff --git a/apps/app-frontend/src/helpers/pack.ts b/apps/app-frontend/src/helpers/pack.ts
new file mode 100644
index 0000000000..ae1131a3f8
--- /dev/null
+++ b/apps/app-frontend/src/helpers/pack.ts
@@ -0,0 +1,90 @@
+import { invoke } from '@tauri-apps/api/core'
+
+import { create } from './profile'
+import type { InstanceLoader } from './types'
+
+interface PackProfileCreator {
+ name: string
+ gameVersion: string
+ modloader: InstanceLoader
+ loaderVersion: string | null
+}
+
+interface PackLocationVersionId {
+ type: 'fromVersionId'
+ project_id: string
+ version_id: string
+ title: string
+ icon_url?: string
+}
+
+interface PackLocationFile {
+ type: 'fromFile'
+ path: string
+}
+
+export async function create_profile_and_install(
+ projectId: string,
+ versionId: string,
+ packTitle: string,
+ iconUrl?: string,
+ createInstanceCallback: (profile: string) => void = () => {},
+): Promise {
+ const location: PackLocationVersionId = {
+ type: 'fromVersionId',
+ project_id: projectId,
+ version_id: versionId,
+ title: packTitle,
+ icon_url: iconUrl,
+ }
+ const profile_creator = await invoke(
+ 'plugin:pack|pack_get_profile_from_pack',
+ { location },
+ )
+ const profile = await create(
+ profile_creator.name,
+ profile_creator.gameVersion,
+ profile_creator.modloader,
+ profile_creator.loaderVersion,
+ null,
+ true,
+ )
+ createInstanceCallback(profile)
+
+ return await invoke('plugin:pack|pack_install', { location, profile })
+}
+
+export async function install_to_existing_profile(
+ projectId: string,
+ versionId: string,
+ title: string,
+ profilePath: string,
+): Promise {
+ const location: PackLocationVersionId = {
+ type: 'fromVersionId',
+ project_id: projectId,
+ version_id: versionId,
+ title,
+ }
+ return await invoke('plugin:pack|pack_install', { location, profile: profilePath })
+}
+
+export async function create_profile_and_install_from_file(path: string): Promise {
+ const location: PackLocationFile = {
+ type: 'fromFile',
+ path,
+ }
+ const profile_creator = await invoke(
+ 'plugin:pack|pack_get_profile_from_pack',
+ { location },
+ )
+ const profile = await create(
+ profile_creator.name,
+ profile_creator.gameVersion,
+ profile_creator.modloader,
+ profile_creator.loaderVersion,
+ null,
+ true,
+ )
+ return await invoke('plugin:pack|pack_install', { location, profile })
+}
diff --git a/apps/app-frontend/src/helpers/profile.js b/apps/app-frontend/src/helpers/profile.js
deleted file mode 100644
index 7c3f1090f4..0000000000
--- a/apps/app-frontend/src/helpers/profile.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
- * and deserialized into a usable JS object.
- */
-import { invoke } from '@tauri-apps/api/core'
-
-import { install_to_existing_profile } from '@/helpers/pack.js'
-
-/// Add instance
-/*
- name: String, // the name of the profile, and relative path to create
- game_version: String, // the game version of the profile
- modloader: ModLoader, // the modloader to use
- - ModLoader is an enum, with the following variants: Vanilla, Forge, Fabric, Quilt
- loader_version: String, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
- icon: Path, // the icon for the profile
- - icon is a path to an image file, which will be copied into the profile directory
-*/
-
-export async function create(name, gameVersion, modloader, loaderVersion, icon, skipInstall) {
- //Trim string name to avoid "Unable to find directory"
- name = name.trim()
- return await invoke('plugin:profile-create|profile_create', {
- name,
- gameVersion,
- modloader,
- loaderVersion,
- icon,
- skipInstall,
- })
-}
-
-// duplicate a profile
-export async function duplicate(path) {
- return await invoke('plugin:profile-create|profile_duplicate', { path })
-}
-
-// Remove a profile
-export async function remove(path) {
- return await invoke('plugin:profile|profile_remove', { path })
-}
-
-// Get a profile by path
-// Returns a Profile
-export async function get(path) {
- return await invoke('plugin:profile|profile_get', { path })
-}
-
-export async function get_many(paths) {
- return await invoke('plugin:profile|profile_get_many', { paths })
-}
-
-// Get a profile's projects
-// Returns a map of a path to profile file
-export async function get_projects(path, cacheBehaviour) {
- return await invoke('plugin:profile|profile_get_projects', { path, cacheBehaviour })
-}
-
-// Get a profile's full fs path
-// Returns a path
-export async function get_full_path(path) {
- return await invoke('plugin:profile|profile_get_full_path', { path })
-}
-
-// Get's a mod's full fs path
-// Returns a path
-export async function get_mod_full_path(path, projectPath) {
- return await invoke('plugin:profile|profile_get_mod_full_path', { path, projectPath })
-}
-
-// Get optimal java version from profile
-// Returns a java version
-export async function get_optimal_jre_key(path) {
- return await invoke('plugin:profile|profile_get_optimal_jre_key', { path })
-}
-
-// Get a copy of the profile set
-// Returns hashmap of path -> Profile
-export async function list() {
- return await invoke('plugin:profile|profile_list')
-}
-
-export async function check_installed(path, projectId) {
- return await invoke('plugin:profile|profile_check_installed', { path, projectId })
-}
-
-// Installs/Repairs a profile
-export async function install(path, force) {
- return await invoke('plugin:profile|profile_install', { path, force })
-}
-
-// Updates all of a profile's projects
-export async function update_all(path) {
- return await invoke('plugin:profile|profile_update_all', { path })
-}
-
-// Updates a specified project
-export async function update_project(path, projectPath) {
- return await invoke('plugin:profile|profile_update_project', { path, projectPath })
-}
-
-// Add a project to a profile from a version
-// Returns a path to the new project file
-export async function add_project_from_version(path, versionId) {
- return await invoke('plugin:profile|profile_add_project_from_version', { path, versionId })
-}
-
-// Add a project to a profile from a path + project_type
-// Returns a path to the new project file
-export async function add_project_from_path(path, projectPath, projectType) {
- return await invoke('plugin:profile|profile_add_project_from_path', {
- path,
- projectPath,
- projectType,
- })
-}
-
-// Toggle disabling a project
-export async function toggle_disable_project(path, projectPath) {
- return await invoke('plugin:profile|profile_toggle_disable_project', { path, projectPath })
-}
-
-// Remove a project
-export async function remove_project(path, projectPath) {
- return await invoke('plugin:profile|profile_remove_project', { path, projectPath })
-}
-
-// Update a managed Modrinth profile to a specific version
-export async function update_managed_modrinth_version(path, versionId) {
- return await invoke('plugin:profile|profile_update_managed_modrinth_version', {
- path,
- versionId,
- })
-}
-
-// Repair a managed Modrinth profile
-export async function update_repair_modrinth(path) {
- return await invoke('plugin:profile|profile_repair_managed_modrinth', { path })
-}
-
-// Export a profile to .mrpack
-/// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
-// Version id is optional (ie: 1.1.5)
-export async function export_profile_mrpack(
- path,
- exportLocation,
- includedOverrides,
- versionId,
- description,
- name,
-) {
- return await invoke('plugin:profile|profile_export_mrpack', {
- path,
- exportLocation,
- includedOverrides,
- versionId,
- description,
- name,
- })
-}
-
-// Given a folder path, populate an array of all the subfolders
-// Intended to be used for finding potential override folders
-// profile
-// -- mods
-// -- resourcepacks
-// -- file1
-// => [mods, resourcepacks]
-// allows selection for 'included_overrides' in export_profile_mrpack
-export async function get_pack_export_candidates(profilePath) {
- return await invoke('plugin:profile|profile_get_pack_export_candidates', { profilePath })
-}
-
-// Run Minecraft using a pathed profile
-// Returns PID of child
-export async function run(path) {
- return await invoke('plugin:profile|profile_run', { path })
-}
-
-export async function kill(path) {
- return await invoke('plugin:profile|profile_kill', { path })
-}
-
-// Edits a profile
-export async function edit(path, editProfile) {
- return await invoke('plugin:profile|profile_edit', { path, editProfile })
-}
-
-// Edits a profile's icon
-export async function edit_icon(path, iconPath) {
- return await invoke('plugin:profile|profile_edit_icon', { path, iconPath })
-}
-
-export async function finish_install(instance) {
- if (instance.install_stage !== 'pack_installed') {
- let linkedData = instance.linked_data
- await install_to_existing_profile(
- linkedData.project_id,
- linkedData.version_id,
- instance.name,
- instance.path,
- )
- } else {
- await install(instance.path, false)
- }
-}
diff --git a/apps/app-frontend/src/helpers/profile.ts b/apps/app-frontend/src/helpers/profile.ts
new file mode 100644
index 0000000000..5107c34b93
--- /dev/null
+++ b/apps/app-frontend/src/helpers/profile.ts
@@ -0,0 +1,287 @@
+/**
+ * All theseus API calls return serialized values (both return values and errors);
+ * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * and deserialized into a usable JS object.
+ */
+import type { Labrinth } from '@modrinth/api-client'
+import type { ContentItem, ContentOwner } from '@modrinth/ui'
+import { invoke } from '@tauri-apps/api/core'
+
+import { install_to_existing_profile } from '@/helpers/pack'
+
+import type {
+ CacheBehaviour,
+ ContentFile,
+ ContentFileProjectType,
+ GameInstance,
+ InstanceLoader,
+} from './types'
+
+// Add instance
+/*
+ name: String, // the name of the profile, and relative path to create
+ game_version: String, // the game version of the profile
+ modloader: ModLoader, // the modloader to use
+ - ModLoader is an enum, with the following variants: Vanilla, Forge, Fabric, Quilt
+ loader_version: String, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
+ icon: Path, // the icon for the profile
+ - icon is a path to an image file, which will be copied into the profile directory
+*/
+
+export async function create(
+ name: string,
+ gameVersion: string,
+ modloader: InstanceLoader,
+ loaderVersion: string | null,
+ icon: string | null,
+ skipInstall: boolean,
+): Promise {
+ // Trim string name to avoid "Unable to find directory"
+ name = name.trim()
+ return await invoke('plugin:profile-create|profile_create', {
+ name,
+ gameVersion,
+ modloader,
+ loaderVersion,
+ icon,
+ skipInstall,
+ })
+}
+
+// duplicate a profile
+export async function duplicate(path: string): Promise {
+ return await invoke('plugin:profile-create|profile_duplicate', { path })
+}
+
+// Remove a profile
+export async function remove(path: string): Promise {
+ return await invoke('plugin:profile|profile_remove', { path })
+}
+
+// Get a profile by path
+// Returns a Profile
+export async function get(path: string): Promise {
+ return await invoke('plugin:profile|profile_get', { path })
+}
+
+export async function get_many(paths: string[]): Promise {
+ return await invoke('plugin:profile|profile_get_many', { paths })
+}
+
+// Get a profile's projects
+// Returns a map of a path to profile file
+export async function get_projects(
+ path: string,
+ cacheBehaviour?: CacheBehaviour,
+): Promise> {
+ return await invoke('plugin:profile|profile_get_projects', { path, cacheBehaviour })
+}
+
+// Get content items with rich metadata for a profile
+// Returns content items filtered to exclude modpack files (if linked),
+// sorted alphabetically by project name
+export async function get_content_items(
+ path: string,
+ cacheBehaviour?: CacheBehaviour,
+): Promise {
+ return await invoke('plugin:profile|profile_get_content_items', { path, cacheBehaviour })
+}
+
+// Linked modpack info returned from backend
+export interface LinkedModpackInfo {
+ project: Labrinth.Projects.v2.Project
+ version: Labrinth.Versions.v2.Version
+ owner: ContentOwner | null
+ has_update: boolean
+ update_version_id: string | null
+ update_version: Labrinth.Versions.v2.Version | null
+}
+
+// Get linked modpack info for a profile
+// Returns project, version, and owner information for the linked modpack,
+// or null if the profile is not linked to a modpack
+export async function get_linked_modpack_info(
+ path: string,
+ cacheBehaviour?: CacheBehaviour,
+): Promise {
+ return await invoke('plugin:profile|profile_get_linked_modpack_info', { path, cacheBehaviour })
+}
+
+// Get content items that are part of the linked modpack
+// Returns the modpack's dependencies as ContentItem list
+// Returns empty array if the profile is not linked to a modpack
+export async function get_linked_modpack_content(
+ path: string,
+ cacheBehaviour?: CacheBehaviour,
+): Promise {
+ return await invoke('plugin:profile|profile_get_linked_modpack_content', { path, cacheBehaviour })
+}
+
+// Convert a list of dependencies into ContentItems with rich metadata
+export async function get_dependencies_as_content_items(
+ dependencies: Labrinth.Versions.v3.Dependency[],
+ cacheBehaviour?: CacheBehaviour,
+): Promise {
+ return await invoke('plugin:profile|profile_get_dependencies_as_content_items', {
+ dependencies,
+ cacheBehaviour,
+ })
+}
+
+// Get a profile's full fs path
+// Returns a path
+export async function get_full_path(path: string): Promise {
+ return await invoke('plugin:profile|profile_get_full_path', { path })
+}
+
+// Get's a mod's full fs path
+// Returns a path
+export async function get_mod_full_path(path: string, projectPath: string): Promise {
+ return await invoke('plugin:profile|profile_get_mod_full_path', { path, projectPath })
+}
+
+// Get optimal java version from profile
+// Returns a java version
+export async function get_optimal_jre_key(path: string): Promise {
+ return await invoke('plugin:profile|profile_get_optimal_jre_key', { path })
+}
+
+// Get a copy of the profile set
+// Returns hashmap of path -> Profile
+export async function list(): Promise {
+ return await invoke('plugin:profile|profile_list')
+}
+
+export async function check_installed(path: string, projectId: string): Promise {
+ return await invoke('plugin:profile|profile_check_installed', { path, projectId })
+}
+
+// Installs/Repairs a profile
+export async function install(path: string, force: boolean): Promise {
+ return await invoke('plugin:profile|profile_install', { path, force })
+}
+
+// Updates all of a profile's projects
+export async function update_all(path: string): Promise> {
+ return await invoke('plugin:profile|profile_update_all', { path })
+}
+
+// Updates a specified project
+export async function update_project(path: string, projectPath: string): Promise {
+ return await invoke('plugin:profile|profile_update_project', { path, projectPath })
+}
+
+// Add a project to a profile from a version
+// Returns a path to the new project file
+export async function add_project_from_version(path: string, versionId: string): Promise {
+ return await invoke('plugin:profile|profile_add_project_from_version', { path, versionId })
+}
+
+// Add a project to a profile from a path + project_type
+// Returns a path to the new project file
+export async function add_project_from_path(
+ path: string,
+ projectPath: string,
+ projectType?: ContentFileProjectType,
+): Promise {
+ return await invoke('plugin:profile|profile_add_project_from_path', {
+ path,
+ projectPath,
+ projectType,
+ })
+}
+
+// Toggle disabling a project
+export async function toggle_disable_project(path: string, projectPath: string): Promise {
+ return await invoke('plugin:profile|profile_toggle_disable_project', { path, projectPath })
+}
+
+// Remove a project
+export async function remove_project(path: string, projectPath: string): Promise {
+ return await invoke('plugin:profile|profile_remove_project', { path, projectPath })
+}
+
+// Update a managed Modrinth profile to a specific version
+export async function update_managed_modrinth_version(
+ path: string,
+ versionId: string,
+): Promise {
+ return await invoke('plugin:profile|profile_update_managed_modrinth_version', {
+ path,
+ versionId,
+ })
+}
+
+// Repair a managed Modrinth profile
+export async function update_repair_modrinth(path: string): Promise {
+ return await invoke('plugin:profile|profile_repair_managed_modrinth', { path })
+}
+
+// Export a profile to .mrpack
+// included_overrides is an array of paths to override folders to include (ie: 'mods', 'resource_packs')
+// Version id is optional (ie: 1.1.5)
+export async function export_profile_mrpack(
+ path: string,
+ exportLocation: string,
+ includedOverrides: string[],
+ versionId?: string,
+ description?: string,
+ name?: string,
+): Promise {
+ return await invoke('plugin:profile|profile_export_mrpack', {
+ path,
+ exportLocation,
+ includedOverrides,
+ versionId,
+ description,
+ name,
+ })
+}
+
+// Given a folder path, populate an array of all the subfolders
+// Intended to be used for finding potential override folders
+// profile
+// -- mods
+// -- resourcepacks
+// -- file1
+// => [mods, resourcepacks]
+// allows selection for 'included_overrides' in export_profile_mrpack
+export async function get_pack_export_candidates(profilePath: string): Promise {
+ return await invoke('plugin:profile|profile_get_pack_export_candidates', { profilePath })
+}
+
+// Run Minecraft using a pathed profile
+// Returns PID of child
+export async function run(path: string): Promise {
+ return await invoke('plugin:profile|profile_run', { path })
+}
+
+export async function kill(path: string): Promise {
+ return await invoke('plugin:profile|profile_kill', { path })
+}
+
+// Edits a profile
+export async function edit(path: string, editProfile: Partial): Promise {
+ return await invoke('plugin:profile|profile_edit', { path, editProfile })
+}
+
+// Edits a profile's icon
+export async function edit_icon(path: string, iconPath: string | null): Promise {
+ return await invoke('plugin:profile|profile_edit_icon', { path, iconPath })
+}
+
+export async function finish_install(instance: GameInstance): Promise {
+ if (instance.install_stage !== 'pack_installed') {
+ const linkedData = instance.linked_data
+ if (linkedData) {
+ await install_to_existing_profile(
+ linkedData.project_id,
+ linkedData.version_id,
+ instance.name,
+ instance.path,
+ )
+ }
+ } else {
+ await install(instance.path, false)
+ }
+}
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 8e6ac8b416..c3b46e3d49 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -49,17 +49,10 @@ type LinkedData = {
type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
type ContentFile = {
- hash: string
- file_name: string
- size: number
- metadata?: FileMetadata
- update_version_id?: string
- project_type: ContentFileProjectType
-}
-
-type FileMetadata = {
- project_id: string
- version_id: string
+ metadata?: {
+ project_id: string
+ version_id: string
+ }
}
type ContentFileProjectType = 'mod' | 'datapack' | 'resourcepack' | 'shaderpack'
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index d621401151..e00dfc9aec 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -5,6 +5,66 @@
"app.auth-servers.unreachable.header": {
"message": "Cannot reach authentication servers"
},
+ "app.export-modal.description-placeholder": {
+ "message": "Enter modpack description..."
+ },
+ "app.export-modal.export-button": {
+ "message": "Export"
+ },
+ "app.export-modal.header": {
+ "message": "Export modpack"
+ },
+ "app.export-modal.modpack-name-label": {
+ "message": "Modpack Name"
+ },
+ "app.export-modal.modpack-name-placeholder": {
+ "message": "Modpack name"
+ },
+ "app.export-modal.select-files-label": {
+ "message": "Select files and folders to include in pack"
+ },
+ "app.export-modal.version-number-label": {
+ "message": "Version number"
+ },
+ "app.export-modal.version-number-placeholder": {
+ "message": "1.0.0"
+ },
+ "app.instance.mods.content-type-project": {
+ "message": "project"
+ },
+ "app.instance.mods.copy-link": {
+ "message": "Copy link"
+ },
+ "app.instance.mods.installing": {
+ "message": "Installing..."
+ },
+ "app.instance.mods.modpack-fallback": {
+ "message": "Modpack"
+ },
+ "app.instance.mods.project-was-added": {
+ "message": "\"{name}\" was added"
+ },
+ "app.instance.mods.projects-were-added": {
+ "message": "{count} projects were added"
+ },
+ "app.instance.mods.share-text": {
+ "message": "Check out the projects I'm using in my modpack!"
+ },
+ "app.instance.mods.share-title": {
+ "message": "Sharing modpack content"
+ },
+ "app.instance.mods.show-file": {
+ "message": "Show file"
+ },
+ "app.instance.mods.successfully-uploaded": {
+ "message": "Successfully uploaded"
+ },
+ "app.instance.mods.unknown-version": {
+ "message": "Unknown"
+ },
+ "app.instance.mods.updating": {
+ "message": "Updating..."
+ },
"app.modal.install-to-play.header": {
"message": "Install to play"
},
@@ -230,12 +290,6 @@
"instance.edit-world.title": {
"message": "Edit world"
},
- "instance.filter.disabled": {
- "message": "Disabled projects"
- },
- "instance.filter.updates-available": {
- "message": "Updates available"
- },
"instance.server-modal.address": {
"message": "Address"
},
@@ -350,54 +404,24 @@
"instance.settings.tabs.installation.change-version.already-installed.vanilla": {
"message": "Vanilla {game_version} already installed"
},
- "instance.settings.tabs.installation.change-version.button": {
- "message": "Change version"
- },
"instance.settings.tabs.installation.change-version.button.install": {
"message": "Install"
},
"instance.settings.tabs.installation.change-version.button.installing": {
"message": "Installing"
},
- "instance.settings.tabs.installation.change-version.cannot-while-fetching": {
- "message": "Fetching modpack versions"
- },
- "instance.settings.tabs.installation.change-version.in-progress": {
- "message": "Installing new version"
- },
- "instance.settings.tabs.installation.currently-installed": {
- "message": "Currently installed"
- },
- "instance.settings.tabs.installation.debug-information": {
- "message": "Debug information:"
- },
- "instance.settings.tabs.installation.fetching-modpack-details": {
- "message": "Fetching modpack details"
- },
"instance.settings.tabs.installation.game-version": {
"message": "Game version"
},
- "instance.settings.tabs.installation.install": {
- "message": "Install"
- },
"instance.settings.tabs.installation.install.in-progress": {
"message": "Installation in progress"
},
"instance.settings.tabs.installation.loader-version": {
"message": "{loader} version"
},
- "instance.settings.tabs.installation.minecraft-version": {
- "message": "Minecraft {version}"
- },
- "instance.settings.tabs.installation.no-connection": {
- "message": "Cannot fetch linked modpack details. Please check your internet connection."
- },
"instance.settings.tabs.installation.no-loader-versions": {
"message": "{loader} is not available for Minecraft {version}. Try another mod loader."
},
- "instance.settings.tabs.installation.no-modpack-found": {
- "message": "This instance is linked to a modpack, but the modpack could not be found on Modrinth."
- },
"instance.settings.tabs.installation.platform": {
"message": "Platform"
},
@@ -413,12 +437,6 @@
"instance.settings.tabs.installation.reinstall.confirm.title": {
"message": "Are you sure you want to reinstall this instance?"
},
- "instance.settings.tabs.installation.reinstall.description": {
- "message": "Resets the instance's content to its original state, removing any mods or content you have added on top of the original modpack."
- },
- "instance.settings.tabs.installation.reinstall.title": {
- "message": "Reinstall modpack"
- },
"instance.settings.tabs.installation.repair.button": {
"message": "Repair"
},
@@ -431,18 +449,18 @@
"instance.settings.tabs.installation.repair.confirm.title": {
"message": "Repair instance?"
},
+ "instance.settings.tabs.installation.repair.description": {
+ "message": "Reinstalls Minecraft dependencies and checks for corruption. This may resolve issues if your game is not launching due to launcher-related errors."
+ },
"instance.settings.tabs.installation.repair.in-progress": {
"message": "Repair in progress"
},
+ "instance.settings.tabs.installation.repair.title": {
+ "message": "Repair instance"
+ },
"instance.settings.tabs.installation.reset-selections": {
"message": "Reset to current"
},
- "instance.settings.tabs.installation.show-all-versions": {
- "message": "Show all versions"
- },
- "instance.settings.tabs.installation.tooltip.action.change-version": {
- "message": "change version"
- },
"instance.settings.tabs.installation.tooltip.action.install": {
"message": "install"
},
@@ -461,24 +479,6 @@
"instance.settings.tabs.installation.tooltip.cannot-while-repairing": {
"message": "Cannot {action} while repairing"
},
- "instance.settings.tabs.installation.unknown-version": {
- "message": "(unknown version)"
- },
- "instance.settings.tabs.installation.unlink.button": {
- "message": "Unlink instance"
- },
- "instance.settings.tabs.installation.unlink.confirm.description": {
- "message": "If you proceed, you will not be able to re-link it without creating an entirely new instance. You will no longer receive modpack updates and it will become a normal."
- },
- "instance.settings.tabs.installation.unlink.confirm.title": {
- "message": "Are you sure you want to unlink this instance?"
- },
- "instance.settings.tabs.installation.unlink.description": {
- "message": "This instance is linked to a modpack, which means mods can't be updated and you can't change the mod loader or Minecraft version. Unlinking will permanently disconnect this instance from the modpack."
- },
- "instance.settings.tabs.installation.unlink.title": {
- "message": "Unlink from modpack"
- },
"instance.settings.tabs.java": {
"message": "Java and memory"
},
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index 76b00f318f..01e2bad568 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -72,6 +72,10 @@ const instance: Ref = ref(null)
const instanceProjects: Ref = ref(null)
const instanceHideInstalled = ref(false)
const newlyInstalled = ref([])
+// Non-reactive snapshot used by instanceFilters to avoid triggering a search
+// refresh when an item is installed mid-browse (which causes content shift).
+// Synced before each search triggered by filter/page/query changes.
+let newlyInstalledSnapshot: string[] = []
const PERSISTENT_QUERY_PARAMS = ['i', 'ai']
@@ -128,7 +132,7 @@ const instanceFilters = computed(() => {
.filter((x) => x.metadata)
.map((x) => x.metadata.project_id)
- installedMods.push(...newlyInstalled.value)
+ installedMods.push(...newlyInstalledSnapshot)
installedMods
?.map((x) => ({
@@ -206,6 +210,7 @@ watch(requestParams, () => {
})
async function refreshSearch() {
+ newlyInstalledSnapshot = [...newlyInstalled.value]
let rawResults = await get_search_results(requestParams.value)
if (!rawResults) {
rawResults = {
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index 5e8b0a856e..5146b30286 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -1,1178 +1,704 @@
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FileItem.vue b/apps/frontend/src/components/ui/servers/FileItem.vue
deleted file mode 100644
index 338d351181..0000000000
--- a/apps/frontend/src/components/ui/servers/FileItem.vue
+++ /dev/null
@@ -1,352 +0,0 @@
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FileManagerError.vue b/apps/frontend/src/components/ui/servers/FileManagerError.vue
deleted file mode 100644
index 84adf75b66..0000000000
--- a/apps/frontend/src/components/ui/servers/FileManagerError.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesContextMenu.vue b/apps/frontend/src/components/ui/servers/FilesContextMenu.vue
deleted file mode 100644
index 2a3a5aaad1..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesContextMenu.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesDeleteItemModal.vue b/apps/frontend/src/components/ui/servers/FilesDeleteItemModal.vue
deleted file mode 100644
index d5cd6f1382..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesDeleteItemModal.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesEditingNavbar.vue b/apps/frontend/src/components/ui/servers/FilesEditingNavbar.vue
deleted file mode 100644
index cb5cf5111d..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesEditingNavbar.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesEditor.vue b/apps/frontend/src/components/ui/servers/FilesEditor.vue
deleted file mode 100644
index f9961a130a..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesEditor.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesRenameItemModal.vue b/apps/frontend/src/components/ui/servers/FilesRenameItemModal.vue
deleted file mode 100644
index bcb3fdeece..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesRenameItemModal.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadConflictModal.vue b/apps/frontend/src/components/ui/servers/FilesUploadConflictModal.vue
deleted file mode 100644
index b655d29d5e..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesUploadConflictModal.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadDragAndDrop.vue b/apps/frontend/src/components/ui/servers/FilesUploadDragAndDrop.vue
deleted file mode 100644
index 773e015ad1..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesUploadDragAndDrop.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/InstallingTicker.vue b/apps/frontend/src/components/ui/servers/InstallingTicker.vue
deleted file mode 100644
index 5d43a284cb..0000000000
--- a/apps/frontend/src/components/ui/servers/InstallingTicker.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ await nextTick()
-
+ await initProjects()
+})
-
+onUnmounted(() => {
+ removeBeforeEach()
+ unlisten()
+ unlistenProfiles()
+})
+
diff --git a/apps/app-frontend/src/pages/library/Index.vue b/apps/app-frontend/src/pages/library/Index.vue
index df3e39b154..c21af76acd 100644
--- a/apps/app-frontend/src/pages/library/Index.vue
+++ b/apps/app-frontend/src/pages/library/Index.vue
@@ -1,17 +1,17 @@
diff --git a/apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue b/apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue
index c918fe974a..9ad8d20819 100644
--- a/apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue
+++ b/apps/frontend/src/components/ui/create-project-version/CreateProjectVersionModal.vue
@@ -4,6 +4,7 @@
:stages="ctx.stageConfigs"
:context="ctx"
:breadcrumbs="!editingVersion"
+ :close-on-click-outside="false"
@hide="() => (modalOpen = false)"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ :loading="loadingVersions"
+ :loading-changelog="loadingChangelog"
+ @update="handleModalUpdate"
+ @cancel="resetUpdateState"
+ @version-select="handleVersionSelect"
+ @version-hover="handleVersionHover"
+ />
-
-
-
-
- 
- You haven't added any content to this instance yet.
-
-
- You haven't added any content to this instance yet.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Your server was created using a modpack. It's recommended to use the modpack's version of
- the mod.
-
-
-
-
-
-
-
- Show any beta and alpha releases
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formattedVersions.game_versions[0] }}
-
-
- {{ formattedVersions.loaders[0] }}
-
-
-
- {{ type }} version
- - - {{ - noCompatibleVersions - ? `No compatible versions of this ${type.toLowerCase()} were found` - : versionFilter - ? 'Game version and platform is provided by the server' - : 'Incompatible game version and platform versions are unlocked' - }} - -
-- {{ - noCompatibleVersions - ? `No versions compatible with your server were found. You can still select any available version.` - : versionFilter - ? `Unlocking this filter may allow you to change this ${type.toLowerCase()} - to an incompatible version.` - : "You might see versions listed that aren't compatible with your server configuration." - }} -
-
- {{
- filtersRef?.selectedPlatforms.length === 0
- ? 'All platforms'
- : filtersRef?.selectedPlatforms
- .map((x) => {
- return formatLoader(formatMessage, x)
- })
- .join(', ')
- }}
-
-
-
-
- {{
- filtersRef?.selectedGameVersions.length === 0
- ? 'All game versions'
- : filtersRef?.selectedGameVersions.join(', ')
- }}
-
-
-
-
- Something went wrong trying to load versions for this
- {{ type.toLocaleLowerCase() }}. Please try again later or contact support if the issue
- persists.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ name }}
-
-
-
-
- {{ formattedSize }}
-
-
- {{ formattedCreationDate }}
-
-
- {{ formattedModifiedDate }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FileVirtualList.vue b/apps/frontend/src/components/ui/servers/FileVirtualList.vue
deleted file mode 100644
index 800783aa0e..0000000000
--- a/apps/frontend/src/components/ui/servers/FileVirtualList.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
- {{ title }}
-- {{ message }} -
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue b/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue
deleted file mode 100644
index 6c70ee9ae9..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesBrowseNavbar.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
- -
-
-
-
-
-
- New file
- New folder
- Upload file
-
- Upload from .zip file
-
-
- Upload from .zip URL
-
-
- Install CurseForge pack
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesCreateItemModal.vue b/apps/frontend/src/components/ui/servers/FilesCreateItemModal.vue
deleted file mode 100644
index 4ac3e3044e..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesCreateItemModal.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
- Save
- Save as...
-
-
- Save & restart
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesImageViewer.vue b/apps/frontend/src/components/ui/servers/FilesImageViewer.vue
deleted file mode 100644
index e05024c8a5..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesImageViewer.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesLabelBar.vue b/apps/frontend/src/components/ui/servers/FilesLabelBar.vue
deleted file mode 100644
index 72bf21a295..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesLabelBar.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesMoveItemModal.vue b/apps/frontend/src/components/ui/servers/FilesMoveItemModal.vue
deleted file mode 100644
index 3798073117..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesMoveItemModal.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
- ![Viewed image]()
-
-
-
- {{ state.errorMessage || 'Invalid or empty image file.' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - Over 100 files will be overwritten if you proceed with extraction; here is just some of - them: - - - The following {{ files.length }} files already exist on your server, and will be - overwritten if you proceed with extraction: - -
--
-
-
-
{{ file }} -
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue b/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
deleted file mode 100644
index 344e3d06c5..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesUploadDropdown.vue
+++ /dev/null
@@ -1,335 +0,0 @@
-
-
-
-
-
- - Drop {{ type ? type.toLocaleLowerCase() : 'file' }}s here to upload -
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue b/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
deleted file mode 100644
index 98a7ae24ec..0000000000
--- a/apps/frontend/src/components/ui/servers/FilesUploadZipUrlModal.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.file.name }}
- {{ item.size }}
-
-
-
- Done
-
-
- Failed - File already exists
-
-
- Failed - {{ item.error?.message || 'An unexpected error occured.' }}
-
-
- Failed - Incorrect file type
-
-
-
- {{ item.progress }}%
-
-
-
-
-
- Cancelled
-
-
- {{ item.progress }}%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
index 2c9072a731..e7b0c74ed7 100644
--- a/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformChangeModpackVersionModal.vue
@@ -64,15 +64,22 @@
diff --git a/apps/frontend/src/components/ui/servers/ServerInstallation.vue b/apps/frontend/src/components/ui/servers/ServerInstallation.vue
deleted file mode 100644
index 0168d4f203..0000000000
--- a/apps/frontend/src/components/ui/servers/ServerInstallation.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-
-
-
-
- {{ message }}
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/ServerSidebar.vue b/apps/frontend/src/components/ui/servers/ServerSidebar.vue
index 32534c0a52..1f517a9645 100644
--- a/apps/frontend/src/components/ui/servers/ServerSidebar.vue
+++ b/apps/frontend/src/components/ui/servers/ServerSidebar.vue
@@ -24,12 +24,7 @@
-
-
-
-
-
-
-
-
-
-
- Modpack
-
- Update available
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Something went wrong while loading your modpack.
-- {{ versionsError || currentVersionError }} -
-
-
-
-
-
- or
-
-
-
-
-
-
-
-
- Platform
-Your server's platform is the software that runs mods and plugins.
-
-
-
-
-
-
@@ -563,7 +562,6 @@ const {
invalidate,
} = injectProjectPageContext()
-const cosmetics = useCosmetics()
const auth = await useAuth()
const allTeamMembers = ref([])
diff --git a/apps/frontend/src/pages/collection/[id].vue b/apps/frontend/src/pages/collection/[id].vue
index 219affc498..a7fdedf8d0 100644
--- a/apps/frontend/src/pages/collection/[id].vue
+++ b/apps/frontend/src/pages/collection/[id].vue
@@ -347,24 +347,16 @@
-
+
+
+
+
+
+
+
@@ -374,7 +366,6 @@ import {
ChevronLeftIcon,
CompassIcon,
EditIcon,
- EmptyIllustration,
GlobeIcon,
HeartMinusIcon,
LinkIcon,
@@ -395,6 +386,7 @@ import {
ConfirmModal,
defineMessage,
defineMessages,
+ EmptyState,
FileInput,
HorizontalRule,
injectModrinthClient,
diff --git a/apps/frontend/src/pages/dashboard/revenue/transfers.vue b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
index 3b08a8195a..93dd0b4c50 100644
--- a/apps/frontend/src/pages/dashboard/revenue/transfers.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
@@ -72,14 +72,11 @@
-
+
-
-
-
-
-
-
-
-
- {{
- formatMessage(messages.noProjectsLabel)
- }}
-
-
- {{
- formatMessage(messages.noTransactions)
- }}
- {{
- formatMessage(messages.noTransactionsDesc)
- }}
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- Failed to load content
-- We couldn't load your server's {{ type.toLowerCase() }}s. Here's what we know: - {{ - JSON.stringify(server.moduleErrors.content.error) - }} -
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/index.vue b/apps/frontend/src/pages/hosting/manage/[id]/index.vue
index 4d39cbff51..be987c76cf 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/index.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/index.vue
@@ -182,13 +182,12 @@
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/options/network.vue b/apps/frontend/src/pages/hosting/manage/[id]/options/network.vue
index 397e67402e..f9fd5f60eb 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/options/network.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/options/network.vue
@@ -58,7 +58,7 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ filterMethodLabel }}
-
-
-
- All {{ type.toLocaleLowerCase() }}s
- Only enabled
- Only disabled
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ friendlyModName(mod) }}
-
-
-
-
- by {{ mod.owner }}
-
- {{ mod.version_number || `External ${type.toLocaleLowerCase()}` }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - No {{ type.toLocaleLowerCase() }}s found for your query! -
-Try another query, or show everything.
-
-
- No {{ type.toLocaleLowerCase() }}s found!
-- Add some {{ type.toLocaleLowerCase() }}s to your server to manage them here. -
-
-
-
-
-
-
-
-
-
-
-
- Your server is running Vanilla Minecraft
-- Add content to your server by installing a modpack or choosing a different platform that - supports {{ type }}s. -
-
-
-
-
-
-
-
-
-
-
- or
-
@@ -72,10 +72,10 @@
+
@@ -249,7 +249,7 @@
We couldn't load your server's network settings. Here's what we know: {{ - JSON.stringify(server.moduleErrors.network.error) + allocationsError?.message ?? 'Unknown error' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Failed to load startup settings
-- We couldn't load your server's startup settings. Here's what we know: -
-- {{ - JSON.stringify(server.moduleErrors.startup.error) - }} -
-
+
@@ -42,7 +16,7 @@
-
+
+
+
@@ -74,164 +57,190 @@
-
+
+
+
Runtime
The Java runtime your server will use.
-
+
+
+