@@ -764,6 +766,11 @@ const { data: serversData } = useQuery({ queryFn: () => client.archon.servers_v0.list(), }) +const { data: serverFullList } = useQuery({ + queryKey: ['servers', 'v1'], + queryFn: () => client.archon.servers_v1.list(), +}) + const midasProduct = ref(products.find((x) => x.metadata?.type === 'midas')) const midasSubscription = computed(() => subscriptions.value?.find( @@ -919,6 +926,13 @@ const getPyroCharge = (subscription) => { ) } +const getCancellationDate = (subscription) => { + const charge = getPyroCharge(subscription) + if (!charge) return null + if (charge.status === 'cancelled') return charge.due + return null +} + const getProductSize = (product) => { if (!product || !product.metadata) return 'Unknown' const ramSize = product.metadata.ram @@ -982,6 +996,46 @@ const resubscribePyro = async (subscriptionId, wasSuspended) => { } } +function getLatestBackupDownload(serverInfo) { + const serverFull = serverFullList.value?.find((s) => s.id === serverInfo.server_id) + if (!serverFull) return null + + const activeWorld = serverFull.worlds.find((w) => w.is_active) ?? serverFull.worlds[0] + if (!activeWorld?.backups?.length) return null + + const latestBackup = activeWorld.backups + .filter((b) => b.status === 'done') + .sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())[0] + if (!latestBackup) return null + + return async () => { + try { + const server = await client.archon.servers_v0.get(serverInfo.server_id) + const kyrosUrl = server.node?.instance + const jwt = server.node?.token + if (!kyrosUrl || !jwt) { + addNotification({ + title: 'Download unavailable', + text: 'Server connection info is not available. Please contact support.', + type: 'error', + }) + return + } + + window.open( + `https://${kyrosUrl}/modrinth/v0/backups/${latestBackup.id}/download?auth=${jwt}`, + '_blank', + ) + } catch { + addNotification({ + title: 'Download failed', + text: 'An error occurred while trying to download the backup.', + type: 'error', + }) + } + } +} + const refresh = async () => { await Promise.all([ queryClient.invalidateQueries({ queryKey: ['billing'] }), diff --git a/packages/api-client/src/platform/tauri.ts b/packages/api-client/src/platform/tauri.ts index 357a73ab7e..7e57fc2a53 100644 --- a/packages/api-client/src/platform/tauri.ts +++ b/packages/api-client/src/platform/tauri.ts @@ -103,8 +103,11 @@ export class TauriModrinthClient extends XHRUploadClient { throw error } - const data = await response.json() - return data as T + const text = await response.text() + if (!text) { + return undefined as T + } + return JSON.parse(text) as T } catch (error) { throw this.normalizeError(error) } diff --git a/packages/ui/.storybook/preview.ts b/packages/ui/.storybook/preview.ts index d775c85df0..9b340008eb 100644 --- a/packages/ui/.storybook/preview.ts +++ b/packages/ui/.storybook/preview.ts @@ -1,15 +1,22 @@ -import '@modrinth/assets/omorphia.scss' import 'floating-vue/dist/style.css' -import '../src/styles/tailwind.css' +import '../../assets/styles/defaults.scss' +// frontend css imports +// import '../../../apps/frontend/src/assets/styles/global.scss' +// import '../../../apps/frontend/src/assets/styles/tailwind.css' +// --- +// app-frontend css imports +import '../../../apps/app-frontend/src/assets/stylesheets/global.scss' import type { Labrinth } from '@modrinth/api-client' import { GenericModrinthClient } from '@modrinth/api-client' import { withThemeByClassName } from '@storybook/addon-themes' import type { Preview } from '@storybook/vue3-vite' import { setup } from '@storybook/vue3-vite' +import { QueryClient, VueQueryPlugin } from '@tanstack/vue-query' import FloatingVue from 'floating-vue' -import { defineComponent, ref } from 'vue' +import { computed, defineComponent, h, ref } from 'vue' import { createI18n } from 'vue-i18n' +import { createMemoryHistory, createRouter } from 'vue-router' import NotificationPanel from '../src/components/nav/NotificationPanel.vue' import PopupNotificationPanel from '../src/components/nav/PopupNotificationPanel.vue' @@ -109,9 +116,68 @@ class StorybookPopupNotificationManager extends AbstractPopupNotificationManager } } +const StorybookLink = defineComponent({ + name: 'StorybookLink', + inheritAttrs: false, + props: { + to: { + type: [String, Object], + default: '', + }, + }, + setup(props, { attrs, slots }) { + const href = computed(() => { + if (typeof props.to === 'string') return props.to || '#' + if (props.to && typeof props.to === 'object' && 'path' in props.to) { + const path = props.to.path + return typeof path === 'string' ? path : '#' + } + return '#' + }) + + return () => + h( + 'a', + { + ...attrs, + href: href.value, + }, + slots.default?.(), + ) + }, +}) + +const StorybookClientOnly = defineComponent({ + name: 'StorybookClientOnly', + setup(_, { slots }) { + return () => slots.default?.() + }, +}) + setup((app) => { + const queryClient = new QueryClient({ + defaultOptions: { + queries: { + retry: false, + }, + mutations: { + retry: false, + }, + }, + }) + app.use(VueQueryPlugin, { queryClient }) app.use(i18n) + const router = createRouter({ + history: createMemoryHistory(), + routes: [{ path: '/:pathMatch(.*)*', component: { render: () => null } }], + }) + app.use(router) + + app.component('NuxtLink', StorybookLink) + app.component('RouterLink', StorybookLink) + app.component('ClientOnly', StorybookClientOnly) + // Provide the custom I18nContext for components using injectI18n() const i18nContext: I18nContext = { locale: i18n.global.locale, diff --git a/packages/ui/src/components/base/CopyCode.vue b/packages/ui/src/components/base/CopyCode.vue index f046b5f12c..7e3edb33f6 100644 --- a/packages/ui/src/components/base/CopyCode.vue +++ b/packages/ui/src/components/base/CopyCode.vue @@ -1,5 +1,9 @@ -