-
+
- {{ row.label }}
-
-
+
+
+ {{ row.label }}
+
+
@@ -260,7 +289,6 @@ onUnmounted(() => {
align-items: center;
justify-content: center;
width: 100%;
- padding: 1rem;
gap: 1rem;
-ms-overflow-style: none;
@@ -294,31 +322,36 @@ onUnmounted(() => {
a {
margin: 0;
- font-size: var(--font-size-lg);
+ font-size: var(--font-size-md);
font-weight: bolder;
white-space: nowrap;
- color: var(--color-contrast);
+ color: var(--color-base);
}
svg {
- height: 1.5rem;
- width: 1.5rem;
- color: var(--color-contrast);
+ height: 1.25rem;
+ width: 1.25rem;
+ color: var(--color-base);
}
}
.instances {
display: grid;
- grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
- grid-gap: 1rem;
+ grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
+ grid-gap: 0.75rem;
width: 100%;
+
+ &.compact {
+ grid-template-columns: repeat(auto-fill, minmax(18rem, 1fr));
+ gap: 0.75rem;
+ }
}
.projects {
display: grid;
width: 100%;
grid-template-columns: repeat(auto-fill, minmax(18rem, 1fr));
- grid-gap: 1rem;
+ grid-gap: 0.75rem;
.item {
width: 100%;
diff --git a/apps/app-frontend/src/components/modrinth-loading-indicator.js b/apps/app-frontend/src/components/modrinth-loading-indicator.js
deleted file mode 100644
index 27b0c3a3f..000000000
--- a/apps/app-frontend/src/components/modrinth-loading-indicator.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import { computed, defineComponent, h, onBeforeUnmount, ref, watch } from 'vue'
-import { useLoading } from '@/store/state.js'
-
-export default defineComponent({
- props: {
- throttle: {
- type: Number,
- default: 50,
- },
- duration: {
- type: Number,
- default: 500,
- },
- height: {
- type: Number,
- default: 3,
- },
- color: {
- type: [String, Boolean],
- default:
- 'repeating-linear-gradient(to right, var(--color-brand) 0%, var(--color-brand) 100%)',
- },
- offsetWidth: {
- type: String,
- default: '208px',
- },
- offsetHeight: {
- type: String,
- default: '52px',
- },
- },
- setup(props, { slots }) {
- const indicator = useLoadingIndicator({
- duration: props.duration,
- throttle: props.throttle,
- })
-
- onBeforeUnmount(() => indicator.clear)
-
- const loading = useLoading()
-
- watch(loading, (newValue) => {
- if (newValue.barEnabled) {
- if (newValue.loading) {
- indicator.start()
- } else {
- indicator.finish()
- }
- }
- })
-
- return () =>
- h(
- 'div',
- {
- style: {
- position: 'fixed',
- top: props.offsetHeight,
- right: 0,
- left: props.offsetWidth,
- pointerEvents: 'none',
- width: `calc((100vw - ${props.offsetWidth}) * ${indicator.progress.value / 100})`,
- height: `${props.height}px`,
- opacity: indicator.isLoading.value ? 1 : 0,
- background: props.color || undefined,
- backgroundSize: `${(100 / indicator.progress.value) * 100}% auto`,
- transition: 'width 0.1s, height 0.4s, opacity 0.4s',
- zIndex: 6,
- },
- },
- slots,
- )
- },
-})
-
-function useLoadingIndicator(opts) {
- const progress = ref(0)
- const isLoading = ref(false)
- const step = computed(() => 10000 / opts.duration)
-
- let _timer = null
- let _throttle = null
-
- function start() {
- clear()
- progress.value = 0
- if (opts.throttle) {
- _throttle = setTimeout(() => {
- isLoading.value = true
- _startTimer()
- }, opts.throttle)
- } else {
- isLoading.value = true
- _startTimer()
- }
- }
- function finish() {
- progress.value = 100
- _hide()
- }
-
- function clear() {
- clearInterval(_timer)
- clearTimeout(_throttle)
- _timer = null
- _throttle = null
- }
-
- function _increase(num) {
- progress.value = Math.min(100, progress.value + num)
- }
-
- function _hide() {
- clear()
- setTimeout(() => {
- isLoading.value = false
- setTimeout(() => {
- progress.value = 0
- }, 400)
- }, 500)
- }
-
- function _startTimer() {
- _timer = setInterval(() => {
- _increase(step.value)
- }, 100)
- }
-
- return {
- progress,
- isLoading,
- start,
- finish,
- clear,
- }
-}
diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue
index 50080490d..fe1defb0f 100644
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -2,19 +2,23 @@
-
-
diff --git a/apps/app-frontend/src/components/ui/ContextMenu.vue b/apps/app-frontend/src/components/ui/ContextMenu.vue
index 9614d3fe0..a0ca9417e 100644
--- a/apps/app-frontend/src/components/ui/ContextMenu.vue
+++ b/apps/app-frontend/src/components/ui/ContextMenu.vue
@@ -25,7 +25,6 @@
-
+ {{ selectedAccount ? selectedAccount.username : 'Select account' }}
+ Minecraft account
+
+
-
-
+
-
- {{ props.instance.name }}
-- Installing... -
-- {{ props.instance.loader }} - {{ props.instance.game_version }} -
-
-
-
+ {{ instance.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
index 6135b9951..9d0c9b753 100644
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
@@ -199,16 +199,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ instance.name }} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
index c5209625c..bbb2a86ca 100644
--- a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
+++ b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
@@ -1,5 +1,5 @@
-
@@ -73,8 +73,6 @@ function setJavaInstall(javaInstall) {
diff --git a/apps/app-frontend/src/components/ui/NavTabs.vue b/apps/app-frontend/src/components/ui/NavTabs.vue
new file mode 100644
index 000000000..72e772538
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/NavTabs.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/ProjectCard.vue b/apps/app-frontend/src/components/ui/ProjectCard.vue
index b3e680d61..e78f3fb22 100644
--- a/apps/app-frontend/src/components/ui/ProjectCard.vue
+++ b/apps/app-frontend/src/components/ui/ProjectCard.vue
@@ -1,17 +1,15 @@
-
-
+
+
-
+
diff --git a/apps/app-frontend/src/components/ui/PromotionWrapper.vue b/apps/app-frontend/src/components/ui/PromotionWrapper.vue
index 69b540652..4e045fa28 100644
--- a/apps/app-frontend/src/components/ui/PromotionWrapper.vue
+++ b/apps/app-frontend/src/components/ui/PromotionWrapper.vue
@@ -1,126 +1,39 @@
-
-
+
-
+
-
-
-
-
-
+ :style="{
+ background: !project.featured_gallery && !project.gallery[0] ? toTransparent : null,
+ }"
+ >
+
+
+
+ {{ project.title }}
+
+ + {{ project.description }} +
+
+
-
+
-
-
-
- {{ project.title }}
+ class="flex items-center gap-1 pr-2 border-0 border-r-[1px] border-solid border-button-border"
+ >
+
+
+
+ {{ formatCategory(featuredCategory) }}
+
- by {{ project.author }}
- {{ project.description }}
-
-
-
+
+
diff --git a/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
new file mode 100644
index 000000000..396794ba1
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/QuickInstanceSwitcher.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/RunningAppBar.vue b/apps/app-frontend/src/components/ui/RunningAppBar.vue
index ad600fc7f..12e3b0dd8 100644
--- a/apps/app-frontend/src/components/ui/RunningAppBar.vue
+++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue
@@ -1,20 +1,12 @@
75% of ad revenue goes to creators
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
Offline
@@ -45,15 +37,6 @@
-
@@ -108,8 +91,14 @@
-
-
diff --git a/apps/app-frontend/src/components/ui/SplashScreen.vue b/apps/app-frontend/src/components/ui/SplashScreen.vue
index 393899376..14b0a72a4 100644
--- a/apps/app-frontend/src/components/ui/SplashScreen.vue
+++ b/apps/app-frontend/src/components/ui/SplashScreen.vue
@@ -72,7 +72,7 @@
-
@@ -86,8 +86,7 @@ import { ref, watch } from 'vue'
import ProgressBar from '@/components/ui/ProgressBar.vue'
import { loading_listener } from '@/helpers/events.js'
import { getCurrentWindow } from '@tauri-apps/api/window'
-import { XIcon } from '@modrinth/assets'
-import { MaximizeIcon, MinimizeIcon } from '@/assets/icons/index.js'
+import { XIcon, MaximizeIcon, MinimizeIcon } from '@modrinth/assets'
import { getOS } from '@/helpers/utils.js'
import { useLoading } from '@/store/loading.js'
@@ -128,7 +127,6 @@ const os = ref('')
getOS().then((x) => (os.value = x))
loading_listener(async (e) => {
- console.log(e)
if (e.event.type === 'directory_move') {
loadingProgress.value = 100 * (e.fraction ?? 1)
message.value = 'Updating app directory...'
diff --git a/apps/app-frontend/src/components/ui/URLConfirmModal.vue b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
index 0059ab3c2..91014edc8 100644
--- a/apps/app-frontend/src/components/ui/URLConfirmModal.vue
+++ b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
@@ -71,7 +71,6 @@ async function install() {
align-items: center;
justify-content: center;
gap: var(--gap-md);
- padding: var(--gap-lg);
}
.button-row {
diff --git a/apps/app-frontend/src/components/ui/friends/FriendsList.vue b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
new file mode 100644
index 000000000..c936489bc
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/friends/FriendsList.vue
@@ -0,0 +1,357 @@
+
+
+
+ Add friends to share what you're playing!
+
+
+
+
+
+
+
+ {{ friend.username }}
+
+
+
+
+
+ You have no pending friend requests :C
+
+
+
+
+
+
+
+
+ + + {{ friend.username }} sent you a friend request + + + You sent {{ friend.username }} a friend request + +
+{{ friend.created.fromNow() }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Username
+You can add friends with their Modrinth username.
+ +
+
+
+
+
+
+ Friends
+
+ {{ acceptedFriends.length }}
+
+
+
+
+ {{ pendingFriends.length }}
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue b/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue
index f75f7946b..31029e1e6 100644
--- a/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue
@@ -7,37 +7,43 @@
installed.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sign in to add friends!
+
+
+ Add friends
+ to share what you're playing!
+
+
+
+
+
+
+
+
+ {{ friend.username }}
+
+ {{ friend.status }}
+
+ | {{ instance?.name }} | -{{ project.title }} | -||||
|---|---|---|---|---|---|
| {{ instance?.loader }} {{ instance?.game_version }} | -
- | {{ instance?.name }} |
+ {{ project.title }} |
+ {{ instance?.loader }} {{ instance?.game_version }} |
+
+ |
- |
@@ -52,12 +58,13 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
index d9e7f63f3..c86c3e10d 100644
--- a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
@@ -6,7 +6,7 @@ import { useTheming } from '@/store/theme.js'
const themeStore = useTheming()
-defineProps({
+const props = defineProps({
confirmationText: {
type: String,
default: '',
@@ -25,10 +25,22 @@ defineProps({
default: 'No description defined',
required: true,
},
+ proceedIcon: {
+ type: Object,
+ default: undefined,
+ },
proceedLabel: {
type: String,
default: 'Proceed',
},
+ danger: {
+ type: Boolean,
+ default: true,
+ },
+ showAdOnClose: {
+ type: Boolean,
+ default: true,
+ },
})
const emit = defineEmits(['proceed'])
@@ -46,7 +58,9 @@ defineExpose({
})
function onModalHide() {
- show_ads_window()
+ if (props.showAdOnClose) {
+ show_ads_window()
+ }
}
function proceed() {
@@ -61,9 +75,11 @@ function proceed() {
:has-to-type="hasToType"
:title="title"
:description="description"
+ :proceed-icon="proceedIcon"
:proceed-label="proceedLabel"
:on-hide="onModalHide"
:noblur="!themeStore.advancedRendering"
+ :danger="danger"
@proceed="proceed"
/>
diff --git a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
new file mode 100644
index 000000000..8cdb38218
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
index a1b26e33d..63d0c5f9d 100644
--- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
@@ -1,6 +1,6 @@
+
+
diff --git a/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
new file mode 100644
index 000000000..2cbae653c
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/AppearanceSettings.vue
@@ -0,0 +1,123 @@
+
+
+
-
-
-
-
-
-
-
diff --git a/apps/app-frontend/src/helpers/ads.js b/apps/app-frontend/src/helpers/ads.js
index 41b231c38..f4a6430b2 100644
--- a/apps/app-frontend/src/helpers/ads.js
+++ b/apps/app-frontend/src/helpers/ads.js
@@ -1,11 +1,11 @@
import { invoke } from '@tauri-apps/api/core'
-export async function init_ads_window(x, y, width, height, overrideShown = false) {
- return await invoke('plugin:ads|init_ads_window', { x, y, width, height, overrideShown })
+export async function init_ads_window(overrideShown = false) {
+ return await invoke('plugin:ads|init_ads_window', { overrideShown, dpr: window.devicePixelRatio })
}
export async function show_ads_window() {
- return await invoke('plugin:ads|show_ads_window')
+ return await invoke('plugin:ads|show_ads_window', { dpr: window.devicePixelRatio })
}
export async function hide_ads_window(reset) {
diff --git a/apps/app-frontend/src/helpers/events.js b/apps/app-frontend/src/helpers/events.js
index 3bc07bcb9..0ed288365 100644
--- a/apps/app-frontend/src/helpers/events.js
+++ b/apps/app-frontend/src/helpers/events.js
@@ -93,3 +93,7 @@ export async function command_listener(callback) {
export async function warning_listener(callback) {
return await listen('warning', (event) => callback(event.payload))
}
+
+export async function friend_listener(callback) {
+ return await listen('friend', (event) => callback(event.payload))
+}
diff --git a/apps/app-frontend/src/helpers/friends.js b/apps/app-frontend/src/helpers/friends.js
new file mode 100644
index 000000000..168c93837
--- /dev/null
+++ b/apps/app-frontend/src/helpers/friends.js
@@ -0,0 +1,17 @@
+import { invoke } from '@tauri-apps/api/core'
+
+export async function friends() {
+ return await invoke('plugin:friends|friends')
+}
+
+export async function friend_statuses() {
+ return await invoke('plugin:friends|friend_statuses')
+}
+
+export async function add_friend(userId) {
+ return await invoke('plugin:friends|add_friend', { userId })
+}
+
+export async function remove_friend(userId) {
+ return await invoke('plugin:friends|remove_friend', { userId })
+}
diff --git a/apps/app-frontend/src/helpers/pack.js b/apps/app-frontend/src/helpers/pack.js
index 9908e93d1..c175f9030 100644
--- a/apps/app-frontend/src/helpers/pack.js
+++ b/apps/app-frontend/src/helpers/pack.js
@@ -7,7 +7,7 @@ import { invoke } from '@tauri-apps/api/core'
import { create } from './profile'
// Installs pack from a version ID
-export async function install(projectId, versionId, packTitle, iconUrl) {
+export async function create_profile_and_install(projectId, versionId, packTitle, iconUrl) {
const location = {
type: 'fromVersionId',
project_id: projectId,
@@ -28,8 +28,18 @@ export async function install(projectId, versionId, packTitle, iconUrl) {
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 install_from_file(path) {
+export async function create_profile_and_install_from_file(path) {
const location = {
type: 'fromFile',
path: path,
diff --git a/apps/app-frontend/src/helpers/profile.js b/apps/app-frontend/src/helpers/profile.js
index 118a374ae..ed9741bdb 100644
--- a/apps/app-frontend/src/helpers/profile.js
+++ b/apps/app-frontend/src/helpers/profile.js
@@ -4,6 +4,8 @@
* and deserialized into a usable JS object.
*/
import { invoke } from '@tauri-apps/api/core'
+import { install_to_existing_profile } from '@/helpers/pack.js'
+import { handleError } from '@/store/notifications.js'
/// Add instance
/*
@@ -186,3 +188,17 @@ export async function edit(path, editProfile) {
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,
+ ).catch(handleError)
+ } else {
+ await install(instance.path, false).catch(handleError)
+ }
+}
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
new file mode 100644
index 000000000..1007744d0
--- /dev/null
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -0,0 +1,115 @@
+import type { ModrinthId } from '@modrinth/utils'
+
+type GameInstance = {
+ path: string
+ install_stage: InstallStage
+
+ name: string
+ icon_path?: string
+
+ game_version: string
+ loader: InstanceLoader
+ loader_version?: string
+
+ groups: string[]
+
+ linked_data?: LinkedData
+
+ created: Date
+ modified: Date
+ last_played?: Date
+
+ submitted_time_played: number
+ recent_time_played: number
+
+ java_path?: string
+ extra_launch_args?: string[]
+ custom_env_vars?: [string, string][]
+
+ memory?: MemorySettings
+ force_fullscreen?: boolean
+ game_resolution?: [number, number]
+ hooks: Hooks
+}
+
+type InstallStage =
+ | 'installed'
+ | 'minecraft_installing'
+ | 'pack_installed'
+ | 'pack_installing'
+ | 'not_installed'
+
+type LinkedData = {
+ project_id: ModrinthId
+ version_id: ModrinthId
+
+ locked: boolean
+}
+
+type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
+
+type MemorySettings = {
+ maximum: number
+}
+
+type WindowSize = {
+ width: number
+ height: number
+}
+
+type Hooks = {
+ pre_launch?: string
+ wrapper?: string
+ post_exit?: string
+}
+
+type Manifest = {
+ gameVersions: ManifestGameVersion[]
+}
+
+type ManifestGameVersion = {
+ id: string
+ stable: boolean
+ loaders: ManifestLoaderVersion[]
+}
+
+type ManifestLoaderVersion = {
+ id: string
+ url: string
+ stable: boolean
+}
+
+type AppSettings = {
+ max_concurrent_downloads: number
+ max_concurrent_writes: number
+
+ theme: 'dark' | 'light' | 'oled'
+ default_page: 'Home' | 'Library'
+ collapsed_navigation: boolean
+ advanced_rendering: boolean
+ native_decorations: boolean
+
+ telemetry: boolean
+ discord_rpc: boolean
+ developer_mode: boolean
+ personalized_ads: boolean
+
+ onboarded: boolean
+
+ extra_launch_args: string[]
+ custom_env_vars: [string, string][]
+ memory: MemorySettings
+ force_fullscreen: boolean
+ game_resolution: [number, number]
+ hide_on_process_start: boolean
+ hooks: Hooks
+
+ custom_dir?: string
+ prev_custom_dir?: string
+ migrated: boolean
+}
+
+export type InstanceSettingsTabProps = {
+ instance: GameInstance
+ offline?: boolean
+}
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index 69cd5a8c4..569420101 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -49,17 +49,3 @@ export const releaseColor = (releaseType) => {
return ''
}
}
-
-export function debounce(fn, wait) {
- let timer
- return function (...args) {
- if (timer) {
- clearTimeout(timer) // clear any pre-existing timer
- }
-
- const context = this // get the current context
- timer = setTimeout(() => {
- fn.apply(context, args) // call the function if time expires
- }, wait)
- }
-}
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
new file mode 100644
index 000000000..a46dbe60e
--- /dev/null
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -0,0 +1,320 @@
+{
+ "app.settings.developer-mode-enabled": {
+ "message": "Developer mode enabled."
+ },
+ "app.settings.tabs.appearance": {
+ "message": "Appearance"
+ },
+ "app.settings.tabs.default-instance-options": {
+ "message": "Default instance options"
+ },
+ "app.settings.tabs.feature-flags": {
+ "message": "Feature flags"
+ },
+ "app.settings.tabs.java-installations": {
+ "message": "Java installations"
+ },
+ "app.settings.tabs.privacy": {
+ "message": "Privacy"
+ },
+ "app.settings.tabs.resource-management": {
+ "message": "Resource management"
+ },
+ "instance.filter.updates-available": {
+ "message": "Updates available"
+ },
+ "instance.settings.tabs.general": {
+ "message": "General"
+ },
+ "instance.settings.tabs.general.delete": {
+ "message": "Delete instance"
+ },
+ "instance.settings.tabs.general.delete.button": {
+ "message": "Delete instance"
+ },
+ "instance.settings.tabs.general.delete.description": {
+ "message": "Permanently deletes an instance from your device, including your worlds, configs, and all installed content. Be careful, as once you delete a instance there is no way to recover it."
+ },
+ "instance.settings.tabs.general.deleting.button": {
+ "message": "Deleting..."
+ },
+ "instance.settings.tabs.general.duplicate-button": {
+ "message": "Duplicate"
+ },
+ "instance.settings.tabs.general.duplicate-button.tooltip.installing": {
+ "message": "Cannot duplicate while installing."
+ },
+ "instance.settings.tabs.general.duplicate-instance": {
+ "message": "Duplicate instance"
+ },
+ "instance.settings.tabs.general.duplicate-instance.description": {
+ "message": "Creates a copy of this instance, including worlds, configs, mods, etc."
+ },
+ "instance.settings.tabs.general.edit-icon": {
+ "message": "Edit icon"
+ },
+ "instance.settings.tabs.general.edit-icon.remove": {
+ "message": "Remove icon"
+ },
+ "instance.settings.tabs.general.edit-icon.replace": {
+ "message": "Replace icon"
+ },
+ "instance.settings.tabs.general.edit-icon.select": {
+ "message": "Select icon"
+ },
+ "instance.settings.tabs.general.library-groups": {
+ "message": "Library groups"
+ },
+ "instance.settings.tabs.general.library-groups.create": {
+ "message": "Create new group"
+ },
+ "instance.settings.tabs.general.library-groups.description": {
+ "message": "Library groups allow you to organize your instances into different sections in your library."
+ },
+ "instance.settings.tabs.general.library-groups.enter-name": {
+ "message": "Enter group name"
+ },
+ "instance.settings.tabs.general.name": {
+ "message": "Name"
+ },
+ "instance.settings.tabs.hooks": {
+ "message": "Launch hooks"
+ },
+ "instance.settings.tabs.hooks.custom-hooks": {
+ "message": "Custom launch hooks"
+ },
+ "instance.settings.tabs.hooks.description": {
+ "message": "Hooks allow advanced users to run certain system commands before and after launching the game."
+ },
+ "instance.settings.tabs.hooks.post-exit": {
+ "message": "Post-exit"
+ },
+ "instance.settings.tabs.hooks.post-exit.description": {
+ "message": "Ran after the game closes."
+ },
+ "instance.settings.tabs.hooks.post-exit.enter": {
+ "message": "Enter post-exit command..."
+ },
+ "instance.settings.tabs.hooks.pre-launch": {
+ "message": "Pre-launch"
+ },
+ "instance.settings.tabs.hooks.pre-launch.description": {
+ "message": "Ran before the instance is launched."
+ },
+ "instance.settings.tabs.hooks.pre-launch.enter": {
+ "message": "Enter pre-launch command..."
+ },
+ "instance.settings.tabs.hooks.title": {
+ "message": "Game launch hooks"
+ },
+ "instance.settings.tabs.hooks.wrapper": {
+ "message": "Wrapper"
+ },
+ "instance.settings.tabs.hooks.wrapper.description": {
+ "message": "Wrapper command for launching Minecraft."
+ },
+ "instance.settings.tabs.hooks.wrapper.enter": {
+ "message": "Enter wrapper command..."
+ },
+ "instance.settings.tabs.installation": {
+ "message": "Installation"
+ },
+ "instance.settings.tabs.installation.change-version.already-installed.modded": {
+ "message": "{platform} {version} for Minecraft {game_version} already installed"
+ },
+ "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"
+ },
+ "instance.settings.tabs.installation.reinstall.button": {
+ "message": "Reinstall modpack"
+ },
+ "instance.settings.tabs.installation.reinstall.button.reinstalling": {
+ "message": "Reinstalling modpack"
+ },
+ "instance.settings.tabs.installation.reinstall.confirm.description": {
+ "message": "Reinstalling will reset all installed or modified content to what is provided by the modpack, removing any mods or content you have added on top of the original installation. This may fix unexpected behavior if changes have been made to the instance, but if your worlds now depend on additional installed content, it may break existing worlds."
+ },
+ "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"
+ },
+ "instance.settings.tabs.installation.repair.button.repairing": {
+ "message": "Repairing"
+ },
+ "instance.settings.tabs.installation.repair.confirm.description": {
+ "message": "Repairing reinstalls Minecraft dependencies and checks for corruption. This may resolve issues if your game is not launching due to launcher-related errors, but will not resolve issues or crashes related to installed mods."
+ },
+ "instance.settings.tabs.installation.repair.confirm.title": {
+ "message": "Repair instance?"
+ },
+ "instance.settings.tabs.installation.repair.in-progress": {
+ "message": "Repair in progress"
+ },
+ "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"
+ },
+ "instance.settings.tabs.installation.tooltip.action.reinstall": {
+ "message": "reinstall"
+ },
+ "instance.settings.tabs.installation.tooltip.action.repair": {
+ "message": "repair"
+ },
+ "instance.settings.tabs.installation.tooltip.cannot-while-installing": {
+ "message": "Cannot {action} while installing"
+ },
+ "instance.settings.tabs.installation.tooltip.cannot-while-offline": {
+ "message": "Cannot {action} while offline"
+ },
+ "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"
+ },
+ "instance.settings.tabs.java.environment-variables": {
+ "message": "Environment variables"
+ },
+ "instance.settings.tabs.java.hooks": {
+ "message": "Hooks"
+ },
+ "instance.settings.tabs.java.java-arguments": {
+ "message": "Java arguments"
+ },
+ "instance.settings.tabs.java.java-installation": {
+ "message": "Java installation"
+ },
+ "instance.settings.tabs.java.java-memory": {
+ "message": "Memory allocated"
+ },
+ "instance.settings.tabs.window": {
+ "message": "Window"
+ },
+ "instance.settings.tabs.window.custom-window-settings": {
+ "message": "Custom window settings"
+ },
+ "instance.settings.tabs.window.fullscreen": {
+ "message": "Fullscreen"
+ },
+ "instance.settings.tabs.window.fullscreen.description": {
+ "message": "Make the game start in full screen when launched (using options.txt)."
+ },
+ "instance.settings.tabs.window.height": {
+ "message": "Height"
+ },
+ "instance.settings.tabs.window.height.description": {
+ "message": "The height of the game window when launched."
+ },
+ "instance.settings.tabs.window.height.enter": {
+ "message": "Enter height..."
+ },
+ "instance.settings.tabs.window.width": {
+ "message": "Width"
+ },
+ "instance.settings.tabs.window.width.description": {
+ "message": "The width of the game window when launched."
+ },
+ "instance.settings.tabs.window.width.enter": {
+ "message": "Enter width..."
+ },
+ "instance.settings.title": {
+ "message": "Settings"
+ },
+ "search.filter.locked.instance": {
+ "message": "Provided by the instance"
+ },
+ "search.filter.locked.instance-game-version.title": {
+ "message": "Game version is provided by the instance"
+ },
+ "search.filter.locked.instance-loader.title": {
+ "message": "Loader is provided by the instance"
+ },
+ "search.filter.locked.instance.sync": {
+ "message": "Sync with instance"
+ }
+}
diff --git a/apps/app-frontend/src/main.js b/apps/app-frontend/src/main.js
index 2262d1a5c..ba6d3f49b 100644
--- a/apps/app-frontend/src/main.js
+++ b/apps/app-frontend/src/main.js
@@ -37,7 +37,16 @@ Sentry.init({
app.use(router)
app.use(pinia)
-app.use(FloatingVue)
+app.use(FloatingVue, {
+ themes: {
+ 'ribbit-popout': {
+ $extend: 'dropdown',
+ placement: 'bottom-end',
+ instantMove: true,
+ distance: 8,
+ },
+ },
+})
app.use(VIntlPlugin)
app.mount('#app')
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index 793029908..a57b2fddd 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -1,32 +1,165 @@
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
new file mode 100644
index 000000000..f31ebd208
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/instance_settings/HooksSettings.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ formatMessage(messages.duplicateInstance) }} +
++ {{ formatMessage(messages.duplicateInstanceDescription) }} +
++ {{ formatMessage(messages.libraryGroups) }} +
++ {{ formatMessage(messages.libraryGroupsDescription) }} +
+
+
+
+
+
+
+
+
+ + {{ formatMessage(messages.deleteInstance) }} +
++ {{ formatMessage(messages.deleteInstanceDescription) }} +
+
+
+
diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
new file mode 100644
index 000000000..7810581a3
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -0,0 +1,789 @@
+
+
+
+ + {{ formatMessage(messages.hooks) }} +
++ {{ formatMessage(messages.hooksDescription) }} +
++ {{ formatMessage(messages.preLaunch) }} +
++ {{ formatMessage(messages.preLaunchDescription) }} +
+ + ++ {{ formatMessage(messages.wrapper) }} +
++ {{ formatMessage(messages.wrapperDescription) }} +
+ + ++ {{ formatMessage(messages.postExit) }} +
++ {{ formatMessage(messages.postExitDescription) }} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
new file mode 100644
index 000000000..fe09bef67
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
@@ -0,0 +1,188 @@
+
+
+
+ + {{ formatMessage(messages.currentlyInstalled) }} +
+
+
+
+
+
+
{{ formatMessage(messages.debugInformation) }}
+
+ {{ instance.linked_data }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ modpackProject
+ ? modpackProject.title
+ : formatMessage(messages.minecraftVersion, { version: instance.game_version })
+ }}
+
+
+ {{
+ modpackProject
+ ? modpackVersion
+ ? modpackVersion?.version_number
+ : 'Unknown version'
+ : formatCategory(instance.loader)
+ }}
+
+ {{ instance.loader_version || formatMessage(messages.unknownVersion) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ formatMessage(messages.platform) }} +
++ {{ formatMessage(messages.gameVersion) }} +
+
+
+
+ + {{ formatMessage(messages.loaderVersion, { loader: formatCategory(loader) }) }} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ formatMessage(messages.unlinkInstanceTitle) }} +
++ {{ formatMessage(messages.unlinkInstanceDescription) }} +
+
+
+ + {{ formatMessage(messages.reinstallModpackTitle) }} +
++ {{ formatMessage(messages.reinstallModpackDescription) }} +
+
+
+
diff --git a/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
new file mode 100644
index 000000000..735d6c083
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue
@@ -0,0 +1,165 @@
+
+
+
+ + {{ formatMessage(messages.javaInstallation) }} +
+
+
+
+
+ {{ javaInstall.path }}
+
+
+ + {{ formatMessage(messages.javaMemory) }} +
++ {{ formatMessage(messages.javaArguments) }} +
++ {{ formatMessage(messages.javaEnvironmentVariables) }} +
+
+
+
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
new file mode 100644
index 000000000..071b0e9b6
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+ + {{ formatMessage(messages.fullscreen) }} +
++ {{ formatMessage(messages.fullscreenDescription) }} +
+
+
+
+
+
+
+ + {{ formatMessage(messages.width) }} +
++ {{ formatMessage(messages.widthDescription) }} +
+
+
+
+
+
+ + {{ formatMessage(messages.height) }} +
++ {{ formatMessage(messages.heightDescription) }} +
+
+
+
+ + {{ formatMessage(developerModeEnabled) }} +
+
+
+
+
+
+ Modrinth App {{ version }}
++ MacOS + {{ osPlatform }} + {{ osVersion }} +
+Color theme
+Select your preferred color theme for Modrinth App.
+ +
+
+
+
+
+
+ Advanced rendering
++ Enables advanced rendering such as blur effects that may cause performance issues without + hardware-accelerated rendering. +
+
+
+
+
+
+ Native Decorations
+Use system window frame (app restart required).
+
+
+
+
+
+ Minimize launcher
+Minimize the launcher when a Minecraft process starts.
+
+
+
+
+
+ Default landing page
+Change the page to which the launcher opens on.
+
+
+
diff --git a/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue b/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
new file mode 100644
index 000000000..ecff3f485
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+ Toggle sidebar
+Enables the ability to toggle the sidebar.
+
+
+ +
+ +
+
diff --git a/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue b/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
new file mode 100644
index 000000000..fde4a5c1c
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/FeatureFlagSettings.vue
@@ -0,0 +1,44 @@
+
+
+ Window size
+ +
+
+
+
+
+
+ Fullscreen
++ Overwrites the options.txt file to start in full screen when launched. +
+
+
+
+
+
+
+
+ Width
++ The width of the game window when launched. +
+
+
+
+
+
+
+
+ Height
++ The height of the game window when launched. +
++ +
Memory allocated
+The memory allocated to each instance when it is ran.
+Java arguments
+ + +Environmental variables
+ + ++ +
Hooks
+ +Pre launch
+Ran before the instance is launched.
+ + +Wrapper
++ Wrapper command for launching Minecraft. +
+ + +Post exit
+Ran after the game closes.
+ +
+
+
diff --git a/apps/app-frontend/src/components/ui/settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/settings/JavaSettings.vue
new file mode 100644
index 000000000..226c809d1
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/JavaSettings.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+ + {{ option }} +
+
+
+
diff --git a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
new file mode 100644
index 000000000..5bb4deac0
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
@@ -0,0 +1,84 @@
+
+
+
+ + Java {{ javaVersion }} location +
+
+
+
+
+
+ Personalized ads
++ Modrinth's ad provider, Aditude, shows ads based on your preferences. By disabling this + option, you opt out and ads will no longer be shown based on your interests. +
+
+
+
+
+
+ Telemetry
++ Modrinth collects anonymized analytics and usage data to improve our user experience and + customize your experience. By disabling this option, you opt out and your data will no + longer be collected. +
+
+
+
diff --git a/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue b/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
new file mode 100644
index 000000000..f67313447
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/settings/ResourceManagementSettings.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+ Discord RPC
++ Manages the Discord Rich Presence integration. Disabling this will cause 'Modrinth' to no + longer show up as a game or app you are using on your Discord profile. +
++ Note: This will not prevent any instance-specific Discord Rich Presence integrations, such + as those added by mods. (app restart required to take effect) +
+App directory
++ The directory where the launcher stores all of its files. Changes will be applied after + restarting the launcher. +
+ +
+
+
+
+
+
+
+
+
+ App cache
++ The Modrinth app stores a cache of data to speed up loading. This can be purged to force the + app to reload data. This may slow down the app temporarily. +
+Maximum concurrent downloads
++ The maximum amount of files the launcher can download at the same time. Set this to a lower + value if you have a poor internet connection. (app restart required to take effect) +
+Maximum concurrent writes
++ The maximum amount of files the launcher can write to the disk at once. Set this to a lower + value if you are frequently getting I/O errors. (app restart required to take effect) +
+Enter two-factor code
-Please enter a two-factor code to proceed.
- - - -Login to Modrinth
-Create an account
-
-
-
-
-
-
-
-
-
-
-
- -
Or
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
- Sort by
-
-
- Show per page
-
-
+ Loading...
+
+ {{ filter.formatted_name }}
+ + + {{ formatMessage(messages.gameVersionProvidedByInstance) }} + + + {{ formatMessage(messages.modLoaderProvidedByInstance) }} + + {{ formatMessage(messages.syncFilterButton) }} +
+
+
-
-
-
-
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index a134463ef..9d9064eb5 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -1,5 +1,5 @@
- Install content to instance
+ +
+
+
+
+ Sort by:
+ {{ selected }}
+
+
+ View:
+ {{ selected }}
+
+
+
+
+
You are currently offline. Connect to the internet to browse Modrinth!
@@ -733,7 +485,7 @@ const isModProject = computed(() => ['modpack', 'mod'].includes(projectType.valu
v-for="result in results.hits"
:key="result?.project_id"
:project="result"
- :instance="instanceContext"
+ :instance="instance"
:categories="[
...categories.filter(
(cat) =>
@@ -745,176 +497,27 @@ const isModProject = computed(() => ['modpack', 'mod'].includes(projectType.valu
loader.supported_project_types?.includes(projectType),
),
]"
- :installed="result.installed"
+ :installed="result.installed || newlyInstalled.includes(result.project_id)"
+ @install="
+ (id) => {
+ newlyInstalled.push(id)
+ }
+ "
+ @contextmenu.prevent.stop="(event) => handleRightClick(event, result)"
/>
+
+
-
+
+
+
+
+
-.page-container {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- width: 100%;
-}
-
diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue
deleted file mode 100644
index acdc5b04c..000000000
--- a/apps/app-frontend/src/pages/Settings.vue
+++ /dev/null
@@ -1,628 +0,0 @@
-
-
-
-
Welcome back!
+Welcome to Modrinth App!
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/app-frontend/src/pages/index.js b/apps/app-frontend/src/pages/index.js
index cf05aec56..6c4866b46 100644
--- a/apps/app-frontend/src/pages/index.js
+++ b/apps/app-frontend/src/pages/index.js
@@ -1,6 +1,4 @@
import Index from './Index.vue'
import Browse from './Browse.vue'
-import Library from './Library.vue'
-import Settings from './Settings.vue'
-export { Index, Browse, Library, Settings }
+export { Index, Browse }
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index eb6919192..d2f3d52e0 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -1,98 +1,143 @@
-
-
- - General settings -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Display -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Resource management -
-
-
-
-
-
-
-
-
-
- - Privacy -
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Java settings -
-- - - - -
-
-
-
-
-
- - Hooks -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Window size -
-
-
-
-
-
-
-
-
-
-
-
-
-
- - About -
-
-
-
-
-
-
-
@@ -1173,16 +1078,6 @@ onUnmounted(() => {
diff --git a/apps/app-frontend/src/pages/instance/Options.vue b/apps/app-frontend/src/pages/instance/Options.vue
deleted file mode 100644
index 2089fafe8..000000000
--- a/apps/app-frontend/src/pages/instance/Options.vue
+++ /dev/null
@@ -1,974 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ {{ instance.name }}
- {{ instance.loader }} {{ instance.game_version }} +
+
+
+
+
+
+
+
-
-
-
+
-
+
+
+
+
+
+
+
-
+
- Loading...
-
-
-
-
-
- -
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Loader
-
-
- Game Version
-
-
-
-
- Loader Version
-
-
-
-
-
-
-
- - Instance -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Java -
-
-
- Installation
--
-
- Java arguments
-
-
- Environment variables
--
-
- Java memory
-
-
- - Window -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Hooks -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Modpack -
-
-
-
-
-
- This is an unlocked instance. There may be unexpected behaviour unintended by the modpack
- creator.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Instance management -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
diff --git a/apps/app-frontend/src/pages/project/Gallery.vue b/apps/app-frontend/src/pages/project/Gallery.vue
index b1b0acaa1..833048612 100644
--- a/apps/app-frontend/src/pages/project/Gallery.vue
+++ b/apps/app-frontend/src/pages/project/Gallery.vue
@@ -198,7 +198,7 @@ document.addEventListener('keypress', keyListener)
.expanded-image-modal {
position: fixed;
- z-index: 10;
+ z-index: 11;
overflow: auto;
top: 0;
left: 0;
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index 36633b71a..1f5082b13 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -1,248 +1,157 @@
-
+
diff --git a/apps/app-frontend/src/pages/library/Overview.vue b/apps/app-frontend/src/pages/library/Overview.vue
new file mode 100644
index 000000000..06c9bcdf4
--- /dev/null
+++ b/apps/app-frontend/src/pages/library/Overview.vue
@@ -0,0 +1,13 @@
+
+
+ Library
+
+
-
+
+ No instances found
+ +No instances found
- -
-
-
diff --git a/apps/frontend/src/components/ui/AdPlaceholder.vue b/apps/frontend/src/components/ui/AdPlaceholder.vue
index be6b5d7e0..639a28b86 100644
--- a/apps/frontend/src/components/ui/AdPlaceholder.vue
+++ b/apps/frontend/src/components/ui/AdPlaceholder.vue
@@ -22,10 +22,10 @@ import { ChevronRightIcon } from "@modrinth/assets";
useHead({
script: [
- {
- // Clean.io
- src: "https://cadmus.script.ac/d14pdm1b7fi5kh/script.js",
- },
+ // {
+ // // Clean.io
+ // src: "https://cadmus.script.ac/d14pdm1b7fi5kh/script.js",
+ // },
{
// Aditude
src: "https://dn0qt3r0xannq.cloudfront.net/modrinth-7JfmkEIXEp/modrinth-longform/prebid-load.js",
diff --git a/apps/frontend/src/components/ui/Badge.vue b/apps/frontend/src/components/ui/Badge.vue
index 376d3f9d6..1ebb84510 100644
--- a/apps/frontend/src/components/ui/Badge.vue
+++ b/apps/frontend/src/components/ui/Badge.vue
@@ -4,7 +4,7 @@
'badge flex items-center gap-1 font-semibold text-secondary ' + color + ' type--' + type
"
>
- {{ $capitalizeString(type) }}
+ {{ capitalizeString(type) }}
-
-
-
-
-
-
+
+
+
+
-
- {{
- instance.name.length > 20 ? instance.name.substring(0, 20) + '...' : instance.name
- }}
-
- {{ instance.loader.charAt(0).toUpperCase() + instance.loader.slice(1) }}
- {{ instance.game_version }}
-
-
-
-
- {{ data.title }}
- {{ data.description }} -
+
-
-
-
-
- -
-
- -
-
-
-
-
-
-
-
-
- - {{ formatNumber(data.downloads) }} - downloads -
-
-
- - {{ formatNumber(data.followers) }} - followers -
-
-
-
-
- -
-
-
-
- - -
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/servers/LoaderSelector.vue b/apps/frontend/src/components/ui/servers/LoaderSelector.vue
index ceb3e3143..f1e1a14ff 100644
--- a/apps/frontend/src/components/ui/servers/LoaderSelector.vue
+++ b/apps/frontend/src/components/ui/servers/LoaderSelector.vue
@@ -1,52 +1,60 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.file.name }}
+ {{ item.size }}
+
+
+
+ Done
+
+
+ Failed - File already exists
+
+
+ Failed - Incorrect file type
+
+
+
+ {{ item.progress }}%
+
+
+
+
+
+ Cancelled
+
+
+ {{ item.progress }}%
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -21,19 +20,16 @@
circle
:raised="raised"
/>
-
+
+
{{ members[message.author_id].username }}
-
+
(path: string, options: PyroFetchOptions = {}): Promi
});
return response;
} catch (error) {
- console.error("[PYROSERVERS]:", error);
+ console.error("[PyroServers/PyroFetch]:", error);
if (error instanceof FetchError) {
const statusCode = error.response?.status;
- const statusText = error.response?.statusText || "Unknown error";
+ const statusText = error.response?.statusText || "[no status text available]";
const errorMessages: { [key: number]: string } = {
400: "Bad Request",
401: "Unauthorized",
@@ -80,15 +80,16 @@ async function PyroFetch(path: string, options: PyroFetchOptions = {}): Promi
429: "Too Many Requests",
500: "Internal Server Error",
502: "Bad Gateway",
+ 503: "Service Unavailable",
};
const message =
statusCode && statusCode in errorMessages
? errorMessages[statusCode]
- : `HTTP Error: ${statusCode || "unknown"} ${statusText}`;
- throw new PyroFetchError(`[PYROSERVERS][PYRO] ${message}`, statusCode, error);
+ : `HTTP Error: ${statusCode || "[unhandled status code]"} ${statusText}`;
+ throw new PyroFetchError(`[PyroServers/PyroFetch] ${message}`, statusCode, error);
}
throw new PyroFetchError(
- "[PYROSERVERS][PYRO] An unexpected error occurred during the fetch operation.",
+ "[PyroServers/PyroFetch] An unexpected error occurred during the fetch operation.",
undefined,
error as Error,
);
@@ -168,7 +169,15 @@ interface General {
backup_quota: number;
used_backup_quota: number;
status: string;
- suspension_reason: string;
+ suspension_reason:
+ | "moderated"
+ | "paymentfailed"
+ | "cancelled"
+ | "other"
+ | "transferring"
+ | "upgrading"
+ | "support"
+ | (string & {});
loader: string;
loader_version: string;
mc_version: string;
@@ -198,14 +207,16 @@ interface Startup {
jdk_build: "corretto" | "temurin" | "graal";
}
-interface Mod {
+export interface Mod {
filename: string;
- project_id: string;
- version_id: string;
- name: string;
- version_number: string;
- icon_url: string;
+ project_id: string | undefined;
+ version_id: string | undefined;
+ name: string | undefined;
+ version_number: string | undefined;
+ icon_url: string | undefined;
+ owner: string | undefined;
disabled: boolean;
+ installing: boolean;
}
interface Backup {
@@ -213,6 +224,7 @@ interface Backup {
name: string;
created_at: string;
ongoing: boolean;
+ locked: boolean;
}
interface AutoBackupSettings {
@@ -225,6 +237,23 @@ interface JWTAuth {
token: string;
}
+export interface DirectoryItem {
+ name: string;
+ type: "directory" | "file";
+ count?: number;
+ modified: number;
+ created: number;
+ path: string;
+}
+
+export interface DirectoryResponse {
+ items: DirectoryItem[];
+ total: number;
+ current?: number;
+}
+
+type ContentType = "Mod" | "Plugin";
+
const constructServerProperties = (properties: any): string => {
let fileContent = `#Minecraft server properties\n#${new Date().toUTCString()}\n`;
@@ -483,13 +512,16 @@ const setMotd = async (motd: string) => {
}
};
-// ------------------ MODS ------------------ //
+// ------------------ CONTENT ------------------ //
-const installMod = async (projectId: string, versionId: string) => {
+const installContent = async (contentType: ContentType, projectId: string, versionId: string) => {
try {
await PyroFetch(`servers/${internalServerRefrence.value.serverId}/mods`, {
method: "POST",
- body: { rinth_ids: { project_id: projectId, version_id: versionId } },
+ body: {
+ install_as: contentType,
+ rinth_ids: { project_id: projectId, version_id: versionId },
+ },
});
} catch (error) {
console.error("Error installing mod:", error);
@@ -497,12 +529,13 @@ const installMod = async (projectId: string, versionId: string) => {
}
};
-const removeMod = async (modId: string) => {
+const removeContent = async (contentType: ContentType, contentId: string) => {
try {
await PyroFetch(`servers/${internalServerRefrence.value.serverId}/deleteMod`, {
method: "POST",
body: {
- path: modId,
+ install_as: contentType,
+ path: contentId,
},
});
} catch (error) {
@@ -511,11 +544,15 @@ const removeMod = async (modId: string) => {
}
};
-const reinstallMod = async (modId: string, versionId: string) => {
+const reinstallContent = async (
+ contentType: ContentType,
+ contentId: string,
+ newContentId: string,
+) => {
try {
- await PyroFetch(`servers/${internalServerRefrence.value.serverId}/mods/${modId}`, {
+ await PyroFetch(`servers/${internalServerRefrence.value.serverId}/mods/${contentId}`, {
method: "PUT",
- body: { version_id: versionId },
+ body: { install_as: contentType, version_id: newContentId },
});
} catch (error) {
console.error("Error reinstalling mod:", error);
@@ -527,10 +564,11 @@ const reinstallMod = async (modId: string, versionId: string) => {
const createBackup = async (backupName: string) => {
try {
- await PyroFetch(`servers/${internalServerRefrence.value.serverId}/backups`, {
+ const response = (await PyroFetch(`servers/${internalServerRefrence.value.serverId}/backups`, {
method: "POST",
body: { name: backupName },
- });
+ })) as { id: string };
+ return response.id;
} catch (error) {
console.error("Error creating backup:", error);
throw error;
@@ -604,6 +642,34 @@ const getAutoBackup = async () => {
}
};
+const lockBackup = async (backupId: string) => {
+ try {
+ return await PyroFetch(
+ `servers/${internalServerRefrence.value.serverId}/backups/${backupId}/lock`,
+ {
+ method: "POST",
+ },
+ );
+ } catch (error) {
+ console.error("Error locking backup:", error);
+ throw error;
+ }
+};
+
+const unlockBackup = async (backupId: string) => {
+ try {
+ return await PyroFetch(
+ `servers/${internalServerRefrence.value.serverId}/backups/${backupId}/unlock`,
+ {
+ method: "POST",
+ },
+ );
+ } catch (error) {
+ console.error("Error locking backup:", error);
+ throw error;
+ }
+};
+
// ------------------ NETWORK ------------------ //
const reserveAllocation = async (name: string): Promise => {
@@ -698,6 +764,8 @@ const retryWithAuth = async (requestFn: () => Promise) => {
await internalServerRefrence.value.refresh(["fs"]);
return await requestFn();
}
+
+ throw error;
}
};
@@ -723,21 +791,74 @@ const createFileOrFolder = (path: string, type: "file" | "directory") => {
};
const uploadFile = (path: string, file: File) => {
+ // eslint-disable-next-line require-await
return retryWithAuth(async () => {
const encodedPath = encodeURIComponent(path);
- return await PyroFetch(`/create?path=${encodedPath}&type=file`, {
- method: "POST",
- contentType: "application/octet-stream",
- body: file,
- override: internalServerRefrence.value.fs.auth,
+ const progressSubject = new EventTarget();
+ const abortController = new AbortController();
+
+ const uploadPromise = new Promise((resolve, reject) => {
+ const xhr = new XMLHttpRequest();
+
+ xhr.upload.addEventListener("progress", (e) => {
+ if (e.lengthComputable) {
+ const progress = (e.loaded / e.total) * 100;
+ progressSubject.dispatchEvent(
+ new CustomEvent("progress", {
+ detail: {
+ loaded: e.loaded,
+ total: e.total,
+ progress,
+ },
+ }),
+ );
+ }
+ });
+
+ xhr.onload = () => {
+ if (xhr.status >= 200 && xhr.status < 300) {
+ resolve(xhr.response);
+ } else {
+ reject(new Error(`Upload failed with status ${xhr.status}`));
+ }
+ };
+
+ xhr.onerror = () => reject(new Error("Upload failed"));
+ xhr.onabort = () => reject(new Error("Upload cancelled"));
+
+ xhr.open(
+ "POST",
+ `https://${internalServerRefrence.value.fs.auth.url}/create?path=${encodedPath}&type=file`,
+ );
+ xhr.setRequestHeader("Authorization", `Bearer ${internalServerRefrence.value.fs.auth.token}`);
+ xhr.setRequestHeader("Content-Type", "application/octet-stream");
+ xhr.send(file);
+
+ abortController.signal.addEventListener("abort", () => {
+ xhr.abort();
+ });
});
+
+ return {
+ promise: uploadPromise,
+ onProgress: (
+ callback: (progress: { loaded: number; total: number; progress: number }) => void,
+ ) => {
+ progressSubject.addEventListener("progress", ((e: CustomEvent) => {
+ callback(e.detail);
+ }) as EventListener);
+ },
+ cancel: () => {
+ abortController.abort();
+ },
+ };
});
};
const renameFileOrFolder = (path: string, name: string) => {
const pathName = path.split("/").slice(0, -1).join("/") + "/" + name;
return retryWithAuth(async () => {
- return await PyroFetch(`/move`, {
+ await PyroFetch(`/move`, {
method: "POST",
override: internalServerRefrence.value.fs.auth,
body: {
@@ -745,6 +866,7 @@ const renameFileOrFolder = (path: string, name: string) => {
destination: pathName,
},
});
+ return true;
});
};
@@ -858,7 +980,7 @@ const modules: any = {
setMotd,
fetchConfigFile,
},
- mods: {
+ content: {
get: async (serverId: string) => {
try {
const mods = await PyroFetch(`servers/${serverId}/mods`);
@@ -873,9 +995,9 @@ const modules: any = {
return undefined;
}
},
- install: installMod,
- remove: removeMod,
- reinstall: reinstallMod,
+ install: installContent,
+ remove: removeContent,
+ reinstall: reinstallContent,
},
backups: {
get: async (serverId: string) => {
@@ -893,6 +1015,8 @@ const modules: any = {
download: downloadBackup,
updateAutoBackup,
getAutoBackup,
+ lock: lockBackup,
+ unlock: unlockBackup,
},
network: {
get: async (serverId: string) => {
@@ -1018,9 +1142,9 @@ type GeneralFunctions = {
fetchConfigFile: (fileName: string) => Promise;
};
-type ModFunctions = {
+type ContentFunctions = {
/**
- * INTERNAL: Gets the mods of a server.
+ * INTERNAL: Gets the list content of a server.
* @param serverId - The ID of the server.
* @returns
*/
@@ -1028,23 +1152,26 @@ type ModFunctions = {
/**
* Installs a mod to a server.
+ * @param contentType - The type of content to install.
* @param projectId - The ID of the project.
* @param versionId - The ID of the version.
*/
- install: (projectId: string, versionId: string) => Promise;
+ install: (contentType: ContentType, projectId: string, versionId: string) => Promise;
/**
* Removes a mod from a server.
- * @param modId - The ID of the mod.
+ * @param contentType - The type of content to remove.
+ * @param contentId - The ID of the content.
*/
- remove: (modId: string) => Promise;
+ remove: (contentType: ContentType, contentId: string) => Promise;
/**
* Reinstalls a mod to a server.
- * @param modId - The ID of the mod.
- * @param versionId - The ID of the version.
+ * @param contentType - The type of content to reinstall.
+ * @param contentId - The ID of the content.
+ * @param newContentId - The ID of the new version.
*/
- reinstall: (modId: string, versionId: string) => Promise;
+ reinstall: (contentType: ContentType, contentId: string, newContentId: string) => Promise;
};
type BackupFunctions = {
@@ -1058,6 +1185,7 @@ type BackupFunctions = {
/**
* Creates a new backup for the server.
* @param backupName - The name of the backup.
+ * @returns The ID of the backup.
*/
create: (backupName: string) => Promise;
@@ -1098,6 +1226,18 @@ type BackupFunctions = {
* Gets the auto backup settings of the server.
*/
getAutoBackup: () => Promise;
+
+ /**
+ * Locks a backup for the server.
+ * @param backupId - The ID of the backup.
+ */
+ lock: (backupId: string) => Promise;
+
+ /**
+ * Unlocks a backup for the server.
+ * @param backupId - The ID of the backup.
+ */
+ unlock: (backupId: string) => Promise;
};
type NetworkFunctions = {
@@ -1177,7 +1317,7 @@ type FSFunctions = {
* @param pageSize - The page size to list.
* @returns
*/
- listDirContents: (path: string, page: number, pageSize: number) => Promise;
+ listDirContents: (path: string, page: number, pageSize: number) => Promise;
/**
* @param path - The path to create the file or folder at.
@@ -1231,15 +1371,15 @@ type FSFunctions = {
};
type GeneralModule = General & GeneralFunctions;
-type ModsModule = { data: Mod[] } & ModFunctions;
+type ContentModule = { data: Mod[] } & ContentFunctions;
type BackupsModule = { data: Backup[] } & BackupFunctions;
type NetworkModule = { allocations: Allocation[] } & NetworkFunctions;
type StartupModule = Startup & StartupFunctions;
-type FSModule = { auth: JWTAuth } & FSFunctions;
+export type FSModule = { auth: JWTAuth } & FSFunctions;
type ModulesMap = {
general: GeneralModule;
- mods: ModsModule;
+ content: ContentModule;
backups: BackupsModule;
network: NetworkModule;
startup: StartupModule;
@@ -1247,7 +1387,7 @@ type ModulesMap = {
fs: FSModule;
};
-type avaliableModules = ("general" | "mods" | "backups" | "network" | "startup" | "ws" | "fs")[];
+type avaliableModules = ("general" | "content" | "backups" | "network" | "startup" | "ws" | "fs")[];
export type Server = {
[K in T[number]]?: ModulesMap[K];
diff --git a/apps/frontend/src/helpers/infer.js b/apps/frontend/src/helpers/infer.js
index 406f7e917..5629eb06e 100644
--- a/apps/frontend/src/helpers/infer.js
+++ b/apps/frontend/src/helpers/infer.js
@@ -403,6 +403,99 @@ export const inferVersionInfo = async function (rawFile, project, gameVersions)
case 13:
newGameVersions.push("1.19.4");
break;
+ case 14:
+ newGameVersions = getRange("23w14a", "23w16a");
+ break;
+ case 15:
+ newGameVersions = getRange("1.20", "1.20.1");
+ break;
+ case 16:
+ newGameVersions.push("23w31a");
+ break;
+ case 17:
+ newGameVersions = getRange("23w32a", "1.20.2-pre1");
+ break;
+ case 18:
+ newGameVersions.push("1.20.2");
+ break;
+ case 19:
+ newGameVersions.push("23w42a");
+ break;
+ case 20:
+ newGameVersions = getRange("23w43a", "23w44a");
+ break;
+ case 21:
+ newGameVersions = getRange("23w45a", "23w46a");
+ break;
+ case 22:
+ newGameVersions = getRange("1.20.3", "1.20.4");
+ break;
+ case 24:
+ newGameVersions = getRange("24w03a", "24w04a");
+ break;
+ case 25:
+ newGameVersions = getRange("24w05a", "24w05b");
+ break;
+ case 26:
+ newGameVersions = getRange("24w06a", "24w07a");
+ break;
+ case 28:
+ newGameVersions = getRange("24w09a", "24w10a");
+ break;
+ case 29:
+ newGameVersions.push("24w11a");
+ break;
+ case 30:
+ newGameVersions.push("24w12a");
+ break;
+ case 31:
+ newGameVersions = getRange("24w13a", "1.20.5-pre3");
+ break;
+ case 32:
+ newGameVersions = getRange("1.20.5", "1.20.6");
+ break;
+ case 33:
+ newGameVersions = getRange("24w18a", "24w20a");
+ break;
+ case 34:
+ newGameVersions = getRange("1.21", "1.21.1");
+ break;
+ case 35:
+ newGameVersions.push("24w33a");
+ break;
+ case 36:
+ newGameVersions = getRange("24w34a", "24w35a");
+ break;
+ case 37:
+ newGameVersions.push("24w36a");
+ break;
+ case 38:
+ newGameVersions.push("24w37a");
+ break;
+ case 39:
+ newGameVersions = getRange("24w38a", "24w39a");
+ break;
+ case 40:
+ newGameVersions.push("24w40a");
+ break;
+ case 41:
+ newGameVersions = getRange("1.21.2-pre1", "1.21.2-pre2");
+ break;
+ case 42:
+ newGameVersions = getRange("1.21.2", "1.21.3");
+ break;
+ case 43:
+ newGameVersions.push("24w44a");
+ break;
+ case 44:
+ newGameVersions.push("24w45a");
+ break;
+ case 45:
+ newGameVersions.push("24w46a");
+ break;
+ case 46:
+ newGameVersions.push("1.21.4");
+ break;
default:
}
}
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index e70191c04..25c977363 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -1,4 +1,10 @@
+
@@ -203,7 +209,10 @@
@@ -588,15 +599,14 @@ import {
GlassesIcon,
PaintBrushIcon,
PackageOpenIcon,
+ XIcon as CrossIcon,
+ ScaleIcon as ModerationIcon,
+ BellIcon as NotificationIcon,
} from "@modrinth/assets";
-import { Button, ButtonStyled, OverflowMenu, Avatar } from "@modrinth/ui";
+import { Button, ButtonStyled, OverflowMenu, Avatar, commonMessages } from "@modrinth/ui";
-import CrossIcon from "assets/images/utils/x.svg";
-import NotificationIcon from "assets/images/sidebar/notifications.svg";
-import ModerationIcon from "assets/images/sidebar/admin.svg";
import ModalCreation from "~/components/ui/ModalCreation.vue";
import { getProjectTypeMessage } from "~/utils/i18n-project-type.ts";
-import { commonMessages } from "~/utils/common-messages.ts";
import CollectionCreateModal from "~/components/ui/CollectionCreateModal.vue";
import OrganizationCreateModal from "~/components/ui/OrganizationCreateModal.vue";
import TeleportOverflowMenu from "~/components/ui/servers/TeleportOverflowMenu.vue";
@@ -614,6 +624,9 @@ const config = useRuntimeConfig();
const route = useNativeRoute();
const link = config.public.siteUrl + route.path.replace(/\/+$/, "");
+const createPopoutId = useId();
+const userPopoutId = useId();
+
const verifyEmailBannerMessages = defineMessages({
title: {
id: "layout.banner.verify-email.title",
@@ -907,9 +920,13 @@ const userMenuOptions = computed(() => {
return options;
});
-const isDiscovering = computed(() => route.name && route.name.startsWith("search-"));
+const isDiscovering = computed(
+ () => route.name && route.name.startsWith("search-") && !route.query.sid,
+);
-const isDiscoveringSubpage = computed(() => route.name && route.name.startsWith("type-id"));
+const isDiscoveringSubpage = computed(
+ () => route.name && route.name.startsWith("type-id") && !route.query.sid,
+);
onMounted(() => {
if (window && import.meta.client) {
@@ -1014,7 +1031,6 @@ function hideStagingBanner() {
.layout {
min-height: 100vh;
- background-color: var(--color-bg);
display: block;
@media screen and (min-width: 1024px) {
@@ -1430,7 +1446,7 @@ function hideStagingBanner() {
}
main {
- padding-top: 0.75rem;
+ padding-top: 1.5rem;
}
}
diff --git a/apps/frontend/src/layouts/empty.vue b/apps/frontend/src/layouts/empty.vue
index 3b417e250..257037c03 100644
--- a/apps/frontend/src/layouts/empty.vue
+++ b/apps/frontend/src/layouts/empty.vue
@@ -1 +1,4 @@
{count} project} other {{count} projects}}"
},
@@ -287,72 +251,6 @@
"frog.title": {
"message": "Frog"
},
- "input.view.gallery": {
- "message": "Gallery view"
- },
- "input.view.grid": {
- "message": "Grid view"
- },
- "input.view.list": {
- "message": "Rows view"
- },
- "label.changes-saved": {
- "message": "Changes saved"
- },
- "label.collections": {
- "message": "Collections"
- },
- "label.created-ago": {
- "message": "Created {ago}"
- },
- "label.dashboard": {
- "message": "Dashboard"
- },
- "label.delete": {
- "message": "Delete"
- },
- "label.description": {
- "message": "Description"
- },
- "label.error": {
- "message": "Error"
- },
- "label.followed-projects": {
- "message": "Followed projects"
- },
- "label.moderation": {
- "message": "Moderation"
- },
- "label.notifications": {
- "message": "Notifications"
- },
- "label.password": {
- "message": "Password"
- },
- "label.public": {
- "message": "Public"
- },
- "label.rejected": {
- "message": "Rejected"
- },
- "label.scopes": {
- "message": "Scopes"
- },
- "label.settings": {
- "message": "Settings"
- },
- "label.title": {
- "message": "Title"
- },
- "label.unlisted": {
- "message": "Unlisted"
- },
- "label.visibility": {
- "message": "Visibility"
- },
- "label.visit-your-profile": {
- "message": "Visit your profile"
- },
"layout.action.change-theme": {
"message": "Change theme"
},
@@ -440,9 +338,6 @@
"layout.nav.search": {
"message": "Search"
},
- "notification.error.title": {
- "message": "An error occurred"
- },
"profile.button.manage-projects": {
"message": "Manage projects"
},
@@ -491,9 +386,6 @@
"profile.user-id": {
"message": "User ID: {id}"
},
- "project-type.all": {
- "message": "All"
- },
"project-type.collection.plural": {
"message": "Collections"
},
@@ -542,24 +434,6 @@
"project-type.shader.singular": {
"message": "Shader"
},
- "project.about.compatibility.environments": {
- "message": "Supported environments"
- },
- "project.about.compatibility.game.minecraftJava": {
- "message": "Minecraft: Java Edition"
- },
- "project.about.compatibility.platforms": {
- "message": "Platforms"
- },
- "project.about.compatibility.title": {
- "message": "Compatibility"
- },
- "project.about.creators.owner": {
- "message": "Project owner"
- },
- "project.about.creators.title": {
- "message": "Creators"
- },
"project.about.details.created": {
"message": "Created {date}"
},
@@ -578,39 +452,6 @@
"project.about.details.updated": {
"message": "Updated {date}"
},
- "project.about.links.discord": {
- "message": "Join Discord server"
- },
- "project.about.links.donate.bmac": {
- "message": "Buy Me a Coffee"
- },
- "project.about.links.donate.generic": {
- "message": "Donate"
- },
- "project.about.links.donate.github": {
- "message": "Sponsor on GitHub"
- },
- "project.about.links.donate.kofi": {
- "message": "Donate on Ko-fi"
- },
- "project.about.links.donate.patreon": {
- "message": "Donate on Patreon"
- },
- "project.about.links.donate.paypal": {
- "message": "Donate on PayPal"
- },
- "project.about.links.issues": {
- "message": "Report issues"
- },
- "project.about.links.source": {
- "message": "View source"
- },
- "project.about.links.title": {
- "message": "Links"
- },
- "project.about.links.wiki": {
- "message": "Visit wiki"
- },
"project.description.title": {
"message": "Description"
},
@@ -887,17 +728,17 @@
"scopes.versionWrite.label": {
"message": "Write versions"
},
- "settings.account.title": {
- "message": "Account and security"
+ "search.filter.locked.server": {
+ "message": "Provided by the server"
},
- "settings.appearance.title": {
- "message": "Appearance"
+ "search.filter.locked.server-game-version.title": {
+ "message": "Game version is provided by the server"
},
- "settings.applications.title": {
- "message": "Your applications"
+ "search.filter.locked.server-loader.title": {
+ "message": "Loader is provided by the server"
},
- "settings.authorized-apps.title": {
- "message": "Authorized apps"
+ "search.filter.locked.server.sync": {
+ "message": "Sync with server"
},
"settings.billing.modal.cancel.action": {
"message": "Cancel subscription"
@@ -977,15 +818,18 @@
"settings.billing.payment_method_type.visa": {
"message": "Visa"
},
+ "settings.billing.pyro_subscription.description": {
+ "message": "Manage your Modrinth Server subscriptions."
+ },
+ "settings.billing.pyro_subscription.title": {
+ "message": "Modrinth Server Subscriptions"
+ },
"settings.billing.subscription.description": {
"message": "Manage your Modrinth subscriptions."
},
"settings.billing.subscription.title": {
"message": "Subscriptions"
},
- "settings.billing.title": {
- "message": "Billing and subscriptions"
- },
"settings.display.banner.developer-mode.button": {
"message": "Deactivate developer mode"
},
@@ -1058,30 +902,9 @@
"settings.display.sidebar.right-aligned-filters-sidebar.title": {
"message": "Right-aligned filters sidebar on search pages"
},
- "settings.display.theme.dark": {
- "message": "Dark"
- },
"settings.display.theme.description": {
"message": "Select your preferred color theme for Modrinth on this device."
},
- "settings.display.theme.light": {
- "message": "Light"
- },
- "settings.display.theme.oled": {
- "message": "OLED"
- },
- "settings.display.theme.preferred-dark-theme": {
- "message": "Preferred dark theme"
- },
- "settings.display.theme.preferred-light-theme": {
- "message": "Preferred light theme"
- },
- "settings.display.theme.retro": {
- "message": "Retro"
- },
- "settings.display.theme.system": {
- "message": "Sync with system"
- },
"settings.display.theme.title": {
"message": "Color theme"
},
@@ -1127,9 +950,6 @@
"settings.language.languages.search.no-results": {
"message": "No languages match your search."
},
- "settings.language.title": {
- "message": "Language"
- },
"settings.pats.action.create": {
"message": "Create a PAT"
},
@@ -1163,9 +983,6 @@
"settings.pats.modal.edit.title": {
"message": "Edit personal access token"
},
- "settings.pats.title": {
- "message": "Personal access tokens"
- },
"settings.pats.token.action.edit": {
"message": "Edit token"
},
@@ -1202,9 +1019,6 @@
"settings.profile.profile-picture.title": {
"message": "Profile picture"
},
- "settings.profile.title": {
- "message": "Public profile"
- },
"settings.profile.username.description": {
"message": "A unique case-insensitive name to identify your profile."
},
@@ -1226,16 +1040,10 @@
"settings.sessions.last-accessed-ago": {
"message": "Last accessed {ago}"
},
- "settings.sessions.title": {
- "message": "Sessions"
- },
"settings.sessions.unknown-os": {
"message": "Unknown OS"
},
"settings.sessions.unknown-platform": {
"message": "Unknown platform"
- },
- "tooltip.date-at-time": {
- "message": "{date, date, long} at {time, time, short}"
}
}
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index 1afc0e82a..e36ffc875 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -1,4 +1,7 @@
+
+
-
+
(versionFilter && x.includes(versionFilter)) ||
@@ -281,30 +296,39 @@
)
.slice()
.reverse()"
- :key="version"
- :color="currentGameVersion === version ? 'brand' : 'standard'"
+ :key="gameVersion"
+ :color="currentGameVersion === gameVersion ? 'brand' : 'standard'"
>
@@ -376,6 +400,15 @@
if (!currentGameVersion && gameVersionAccordion) {
gameVersionAccordion.open();
}
+
+ navigateTo({
+ query: {
+ ...route.query,
+ ...(userSelectedGameVersion && { version: userSelectedGameVersion }),
+ ...(userSelectedPlatform && { loader: userSelectedPlatform }),
+ },
+ hash: route.hash,
+ });
}
"
>
@@ -430,47 +463,7 @@
}"
>
Mod loaders
+
-
-
-
+
-
- - {{ loader.displayName }} -
- -- {{ data.loader_version }} -
+
+
-
-
diff --git a/apps/frontend/src/components/ui/servers/PanelTerminal.vue b/apps/frontend/src/components/ui/servers/PanelTerminal.vue
index 47c0a8e84..29dfb8c0c 100644
--- a/apps/frontend/src/components/ui/servers/PanelTerminal.vue
+++ b/apps/frontend/src/components/ui/servers/PanelTerminal.vue
@@ -136,15 +136,18 @@
diff --git a/apps/frontend/src/components/ui/thread/ThreadMessage.vue b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
index 93fae43a5..42263b482 100644
--- a/apps/frontend/src/components/ui/thread/ThreadMessage.vue
+++ b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
@@ -8,10 +8,9 @@
}"
>
- Plugin loaders
+
+
-
-
+
+
+
+
+
+
@@ -272,7 +287,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
-
-
- {{ formatCategory(category) }}
-
-
-
+
+
-
-
+
+ {{ option.name }}
+
+
+
+
+ No collections found.
+
-
+ No collections found.
-
-
-
-
-
-
-
-
-
+ {{ formatMessage(compatibilityMessages.title) }}
-{{ formatMessage(compatibilityMessages.minecraftJava) }}
-
-
-
- {{ version }}
-
- {{ formatMessage(compatibilityMessages.platforms) }}
-
-
-
-
- {{ formatCategory(platform) }}
-
- {{ formatMessage(compatibilityMessages.environments) }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formatMessage(linksMessages.title) }}
-
-
-
- -
- - -
-
+ />
+ {{ formatMessage(creatorsMessages.title) }}
-
-
-
-
-
- -
-
-
-
-
- {{ organization.name }}
-
- Organization
-
- - -
-
- {{ member.name }}
-
- {{ formatMessage(detailsMessages.title) }}
@@ -979,46 +815,31 @@
diff --git a/apps/frontend/src/pages/auth.vue b/apps/frontend/src/pages/auth.vue
index 2fea3e565..8edb3eea8 100644
--- a/apps/frontend/src/pages/auth.vue
+++ b/apps/frontend/src/pages/auth.vue
@@ -83,4 +83,20 @@ definePageMeta({
gap: var(--gap-md);
flex-wrap: wrap;
}
+
+.turnstile {
+ display: flex;
+ justify-content: center;
+ overflow: hidden;
+ border-radius: var(--radius-md);
+ border: 2px solid var(--color-button-bg);
+ height: 65px;
+ width: 100%;
+
+ > div {
+ position: relative;
+ top: -2px;
+ min-width: calc(100% + 4px);
+ }
+}
diff --git a/apps/frontend/src/pages/auth/authorize.vue b/apps/frontend/src/pages/auth/authorize.vue
index e532e225c..76cb38948 100644
--- a/apps/frontend/src/pages/auth/authorize.vue
+++ b/apps/frontend/src/pages/auth/authorize.vue
@@ -80,7 +80,7 @@
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index c5d680d7f..9cac71a2c 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -1,7 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+ Server Upgrading
++ Your server's hardware is currently being upgraded and will be back online shortly. +
+
+
+
+
+
+
+
+
+
+
+ We're working on your server
++ You recently contacted Modrinth Support, and we're actively working on your server. It + will be back online shortly. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Server Suspended
+
+ {{
+ serverData.suspension_reason
+ ? `Your server has been suspended: ${serverData.suspension_reason}`
+ : "Your server has been suspended."
+ }}
+
+ This is most likely due to a billing issue. Please check your billing information and
+ contact Modrinth support if you believe this is an error.
+
@@ -23,6 +88,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Server Node Unavailable
++ Your server's node, where your Modrinth Server is physically hosted, is experiencing + issues. We are working with our datacenter to resolve the issue as quickly as possible. +
++ Your data is safe and will not be lost, and your server will be back online as soon as + the issue is resolved. +
++ For updates, please join the Modrinth Discord or contact Modrinth Support via the chat + bubble in the bottom right corner and we'll be happy to help. +
+ +
+
+
-
-
{{ errorTitle }}
+ {{ errorTitle }}
+
+ An error occurred while installing your server because Modrinth Servers does not
+ support the version of Minecraft or the loader you specified. Try reinstalling
+ your server with a different version or loader, and if the problem persists,
+ please contact Modrinth support with your server's debug information.
+
(null);
const isReconnecting = ref(false);
@@ -294,7 +422,7 @@ const router = useRouter();
const serverId = route.params.id as string;
const server = await usePyroServer(serverId, [
"general",
- "mods",
+ "content",
"backups",
"network",
"startup",
@@ -305,6 +433,7 @@ const server = await usePyroServer(serverId, [
watch(
() => server.error,
(newError) => {
+ if (server.general?.status === "suspended") return;
if (newError && !newError.message.includes("Forbidden")) {
startPolling();
}
@@ -319,9 +448,8 @@ const serverData = computed(() => server.general);
const error = ref(null);
const isConnected = ref(false);
const isWSAuthIncorrect = ref(false);
-const maxConsoleOutput = 5000;
-const consoleOutput = ref([]);
-const throttledConsoleOutput = refThrottled(consoleOutput, 200);
+const pyroConsole = usePyroConsole();
+console.log("||||||||||||||||||||||| console", pyroConsole.output);
const cpuData = ref([]);
const ramData = ref([]);
const isActioning = ref(false);
@@ -401,7 +529,7 @@ const connectWebSocket = () => {
return;
}
- consoleOutput.value = [];
+ pyroConsole.clear();
socket.value?.send(JSON.stringify({ event: "auth", jwt: wsAuth.value?.token }));
isConnected.value = true;
isReconnecting.value = false;
@@ -409,7 +537,7 @@ const connectWebSocket = () => {
if (firstConnect.value) {
for (let i = 0; i < initialConsoleMessage.length; i++) {
- consoleOutput.value.push(initialConsoleMessage[i]);
+ pyroConsole.addLine(initialConsoleMessage[i]);
}
}
@@ -432,9 +560,7 @@ const connectWebSocket = () => {
socket.value.onclose = () => {
if (isMounted.value) {
- consoleOutput.value.push(
- "\nSomething went wrong with the connection, we're reconnecting...",
- );
+ pyroConsole.addLine("\nSomething went wrong with the connection, we're reconnecting...");
isConnected.value = false;
scheduleReconnect();
}
@@ -492,10 +618,7 @@ const handleWebSocketMessage = (data: WSEvent) => {
case "log":
// eslint-disable-next-line no-case-declarations
const log = data.message.split("\n").filter((l) => l.trim());
- if (consoleOutput.value.length > maxConsoleOutput) {
- consoleOutput.value.shift();
- }
- consoleOutput.value.push(...log);
+ pyroConsole.addLines(log);
break;
case "stats":
updateStats(data);
@@ -518,7 +641,7 @@ const handleWebSocketMessage = (data: WSEvent) => {
handleInstallationResult(data);
break;
case "new-mod":
- server.refresh(["mods"]);
+ server.refresh(["content"]);
console.log("New mod:", data);
break;
case "auth-ok":
@@ -562,17 +685,22 @@ const handleInstallationResult = async (data: WSInstallationResultEvent) => {
errorMessage.value = data.reason ?? "Unknown error";
error.value = new Error(data.reason ?? "Unknown error");
let files = await server.fs?.listDirContents("/", 1, 100);
- if (files.total > 1) {
- for (let i = 1; i < files.total; i++) {
- files = await server.fs?.listDirContents("/", i, 100);
- if (files.items?.length === 0) break;
+ if (files) {
+ if (files.total > 1) {
+ for (let i = 1; i < files.total; i++) {
+ const nextFiles = await server.fs?.listDirContents("/", i, 100);
+ if (nextFiles?.items?.length === 0) break;
+ if (nextFiles) files = nextFiles;
+ }
}
}
- const fileName = await files.items?.find((file: { name: string }) =>
+ const fileName = files?.items?.find((file: { name: string }) =>
file.name.startsWith("modrinth-installation"),
)?.name;
- errorLogFile.value = fileName;
- errorLog.value = await server.fs?.downloadFile(fileName);
+ errorLogFile.value = fileName ?? "";
+ if (fileName) {
+ errorLog.value = await server.fs?.downloadFile(fileName);
+ }
break;
}
}
@@ -585,7 +713,7 @@ const onReinstall = (potentialArgs: any) => {
// serverData.value.loader_version = potentialArgs.lVersion;
// serverData.value.mc_version = potentialArgs.mVersion;
// if (potentialArgs?.loader) {
- // console.log("setting loader to", potentialArgs.loader);
+ // console.log("setting loadeconsole
// serverData.value.loader = potentialArgs.loader;
// }
// if (potentialArgs?.lVersion) {
diff --git a/apps/frontend/src/pages/servers/manage/[id]/backups.vue b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
index ddb55c69f..31656983e 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
@@ -107,6 +107,7 @@
v-tooltip="'Backup in progress'"
class="size-6 animate-spin"
/>
+
@@ -159,6 +160,16 @@
},
},
{ id: 'download', action: () => initiateDownload(backup.id) },
+ {
+ id: 'lock',
+ action: () => {
+ if (backup.locked) {
+ unlockBackup(backup.id);
+ } else {
+ lockBackup(backup.id);
+ }
+ },
+ },
{
id: 'delete',
action: () => {
@@ -172,6 +183,8 @@
+
@@ -15,11 +15,11 @@
-
+
@@ -56,9 +56,9 @@
-
-
-
+
+
-
+
-
+
{{ filterMethodLabel }}
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
- (null);
const windowScrollY = ref(0);
const windowHeight = ref(0);
-const localMods = ref([]);
+const localMods = ref([]);
const searchInput = ref("");
const modSearchInput = ref("");
const filterMethod = ref("all");
+const uploadDropdownRef = ref();
+
+const handleDroppedFiles = (files: File[]) => {
+ files.forEach((file) => {
+ uploadDropdownRef.value?.uploadFile(file);
+ });
+};
+
+const initiateFileUpload = () => {
+ const input = document.createElement("input");
+ input.type = "file";
+ input.accept = acceptFileFromProjectType(type.value.toLowerCase());
+ input.multiple = true;
+ input.onchange = () => {
+ if (input.files) {
+ Array.from(input.files).forEach((file) => {
+ uploadDropdownRef.value?.uploadFile(file);
+ });
+ }
+ };
+ input.click();
+};
+
+const showAll = () => {
+ searchInput.value = "";
+ modSearchInput.value = "";
+ filterMethod.value = "all";
+};
+
const filterMethodLabel = computed(() => {
switch (filterMethod.value) {
case "disabled":
@@ -291,7 +435,7 @@ const filterMethodLabel = computed(() => {
case "enabled":
return "Only enabled";
default:
- return "All mods";
+ return `All ${type.value.toLocaleLowerCase()}s`;
}
});
@@ -350,7 +494,7 @@ onUnmounted(() => {
});
watch(
- () => props.server.mods?.data,
+ () => props.server.content?.data,
(newMods) => {
if (newMods) {
localMods.value = [...newMods];
@@ -375,14 +519,17 @@ const debouncedSearch = debounce(() => {
modSearchInput.value = searchInput.value;
if (pyroContentSentinel.value) {
- pyroContentSentinel.value.scrollIntoView({
- behavior: "smooth",
- block: "start",
- });
+ const sentinelRect = pyroContentSentinel.value.getBoundingClientRect();
+ if (sentinelRect.top < 0 || sentinelRect.bottom > window.innerHeight) {
+ pyroContentSentinel.value.scrollIntoView({
+ // behavior: "smooth",
+ block: "start",
+ });
+ }
}
}, 300);
-async function toggleMod(mod: Mod) {
+async function toggleMod(mod: ContentItem) {
mod.changing = true;
const originalFilename = mod.filename;
@@ -399,7 +546,7 @@ async function toggleMod(mod: Mod) {
await props.server.fs?.moveFileOrFolder(sourcePath, destinationPath);
- await props.server.refresh(["general", "mods"]);
+ await props.server.refresh(["general", "content"]);
} catch (error) {
mod.filename = originalFilename;
mod.disabled = originalFilename.endsWith(".disabled");
@@ -414,12 +561,15 @@ async function toggleMod(mod: Mod) {
mod.changing = false;
}
-async function removeMod(mod: Mod) {
+async function removeMod(mod: ContentItem) {
mod.changing = true;
try {
- await props.server.mods?.remove(`/mods/${mod.filename}`);
- await props.server.refresh(["general", "mods"]);
+ await props.server.content?.remove(
+ type.value as "Mod" | "Plugin",
+ `/${type.value.toLowerCase()}s/${mod.filename}`,
+ );
+ await props.server.refresh(["general", "content"]);
} catch (error) {
console.error("Error removing mod:", error);
@@ -439,7 +589,12 @@ const currentVersion = ref();
async function beginChangeModVersion(mod: Mod) {
currentMod.value = mod;
- currentVersions.value = await useBaseFetch(`project/${mod.project_id}/version`, {}, false, true);
+ currentVersions.value = await useBaseFetch(`project/${mod.project_id}/version`, {}, false);
+
+ currentVersions.value = currentVersions.value.filter((version: any) =>
+ version.loaders.includes(props.server.general?.loader?.toLowerCase()),
+ );
+
currentVersion.value = currentVersions.value.find(
(version: any) => version.id === mod.version_id,
);
@@ -450,9 +605,12 @@ async function changeModVersion() {
currentMod.value.changing = true;
try {
modModal.value.hide();
- await props.server.mods?.remove(`/mods/${currentMod.value.filename}`);
- await props.server.mods?.install(currentMod.value.project_id, currentVersion.value.id);
- await props.server.refresh(["general", "mods"]);
+ await props.server.content?.reinstall(
+ type.value,
+ currentMod.value.version_id,
+ currentVersion.value.id,
+ );
+ await props.server.refresh(["general", "content"]);
} catch (error) {
console.error("Error changing mod version:", error);
}
@@ -460,6 +618,10 @@ async function changeModVersion() {
}
const hasMods = computed(() => {
+ return localMods.value?.length > 0;
+});
+
+const hasFilteredMods = computed(() => {
return filteredMods.value?.length > 0;
});
diff --git a/apps/frontend/src/pages/servers/manage/[id]/files.vue b/apps/frontend/src/pages/servers/manage/[id]/files.vue
index 94aac0dde..e61e2d6ac 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/files.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/files.vue
@@ -25,25 +25,31 @@
@delete="handleDeleteItem"
/>
-
import { useInfiniteScroll } from "@vueuse/core";
import { UploadIcon, FolderOpenIcon } from "@modrinth/assets";
-import type { Server } from "~/composables/pyroServers";
+import type { DirectoryResponse, DirectoryItem, Server } from "~/composables/pyroServers";
+import FilesUploadDragAndDrop from "~/components/ui/servers/FilesUploadDragAndDrop.vue";
+import FilesUploadDropdown from "~/components/ui/servers/FilesUploadDropdown.vue";
+
+interface BaseOperation {
+ type: "move" | "rename";
+ itemType: string;
+ fileName: string;
+}
+
+interface MoveOperation extends BaseOperation {
+ type: "move";
+ sourcePath: string;
+ destinationPath: string;
+}
+
+interface RenameOperation extends BaseOperation {
+ type: "rename";
+ path: string;
+ oldName: string;
+ newName: string;
+}
+
+type Operation = MoveOperation | RenameOperation;
const props = defineProps<{
- server: Server<["general", "mods", "backups", "network", "startup", "ws", "fs"]>;
+ server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
}>();
const route = useRoute();
@@ -154,6 +192,8 @@ const VAceEditor = ref();
const mainContent = ref(null);
const scrollContainer = ref(null);
const contextMenu = ref();
+const operationHistory = ref([]);
+const redoStack = ref([]);
const searchQuery = ref("");
const sortMethod = ref("default");
@@ -182,7 +222,8 @@ const isEditingImage = ref(false);
const imagePreview = ref();
const isDragging = ref(false);
-const dragCounter = ref(0);
+
+const uploadDropdownRef = ref();
const data = computed(() => props.server.general);
@@ -190,7 +231,7 @@ useHead({
title: computed(() => `Files - ${data.value?.name ?? "Server"} - Modrinth`),
});
-const fetchDirectoryContents = async (): Promise<{ items: any[]; total: number }> => {
+const fetchDirectoryContents = async (): Promise => {
const path = Array.isArray(currentPath.value) ? currentPath.value.join("") : currentPath.value;
try {
const data = await props.server.fs?.listDirContents(path, currentPage.value, maxResults);
@@ -240,16 +281,97 @@ const refreshList = () => {
reset();
};
+const undoLastOperation = async () => {
+ const lastOperation = operationHistory.value.pop();
+ if (!lastOperation) return;
+
+ try {
+ switch (lastOperation.type) {
+ case "move":
+ await props.server.fs?.moveFileOrFolder(
+ `${lastOperation.destinationPath}/${lastOperation.fileName}`.replace("//", "/"),
+ `${lastOperation.sourcePath}/${lastOperation.fileName}`.replace("//", "/"),
+ );
+ break;
+ case "rename":
+ await props.server.fs?.renameFileOrFolder(
+ `${lastOperation.path}/${lastOperation.newName}`.replace("//", "/"),
+ lastOperation.oldName,
+ );
+ break;
+ }
+
+ redoStack.value.push(lastOperation);
+
+ refreshList();
+ addNotification({
+ group: "files",
+ title: `${lastOperation.type === "move" ? "Move" : "Rename"} undone`,
+ text: `${lastOperation.fileName} has been restored to its original ${lastOperation.type === "move" ? "location" : "name"}`,
+ type: "success",
+ });
+ } catch (error) {
+ console.error(`Error undoing ${lastOperation.type}:`, error);
+ addNotification({
+ group: "files",
+ title: "Undo failed",
+ text: `Failed to undo the last ${lastOperation.type} operation`,
+ type: "error",
+ });
+ }
+};
+
+const redoLastOperation = async () => {
+ const lastOperation = redoStack.value.pop();
+ if (!lastOperation) return;
+
+ try {
+ switch (lastOperation.type) {
+ case "move":
+ await props.server.fs?.moveFileOrFolder(
+ `${lastOperation.sourcePath}/${lastOperation.fileName}`.replace("//", "/"),
+ `${lastOperation.destinationPath}/${lastOperation.fileName}`.replace("//", "/"),
+ );
+ break;
+ case "rename":
+ await props.server.fs?.renameFileOrFolder(
+ `${lastOperation.path}/${lastOperation.oldName}`.replace("//", "/"),
+ lastOperation.newName,
+ );
+ break;
+ }
+
+ operationHistory.value.push(lastOperation);
+
+ refreshList();
+ addNotification({
+ group: "files",
+ title: `${lastOperation.type === "move" ? "Move" : "Rename"} redone`,
+ text: `${lastOperation.fileName} has been ${lastOperation.type === "move" ? "moved" : "renamed"} again`,
+ type: "success",
+ });
+ } catch (error) {
+ console.error(`Error redoing ${lastOperation.type}:`, error);
+ addNotification({
+ group: "files",
+ title: "Redo failed",
+ text: `Failed to redo the last ${lastOperation.type} operation`,
+ type: "error",
+ });
+ }
+};
+
const handleCreateNewItem = async (name: string) => {
try {
const path = `${currentPath.value}/${name}`.replace("//", "/");
await props.server.fs?.createFileOrFolder(path, newItemType.value);
refreshList();
+
addNotification({
group: "files",
- title: "File created",
- text: "Your file has been created.",
+ title: `${newItemType.value === "directory" ? "Folder" : "File"} created`,
+ text: `New ${newItemType.value === "directory" ? "folder" : "file"} ${name} has been created.`,
type: "success",
});
} catch (error) {
@@ -262,6 +384,16 @@ const handleRenameItem = async (newName: string) => {
const path = `${currentPath.value}/${selectedItem.value.name}`.replace("//", "/");
await props.server.fs?.renameFileOrFolder(path, newName);
+ redoStack.value = [];
+ operationHistory.value.push({
+ type: "rename",
+ itemType: selectedItem.value.type,
+ fileName: selectedItem.value.name,
+ path: currentPath.value,
+ oldName: selectedItem.value.name,
+ newName,
+ });
+
refreshList();
if (closeEditor.value) {
@@ -274,27 +406,90 @@ const handleRenameItem = async (newName: string) => {
addNotification({
group: "files",
- title: "File renamed",
- text: "Your file has been renamed.",
+ title: `${selectedItem.value.type === "directory" ? "Folder" : "File"} renamed`,
+ text: `${selectedItem.value.name} has been renamed to ${newName}`,
type: "success",
});
} catch (error) {
- handleRenameError(error);
+ console.error("Error renaming item:", error);
+ if (error instanceof PyroFetchError) {
+ if (error.statusCode === 400) {
+ addNotification({
+ group: "files",
+ title: "Could not rename",
+ text: `An item named "${newName}" already exists in this location`,
+ type: "error",
+ });
+ return;
+ }
+ addNotification({
+ group: "files",
+ title: "Could not rename item",
+ text: "An unexpected error occurred",
+ type: "error",
+ });
+ }
}
};
const handleMoveItem = async (destination: string) => {
try {
+ const itemType = selectedItem.value.type;
+ const sourcePath = currentPath.value;
+ const newPath = `${destination}/${selectedItem.value.name}`.replace("//", "/");
+
await props.server.fs?.moveFileOrFolder(
- `${currentPath.value}/${selectedItem.value.name}`.replace("//", "/"),
- `${destination}/${selectedItem.value.name}`.replace("//", "/"),
+ `${sourcePath}/${selectedItem.value.name}`.replace("//", "/"),
+ newPath,
);
+ redoStack.value = [];
+ operationHistory.value.push({
+ type: "move",
+ sourcePath,
+ destinationPath: destination,
+ fileName: selectedItem.value.name,
+ itemType,
+ });
+
refreshList();
addNotification({
group: "files",
- title: "File moved",
- text: "Your file has been moved.",
+ title: `${itemType === "directory" ? "Folder" : "File"} moved`,
+ text: `${selectedItem.value.name} has been moved to ${newPath}`,
+ type: "success",
+ });
+ } catch (error) {
+ console.error("Error moving item:", error);
+ }
+};
+
+const handleDirectMove = async (moveData: {
+ name: string;
+ type: string;
+ path: string;
+ destination: string;
+}) => {
+ try {
+ const newPath = `${moveData.destination}/${moveData.name}`.replace("//", "/");
+ const sourcePath = moveData.path.substring(0, moveData.path.lastIndexOf("/"));
+
+ await props.server.fs?.moveFileOrFolder(moveData.path, newPath);
+
+ redoStack.value = [];
+ operationHistory.value.push({
+ type: "move",
+ sourcePath,
+ destinationPath: moveData.destination,
+ fileName: moveData.name,
+ itemType: moveData.type,
+ });
+
+ refreshList();
+ addNotification({
+ group: "files",
+ title: `${moveData.type === "directory" ? "Folder" : "File"} moved`,
+ text: `${moveData.name} has been moved to ${newPath}`,
type: "success",
});
} catch (error) {
@@ -356,40 +551,18 @@ const handleCreateError = (error: any) => {
addNotification({
group: "files",
title: "Error creating item",
- text: "File already exists",
+ text: "Something went wrong. The file may already exist.",
type: "error",
});
}
}
};
-const handleRenameError = (error: any) => {
- console.error("Error renaming item:", error);
- if (error instanceof PyroFetchError) {
- if (error.statusCode === 400) {
- addNotification({
- group: "files",
- title: "Could not rename item",
- text: "This item already exists or is invalid.",
- type: "error",
- });
- } else if (error.statusCode === 500) {
- addNotification({
- group: "files",
- title: "Could not rename item",
- text: "Invalid file",
- type: "error",
- });
- }
- }
-};
-
-const applyDefaultSort = (items: any[]) => {
+const applyDefaultSort = (items: DirectoryItem[]) => {
return items.sort((a: any, b: any) => {
if (a.type === "directory" && b.type !== "directory") return -1;
if (a.type !== "directory" && b.type === "directory") return 1;
- if (a.count > b.count) return -1;
- if (a.count < b.count) return 1;
+
return a.name.localeCompare(b.name);
});
};
@@ -406,6 +579,9 @@ const filteredItems = computed(() => {
case "modified":
result.sort((a, b) => new Date(b.modified).getTime() - new Date(a.modified).getTime());
break;
+ case "created":
+ result.sort((a, b) => new Date(b.created).getTime() - new Date(a.created).getTime());
+ break;
case "filesOnly":
result = result.filter((item) => item.type !== "directory");
break;
@@ -509,15 +685,31 @@ const editFile = async (item: { name: string; type: string; path: string }) => {
onMounted(async () => {
await import("ace-builds");
await import("ace-builds/src-noconflict/mode-json");
+ await import("ace-builds/src-noconflict/mode-yaml");
+ await import("ace-builds/src-noconflict/mode-toml");
+ await import("ace-builds/src-noconflict/mode-sh");
await import("ace-builds/src-noconflict/theme-one_dark");
+ await import("ace-builds/src-noconflict/ext-searchbox");
VAceEditor.value = markRaw((await import("vue3-ace-editor")).VAceEditor);
document.addEventListener("click", onAnywhereClicked);
window.addEventListener("scroll", onScroll);
+
+ document.addEventListener("keydown", (e) => {
+ if ((e.ctrlKey || e.metaKey) && !e.shiftKey && e.key === "z") {
+ e.preventDefault();
+ undoLastOperation();
+ }
+ if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.key === "z") {
+ e.preventDefault();
+ redoLastOperation();
+ }
+ });
});
onUnmounted(() => {
document.removeEventListener("click", onAnywhereClicked);
window.removeEventListener("scroll", onScroll);
+ document.removeEventListener("keydown", () => {});
});
watch(
@@ -597,64 +789,23 @@ const requestShareLink = async () => {
}
};
-const handleDragEnter = (event: DragEvent) => {
+const handleDroppedFiles = (files: File[]) => {
if (isEditing.value) return;
- event.preventDefault();
- dragCounter.value++;
- isDragging.value = true;
-};
-const handleDragOver = (event: DragEvent) => {
- if (isEditing.value) return;
- event.preventDefault();
-};
-
-const handleDragLeave = (event: DragEvent) => {
- if (isEditing.value) return;
- event.preventDefault();
- dragCounter.value--;
- if (dragCounter.value === 0) {
- isDragging.value = false;
- }
-};
-
-const handleDrop = async (event: DragEvent) => {
- if (isEditing.value) return;
- event.preventDefault();
- isDragging.value = false;
- dragCounter.value = 0;
- const files = event.dataTransfer?.files;
- if (files) {
- for (let i = 0; i < files.length; i++) {
- await uploadFile(files[i]);
- }
- }
-};
-
-const uploadFile = async (file: File) => {
- try {
- const filePath = `${currentPath.value}/${file.name}`.replace("//", "/");
- await props.server.fs?.uploadFile(filePath, file);
- refreshList();
-
- addNotification({
- group: "files",
- title: "File uploaded",
- text: "Your file has been uploaded.",
- type: "success",
- });
- } catch (error) {
- console.error("Error uploading file:", error);
- }
+ files.forEach((file) => {
+ uploadDropdownRef.value?.uploadFile(file);
+ });
};
const initiateFileUpload = () => {
const input = document.createElement("input");
input.type = "file";
- input.onchange = async () => {
- const file = input.files?.[0];
- if (file) {
- await uploadFile(file);
+ input.multiple = true;
+ input.onchange = () => {
+ if (input.files) {
+ Array.from(input.files).forEach((file) => {
+ uploadDropdownRef.value?.uploadFile(file);
+ });
}
};
input.click();
@@ -708,6 +859,13 @@ const saveFileContent = async (exit: boolean = true) => {
const saveFileContentRestart = async () => {
await saveFileContent();
await props.server.general?.power("Restart");
+
+ addNotification({
+ group: "files",
+ title: "Server restarted",
+ text: "Your server has been restarted.",
+ type: "success",
+ });
};
const saveFileContentAs = async () => {
@@ -734,3 +892,38 @@ const onScroll = () => {
}
};
+
+
diff --git a/apps/frontend/src/pages/servers/manage/[id]/index.vue b/apps/frontend/src/pages/servers/manage/[id]/index.vue
index fdca6702b..37d687c66 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/index.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/index.vue
@@ -88,7 +88,7 @@
-
-
@@ -251,23 +361,28 @@ import {
XIcon,
PlusIcon,
MoreVerticalIcon,
+ CompassIcon,
+ WrenchIcon,
+ ListIcon,
+ FileIcon,
} from "@modrinth/assets";
import { ButtonStyled, NewModal } from "@modrinth/ui";
import { ref, computed, watch, onMounted, onUnmounted } from "vue";
+import FilesUploadDragAndDrop from "~/components/ui/servers/FilesUploadDragAndDrop.vue";
+import FilesUploadDropdown from "~/components/ui/servers/FilesUploadDropdown.vue";
import type { Server } from "~/composables/pyroServers";
+import { acceptFileFromProjectType } from "~/helpers/fileUtils.js";
const props = defineProps<{
- server: Server<["general", "mods", "backups", "network", "startup", "ws", "fs"]>;
+ server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
}>();
-interface Mod {
- name?: string;
- filename: string;
- project_id?: string;
- version_id?: string;
- version_number?: string;
- icon_url?: string;
- disabled: boolean;
+const type = computed(() => {
+ const loader = props.server.general?.loader?.toLowerCase();
+ return loader === "paper" || loader === "purpur" ? "Plugin" : "Mod";
+});
+
+interface ContentItem extends Mod {
changing?: boolean;
}
@@ -278,12 +393,41 @@ const listContainer = ref
-
+
+
-
+
-
+
+
+
-
+
-
+
+
-
- {{
+
-
+
+ {{
mod.name || mod.filename.replace(".disabled", "")
}}
Disabled
- {{
+
+
+
+ by {{ mod.owner }}
+
+ {{ mod.version_number || "External mod" }}
+
+
+
+
-
-
+ {{
mod.version_number || "External mod"
}}
+
+ {{ mod.filename }}
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
- Add content
-
-
+
+ No mods found!
-Add some mods to your server to manage them here.
-
+
+
+
+
+
+
+ + 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
+
-
+
+
+
+
This folder is empty
+This folder is empty
There are no files or folders.
Drop files here to upload
- ;
+ server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
};
const props = defineProps
.modrinth.gg
-
+
Subdomain must be at least 5 characters long.
@@ -134,7 +134,7 @@ import ButtonStyled from "@modrinth/ui/src/components/base/ButtonStyled.vue";
import type { Server } from "~/composables/pyroServers";
const props = defineProps<{
- server: Server<["general", "mods", "backups", "network", "startup", "ws", "fs"]>;
+ server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
}>();
const data = computed(() => props.server.general);
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/info.vue b/apps/frontend/src/pages/servers/manage/[id]/options/info.vue
index b9f969413..dee9ddcd7 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/info.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/info.vue
@@ -123,7 +123,7 @@ const route = useNativeRoute();
const serverId = route.params.id as string;
const props = defineProps<{
- server: Server<["general", "mods", "backups", "network", "startup", "ws", "fs"]>;
+ server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
}>();
const data = computed(() => props.server.general);
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue b/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
index 18781fc64..35a863db3 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
@@ -1,51 +1,152 @@
-
-
-
-
- {{ - isSecondPhase - ? "This will reinstall your server and erase all data. You may want to back up your server before proceeding. Are you sure you want to continue?" - : "Choose the version of Minecraft you want to use for this server." - }} + This will reinstall your server and erase all data. You may want to back up your server + before proceeding. Are you sure you want to continue?
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Minecraft version
+
+
+
+
+
+ {{ selectedLoader }} version
+
+
+
+ Select a Minecraft version to see available versions
+
+
+
+
+
+
+
+ No versions available for Minecraft {{ selectedMCVersion }}.
+
+
+
+
+
+
+
+
+
+ Removes all data on your server, including your worlds, mods, and configuration files,
+ then reinstalls it with the selected version.
+
+
+
+
+
+
+
+ Creates a backup of your server before proceeding with the installation or
+ reinstallation.
+
@@ -53,13 +154,15 @@
@@ -75,51 +178,130 @@
"
>
-
-
-
+
+
-
+
-
-
@@ -148,48 +330,76 @@
+
+
+ This will reinstall your server and erase all data. You may want to back up your server + before proceeding. Are you sure you want to continue? +
+
+
-
+
+
+
+
+
+
+
+
+
+ Upload mrpack
+
+
+
+
+
+
+
+
+
+ Removes all data on your server, including your worlds, mods, and configuration files,
+ then reinstalls it with the selected version.
+
+
+
+
+
+
+ Creates a backup of your server before proceeding.
+
-
-
-
-
- {{ data.project?.title }} -
- - {{ - data.project?.description && data.project.description.length > 150 - ? data.project.description.substring(0, 150) + "..." - : data.project?.description || "" - }} - +
+
+
+
+
+
-
+
+ {{ data.project?.title }} +
+ + {{ + data.project?.description && data.project.description.length > 150 + ? data.project.description.substring(0, 150) + "..." + : data.project?.description || "" + }} + +
-
+
+
+
Change modpack version
++ Select the version of {{ data.project?.title || "the modpack" }} you want to install + on your server. +
+ +
+
-
or
@@ -213,18 +423,21 @@
+
@@ -199,7 +409,7 @@
+
+
+
+ + If enabled, existing mods, worlds, and configurations, will be deleted before + installing the new modpack version. +
+
-
Mod loader
-Mod loaders allow you to run mods on your server.
+Platform
++ Your server's platform is the software that runs your server. Different platforms + support different mods and plugins. +
;
+ server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
}>();
const emit = defineEmits<{
@@ -272,7 +489,9 @@ const backupServer = ref(false);
const isError = computed(() => props.server.general?.status === "error");
const isDangerous = computed(() => hardReset.value);
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
const isBackupLimited = computed(() => (props.server.backups?.data?.length || 0) >= 15);
+const isBackingUp = ref(false);
const versionStrings = ["forge", "fabric", "quilt", "neo"] as const;
@@ -311,14 +530,12 @@ const loaderVersions = (await Promise.all(
}[]
>;
-const editModal = ref();
const versionSelectModal = ref();
const mrpackModal = ref();
const canInstall = computed(() => {
const conds =
!selectedMCVersion.value ||
- isBackupLimited.value ||
isLoading.value ||
loadingServerCheck.value ||
serverCheckError.value.trim().length > 0;
@@ -330,6 +547,16 @@ const canInstall = computed(() => {
return conds || !selectedLoaderVersion.value;
});
+const canInstallUpload = computed(() => {
+ const conds =
+ !mrpackFile.value ||
+ isLoading.value ||
+ loadingServerCheck.value ||
+ serverCheckError.value.trim().length > 0;
+
+ return conds;
+});
+
const mcVersions = tags.value.gameVersions
.filter((x) => x.version_type === "release")
.map((x) => x.version)
@@ -343,27 +570,37 @@ const mcVersions = tags.value.gameVersions
});
const selectedLoaderVersions = computed(() => {
- /*
- loaderVersions[
- selectedLoader.value.toLowerCase() === "neoforge" ? "neo" : selectedLoader.toLowerCase()
- ]
- .find((x) => x.id === selectedMCVersion)
- ?.loaders.map((x) => x.id) || []
- */
- let loader = selectedLoader.value.toLowerCase();
- if (loader === "neoforge") {
- loader = "neo";
+ const loader = selectedLoader.value.toLowerCase();
+
+ if (loader === "paper") {
+ return paperVersions.value[selectedMCVersion.value] || [];
}
- const backwardsCompatibleVersion = loaderVersions[loader].find(
+
+ if (loader === "purpur") {
+ return purpurVersions.value[selectedMCVersion.value] || [];
+ }
+
+ if (loader === "vanilla") {
+ return [];
+ }
+
+ let apiLoader = loader;
+ if (loader === "neoforge") {
+ apiLoader = "neo";
+ }
+
+ const backwardsCompatibleVersion = loaderVersions[apiLoader]?.find(
// eslint-disable-next-line no-template-curly-in-string
(x) => x.id === "${modrinth.gameVersion}",
);
+
if (backwardsCompatibleVersion) {
return backwardsCompatibleVersion.loaders.map((x) => x.id);
}
+
return (
- loaderVersions[loader]
- .find((x) => x.id === selectedMCVersion.value)
+ loaderVersions[apiLoader]
+ ?.find((x) => x.id === selectedMCVersion.value)
?.loaders.map((x) => x.id) || []
);
});
@@ -395,7 +632,7 @@ const versionIds = computed(() =>
const version = ref();
const currentVersion = ref();
-const selectedLoader = ref("");
+const selectedLoader = ref("Vanilla");
const selectedMCVersion = ref("");
const selectedLoaderVersion = ref("");
const isSecondPhase = ref(false);
@@ -409,8 +646,56 @@ const updateData = async () => {
};
updateData();
+const latestVersion = computed(() => {
+ if (!Array.isArray(versions?.value) || versions.value.length === 0) return null;
+ return versions.value.reduce((latest: any, current: any) => {
+ if (!latest) return current;
+ return latest.version_number > current.version_number ? latest : current;
+ }, null);
+});
+
+const hasNewerVersion = computed(() => {
+ if (!currentVersion.value?.version_number || !latestVersion.value?.version_number) return false;
+ return latestVersion.value.version_number > currentVersion.value.version_number;
+});
+
+const handleUpdateToLatest = async () => {
+ if (!latestVersion.value) return;
+
+ version.value = latestVersion.value.version_number;
+ hardReset.value = false;
+ await reinstallCurrent();
+};
+
+const paperVersions = ref>({});
+const purpurVersions = ref>({});
+
+const fetchPaperVersions = async (mcVersion: string) => {
+ try {
+ const res = await $fetch(`https://api.papermc.io/v2/projects/paper/versions/${mcVersion}`);
+ paperVersions.value[mcVersion] = (res as any).builds.sort((a: number, b: number) => b - a);
+ return res;
+ } catch (e) {
+ console.error(e);
+ return null;
+ }
+};
+
+const fetchPurpurVersions = async (mcVersion: string) => {
+ try {
+ const res = await $fetch(`https://api.purpurmc.org/v2/purpur/${mcVersion}`);
+ purpurVersions.value[mcVersion] = (res as any).builds.all.sort(
+ (a: string, b: string) => parseInt(b) - parseInt(a),
+ );
+ return res;
+ } catch (e) {
+ console.error(e);
+ return null;
+ }
+};
+
const selectLoader = (loader: string) => {
- selectedLoader.value = loader;
+ selectedLoader.value = loader as Loaders;
versionSelectModal.value.show();
};
@@ -421,30 +706,55 @@ const cachedVersions: Record = {};
watch(selectedMCVersion, async () => {
if (selectedMCVersion.value.trim().length < 3) return;
- // const res = await fetch(
- // `/loader-versions?loader=minecraft&version=${selectedMCVersion.value}`,
- // ).then((r) => r.json());
+ isLoading.value = true;
loadingServerCheck.value = true;
- const res =
- cachedVersions[selectedMCVersion.value] ||
- (await $fetch(`/loader-versions?loader=minecraft&version=${selectedMCVersion.value}`));
- cachedVersions[selectedMCVersion.value] = res;
+ try {
+ // Check if Minecraft version exists
+ const mcRes =
+ cachedVersions[selectedMCVersion.value] ||
+ (await $fetch(`/loader-versions?loader=minecraft&version=${selectedMCVersion.value}`));
- loadingServerCheck.value = false;
+ cachedVersions[selectedMCVersion.value] = mcRes;
+
+ if (!mcRes.downloads?.server) {
+ serverCheckError.value =
+ "We couldn't find a server.jar for this version. Please pick another one.";
+ return;
+ }
+
+ // Fetch Paper/Purpur versions if needed
+ if (selectedLoader.value.toLowerCase() === "paper") {
+ const paperRes = await fetchPaperVersions(selectedMCVersion.value);
+ if (!paperRes) {
+ serverCheckError.value = "This Minecraft version is not supported by Paper.";
+ return;
+ }
+ }
+
+ if (selectedLoader.value.toLowerCase() === "purpur") {
+ const purpurRes = await fetchPurpurVersions(selectedMCVersion.value);
+ if (!purpurRes) {
+ serverCheckError.value = "This Minecraft version is not supported by Purpur.";
+ return;
+ }
+ }
- if (res.downloads.server) {
serverCheckError.value = "";
- } else {
- serverCheckError.value =
- "We couldn't find a server.jar for this version. Please pick another one.";
+ } catch (error) {
+ console.error(error);
+ serverCheckError.value = "Failed to fetch versions. Please try again.";
+ } finally {
+ loadingServerCheck.value = false;
+ isLoading.value = false;
}
});
const onShow = () => {
- selectedMCVersion.value = "";
+ selectedMCVersion.value = props.server.general?.mc_version || "";
selectedLoaderVersion.value = "";
+ hardReset.value = false;
};
const onHide = () => {
@@ -483,7 +793,14 @@ const reinstallCurrent = async () => {
const resolvedVersionIds = versionIds.value;
const versionId = resolvedVersionIds.find((entry: any) => entry[version.value])?.[version.value];
try {
- await props.server.general?.reinstall(serverId, false, projectId, versionId);
+ await props.server.general?.reinstall(
+ serverId,
+ false,
+ projectId,
+ versionId,
+ undefined,
+ hardReset.value,
+ );
emit("reinstall");
} catch (error) {
handleReinstallError(error);
@@ -510,7 +827,36 @@ const handleReinstall = async () => {
});
const backupName = `Reinstallation - ${format}`;
isLoading.value = true;
- await props.server.backups?.create(backupName);
+ const backupId = (await props.server.backups?.create(backupName)) as unknown as string;
+
+ isBackingUp.value = true;
+
+ let attempts = 0;
+
+ while (true) {
+ attempts += 1;
+
+ if (attempts > 100) {
+ addNotification({
+ group: "server",
+ title: "Backup Failed",
+ text: "An unexpected error occurred while backing up. Please try again later.",
+ type: "error",
+ });
+ isLoading.value = false;
+ return;
+ }
+
+ await props.server.refresh(["backups"]);
+ const backups = await props.server.backups?.data;
+ const backup = backupId ? backups?.find((x) => x.id === backupId) : undefined;
+ if (backup && !backup.ongoing) {
+ console.log("Backup Finished");
+ isBackingUp.value = false;
+ break;
+ }
+ await new Promise((resolve) => setTimeout(resolve, 3000));
+ }
} catch {
addNotification({
group: "server",
@@ -551,24 +897,6 @@ const handleReinstall = async () => {
}
};
-const reinstallNew = async (project: any, versionNumber: string) => {
- editModal.value.hide();
- try {
- const versions = (await useBaseFetch(`project/${project.project_id}/version`)) as any;
- const version = versions.find((x: any) => x.version_number === versionNumber);
-
- if (!version?.id) {
- throw new Error("Version not found");
- }
- await props.server.general?.reinstall(serverId, false, project.project_id, version.id);
- emit("reinstall");
- await nextTick();
- window.scrollTo(0, 0);
- } catch (error) {
- handleReinstallError(error);
- }
-};
-
const mrpackFile = ref(null);
const uploadMrpack = (event: Event) => {
@@ -579,19 +907,86 @@ const uploadMrpack = (event: Event) => {
mrpackFile.value = target.files[0];
};
-const reinstallMrpack = async () => {
- if (!mrpackFile.value) {
+const handleReinstallUpload = async () => {
+ if (hardReset.value && !backupServer.value && !isSecondPhase.value) {
+ isSecondPhase.value = true;
return;
}
- const mrpack = new File([mrpackFile.value], mrpackFile.value.name, {
- type: mrpackFile.value.type,
- });
+ if (backupServer.value) {
+ try {
+ const date = new Date();
+ const format = date.toLocaleString(navigator.language || "en-US", {
+ month: "short",
+ day: "numeric",
+ year: "numeric",
+ hour: "numeric",
+ minute: "numeric",
+ second: "numeric",
+ timeZoneName: "short",
+ });
+ const backupName = `Reinstallation - ${format}`;
+ isLoading.value = true;
+ const backupId = (await props.server.backups?.create(backupName)) as unknown as string;
+
+ isBackingUp.value = true;
+
+ let attempts = 0;
+
+ while (true) {
+ attempts += 1;
+
+ if (attempts > 100) {
+ addNotification({
+ group: "server",
+ title: "Backup Failed",
+ text: "An unexpected error occurred while backing up. Please try again later.",
+ type: "error",
+ });
+ isLoading.value = false;
+ return;
+ }
+
+ await props.server.refresh(["backups"]);
+ const backups = await props.server.backups?.data;
+ const backup = backupId ? backups?.find((x) => x.id === backupId) : undefined;
+ if (backup && !backup.ongoing) {
+ console.log("Backup Finished");
+ isBackingUp.value = false;
+ break;
+ }
+ await new Promise((resolve) => setTimeout(resolve, 3000));
+ }
+ } catch {
+ addNotification({
+ group: "server",
+ title: "Backup Failed",
+ text: "An unexpected error occurred while backing up. Please try again later.",
+ type: "error",
+ });
+ isLoading.value = false;
+ return;
+ }
+ }
+
+ isLoading.value = true;
try {
- isLoading.value = true;
+ if (!mrpackFile.value) {
+ throw new Error("No mrpack file selected");
+ }
+ const mrpack = new File([mrpackFile.value], mrpackFile.value.name, {
+ type: mrpackFile.value.type,
+ });
+
await props.server.general?.reinstallFromMrpack(mrpack, hardReset.value);
- emit("reinstall");
+
+ emit("reinstall", {
+ loader: "mrpack",
+ lVersion: "",
+ mVersion: "",
+ });
+
await nextTick();
window.scrollTo(0, 0);
} catch (error) {
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/network.vue b/apps/frontend/src/pages/servers/manage/[id]/options/network.vue
index ba3a3528a..7743fb5ca 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/network.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/network.vue
@@ -204,6 +204,7 @@
+