mirror of
https://github.com/modrinth/code.git
synced 2026-08-30 11:36:05 +00:00
* 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 86e284c4bd.
* 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>
188 lines
5.6 KiB
Vue
188 lines
5.6 KiB
Vue
<script setup lang="ts">
|
|
import { CheckCircleIcon, XCircleIcon } from '@modrinth/assets'
|
|
import {
|
|
Checkbox,
|
|
defineMessages,
|
|
injectNotificationManager,
|
|
Slider,
|
|
StyledInput,
|
|
useVIntl,
|
|
} from '@modrinth/ui'
|
|
import { computed, readonly, ref, watch } from 'vue'
|
|
|
|
import JavaSelector from '@/components/ui/JavaSelector.vue'
|
|
import useMemorySlider from '@/composables/useMemorySlider'
|
|
import { edit, get_optimal_jre_key } from '@/helpers/profile'
|
|
import { get } from '@/helpers/settings.ts'
|
|
import { injectInstanceSettings } from '@/providers/instance-settings'
|
|
|
|
import type { AppSettings } from '../../../helpers/types'
|
|
|
|
const { handleError } = injectNotificationManager()
|
|
const { formatMessage } = useVIntl()
|
|
|
|
const { instance } = injectInstanceSettings()
|
|
|
|
const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
|
|
|
|
const overrideJavaInstall = ref(!!instance.value.java_path)
|
|
const optimalJava = readonly(await get_optimal_jre_key(instance.value.path).catch(handleError))
|
|
const javaInstall = ref({ path: optimalJava.path ?? instance.value.java_path })
|
|
|
|
const overrideJavaArgs = ref((instance.value.extra_launch_args?.length ?? 0) > 0)
|
|
const javaArgs = ref(
|
|
(instance.value.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
|
|
)
|
|
|
|
const overrideEnvVars = ref((instance.value.custom_env_vars?.length ?? 0) > 0)
|
|
const envVars = ref(
|
|
(instance.value.custom_env_vars ?? globalSettings.custom_env_vars)
|
|
.map((x) => x.join('='))
|
|
.join(' '),
|
|
)
|
|
|
|
const overrideMemorySettings = ref(!!instance.value.memory)
|
|
const memory = ref(instance.value.memory ?? globalSettings.memory)
|
|
const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
|
|
maxMemory: number
|
|
snapPoints: number[]
|
|
}
|
|
|
|
const editProfileObject = computed(() => {
|
|
return {
|
|
java_path:
|
|
overrideJavaInstall.value && javaInstall.value.path !== ''
|
|
? javaInstall.value.path.replace('java.exe', 'javaw.exe')
|
|
: null,
|
|
extra_launch_args: overrideJavaArgs.value
|
|
? javaArgs.value.trim().split(/\s+/).filter(Boolean)
|
|
: null,
|
|
custom_env_vars: overrideEnvVars.value
|
|
? envVars.value
|
|
.trim()
|
|
.split(/\s+/)
|
|
.filter(Boolean)
|
|
.map((x) => x.split('=').filter(Boolean))
|
|
: null,
|
|
memory: overrideMemorySettings.value ? memory.value : null,
|
|
}
|
|
})
|
|
|
|
watch(
|
|
[
|
|
overrideJavaInstall,
|
|
javaInstall,
|
|
overrideJavaArgs,
|
|
javaArgs,
|
|
overrideEnvVars,
|
|
envVars,
|
|
overrideMemorySettings,
|
|
memory,
|
|
],
|
|
async () => {
|
|
await edit(instance.value.path, editProfileObject.value)
|
|
},
|
|
{ deep: true },
|
|
)
|
|
|
|
const messages = defineMessages({
|
|
javaInstallation: {
|
|
id: 'instance.settings.tabs.java.java-installation',
|
|
defaultMessage: 'Java installation',
|
|
},
|
|
javaArguments: {
|
|
id: 'instance.settings.tabs.java.java-arguments',
|
|
defaultMessage: 'Java arguments',
|
|
},
|
|
javaEnvironmentVariables: {
|
|
id: 'instance.settings.tabs.java.environment-variables',
|
|
defaultMessage: 'Environment variables',
|
|
},
|
|
javaMemory: {
|
|
id: 'instance.settings.tabs.java.java-memory',
|
|
defaultMessage: 'Memory allocated',
|
|
},
|
|
hooks: {
|
|
id: 'instance.settings.tabs.java.hooks',
|
|
defaultMessage: 'Hooks',
|
|
},
|
|
})
|
|
</script>
|
|
|
|
<template>
|
|
<div>
|
|
<h2 id="project-name" class="m-0 mb-2.5 text-lg font-semibold text-contrast block">
|
|
{{ formatMessage(messages.javaInstallation) }}
|
|
</h2>
|
|
<Checkbox v-model="overrideJavaInstall" label="Custom Java installation" class="mb-2.5" />
|
|
<template v-if="!overrideJavaInstall">
|
|
<div class="flex my-2 items-center gap-2 font-semibold">
|
|
<template v-if="javaInstall">
|
|
<CheckCircleIcon class="text-brand-green h-4 w-4" />
|
|
<span>Using default Java {{ optimalJava.major_version }} installation:</span>
|
|
</template>
|
|
<template v-else-if="optimalJava">
|
|
<XCircleIcon class="text-brand-red h-5 w-5" />
|
|
<span
|
|
>Could not find a default Java {{ optimalJava.major_version }} installation. Please set
|
|
one below:</span
|
|
>
|
|
</template>
|
|
<template v-else>
|
|
<XCircleIcon class="text-brand-red h-5 w-5" />
|
|
<span
|
|
>Could not automatically determine a Java installation to use. Please set one
|
|
below:</span
|
|
>
|
|
</template>
|
|
</div>
|
|
<div
|
|
v-if="javaInstall && !overrideJavaInstall"
|
|
class="p-4 bg-bg rounded-xl text-xs text-secondary leading-none font-mono"
|
|
>
|
|
{{ javaInstall.path }}
|
|
</div>
|
|
</template>
|
|
<JavaSelector v-if="overrideJavaInstall || !javaInstall" v-model="javaInstall" />
|
|
<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
|
|
{{ formatMessage(messages.javaMemory) }}
|
|
</h2>
|
|
<Checkbox v-model="overrideMemorySettings" label="Custom memory allocation" class="mb-2.5" />
|
|
<Slider
|
|
id="max-memory"
|
|
v-model="memory.maximum"
|
|
:disabled="!overrideMemorySettings"
|
|
:min="512"
|
|
:max="maxMemory"
|
|
:step="64"
|
|
:snap-points="snapPoints"
|
|
:snap-range="512"
|
|
unit="MB"
|
|
/>
|
|
<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
|
|
{{ formatMessage(messages.javaArguments) }}
|
|
</h2>
|
|
<Checkbox v-model="overrideJavaArgs" label="Custom java arguments" class="my-2" />
|
|
<StyledInput
|
|
id="java-args"
|
|
v-model="javaArgs"
|
|
autocomplete="off"
|
|
:disabled="!overrideJavaArgs"
|
|
placeholder="Enter java arguments..."
|
|
wrapper-class="w-full"
|
|
/>
|
|
<h2 id="project-name" class="mt-6 mb-2.5 text-lg font-semibold text-contrast block">
|
|
{{ formatMessage(messages.javaEnvironmentVariables) }}
|
|
</h2>
|
|
<Checkbox v-model="overrideEnvVars" label="Custom environment variables" class="mb-2.5" />
|
|
<StyledInput
|
|
id="env-vars"
|
|
v-model="envVars"
|
|
autocomplete="off"
|
|
:disabled="!overrideEnvVars"
|
|
placeholder="Enter environmental variables..."
|
|
wrapper-class="w-full"
|
|
/>
|
|
</div>
|
|
</template>
|