You've already forked AstralRinth
693a371d61
* start new server settings tabs * update properties tab to match design * better stying in general tab * feat: add suffix input for hostname field * implement tables for allocations and DNS records * add tags for dns record type * small gap adjustment * polish advanced page * adjust properties page hierarchy * fix searching properties, empty state and projection radius appearing * pnpm prepr * update copy to match designs * fix suffix input component * style fixes and match heading size * small fix * fix search allocations placeholder * adjust table styles * move all installation settings helper text to below input * update icon to use overflow menu buttons * fix modal to be consistent * open advanced properties when search * remove other and custom properties, and update styles * remove hide/show all java versions * handle mc 26 * refactor: move server settings pages into /ui and add app ServerSettingsModal * hook up server pages for app * add server page header to app * hook up server settings modal * use large size * fix card box shadow style * fix hostname input for app * fix app/website card containers * implement external tabs for billing and admin billing * fix save banner fixed to parent instead of page body * remove unused prop to FriendsList causing warning in app * fix client-only not available for app * fix bottom cut off * wire node auth * implement full copy buttons * dedup copy button tailwind styles * fix hover class not working in @apply * fix spacing * fix error validation styles * apply consistent styles and spacing * feat: update hosting server card (#5609) * fix type errors * fix some stylesheets not imported for storybook * add server listing stories * add fix for frontend stylesheet imports * remove props. * convert copy code to use tailwind * update server listing component styles * update server info label styles * start status/player count info label, more style updates and fixes * add new server card buttons * hook up server cards and implement updated styles * hook up on download button * fix tauri throwing error when api returns 204 No Content * hook up purchase server modal in app * fix upgrading state loading icon * pnpm prepr * filter out servers past 30 days after cancellation * do not apply opacity on lock or spiner icons * fix disabled server icon background * update pending change stage * handle known suspension states * refactor: reduce code duplication for server listing * update disabled state text color * fix loading icon color * clean up copy * fix disabled opacity for server card * update server listing files kept to be countdown * implement resubscribe modal * implement proper provisioning state for resubscribe * fix duplicate attribute and pnpm prepr * feat: add shared UI package auth DI * feat: update purchase server flow (#5714) * implement server list empty state component * fix stories and adjust spacing * implement select plan design refresh * implement auth for empty server list * use refs instead of reactive * pnpm prepr * fix auth usage for empty servers list * move app auth provider setup to src/providers/setup * pnpm prepr * fix max height * style fix * fix getCreds no auth is blocking api client * implement servers guest plan modal and signin which redirects back to modal's next step * refactor guest plan select logic into provider * implement sign in or create account popup * remove force empty serverList * add download button for suspended mod and generic * add handling for when user logs out * QA pass style fixes * more consistent page styles * fix duplicate export * refactor: remove all fallback stuff from resubscribe modal * implement shared download latest backup util * i18n pass * pnpm prepr * fix region being selected if ping failed * pnpm prepr * feat: servers in app finalization (#5744) * feat: start on shared console implementation into logs and overview pages * fix: terminal gap issues * feat: swap word wrap for full screen * fix: stats cards alignment * fix: stats * feat: fix console clear + remove copy * fix: lint * fix: use reset not clear * feat: shared server header & overview page for app and website (#5736) * feat: implement shared server header for app and website * feat: implement wrapped overview page with shared composable and hook it up * pnpm prepr * fix: bugs * qa: cleanup * feat: root.vue shared layout * feat: delete old options pages + fix discovery frontend * fix: discovery * fix: misc style/layout issues * fix page padding * fix: modal height jankiness * feat: implement server install content in app and server setup modal with DI * fix: spacing * remove servers in app feature flag * Revert "remove servers in app feature flag" This reverts commit 86e284c4bdd6fa42c3c8fbaf1efbec41f4d1c6d2. * fix: qa * feat: remove legacy components from apps/frontend/src/components/ui/servers --------- Co-authored-by: Calum H. (IMB11) <contact@cal.engineer> * qa pass (#5738) * fix: qa * feat: qa * fix: server icon fetch fails due to global node auth race condition overriding each other * fix: lint * fix: server icon upload/sync and centralize logic * fix: server settings modal not closing for server reset * fix: better server sorting * feat: copy address in server listing card * fix: notification panel in modal and when overlapping with action bar * fix: empty server list empty state flashing when refresh, fixed by adding isReady auth flag * feat: use floating action bar for save banner * fix: saving state in save bar * fix: edit server icon styling * fix: confirm modal to have consistent buttons * feat: loading animation for server panel + caching improvements for app * pnpm prepr * feat: search page deduplication (#5754) * fix: action bar behind modal * fix: remove warning modal for stopping * fix: server cards states * we hate webkit we hate webkit * fix: update allocation creation to not use modal * fix: properties tab spacing and styles * feat: add files tab copy * fix: advanced properties icon * fix: remove back to all servers link * feat: add files tab link in copy * fix: server header styles to be consistent with instance * fix: add header icons back * feat: update instance settings icon to be consistent * fix: icon container * feat: upload state persistence across tabs * fix: server labels text wrapping * fix: use surface-5 border * fix: loading spinner showing with onboarding below * feat: new server button shows purchase modal in website * fix: billing page not showing quarterly interval * fix: server downgrade not showing updated subscription notification * fix: server settings invalidate saved state and remove server context provider since its already provided in the page * pnpm prepr * add stripe publishable key to app build * feat: console highlighting * fix: rename servers title to modrinth hosting * feat: search fix * fix: qa/styles * fix: ip click active and remove power dont ask again * fix: qa * feat: highlighting fix console * fix: disable conflicts action * fix: error dismiss bug * feat: modal clarification * fix: files perms issue * fix: lint * feat: modal fix * enable show uptime * fix: add loading state to edit server icon * fix: notification panel take in has sidebar from settings * fix: consistency pass on app settings * fix: consistency pass on instance settings * pnpm prepr * fix: nagivate to billing button in app to go to website * fix: stripe return url in app causing app to open modrinth.com in tauri * refactor: better show polling UI code * fix: new server polling comparison to use server ids instead of length * fix: buttonstyled story * fix: button styling * fix: content.vue regression * feat: project url redirects * fix: breadcrumbs * fix: purchase with newly added card * fix: console ordering problems * fix: app-frontend missing env config and staging environment * fix: log syncing for instances and server panel accidentally * fix: QA issues * fix: server page loading state * fix: stats card logic * fix: lint * fix: qa * fix: console height padding * fix: terminal padding + loading indicator * feat: update medal server listing styling * fix: no upgrade button for medal server listing in app * fix: go to overview instead of content tab after onboarding * fix: qa * fix: teleport modals to body * fix: logs tab + qa * fix: local storage for user preferences * fix: qa loading indic * feat: considitonal debug and trace * fix: jump to top on install bug * feat: swap out server hard drive icon to server stack icon * feat: servers in app feature flag default true * fix: highlight row ufll * fix: webkit thing onto a tag * fix: input field * fix: clear fix * fix: lint * fix: fmt * feat: improve share modal and bring it back for sharing log * pnpm prepr * fix: menu overflowing * feat: remove servers in app feature flag * fix: server stat charts no longer showing color * fix: library nav no primary state * fix: better modal height and width * fix: highlighting bugs * fix: empty states * fix: delay import to fix overview page slow load on MacOS * fix: medal server listing too bright on light mode * fix: admon analysis + fix logs * fix: bug * fix: clear purchase intent from sign-in after closing modal * performance: improve server manage stats loading by splitting reactivity * fix: deploy + admon + disable highlighting * fix: clippy --------- Co-authored-by: tdgao <mr.trumgao@gmail.com> Co-authored-by: Truman Gao <106889354+tdgao@users.noreply.github.com> * feat: temp wrangler * fix: lint * fix: logs upload * fix: console empty state and admon regressions * fix: fields * feat: log deleting + prefetch for Logs.vue * feat: move delete before share * feat: clear endpoint * feat: we ball! --------- Co-authored-by: Calum H. <calum@modrinth.com> Co-authored-by: Calum H. (IMB11) <contact@cal.engineer>
350 lines
8.9 KiB
Vue
350 lines
8.9 KiB
Vue
<template>
|
|
<ModrinthServersPurchaseModal
|
|
v-if="customer && regionsData"
|
|
ref="purchaseModal"
|
|
:publishable-key="props.stripePublishableKey"
|
|
:initiate-payment="async (body) => await initiatePayment(body)"
|
|
:available-products="pyroProducts"
|
|
:on-error="handleError"
|
|
:customer="customer"
|
|
:payment-methods="paymentMethods"
|
|
:currency="selectedCurrency"
|
|
:return-url="checkoutReturnUrl"
|
|
:pings="regionPings"
|
|
:regions="regionsData"
|
|
:refresh-payment-methods="fetchPaymentData"
|
|
:fetch-stock="fetchStock"
|
|
:plan-stage="true"
|
|
:existing-plan="currentPlanFromSubscription"
|
|
:existing-subscription="subscription || undefined"
|
|
:on-finalize-no-payment-change="finalizeDowngrade"
|
|
@hide="
|
|
() => {
|
|
debug('modal hidden, resetting subscription')
|
|
subscription = null
|
|
}
|
|
"
|
|
/>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import type { Archon, Labrinth } from '@modrinth/api-client'
|
|
import {
|
|
injectModrinthClient,
|
|
injectNotificationManager,
|
|
ModrinthServersPurchaseModal,
|
|
useDebugLogger,
|
|
} from '@modrinth/ui'
|
|
import { useMutation, useQuery } from '@tanstack/vue-query'
|
|
import { computed, ref, watch } from 'vue'
|
|
|
|
const props = defineProps<{
|
|
stripePublishableKey: string
|
|
siteUrl?: string
|
|
products: Labrinth.Billing.Internal.Product[]
|
|
}>()
|
|
|
|
const checkoutReturnUrl = computed(() => {
|
|
return props.siteUrl ? `${props.siteUrl}/hosting/manage` : undefined
|
|
})
|
|
|
|
const { addNotification } = injectNotificationManager()
|
|
const { labrinth, archon } = injectModrinthClient()
|
|
const debug = useDebugLogger('ServersUpgradeModalWrapper')
|
|
const purchaseModal = ref<InstanceType<typeof ModrinthServersPurchaseModal> | null>(null)
|
|
|
|
// stripe type
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const customer = ref<any>(null)
|
|
|
|
// stripe type
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const paymentMethods = ref<any[]>([])
|
|
const selectedCurrency = ref<string>('USD')
|
|
|
|
const regionPings = ref<
|
|
{
|
|
region: string
|
|
ping: number
|
|
}[]
|
|
>([])
|
|
|
|
const pyroProducts = (props.products as Labrinth.Billing.Internal.Product[])
|
|
.filter((p) => p?.metadata?.type === 'pyro' || p?.metadata?.type === 'medal')
|
|
.sort((a, b) => {
|
|
const aRam = a?.metadata?.type === 'pyro' || a?.metadata?.type === 'medal' ? a.metadata.ram : 0
|
|
const bRam = b?.metadata?.type === 'pyro' || b?.metadata?.type === 'medal' ? b.metadata.ram : 0
|
|
return aRam - bRam
|
|
})
|
|
|
|
function handleError(err: unknown) {
|
|
debug('Purchase modal error:', err)
|
|
}
|
|
|
|
const { data: customerData } = useQuery({
|
|
queryKey: ['billing', 'customer'],
|
|
queryFn: () => labrinth.billing_internal.getCustomer(),
|
|
})
|
|
|
|
const { data: paymentMethodsData, refetch: refetchPaymentMethods } = useQuery({
|
|
queryKey: ['billing', 'payment-methods'],
|
|
queryFn: () => labrinth.billing_internal.getPaymentMethods(),
|
|
})
|
|
|
|
const { data: regionsData } = useQuery({
|
|
queryKey: ['servers', 'regions'],
|
|
queryFn: () => archon.servers_v1.getRegions(),
|
|
})
|
|
|
|
watch(
|
|
customerData,
|
|
(newCustomer) => {
|
|
if (newCustomer) customer.value = newCustomer
|
|
},
|
|
{ immediate: true },
|
|
)
|
|
|
|
watch(
|
|
paymentMethodsData,
|
|
(newMethods) => {
|
|
if (newMethods) paymentMethods.value = newMethods
|
|
},
|
|
{ immediate: true },
|
|
)
|
|
|
|
watch(
|
|
regionsData,
|
|
(newRegions) => {
|
|
if (newRegions) {
|
|
newRegions.forEach((region) => {
|
|
runPingTest(region)
|
|
})
|
|
}
|
|
},
|
|
{ immediate: true },
|
|
)
|
|
|
|
async function fetchPaymentData() {
|
|
await refetchPaymentMethods()
|
|
}
|
|
|
|
async function fetchStock(
|
|
region: Archon.Servers.v1.Region,
|
|
request: Archon.Servers.v0.StockRequest,
|
|
): Promise<number> {
|
|
const result = await archon.servers_v0.checkStock(region.shortcode, request)
|
|
return result.available
|
|
}
|
|
|
|
const PING_COUNT = 20
|
|
const PING_INTERVAL = 200
|
|
const MAX_PING_TIME = 1000
|
|
|
|
function runPingTest(region: Archon.Servers.v1.Region, index = 1) {
|
|
if (index > 10) {
|
|
regionPings.value.push({
|
|
region: region.shortcode,
|
|
ping: -1,
|
|
})
|
|
return
|
|
}
|
|
|
|
const wsUrl = `wss://${region.shortcode}${index}.${region.zone}/pingtest`
|
|
try {
|
|
const socket = new WebSocket(wsUrl)
|
|
const pings: number[] = []
|
|
|
|
socket.onopen = () => {
|
|
for (let i = 0; i < PING_COUNT; i++) {
|
|
setTimeout(() => {
|
|
socket.send(String(performance.now()))
|
|
}, i * PING_INTERVAL)
|
|
}
|
|
setTimeout(
|
|
() => {
|
|
socket.close()
|
|
const median = Math.round([...pings].sort((a, b) => a - b)[Math.floor(pings.length / 2)])
|
|
if (median) {
|
|
regionPings.value.push({
|
|
region: region.shortcode,
|
|
ping: median,
|
|
})
|
|
}
|
|
},
|
|
PING_COUNT * PING_INTERVAL + MAX_PING_TIME,
|
|
)
|
|
}
|
|
|
|
socket.onmessage = (event) => {
|
|
const start = Number(event.data)
|
|
pings.push(performance.now() - start)
|
|
}
|
|
|
|
socket.onerror = () => {
|
|
runPingTest(region, index + 1)
|
|
}
|
|
} catch {
|
|
// ignore
|
|
}
|
|
}
|
|
|
|
const subscription = ref<Labrinth.Billing.Internal.UserSubscription | null>(null)
|
|
const pendingDowngradeBody = ref<Labrinth.Billing.Internal.EditSubscriptionRequest | null>(null)
|
|
const currentPlanFromSubscription = computed<Labrinth.Billing.Internal.Product | undefined>(() => {
|
|
return subscription.value
|
|
? (pyroProducts.find((p) =>
|
|
p.prices.some((price) => price.id === subscription.value?.price_id),
|
|
) ?? undefined)
|
|
: undefined
|
|
})
|
|
|
|
const currentInterval = computed<'monthly' | 'quarterly'>(() => {
|
|
const interval = subscription.value?.interval
|
|
|
|
if (interval === 'monthly' || interval === 'quarterly') {
|
|
return interval
|
|
}
|
|
|
|
return 'monthly'
|
|
})
|
|
|
|
const editSubscriptionMutation = useMutation({
|
|
mutationFn: async ({
|
|
id,
|
|
body,
|
|
dry,
|
|
}: {
|
|
id: string
|
|
body: Labrinth.Billing.Internal.EditSubscriptionRequest
|
|
dry: boolean
|
|
}) => {
|
|
return await labrinth.billing_internal.editSubscription(id, body, dry)
|
|
},
|
|
})
|
|
|
|
async function initiatePayment(
|
|
body: Labrinth.Billing.Internal.InitiatePaymentRequest,
|
|
): Promise<Labrinth.Billing.Internal.EditSubscriptionResponse | null> {
|
|
debug('initiatePayment called', {
|
|
hasSubscription: !!subscription.value,
|
|
subscriptionId: subscription.value?.id,
|
|
body,
|
|
})
|
|
if (subscription.value) {
|
|
const transformedBody: Labrinth.Billing.Internal.EditSubscriptionRequest = {
|
|
interval: body.charge.type === 'new' ? body.charge.interval : undefined,
|
|
payment_method: body.type === 'confirmation_token' ? body.token : body.id,
|
|
product: body.charge.type === 'new' ? body.charge.product_id : undefined,
|
|
region: body.metadata?.server_region,
|
|
}
|
|
|
|
try {
|
|
const dry = await editSubscriptionMutation.mutateAsync({
|
|
id: subscription.value.id,
|
|
body: transformedBody,
|
|
dry: true,
|
|
})
|
|
|
|
const requiresPayment =
|
|
dry && typeof dry === 'object' && 'requires_payment' in dry && dry.requires_payment
|
|
|
|
if (requiresPayment) {
|
|
// Upgrade: requires payment — finalize to create the payment intent
|
|
return await finalizeImmediate(transformedBody)
|
|
} else {
|
|
// Downgrade or no payment change — defer until user confirms
|
|
pendingDowngradeBody.value = transformedBody
|
|
return null
|
|
}
|
|
} catch (e) {
|
|
debug('Dry run failed, attempting immediate patch', e)
|
|
return await finalizeImmediate(transformedBody)
|
|
}
|
|
} else {
|
|
debug('subscription.value is null/undefined', {
|
|
subscriptionValue: subscription.value,
|
|
})
|
|
addNotification({
|
|
title: 'Unable to determine subscription ID.',
|
|
text: 'Please contact support.',
|
|
type: 'error',
|
|
})
|
|
return Promise.reject(new Error('Unable to determine subscription ID.'))
|
|
}
|
|
}
|
|
|
|
async function finalizeImmediate(body: Labrinth.Billing.Internal.EditSubscriptionRequest) {
|
|
if (!subscription.value) return null
|
|
|
|
const result = await editSubscriptionMutation.mutateAsync({
|
|
id: subscription.value.id,
|
|
body,
|
|
dry: false,
|
|
})
|
|
|
|
return result ?? null
|
|
}
|
|
|
|
async function finalizeDowngrade() {
|
|
try {
|
|
if (!subscription.value || !pendingDowngradeBody.value)
|
|
throw new Error('Missing subscription or pending downgrade body')
|
|
|
|
await finalizeImmediate(pendingDowngradeBody.value)
|
|
addNotification({
|
|
title: 'Subscription updated',
|
|
text: 'Your plan has been downgraded and will take effect next billing cycle.',
|
|
type: 'success',
|
|
})
|
|
} catch (e) {
|
|
addNotification({
|
|
title: 'Failed to apply subscription changes',
|
|
text: 'Please try again or contact support.',
|
|
type: 'error',
|
|
})
|
|
throw e
|
|
} finally {
|
|
pendingDowngradeBody.value = null
|
|
}
|
|
}
|
|
|
|
async function open(id?: string) {
|
|
debug('open called', { id })
|
|
if (id) {
|
|
const subscriptions = await labrinth.billing_internal.getSubscriptions()
|
|
debug('fetched subscriptions', {
|
|
count: subscriptions.length,
|
|
subscriptions: subscriptions.map((s) => ({
|
|
id: s.id,
|
|
metadataType: s.metadata?.type,
|
|
metadataId: s.metadata?.id,
|
|
})),
|
|
})
|
|
for (const sub of subscriptions) {
|
|
if (
|
|
(sub?.metadata?.type === 'pyro' || sub?.metadata?.type === 'medal') &&
|
|
sub.metadata.id === id
|
|
) {
|
|
subscription.value = sub
|
|
debug('found matching subscription', {
|
|
subscriptionId: sub.id,
|
|
})
|
|
break
|
|
}
|
|
}
|
|
if (!subscription.value) {
|
|
debug('no matching subscription found for id', id)
|
|
}
|
|
} else {
|
|
debug('no id provided, resetting subscription')
|
|
subscription.value = null
|
|
}
|
|
|
|
purchaseModal.value?.show(currentInterval.value)
|
|
}
|
|
|
|
defineExpose({
|
|
open,
|
|
})
|
|
</script>
|