* 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>
392 lines
12 KiB
Vue
392 lines
12 KiB
Vue
<template>
|
|
<div class="relative h-full w-full">
|
|
<div class="flex h-full w-full flex-col gap-4">
|
|
<div class="flex flex-col gap-6">
|
|
<!-- SFTP section -->
|
|
<div class="flex flex-col gap-2">
|
|
<div class="flex flex-col items-center justify-between gap-0.5 sm:flex-row">
|
|
<span class="text-lg font-semibold text-contrast">SFTP</span>
|
|
<ButtonStyled>
|
|
<a
|
|
v-tooltip="'This button only works with compatible SFTP clients (e.g. WinSCP)'"
|
|
class="!w-full sm:!w-auto"
|
|
:href="sftpUrl"
|
|
target="_blank"
|
|
>
|
|
<ExternalIcon class="h-5 w-5" />
|
|
Launch SFTP
|
|
</a>
|
|
</ButtonStyled>
|
|
</div>
|
|
|
|
<div class="flex flex-col gap-2.5 rounded-2xl bg-surface-2 p-4">
|
|
<span class="text-lg font-semibold text-contrast">Server Address</span>
|
|
<div
|
|
v-tooltip="'Copy SFTP server address'"
|
|
class="copy-field hover:bg-button-bg-hover"
|
|
@click="copyToClipboard('Server address', server?.sftp_host)"
|
|
>
|
|
<span class="cursor-pointer font-semibold text-primary">
|
|
{{ server?.sftp_host }}
|
|
</span>
|
|
<div class="grid h-10 w-10 place-content-center">
|
|
<CopyIcon class="h-5 w-5" />
|
|
</div>
|
|
</div>
|
|
<div class="flex flex-col gap-2 sm:mt-0 sm:flex-row">
|
|
<div class="flex w-full flex-col justify-center gap-2">
|
|
<span class="text-lg font-semibold text-contrast">Username</span>
|
|
<div
|
|
v-tooltip="'Copy SFTP username'"
|
|
class="copy-field hover:bg-button-bg-hover"
|
|
@click="copyToClipboard('Username', server?.sftp_username)"
|
|
>
|
|
<div class="truncate font-semibold">
|
|
{{ server?.sftp_username }}
|
|
</div>
|
|
<div class="grid h-10 w-9 place-content-center">
|
|
<CopyIcon class="h-5 w-5" />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="flex w-full flex-col justify-center gap-2">
|
|
<span class="text-lg font-semibold text-contrast">Password</span>
|
|
<div
|
|
class="copy-field-has-button [&:hover:not(:has(button:hover))]:bg-button-bg-hover"
|
|
@click="copyToClipboard('Password', server?.sftp_password)"
|
|
>
|
|
<div class="flex items-center gap-1.5 h-full w-full">
|
|
<div
|
|
v-tooltip="'Copy SFTP Password'"
|
|
class="h-full flex justify-between grow items-center"
|
|
>
|
|
<div class="truncate font-semibold">
|
|
{{
|
|
showPassword
|
|
? server?.sftp_password
|
|
: '*'.repeat(server?.sftp_password?.length ?? 0)
|
|
}}
|
|
</div>
|
|
<CopyIcon class="h-5 w-5" />
|
|
</div>
|
|
|
|
<ButtonStyled type="transparent" circular>
|
|
<button
|
|
v-tooltip="showPassword ? 'Hide password' : 'Show password'"
|
|
class="hover:bg-button-bg-hover grid h-10 w-10 place-content-center rounded-lg"
|
|
@click.stop="showPassword = !showPassword"
|
|
>
|
|
<!-- look into doing stop propagation here -->
|
|
<EyeIcon v-if="showPassword" class="h-5 w-5" />
|
|
<EyeOffIcon v-else class="h-5 w-5" />
|
|
</button>
|
|
</ButtonStyled>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Startup command section -->
|
|
<div class="flex flex-col gap-2.5">
|
|
<div class="flex h-10 flex-col items-end justify-between gap-4 sm:flex-row">
|
|
<label for="startup-command-field" class="mb-0.5 flex flex-col gap-2">
|
|
<span class="text-lg font-semibold text-contrast">Startup command</span>
|
|
</label>
|
|
<ButtonStyled v-if="startupCommand !== defaultStartupCommand" type="transparent">
|
|
<button
|
|
:disabled="isStartupLoading || startupCommand === defaultStartupCommand"
|
|
class="relative !w-full sm:!w-auto"
|
|
@click="resetToDefault"
|
|
>
|
|
<UpdatedIcon class="h-5 w-5" />
|
|
Default
|
|
</button>
|
|
</ButtonStyled>
|
|
</div>
|
|
<div class="relative">
|
|
<StyledInput
|
|
id="startup-command-field"
|
|
v-model="startupCommand"
|
|
multiline
|
|
resize="vertical"
|
|
input-class="font-mono field-sizing-content"
|
|
:disabled="isStartupLoading"
|
|
/>
|
|
<div
|
|
v-if="isStartupLoading"
|
|
class="bg-bg/50 absolute inset-0 flex items-center justify-center rounded-xl"
|
|
>
|
|
<SpinnerIcon class="h-6 w-6 animate-spin text-secondary" />
|
|
</div>
|
|
</div>
|
|
<span> The command that runs when your server is started. </span>
|
|
</div>
|
|
|
|
<!-- Java version section -->
|
|
<div class="flex flex-col gap-2.5">
|
|
<div class="flex flex-col gap-2">
|
|
<span class="text-lg font-semibold text-contrast">Java version</span>
|
|
</div>
|
|
<div class="relative max-w-xs">
|
|
<Combobox
|
|
:id="'java-version-field'"
|
|
v-model="javaVersion"
|
|
name="java-version"
|
|
:options="displayedJavaVersions"
|
|
:display-value="javaVersionLabel ?? 'Java Version'"
|
|
:disabled="isStartupLoading"
|
|
>
|
|
<template #dropdown-footer>
|
|
<button
|
|
class="flex w-full cursor-pointer items-center justify-center gap-1.5 border-0 border-t border-solid border-surface-5 bg-transparent py-3 text-center text-sm font-semibold text-secondary transition-colors hover:text-contrast"
|
|
@mousedown.prevent
|
|
@click="showAllVersions = !showAllVersions"
|
|
>
|
|
<EyeOffIcon v-if="showAllVersions" class="size-4" />
|
|
<EyeIcon v-else class="size-4" />
|
|
{{ showAllVersions ? 'Hide extra versions' : 'Show all versions' }}
|
|
</button>
|
|
</template>
|
|
</Combobox>
|
|
<div
|
|
v-if="isStartupLoading"
|
|
class="bg-bg/50 absolute inset-0 flex items-center justify-center rounded-xl"
|
|
>
|
|
<SpinnerIcon class="h-5 w-5 animate-spin text-secondary" />
|
|
</div>
|
|
</div>
|
|
<span> The Java version your server runs on. </span>
|
|
</div>
|
|
|
|
<!-- Java runtime section -->
|
|
<div class="flex flex-col gap-2.5">
|
|
<div class="flex flex-col gap-2">
|
|
<span class="text-lg font-semibold text-contrast">Java runtime</span>
|
|
</div>
|
|
<div class="relative max-w-xs">
|
|
<Combobox
|
|
:id="'runtime-field'"
|
|
v-model="jreVendor"
|
|
name="runtime"
|
|
:options="JRE_VENDORS"
|
|
:display-value="jreVendorLabel ?? 'Runtime'"
|
|
:disabled="isStartupLoading"
|
|
/>
|
|
<div
|
|
v-if="isStartupLoading"
|
|
class="bg-bg/50 absolute inset-0 flex items-center justify-center rounded-xl"
|
|
>
|
|
<SpinnerIcon class="h-5 w-5 animate-spin text-secondary" />
|
|
</div>
|
|
</div>
|
|
<span> The Java runtime your server will use. </span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<SaveBanner
|
|
:is-visible="!!hasUnsavedChanges || isPending"
|
|
:server-id="serverId"
|
|
:is-updating="isPending"
|
|
:save="() => saveStartup()"
|
|
:reset="resetStartup"
|
|
/>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import type { Archon } from '@modrinth/api-client'
|
|
import {
|
|
CopyIcon,
|
|
ExternalIcon,
|
|
EyeIcon,
|
|
EyeOffIcon,
|
|
SpinnerIcon,
|
|
UpdatedIcon,
|
|
} from '@modrinth/assets'
|
|
import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
|
|
import { computed, ref, watch } from 'vue'
|
|
|
|
import { ButtonStyled, Combobox, StyledInput } from '#ui/components'
|
|
import SaveBanner from '#ui/components/servers/SaveBanner.vue'
|
|
import {
|
|
injectModrinthClient,
|
|
injectModrinthServerContext,
|
|
injectNotificationManager,
|
|
} from '#ui/providers'
|
|
|
|
const { addNotification } = injectNotificationManager()
|
|
const { server, serverId, worldId } = injectModrinthServerContext()
|
|
const client = injectModrinthClient()
|
|
const queryClient = useQueryClient()
|
|
|
|
// SFTP state
|
|
const showPassword = ref(false)
|
|
const sftpUrl = computed(() => `sftp://${server.value?.sftp_username}@${server.value?.sftp_host}`)
|
|
|
|
const copyToClipboard = (name: string, textToCopy?: string) => {
|
|
navigator.clipboard.writeText(textToCopy || '')
|
|
addNotification({
|
|
type: 'success',
|
|
title: `${name} copied to clipboard!`,
|
|
})
|
|
}
|
|
|
|
// Startup state
|
|
const startupQueryKey = computed(() => ['servers', 'startup', 'v1', serverId, worldId.value])
|
|
|
|
const { data: startupData, isLoading: isStartupLoading } = useQuery({
|
|
queryKey: startupQueryKey,
|
|
queryFn: () => client.archon.options_v1.getStartup(serverId, worldId.value!),
|
|
enabled: computed(() => worldId.value !== null),
|
|
})
|
|
|
|
const JAVA_VERSIONS = [
|
|
{ value: 8, label: 'Java 8' },
|
|
{ value: 11, label: 'Java 11' },
|
|
{ value: 17, label: 'Java 17' },
|
|
{ value: 21, label: 'Java 21' },
|
|
{ value: 25, label: 'Java 25' },
|
|
]
|
|
|
|
const showAllVersions = ref(false)
|
|
|
|
type MinecraftReleaseVersion = {
|
|
major: number
|
|
minor: number
|
|
}
|
|
|
|
function parseMinecraftReleaseVersion(version: string): MinecraftReleaseVersion | null {
|
|
const [majorPart, minorPart] = version.split('.')
|
|
|
|
if (!majorPart || !minorPart) return null
|
|
|
|
const major = Number(majorPart)
|
|
const minor = Number(minorPart)
|
|
|
|
if (!Number.isInteger(major) || !Number.isInteger(minor)) return null
|
|
|
|
return { major, minor }
|
|
}
|
|
|
|
function filterJavaVersions(compatibleVersions: number[]) {
|
|
return JAVA_VERSIONS.filter((version) => compatibleVersions.includes(version.value))
|
|
}
|
|
|
|
const displayedJavaVersions = computed(() => {
|
|
if (showAllVersions.value) return JAVA_VERSIONS
|
|
|
|
const mcVersion = server.value?.mc_version ?? ''
|
|
if (!mcVersion) return JAVA_VERSIONS
|
|
|
|
const releaseVersion = parseMinecraftReleaseVersion(mcVersion)
|
|
if (!releaseVersion) return JAVA_VERSIONS
|
|
|
|
if (releaseVersion.major > 1) {
|
|
if (releaseVersion.major >= 26) {
|
|
return filterJavaVersions([25])
|
|
}
|
|
|
|
return JAVA_VERSIONS
|
|
}
|
|
|
|
if (releaseVersion.minor >= 20) return filterJavaVersions([21])
|
|
if (releaseVersion.minor >= 17) return filterJavaVersions([17, 21])
|
|
if (releaseVersion.minor >= 12) return filterJavaVersions([8, 11, 17, 21])
|
|
if (releaseVersion.minor >= 6) return filterJavaVersions([8, 11])
|
|
return filterJavaVersions([8])
|
|
})
|
|
|
|
const JRE_VENDORS: { value: Archon.Content.v1.JreVendor; label: string }[] = [
|
|
{ value: 'corretto', label: 'Corretto' },
|
|
{ value: 'temurin', label: 'Temurin' },
|
|
{ value: 'graal', label: 'GraalVM' },
|
|
]
|
|
|
|
const savedStartupCommand = computed(() => startupData.value?.startup_command ?? '')
|
|
const savedJavaVersion = computed(() => startupData.value?.java_version ?? undefined)
|
|
const savedJreVendor = computed(() => startupData.value?.jre_vendor ?? undefined)
|
|
const defaultStartupCommand = computed(
|
|
() => startupData.value?.original_invocation ?? savedStartupCommand.value,
|
|
)
|
|
|
|
const startupCommand = ref('')
|
|
const javaVersion = ref<number>()
|
|
const jreVendor = ref<Archon.Content.v1.JreVendor>()
|
|
|
|
const javaVersionLabel = computed(
|
|
() => JAVA_VERSIONS.find((v) => v.value === javaVersion.value)?.label,
|
|
)
|
|
const jreVendorLabel = computed(() => JRE_VENDORS.find((v) => v.value === jreVendor.value)?.label)
|
|
|
|
function syncFormFromData() {
|
|
startupCommand.value = savedStartupCommand.value
|
|
javaVersion.value = savedJavaVersion.value
|
|
jreVendor.value = savedJreVendor.value
|
|
}
|
|
|
|
watch(
|
|
startupData,
|
|
(newData, oldData) => {
|
|
if (newData && !oldData) {
|
|
syncFormFromData()
|
|
}
|
|
},
|
|
{ immediate: true },
|
|
)
|
|
|
|
const hasUnsavedChanges = computed(
|
|
() =>
|
|
startupCommand.value !== savedStartupCommand.value ||
|
|
javaVersion.value !== savedJavaVersion.value ||
|
|
jreVendor.value !== savedJreVendor.value,
|
|
)
|
|
|
|
const { mutate: saveStartup, isPending } = useMutation({
|
|
mutationFn: () =>
|
|
client.archon.options_v1.patchStartup(serverId, worldId.value!, {
|
|
startup_command: startupCommand.value || null,
|
|
java_version: javaVersion.value ?? null,
|
|
jre_vendor: jreVendor.value ?? null,
|
|
}),
|
|
onSuccess: async () => {
|
|
await queryClient.invalidateQueries({ queryKey: startupQueryKey.value })
|
|
syncFormFromData()
|
|
addNotification({
|
|
type: 'success',
|
|
title: 'Server settings updated',
|
|
text: 'Your server settings were successfully changed.',
|
|
})
|
|
},
|
|
onError: (error) => {
|
|
console.error(error)
|
|
addNotification({
|
|
type: 'error',
|
|
title: 'Failed to update server arguments',
|
|
text: 'Please try again later.',
|
|
})
|
|
},
|
|
})
|
|
|
|
function resetStartup() {
|
|
syncFormFromData()
|
|
}
|
|
|
|
function resetToDefault() {
|
|
startupCommand.value = defaultStartupCommand.value
|
|
}
|
|
</script>
|
|
|
|
<style scoped>
|
|
.copy-field {
|
|
@apply flex h-10 cursor-pointer items-center justify-between gap-2 rounded-lg bg-button-bg px-3 pr-1.5 transition-all;
|
|
@apply hover:brightness-125 active:scale-95;
|
|
}
|
|
|
|
.copy-field-has-button {
|
|
@apply flex h-10 cursor-pointer items-center justify-between gap-2 rounded-lg bg-button-bg px-3 pr-1.5 transition-all;
|
|
@apply [&:hover:not(:has(button:hover))]:brightness-125 [&:active:not(:has(button:active))]:scale-95;
|
|
}
|
|
</style>
|