-
+
- {{ 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 d117d4c60..c8a3cf34d 100644
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -1,10 +1,27 @@
-
-
-
-
diff --git a/apps/app-frontend/src/components/ui/ErrorModal.vue b/apps/app-frontend/src/components/ui/ErrorModal.vue
index 94b4812f2..d9a71608d 100644
--- a/apps/app-frontend/src/components/ui/ErrorModal.vue
+++ b/apps/app-frontend/src/components/ui/ErrorModal.vue
@@ -323,7 +323,6 @@ async function repairInstance() {
display: flex;
flex-direction: column;
gap: var(--gap-md);
- padding: var(--gap-lg);
}
.markdown-body {
diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue
index aaf2712b9..031e6dc59 100644
--- a/apps/app-frontend/src/components/ui/ExportModal.vue
+++ b/apps/app-frontend/src/components/ui/ExportModal.vue
@@ -211,7 +211,6 @@ const exportPack = async () => {
-
-
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
index 6135b9951..ed38e6fcc 100644
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
@@ -237,7 +237,7 @@ const display_icon = ref(null)
const showAdvanced = ref(false)
const creating = ref(false)
const showSnapshots = ref(false)
-const creationType = ref('from file')
+const creationType = ref('custom')
const isShowing = ref(false)
defineExpose({
@@ -525,8 +525,8 @@ const next = async () => {
.modal-body {
display: flex;
flex-direction: column;
- padding: var(--gap-lg);
gap: var(--gap-md);
+ margin-top: var(--gap-lg);
}
.input-label {
@@ -595,7 +595,6 @@ const next = async () => {
flex-direction: row;
justify-content: space-between;
align-items: center;
- padding: var(--gap-lg);
padding-bottom: 0;
}
diff --git a/apps/app-frontend/src/components/ui/InstanceIndicator.vue b/apps/app-frontend/src/components/ui/InstanceIndicator.vue
new file mode 100644
index 000000000..61adcfa2e
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/InstanceIndicator.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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/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 2b512d64b..6e6ec23c0 100644
--- a/apps/app-frontend/src/components/ui/RunningAppBar.vue
+++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue
@@ -1,15 +1,12 @@
-
+
-
+
-
-
-
-
-
+ :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 }}
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
Offline
@@ -31,10 +28,6 @@
-
@@ -105,8 +98,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..ef5b9f23f
--- /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 1a2904169..49d3998dc 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'])
@@ -44,13 +56,29 @@ defineExpose({
},
})
+// function onModalHide() {
+// if (props.showAdOnClose) {
+// show_ads_window()
+// }
+// }
+
function proceed() {
emit('proceed')
}
-
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
index fdbca9e51..9daeedc3a 100644
--- a/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ModalWrapper.vue
@@ -1,7 +1,7 @@
+
+
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/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/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
new file mode 100644
index 000000000..b97453697
--- /dev/null
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -0,0 +1,110 @@
+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' | 'installing' | '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 fbd7ddb1a..53256838b 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -54,17 +54,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 0bee9aa82..a57b2fddd 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -1,31 +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 02e2fe114..fcf8607c4 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -31,19 +31,21 @@ window.addEventListener('online', () => {
const getInstances = async () => {
const profiles = await list().catch(handleError)
- recentInstances.value = profiles.sort((a, b) => {
- const dateA = dayjs(a.last_played ?? 0)
- const dateB = dayjs(b.last_played ?? 0)
+ recentInstances.value = profiles
+ .filter((x) => x.last_played)
+ .sort((a, b) => {
+ const dateA = dayjs(a.last_played)
+ const dateB = dayjs(b.last_played)
- if (dateA.isSame(dateB)) {
- return a.name.localeCompare(b.name)
- }
+ if (dateA.isSame(dateB)) {
+ return a.name.localeCompare(b.name)
+ }
- return dateB - dateA
- })
+ return dateB - dateA
+ })
const filters = []
- for (const instance of recentInstances.value) {
+ for (const instance of profiles) {
if (instance.linked_data && instance.linked_data.project_id) {
filters.push(`NOT"project_id"="${instance.linked_data.project_id}"`)
}
@@ -99,37 +101,34 @@ onUnmounted(() => {
- Install content to instance
+ +
+
+
+
+ Sort by:
+ {{ selected }}
+
+
+ View:
+ {{ selected }}
+
+
+
+
+
You are currently offline. Connect to the internet to browse Modrinth!
@@ -731,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) =>
@@ -743,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)"
/>
+
+
-
+
+
+
-
+
-
-
diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue
deleted file mode 100644
index ffdb0ac97..000000000
--- a/apps/app-frontend/src/pages/Settings.vue
+++ /dev/null
@@ -1,669 +0,0 @@
-
-
-
- Welcome back!
+Welcome to AstralRinth 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 4d87e09f5..8f2805abb 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -1,97 +1,129 @@
-
-
- - General settings -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Display -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Resource management -
-
-
-
-
-
-
-
-
-
- - Privacy -
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Java settings -
-- - - - -
-
-
-
-
-
- - Hooks -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Window size -
-
-
-
-
-
-
-
-
-
-
-
-
-
- About
-
-
-
- About
-
- You are using a development version, there may be errors.
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -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 f8ef2dd5c..c2eafc0c4 100644
--- a/apps/app-frontend/src/pages/project/Gallery.vue
+++ b/apps/app-frontend/src/pages/project/Gallery.vue
@@ -195,7 +195,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 dbfcdba51..1f5082b13 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -1,247 +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/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 -
-
-
-
-
- -
-
-
-
- - -
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -21,19 +20,16 @@
circle
:raised="raised"
/>
-
+
+
{{ members[message.author_id].username }}
-
+
{
let fileContent = `#Minecraft server properties\n#${new Date().toUTCString()}\n`;
@@ -483,13 +501,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 +518,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 +533,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 +553,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 +631,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 +753,8 @@ const retryWithAuth = async (requestFn: () => Promise) => {
await internalServerRefrence.value.refresh(["fs"]);
return await requestFn();
}
+
+ throw error;
}
};
@@ -723,21 +780,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 +855,7 @@ const renameFileOrFolder = (path: string, name: string) => {
destination: pathName,
},
});
+ return true;
});
};
@@ -858,7 +969,7 @@ const modules: any = {
setMotd,
fetchConfigFile,
},
- mods: {
+ content: {
get: async (serverId: string) => {
try {
const mods = await PyroFetch(`servers/${serverId}/mods`);
@@ -873,9 +984,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 +1004,8 @@ const modules: any = {
download: downloadBackup,
updateAutoBackup,
getAutoBackup,
+ lock: lockBackup,
+ unlock: unlockBackup,
},
network: {
get: async (serverId: string) => {
@@ -1018,9 +1131,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 +1141,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 +1174,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 +1215,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 +1306,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,7 +1360,7 @@ 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;
@@ -1239,7 +1368,7 @@ type FSModule = { auth: JWTAuth } & FSFunctions;
type ModulesMap = {
general: GeneralModule;
- mods: ModsModule;
+ content: ContentModule;
backups: BackupsModule;
network: NetworkModule;
startup: StartupModule;
@@ -1247,7 +1376,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..73d2ce9ba 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -1,4 +1,7 @@
+
+
+
+
+
+
+