+ {{ expandedGalleryItem.title }} +
++ {{ expandedGalleryItem.description }} +
+
+
+
+
+
+
+
+ Java {{ javaVersion }} location
diff --git a/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue b/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue index 24ffa152..2802b866 100644 --- a/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue +++ b/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue @@ -1,4 +1,5 @@ -
+
Jump back in
diff --git a/apps/app-frontend/src/routes.js b/apps/app-frontend/src/routes.js
index 0384017e..d518a38a 100644
--- a/apps/app-frontend/src/routes.js
+++ b/apps/app-frontend/src/routes.js
@@ -29,7 +29,7 @@ export default new createRouter({
},
},
{
- path: '/servers/manage/',
+ path: '/hosting/manage/',
name: 'Servers',
component: ServersManagePageIndex,
meta: {
diff --git a/apps/app-frontend/tailwind.config.ts b/apps/app-frontend/tailwind.config.ts
index 1f5f327c..d3323e11 100644
--- a/apps/app-frontend/tailwind.config.ts
+++ b/apps/app-frontend/tailwind.config.ts
@@ -10,6 +10,7 @@ const config: Config = {
'./src/error.vue',
// monorepo - TODO: migrate this to its own package
'../../packages/**/*.{js,vue,ts}',
+ '!../../packages/**/node_modules/**',
],
theme: {
extend: {
diff --git a/apps/docs/public/openapi.yaml b/apps/docs/public/openapi.yaml
index 5044b2be..a3b843f5 100644
--- a/apps/docs/public/openapi.yaml
+++ b/apps/docs/public/openapi.yaml
@@ -394,15 +394,26 @@ components:
description: The hash of the file you're editing
example: aaaabbbbccccddddeeeeffffgggghhhhiiiijjjj
file_type:
- type: string
- enum: [required-resource-pack, optional-resource-pack]
- description: The hash algorithm of the file you're editing
- example: required-resource-pack
- nullable: true
+ allOf:
+ - $ref: '#/components/schemas/FileTypeEnum'
+ - nullable: true
+ description: The hash algorithm of the file you're editing
required:
- algorithm
- hash
- file_type
+ # https://github.com/modrinth/code/blob/main/apps/labrinth/src/models/v3/projects.rs#L981-990
+ FileTypeEnum:
+ type: string
+ enum:
+ - required-resource-pack
+ - optional-resource-pack
+ - sources-jar
+ - dev-jar
+ - javadoc-jar
+ - unknown
+ - signature
+ example: required-resource-pack
# https://github.com/modrinth/labrinth/blob/master/src/routes/version_creation.rs#L27-L57
CreatableVersion:
allOf:
@@ -506,11 +517,10 @@ components:
example: 1097270
description: The size of the file in bytes
file_type:
- type: string
- enum: [required-resource-pack, optional-resource-pack]
- description: The type of the additional file, used mainly for adding resource packs to datapacks
- example: required-resource-pack
- nullable: true
+ allOf:
+ - $ref: '#/components/schemas/FileTypeEnum'
+ - nullable: true
+ description: The type of the additional file, used mainly for adding resource packs to datapacks
required:
- hashes
- url
diff --git a/apps/frontend/nuxt.config.ts b/apps/frontend/nuxt.config.ts
index beaf5a99..0068aec3 100644
--- a/apps/frontend/nuxt.config.ts
+++ b/apps/frontend/nuxt.config.ts
@@ -7,7 +7,7 @@ import { consola } from 'consola'
import { promises as fs } from 'fs'
import { globIterate } from 'glob'
import { defineNuxtConfig } from 'nuxt/config'
-import { basename, relative, resolve } from 'pathe'
+import { basename, relative } from 'pathe'
import svgLoader from 'vite-svg-loader'
const STAGING_API_URL = 'https://staging-api.modrinth.com/v2/'
@@ -31,7 +31,7 @@ const favicons = {
* Preferably only the locales that reach a certain threshold of complete
* translations would be included in this array.
*/
-const enabledLocales: string[] = []
+// const enabledLocales: string[] = []
/**
* Overrides for the categories of the certain locales.
@@ -154,7 +154,7 @@ export default defineNuxtConfig({
(state.errors ?? []).length === 0
) {
console.log(
- 'Tags already recently generated. Delete apps/frontend/generated/state.json to force regeneration.',
+ 'Tags already recently generated. Delete apps/frontend/src/generated/state.json to force regeneration.',
)
return
}
@@ -176,27 +176,10 @@ export default defineNuxtConfig({
console.log('Tags generated!')
},
- 'pages:extend'(routes) {
- routes.splice(
- routes.findIndex((x) => x.name === 'search-searchProjectType'),
- 1,
- )
-
- const types = ['mods', 'modpacks', 'plugins', 'resourcepacks', 'shaders', 'datapacks']
-
- types.forEach((type) =>
- routes.push({
- name: `search-${type}`,
- path: `/${type}`,
- file: resolve(__dirname, 'src/pages/search/[searchProjectType].vue'),
- children: [],
- }),
- )
- },
async 'vintl:extendOptions'(opts) {
opts.locales ??= []
- const isProduction = getDomain() === 'https://modrinth.com'
+ // const isProduction = getDomain() === 'https://modrinth.com'
const resolveCompactNumberDataImport = await (async () => {
const compactNumberLocales: string[] = []
@@ -251,7 +234,9 @@ export default defineNuxtConfig({
for await (const localeDir of globIterate('src/locales/*/', { posix: true })) {
const tag = basename(localeDir)
- if (isProduction && !enabledLocales.includes(tag) && opts.defaultLocale !== tag) continue
+
+ // NOTICE: temporarily disabled all locales except en-US
+ if (opts.defaultLocale !== tag) continue
const locale =
opts.locales.find((locale) => locale.tag === tag) ??
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index e55353eb..7dfa2598 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -17,6 +17,7 @@
"@formatjs/cli": "^6.2.12",
"@nuxt/devtools": "^1.3.3",
"@types/dompurify": "^3.0.5",
+ "@types/iso-3166-2": "^1.0.4",
"@types/node": "^20.1.0",
"@vintl/compact-number": "^2.0.5",
"@vintl/how-ago": "^3.0.1",
@@ -31,6 +32,7 @@
"tailwindcss": "^3.4.4",
"typescript": "^5.4.5",
"vite-svg-loader": "^5.1.0",
+ "vue-component-type-helpers": "^3.1.8",
"vue-tsc": "^2.0.24"
},
"dependencies": {
@@ -58,6 +60,7 @@
"floating-vue": "^5.2.2",
"fuse.js": "^6.6.2",
"highlight.js": "^11.7.0",
+ "iso-3166-2": "1.0.0",
"js-yaml": "^4.1.0",
"jszip": "^3.10.1",
"markdown-it": "14.1.0",
diff --git a/apps/frontend/src/app.vue b/apps/frontend/src/app.vue
index 5af1c1be..a25d0e63 100644
--- a/apps/frontend/src/app.vue
+++ b/apps/frontend/src/app.vue
@@ -6,7 +6,12 @@
diff --git a/apps/frontend/src/assets/styles/layout.scss b/apps/frontend/src/assets/styles/layout.scss
index 751974d9..a7f038e3 100644
--- a/apps/frontend/src/assets/styles/layout.scss
+++ b/apps/frontend/src/assets/styles/layout.scss
@@ -135,21 +135,6 @@
'sidebar'
/ 100%;
- .normal-page__ultimate-sidebar {
- grid-area: ultimate-sidebar;
- position: fixed;
- bottom: 1rem;
- right: 1rem;
- z-index: 100;
- max-width: calc(100% - 2rem);
- max-height: calc(100vh - 2rem);
- overflow-y: auto;
-
- > div {
- box-shadow: 0 0 15px rgba(0, 0, 0, 0.3);
- }
- }
-
@media screen and (min-width: 1024px) {
&.sidebar {
grid-template:
@@ -173,45 +158,6 @@
}
}
- @media screen and (min-width: 1400px) {
- &.ultimate-sidebar {
- max-width: calc(80rem + 0.75rem + 600px);
-
- grid-template:
- 'header header ultimate-sidebar' auto
- 'content sidebar ultimate-sidebar' auto
- 'content dummy ultimate-sidebar' 1fr
- / 1fr 18.75rem auto;
-
- .normal-page__header {
- max-width: 80rem;
- }
-
- .normal-page__ultimate-sidebar {
- position: sticky;
- top: 4.5rem;
- bottom: unset;
- right: unset;
- z-index: unset;
- align-self: start;
- display: flex;
- height: calc(100vh - 4.5rem * 2);
-
- > div {
- box-shadow: none;
- }
- }
-
- &.alt-layout {
- grid-template:
- 'ultimate-sidebar header header' auto
- 'ultimate-sidebar sidebar content' auto
- 'ultimate-sidebar dummy content' 1fr
- / auto 18.75rem 1fr;
- }
- }
- }
-
.normal-page__sidebar {
grid-area: sidebar;
}
diff --git a/apps/frontend/src/assets/styles/tailwind.css b/apps/frontend/src/assets/styles/tailwind.css
index 2f3b0d6d..ea20c6c6 100644
--- a/apps/frontend/src/assets/styles/tailwind.css
+++ b/apps/frontend/src/assets/styles/tailwind.css
@@ -1,3 +1,5 @@
+@import '@modrinth/ui/src/styles/tailwind-utilities.css';
+
@tailwind base;
@tailwind components;
@tailwind utilities;
diff --git a/apps/frontend/src/components/ui/AdPlaceholder.vue b/apps/frontend/src/components/ui/AdPlaceholder.vue
index eeaf861d..2027b484 100644
--- a/apps/frontend/src/components/ui/AdPlaceholder.vue
+++ b/apps/frontend/src/components/ui/AdPlaceholder.vue
@@ -62,21 +62,21 @@ useHead({
const AD_PRESETS = {
medal: {
- light: 'https://cdn-raw.modrinth.com/medal-modrinth-servers-light-new.webp',
- dark: 'https://cdn-raw.modrinth.com/medal-modrinth-servers-dark-new.webp',
- description: 'Host your next server with Modrinth Servers',
- link: '/servers?plan&ref=medal',
+ light: 'https://cdn-raw.modrinth.com/modrinth-hosting-medal-light.webp',
+ dark: 'https://cdn-raw.modrinth.com/modrinth-hosting-medal-dark.webp',
+ description: 'Host your next server with Modrinth Hosting',
+ link: '/hosting?plan&ref=medal',
},
- 'modrinth-servers': {
- light: 'https://cdn-raw.modrinth.com/modrinth-servers-placeholder-light.webp',
- dark: 'https://cdn-raw.modrinth.com/modrinth-servers-placeholder-dark.webp',
- description: 'Host your next server with Modrinth Servers',
- link: '/servers',
+ 'modrinth-hosting': {
+ light: 'https://cdn-raw.modrinth.com/modrinth-hosting-light.webp',
+ dark: 'https://cdn-raw.modrinth.com/modrinth-hosting-dark.webp',
+ description: 'Host your next server with Modrinth Hosting',
+ link: '/hosting',
},
}
const currentAd = computed(() =>
- flags.value.enableMedalPromotion ? AD_PRESETS.medal : AD_PRESETS['modrinth-servers'],
+ flags.value.enableMedalPromotion ? AD_PRESETS.medal : AD_PRESETS['modrinth-hosting'],
)
onMounted(() => {
diff --git a/apps/frontend/src/components/ui/NavRow.vue b/apps/frontend/src/components/ui/NavRow.vue
deleted file mode 100644
index 5d2544fa..00000000
--- a/apps/frontend/src/components/ui/NavRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/NavTabs.vue b/apps/frontend/src/components/ui/NavTabs.vue
index 5a2c0b78..a84e186a 100644
--- a/apps/frontend/src/components/ui/NavTabs.vue
+++ b/apps/frontend/src/components/ui/NavTabs.vue
@@ -1,23 +1,58 @@
diff --git a/apps/frontend/src/components/ui/ProjectMemberHeader.vue b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
index 10202c12..be287995 100644
--- a/apps/frontend/src/components/ui/ProjectMemberHeader.vue
+++ b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
@@ -20,20 +20,6 @@
-
+
+ Jump back in
+
+
+
+
+
+ Loaders *
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue b/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue
new file mode 100644
index 00000000..575617a6
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/components/McVersionPicker.vue
@@ -0,0 +1,208 @@
+
+
+
+
+ Select one or more loaders this version supports.
+
+
+
+
+
+ {{ formatCategory(loader.name) }}
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependencies.vue b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependencies.vue
new file mode 100644
index 00000000..f92ed383
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependencies.vue
@@ -0,0 +1,65 @@
+
+
+
+ Minecraft versions *
+
+
+
+
+
+
+
+
+
+
+ {{ group.key }}
+
+
+ No versions found.
+
+
+
+
+
+ Hold shift and click to select range.
+
+ Suggested dependencies
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue
new file mode 100644
index 00000000..c3e21f1c
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/components/SuggestedDependencies/SuggestedDependency.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue b/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue
new file mode 100644
index 00000000..49b6a75c
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/components/VersionFileRow.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue
new file mode 100644
index 00000000..45d49446
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddChangelogStage.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue
new file mode 100644
index 00000000..c8878cc7
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddDependenciesStage.vue
@@ -0,0 +1,283 @@
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue
new file mode 100644
index 00000000..e7576273
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddDetailsStage.vue
@@ -0,0 +1,275 @@
+
+
+ Add dependency
+
+
+
+
+
+
+
+
+
+ Project *
+
+
+
+
+ Version
+
+
+
+ Dependency relation
+
+
+
+ Added dependencies
+
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue
new file mode 100644
index 00000000..ee04d8a6
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddEnvironmentStage.vue
@@ -0,0 +1,13 @@
+
+
+
+ Version type *
+
+
+
+
+ Version number *
+
+
+ The version number differentiates this specific version from others.
+
+
+ Version subtitle
+
+
+
+
+
+
+
+
+
+
+
+ {{ usingDetectedLoaders ? 'Detected loaders' : 'Loaders' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatCategory(loader.name) }}
+
+
+
+ No loaders selected.
+
+
+
+
+
+
+
+
+ {{ usingDetectedVersions ? 'Detected versions' : 'Versions' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ version }}
+
+
+ No versions selected.
+
+
+
+
+
+ Environment
+
+
+
+
+
+
+
+
+
+
+
+ No environment has been set.
+
+ {{ environmentCopy.title }}
+
+ {{ environmentCopy.description }}
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue
new file mode 100644
index 00000000..f257a76e
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddFilesStage.vue
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue
new file mode 100644
index 00000000..ce8d9230
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddLoadersStage.vue
@@ -0,0 +1,69 @@
+
+
+ Primary file
+
+
+
+
+
+ The primary file is the default file a user downloads when installing the project.
+
+
+
+
+
+
+ {{ formatMessage(messages.addFilesAdmonition) }}
+
+
+ Supplementary files
+
+
+
+ You can optionally add supplementary files such as source code, documentation, or required
+ resource packs.
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue b/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue
new file mode 100644
index 00000000..06376d18
--- /dev/null
+++ b/apps/frontend/src/components/ui/create-project-version/stages/AddMcVersionsStage.vue
@@ -0,0 +1,59 @@
+
+
+
+
+ Added loaders
+
+
+
+
+
+
+
+
+
+
+ {{ formatCategory(loader.name) }}
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
index b3679674..5c6ebba6 100644
--- a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
+++ b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
@@ -247,13 +247,7 @@ async function createProject() {
})
modal.value.hide()
- await router.push({
- name: 'type-id',
- params: {
- type: 'project',
- id: slug.value,
- },
- })
+ await router.push(`/project/${slug.value}/settings`)
} catch (err) {
addNotification({
title: formatMessage(messages.errorTitle),
diff --git a/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue b/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
index f1b36a3e..cf3f4aa8 100644
--- a/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
+++ b/apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
@@ -158,12 +158,18 @@ import {
SpinnerIcon,
XIcon,
} from '@modrinth/assets'
-import { Admonition, ButtonStyled, Chips, injectNotificationManager, NewModal } from '@modrinth/ui'
+import {
+ Admonition,
+ ButtonStyled,
+ Chips,
+ injectNotificationManager,
+ NewModal,
+ normalizeChildren,
+} from '@modrinth/ui'
import { defineMessages, useVIntl } from '@vintl/vintl'
import { IntlFormatted } from '@vintl/vintl/components'
import { type FormRequestResponse, useAvalara1099 } from '@/composables/avalara1099'
-import { normalizeChildren } from '@/utils/vue-children.ts'
const props = withDefaults(
defineProps<{
diff --git a/apps/frontend/src/components/ui/dashboard/WithdrawFeeBreakdown.vue b/apps/frontend/src/components/ui/dashboard/WithdrawFeeBreakdown.vue
index ed58bfbe..211b95b7 100644
--- a/apps/frontend/src/components/ui/dashboard/WithdrawFeeBreakdown.vue
+++ b/apps/frontend/src/components/ui/dashboard/WithdrawFeeBreakdown.vue
@@ -8,10 +8,21 @@
leave-to-class="opacity-0 max-h-0"
>
+
+
+ Added versions
+
+
+
+
+
+
+
+
+
+ {{ version }}
+
+
+
+ No versions selected.
+
+
+
-
- {{ formatMessage(messages.feeBreakdownAmount) }}
- {{ formatMoney(amount || 0) }}
-
+
+
+ {{ formatMessage(messages.feeBreakdownGiftCardValue) }}
+ {{ formatMoney(amount || 0) }} ({{ formattedLocalCurrency }})
+
+
+
+
+ {{ formatMessage(messages.feeBreakdownAmount) }}
+ {{ formatMoney(amount || 0) }}
+
+
+
{{ formatMessage(messages.feeBreakdownFee) }}
@@ -21,6 +32,7 @@
-{{ formatMoney(fee || 0) }}
+
{{ formatMessage(messages.feeBreakdownNetAmount) }}
@@ -31,7 +43,7 @@
-
+
{{ formatMessage(messages.feeBreakdownExchangeRate) }}
(),
{
exchangeRate: null,
localCurrency: undefined,
+ isGiftCard: false,
},
)
@@ -115,5 +129,13 @@ const messages = defineMessages({
id: 'dashboard.creator-withdraw-modal.fee-breakdown-exchange-rate',
defaultMessage: 'FX rate',
},
+ feeBreakdownGiftCardValue: {
+ id: 'dashboard.creator-withdraw-modal.fee-breakdown-gift-card-value',
+ defaultMessage: 'Gift card value',
+ },
+ feeBreakdownUsdEquivalent: {
+ id: 'dashboard.creator-withdraw-modal.fee-breakdown-usd-equivalent',
+ defaultMessage: 'USD equivalent',
+ },
})
diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue
index 32f0b6c1..0987a973 100644
--- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue
+++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue
@@ -124,6 +124,7 @@
diff --git a/apps/frontend/src/components/ui/moderation/BatchScanProgressAlert.vue b/apps/frontend/src/components/ui/moderation/BatchScanProgressAlert.vue
new file mode 100644
index 00000000..a0cc6936
--- /dev/null
+++ b/apps/frontend/src/components/ui/moderation/BatchScanProgressAlert.vue
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/apps/frontend/src/components/ui/moderation/ModerationDelphiReportCard.vue b/apps/frontend/src/components/ui/moderation/ModerationDelphiReportCard.vue
deleted file mode 100644
index d374418e..00000000
--- a/apps/frontend/src/components/ui/moderation/ModerationDelphiReportCard.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-
+
+
+
+
diff --git a/apps/frontend/src/components/ui/moderation/MaliciousSummaryModal.vue b/apps/frontend/src/components/ui/moderation/MaliciousSummaryModal.vue
new file mode 100644
index 00000000..f5b1fea8
--- /dev/null
+++ b/apps/frontend/src/components/ui/moderation/MaliciousSummaryModal.vue
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+
+ Batch scan in progress
+ {{ progress?.complete }} of {{ progress?.total }} projects completed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Project:
+
+
+ User:
+
+ | Hash | +Version ID | +File Name | +CDN Link | +
|---|---|---|---|
|
+ |
+
+ |
+
+ |
+
+ |
+
No files currently marked as malicious.
+ +
+
+
+
+
+
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue b/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
index f60740c9..3d34ba13 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue
@@ -1,143 +1,127 @@
-
-
-
-
-
-
-
-
-
-
- {{ report.project.title }}
- -
-
-
-
-
-
-
-
-
- {{
- report.version.files.find((file) => file.primary)?.filename ||
- 'Unknown primary file'
- }}
-
-
-
-
- {{ formatRelativeTime(dayjs(report.detected_at).toDate()) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formatRelativeTime(dayjs(report.detected_at).toDate()) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- - {{ queueEntry.project.name }} -
-
-
-
-
-
-
-
-
-
- {{
- props.queueEntry.project.project_types.map(formatProjectType).join(', ')
- }}
- {{
- props.queueEntry.project.project_types.map(formatProjectType).join(', ')
- }}
-
-
- •
-
-
diff --git a/apps/frontend/src/pages/[type]/[id]/gallery.vue b/apps/frontend/src/pages/[type]/[id]/gallery.vue
index 92de1e97..2c75553f 100644
--- a/apps/frontend/src/pages/[type]/[id]/gallery.vue
+++ b/apps/frontend/src/pages/[type]/[id]/gallery.vue
@@ -195,7 +195,36 @@
- Requesting
-
diff --git a/apps/frontend/src/components/ui/thread/ReportThread.vue b/apps/frontend/src/components/ui/thread/ReportThread.vue
deleted file mode 100644
index 7053f8e9..00000000
--- a/apps/frontend/src/components/ui/thread/ReportThread.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-
-
+
diff --git a/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue b/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
index 895099a7..3b81942c 100644
--- a/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
+++ b/apps/frontend/src/components/ui/moderation/ModerationReportCard.vue
@@ -1,176 +1,287 @@
-
+
+
- •
-
+
+
+
+
+ {{ queueEntry.project.name }}
+
+
+
+
+
+ {{
+ queueEntry.project.project_types.map((t) => formatProjectType(t, true)).join(', ')
+ }}
+
+
+
+ Requesting
+
+
+
+ {{ queueEntry.owner.user.username }}
+
+
+
+
+ {{ queueEntry.org.name }}
+
+
- {{ getSubmittedTime(queueEntry) }}
- {{
- getSubmittedTime(queueEntry).replace('Submitted ', '')
- }}
+ {{ formattedDate }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
diff --git a/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue b/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue
index 02d0ae05..4bd494e4 100644
--- a/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue
+++ b/apps/frontend/src/components/ui/servers/icons/LoaderIcon.vue
@@ -1,232 +1,22 @@
-
-
-
-
-
-
-
-
-
+
diff --git a/apps/frontend/src/components/ui/thread/ConversationThread.vue b/apps/frontend/src/components/ui/thread/ConversationThread.vue
index 8fb39045..b288daf7 100644
--- a/apps/frontend/src/components/ui/thread/ConversationThread.vue
+++ b/apps/frontend/src/components/ui/thread/ConversationThread.vue
@@ -217,6 +217,14 @@
hoverFilled: true,
disabled: project.status === 'withheld',
},
+ {
+ id: 'send-to-review-reply',
+ action: () => {
+ sendReply('processing', true)
+ },
+ hoverFilled: true,
+ disabled: project.status === 'processing',
+ },
]
: [
{
@@ -228,6 +236,14 @@
hoverFilled: true,
disabled: project.status === 'withheld',
},
+ {
+ id: 'send-to-review',
+ action: () => {
+ setStatus('processing')
+ },
+ hoverFilled: true,
+ disabled: project.status === 'processing',
+ },
]
"
>
@@ -240,6 +256,14 @@
Withhold
+
+
+ Send to review with reply
+
+
+
+ Send to review
+
-
-
- Reported for
-
- {{ formattedReportType }}
+
+
@@ -133,7 +133,7 @@ import { ModrinthServersFetchError } from '@modrinth/utils'
import { onMounted, onUnmounted } from 'vue'
import type { ModrinthServer } from '~/composables/servers/modrinth-servers'
-import type { BackupInProgressReason } from '~/pages/servers/manage/[id].vue'
+import type { BackupInProgressReason } from '~/pages/hosting/manage/[id].vue'
const { addNotification } = injectNotificationManager()
diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
index 8daf3192..dbaba2ec 100644
--- a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
@@ -159,7 +159,7 @@
@@ -218,7 +218,7 @@ import { type Loaders, ModrinthServersFetchError } from '@modrinth/utils'
import { $fetch } from 'ofetch'
import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
-import type { BackupInProgressReason } from '~/pages/servers/manage/[id].vue'
+import type { BackupInProgressReason } from '~/pages/hosting/manage/[id].vue'
import LoaderIcon from './icons/LoaderIcon.vue'
import LoadingIcon from './icons/LoadingIcon.vue'
diff --git a/apps/frontend/src/components/ui/servers/ServerInstallation.vue b/apps/frontend/src/components/ui/servers/ServerInstallation.vue
index a885e49e..b3769d9b 100644
--- a/apps/frontend/src/components/ui/servers/ServerInstallation.vue
+++ b/apps/frontend/src/components/ui/servers/ServerInstallation.vue
@@ -56,7 +56,7 @@
Switch modpack
-
+
@@ -99,7 +99,7 @@
v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
:class="{ disabled: backupInProgress }"
class="!w-full sm:!w-auto"
- :to="`/modpacks?sid=${props.server.serverId}`"
+ :to="`/discover/modpacks?sid=${props.server.serverId}`"
>
@@ -163,7 +163,7 @@ import { ButtonStyled, NewProjectCard } from '@modrinth/ui'
import type { Loaders } from '@modrinth/utils'
import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
-import type { BackupInProgressReason } from '~/pages/servers/manage/[id].vue'
+import type { BackupInProgressReason } from '~/pages/hosting/manage/[id].vue'
import LoaderSelector from './LoaderSelector.vue'
import PlatformChangeModpackVersionModal from './PlatformChangeModpackVersionModal.vue'
diff --git a/apps/frontend/src/components/ui/servers/ServerSidebar.vue b/apps/frontend/src/components/ui/servers/ServerSidebar.vue
index ee89fbc1..32534c0a 100644
--- a/apps/frontend/src/components/ui/servers/ServerSidebar.vue
+++ b/apps/frontend/src/components/ui/servers/ServerSidebar.vue
@@ -39,7 +39,7 @@ import { RightArrowIcon } from '@modrinth/assets'
import type { RouteLocationNormalized } from 'vue-router'
import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
-import type { BackupInProgressReason } from '~/pages/servers/manage/[id].vue'
+import type { BackupInProgressReason } from '~/pages/hosting/manage/[id].vue'
const emit = defineEmits(['reinstall'])
diff --git a/apps/frontend/src/components/ui/servers/ServerStats.vue b/apps/frontend/src/components/ui/servers/ServerStats.vue
index 600d1c78..a16aa632 100644
--- a/apps/frontend/src/components/ui/servers/ServerStats.vue
+++ b/apps/frontend/src/components/ui/servers/ServerStats.vue
@@ -53,7 +53,7 @@
+
- -
+
-
-
diff --git a/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue b/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
new file mode 100644
index 00000000..3c962040
--- /dev/null
+++ b/apps/frontend/src/components/ui/moderation/ModerationTechRevCard.vue
@@ -0,0 +1,1138 @@
+
+
+
+
+
+
+ Reported for
+
+ {{ formattedReportType }}
+
+
+
+ By
+ Reporter:
+
+
-
- By
- Reporter:
-
-
-
-
-
-
-
- {{
- formatRelativeTime(report.created)
- }}
-
-
- Quick Reply
- Quick Reply
-
-
-
-
-
-
-
-
- - -
-
-
+
-
-
-
-
-
- {{ reportItemTitle }}
-
-
-
-
-
-
-
-
-
- {{
- report.version.files.find((file) => file.primary)?.filename || 'Unknown Version'
- }}
-
-
-
+
-
+ {{
+ formatRelativeTime(report.created)
+ }}
-
-
+
+
+
+
+
+
+
+
+ {{ report.user?.username || 'Unknown User' }}
+
+
+
+ Joined {{ formatRelativeTime(report.user.created) }}
+
+
+
+
+
+
+
+ {{ reportItemTitle }}
+
+
+
+
+
+
+
+ {{ formatProjectType(report.project.project_type, true) }}
+
+
+
+
+ {{ report.version.files.find((f) => f.primary)?.filename || 'Unknown Version' }}
+
+
+
+ {{ report.target.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/ui/news/LatestNewsRow.vue b/apps/frontend/src/components/ui/news/LatestNewsRow.vue
index c0d9dfa9..4cd36875 100644
--- a/apps/frontend/src/components/ui/news/LatestNewsRow.vue
+++ b/apps/frontend/src/components/ui/news/LatestNewsRow.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.project.name }}
+
+
+
+
+
+
+ {{ formatProjectType(project_type, true) }}
+
+
+
+ Auto-Flagged
+
+
+
+ {{
+ capitalizeString(highestSeverity.toLowerCase())
+ }}
+
+
+
+ {{ item.project_owner.name }}
+
+ ({{ item.project_owner.id }})
+
+
+ {{ formattedDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ file.file_name }}
+
+
+
+
+ {{
+ formatFileSize(file.file_size)
+ }}
+
+
+ {{
+ capitalizeString(getFileHighestSeverity(file))
+ }}
+
+
+
+
+
+ Manual review
+
+
+ No flags
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ classItem.filePath }}
+
+
+
+
+
+ {{
+ capitalizeString(getHighestSeverityInClass(classItem.flags))
+ }}
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ flag.issueType.replace(/_/g, ' ')
+ }}
+
+
+
+
+
+
+
+ {{
+ capitalizeString(flag.detail.severity)
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ n + 1 }}
+
+
+
+
+
+
+ + Source code not available or failed to decompile for this file. +
+
+
{{ formatMessage(messages.latestNews) }}
diff --git a/apps/frontend/src/components/ui/servers/BackupCreateModal.vue b/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
deleted file mode 100644
index 95844d15..00000000
--- a/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
{{ formatMessage(messages.latestNews) }}
diff --git a/apps/frontend/src/components/ui/servers/BackupCreateModal.vue b/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
deleted file mode 100644
index 95844d15..00000000
--- a/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue b/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue
deleted file mode 100644
index 1b885faf..00000000
--- a/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/BackupItem.vue b/apps/frontend/src/components/ui/servers/BackupItem.vue
deleted file mode 100644
index 6e910066..00000000
--- a/apps/frontend/src/components/ui/servers/BackupItem.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-
-
-
-
-
-
- {{ backup.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ backup }}
-
-
diff --git a/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue b/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue
deleted file mode 100644
index 7e262d04..00000000
--- a/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue b/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
index c016c602..a87db5e8 100644
--- a/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
+++ b/apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
@@ -208,7 +208,7 @@
the mod.
-
-
-
-
-
-
- You're creating backups too fast. Please wait a moment before trying again.
-
-
-
-
-
-
-
-
-
-
-
- {{ backup.name }}
-
-
-
-
-
-
-
- {{ formatMessage(messages.queuedForBackup) }}
-
- {{ formatMessage(messages.creatingBackup) }}
-
-
- {{ formatMessage(messages.restoringBackup) }}
-
-
-
- {{ dayjs(backup.created_at).format('MMMM D, YYYY [at] h:mm A') }}
-
- {{ 245 }} MiB
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ backup }}
- {{ error }}
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/thread/ThreadMessage.vue b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
index a599329d..fb5148e2 100644
--- a/apps/frontend/src/components/ui/thread/ThreadMessage.vue
+++ b/apps/frontend/src/components/ui/thread/ThreadMessage.vue
@@ -4,7 +4,7 @@
:class="{
'has-body': message.body.type === 'text' && !forceCompact,
'no-actions': noLinks,
- private: message.body.private,
+ private: isPrivateMessage,
}"
>
@@ -23,7 +23,7 @@
- Thread ID:
-
-
-
-
-
-
- This thread is closed and new messages cannot be sent to it.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Creating and editing gallery images can now be done directly from the
+ project settings .
+
+
+
-
+
+
+
+
+
+
+
+
+
+
![]()
+
+
@@ -289,6 +327,7 @@ import {
PlusIcon,
RightArrowIcon,
SaveIcon,
+ SettingsIcon,
StarIcon,
TransferIcon,
TrashIcon,
@@ -296,12 +335,15 @@ import {
XIcon,
} from '@modrinth/assets'
import {
+ Admonition,
+ ButtonStyled,
ConfirmModal,
DropArea,
FileInput,
injectNotificationManager,
NewModal as Modal,
} from '@modrinth/ui'
+import { useLocalStorage } from '@vueuse/core'
import { isPermission } from '~/utils/permissions.ts'
@@ -334,6 +376,11 @@ useSeoMeta({
ogTitle: title,
ogDescription: description,
})
+
+const hideGalleryAdmonition = useLocalStorage(
+ 'hideGalleryHasMovedAdmonition',
+ !props.project.gallery.length,
+)
+
-
+ No images in gallery. Visit
+
-
-
-
-
+
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue b/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue
new file mode 100644
index 00000000..92de1e97
--- /dev/null
+++ b/apps/frontend/src/pages/[type]/[id]/settings/gallery.vue
@@ -0,0 +1,810 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/versions.vue b/apps/frontend/src/pages/[type]/[id]/settings/versions.vue
new file mode 100644
index 00000000..fb5c9ee8
--- /dev/null
+++ b/apps/frontend/src/pages/[type]/[id]/settings/versions.vue
@@ -0,0 +1,414 @@
+
+
+
+
+ ![gallery-preview]()
+
+
+
+
+
+
+ {{ editFile ? editFile.name : 'Current image' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ + {{ item.title }} +
++ {{ item.description }} +
+
+
+
+
+ {{ $dayjs(item.created).format('MMMM D, YYYY') }}
+
+
+
+
+
+
+
+
+
+
+ Edit files
+
+
+
+ Edit details
+
+
+
+ Edit dependencies
+
+
+
+ Edit changelog
+
+
+
+
+
+
+
+
+ Download
+
+
+
+ Open in new tab
+
+
+
+ Copy link
+
+
+
+ Share
+
+
+
+ Report
+
+
+
+ Edit files
+
+
+
+ Edit details
+
+
+
+ Edit dependencies
+
+
+
+ Edit changelog
+
+
+
+ Delete
+
+
+
+ Copy ID
+
+
+
+ Copy Maven coordinates
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version]-new.vue b/apps/frontend/src/pages/[type]/[id]/version/[version]-new.vue
deleted file mode 100644
index fe6b6d53..00000000
--- a/apps/frontend/src/pages/[type]/[id]/version/[version]-new.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
+
+
+
+
+
+
+
+
+
+
+ No versions created
+ Create your first project version.
+ +
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version].vue b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
index 4f71e120..69a61309 100644
--- a/apps/frontend/src/pages/[type]/[id]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
@@ -141,7 +141,7 @@
-
-
-
- - {{ version.version_number }} -
- {{ version.name }} -
-
-
-
-
-
-
-
-
-
-
-
-
- Files
-
-
-
-
-
-
-
- {{
- file.primary ? 'Primary file' : 'Supplementary resource'
- }}
- {{ file.filename }} • {{ formatBytes(file.size) }}
-
-
-
-
-
-
- Dependencies
-Changes
-
-
-
-
@@ -1353,7 +1335,6 @@ export default defineNuxtComponent({
display: flex;
flex-wrap: wrap;
align-items: center;
- margin-bottom: 1rem;
gap: var(--spacing-card-md);
h2,
diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version]/edit.vue b/apps/frontend/src/pages/[type]/[id]/version/[version]/edit.vue
deleted file mode 100644
index 751cd13d..00000000
--- a/apps/frontend/src/pages/[type]/[id]/version/[version]/edit.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/apps/frontend/src/pages/[type]/[id]/versions.vue b/apps/frontend/src/pages/[type]/[id]/versions.vue
index 2eb25a06..f2398bd6 100644
--- a/apps/frontend/src/pages/[type]/[id]/versions.vue
+++ b/apps/frontend/src/pages/[type]/[id]/versions.vue
@@ -1,34 +1,52 @@
-
-
+ Creating and editing project versions can now be done directly from the
+ project settings .
+
+
+
`/${project.project_type}/${
project.slug ? project.slug : project.id
- }/version/${encodeURI(version.displayUrlEnding)}`
+ }/version/${encodeURI(version.displayUrlEnding ? version.displayUrlEnding : version.id)}`
"
+ :open-modal="currentMember ? () => handleOpenCreateVersionModal() : undefined"
>
+
+
+
+
+
+ Edit files
+
+
+
+ Edit details
+
+
+
+ Edit dependencies
+
+
+
+ Edit changelog
+
+
+
Report
-
-
- Edit
+
+
+ Edit files
+
+
+
+ Edit details
+
+
+
+ Edit dependencies
+
+
+
+ Edit changelog
@@ -175,34 +267,49 @@
+
+
diff --git a/apps/frontend/src/pages/admin/billing/[id].vue b/apps/frontend/src/pages/admin/billing/[id].vue
index 5ce70b4c..b3c88168 100644
--- a/apps/frontend/src/pages/admin/billing/[id].vue
+++ b/apps/frontend/src/pages/admin/billing/[id].vue
@@ -182,7 +182,7 @@
"
>
diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index bc22a53d..b67ff318 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -122,7 +122,7 @@
-
-
-
-
- Click to choose a file or drag one onto this page
-
-
+
+
+
+
+
+
+
+
+
+
+ No versions in project. Visit
+
-
-
+
Manage your servers
@@ -110,7 +110,7 @@
Find a modpack. Now it's a server.
@@ -148,7 +148,7 @@
@@ -213,7 +213,7 @@
Servers notices
+Server notices
- Why Modrinth Servers?
+ Why Modrinth Hosting?
Find a modpack. Now it's a server.
@@ -148,7 +148,7 @@
Play where your mods are
- Modrinth Servers seamlessly integrates the mod and modpack installation process into
+ Modrinth Hosting seamlessly integrates the mod and modpack installation process into
your server.
Experience modern, reliable hosting
- Modrinth Servers are hosted on + Modrinth Hosting servers are hosted on high-performance AMD CPUs with DDR5 RAM, running on custom-built software to ensure your server performs smoothly.
@@ -341,7 +341,7 @@ A powerful console, server properties manager, and more- Modrinth Servers come with powerful tools to manage your server. + Modrinth Hosting comes with powerful tools to manage your server.
@@ -378,7 +378,7 @@
SFTP access
- Access your server files directly with SFTP built into Modrinth Servers. + Access your server's files directly with SFTP built into Modrinth Hosting.
@@ -398,11 +398,11 @@
- Modrinth Servers are powered by AMD Ryzen 7900 and 7950X3D equivalent CPUs at 5+ - GHz, paired with DDR5 memory. + Modrinth Hosting servers are powered by AMD Ryzen 7900 and 7950X3D equivalent CPUs + at 5+ GHz, paired with DDR5 memory.
@@ -426,11 +426,11 @@
@@ -439,7 +439,7 @@
- Yes. All Modrinth Servers come with DDoS protection, with up to 17Tbps capacity in - some locations. + Yes. All Modrinth Hosting servers come with DDoS protection, with up to 17Tbps + capacity in some locations.
We have servers available in North America, Europe, and Southeast Asia at the moment
@@ -466,13 +466,13 @@
- Modrinth Servers are hosted on very modern high-performance hardware, but it's tough - to say how exactly that will translate into how fast your server will run because - there are so many factors that affect it, such as the mods, data packs, or plugins - you're running on your server, and even user behavior. + Modrinth Hosting servers are hosted on very modern high-performance hardware, but + it's tough to say how exactly that will translate into how fast your server will run + because there are so many factors that affect it, such as the mods, data packs, or + plugins you're running on your server, and even user behavior.
Most performance issues that arise tend to be the fault of an unoptimized modpack, @@ -502,8 +502,8 @@ What Minecraft versions and loaders can be used?
- Modrinth Servers can run any version of Minecraft: Java Edition going all the way - back to version 1.2.5, including snapshot versions. + Modrinth Hosting servers can run any version of Minecraft: Java Edition going all + the way back to version 1.2.5, including snapshot versions.
We also support a wide range of mod and plugin loaders, including Fabric, Quilt,
@@ -705,7 +705,7 @@ const lowestPrice = computed(() => {
return amount ? amount / monthsInInterval[billingPeriod.value] : undefined
})
-const title = 'Modrinth Servers'
+const title = 'Modrinth Hosting'
const description =
'Start your own Minecraft server directly on Modrinth. Play your favorite mods, plugins, and datapacks — without the hassle of setup.'
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/hosting/manage/[id].vue
similarity index 79%
rename from apps/frontend/src/pages/servers/manage/[id].vue
rename to apps/frontend/src/pages/hosting/manage/[id].vue
index 7a04ce38..af174464 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/hosting/manage/[id].vue
@@ -1,7 +1,7 @@
Not yet implemented.
- We couldn't load your server's backups. Here's what went wrong:
-
- {{
- JSON.stringify(server.moduleErrors.backups.error)
- }}
-
- You can have up to {{ data.backup_quota }} backups at once, stored securely off-site.
-
+
+
-
- An error occurred while installing your server because Modrinth Servers does not
+ An error occurred while installing your server because Modrinth Hosting 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.
@@ -284,7 +296,7 @@
-
+
or
+
+
+
+
diff --git a/apps/frontend/src/pages/news/changelog/index.vue b/apps/frontend/src/pages/news/changelog/index.vue
index 1b307b96..8663497d 100644
--- a/apps/frontend/src/pages/news/changelog/index.vue
+++ b/apps/frontend/src/pages/news/changelog/index.vue
@@ -6,13 +6,19 @@ import { getChangelog, type Product } from '@modrinth/utils'
import NavTabs from '~/components/ui/NavTabs.vue'
const route = useRoute()
+const router = useRouter()
const filter = ref
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No projects in queue.
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- Failed to load backups
-
-
-
-
-
-
-
diff --git a/apps/frontend/src/pages/settings/billing/charges.vue b/apps/frontend/src/pages/settings/billing/charges.vue
index d9f8eef6..a1df435e 100644
--- a/apps/frontend/src/pages/settings/billing/charges.vue
+++ b/apps/frontend/src/pages/settings/billing/charges.vue
@@ -17,7 +17,7 @@
Modrinth Plus
- Modrinth Servers
+ Modrinth Hosting
Medal Server Trial
diff --git a/apps/frontend/src/pages/settings/billing/index.vue b/apps/frontend/src/pages/settings/billing/index.vue
index ecc510ac..da4a1033 100644
--- a/apps/frontend/src/pages/settings/billing/index.vue
+++ b/apps/frontend/src/pages/settings/billing/index.vue
@@ -510,9 +510,7 @@
class="universal-card recessed !mb-0 flex items-center justify-between"
>
-
-
-
-
-
-
- Backups
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -128,7 +129,7 @@ import {
watch,
} from 'vue'
-export interface DropdownOption
@@ -599,14 +597,11 @@
diff --git a/packages/ui/src/components/base/Badge.vue b/packages/ui/src/components/base/Badge.vue
index 69719054..b057b6fd 100644
--- a/packages/ui/src/components/base/Badge.vue
+++ b/packages/ui/src/components/base/Badge.vue
@@ -69,6 +69,14 @@
{{ formatMessage(messages.closedLabel) }}
+
+
+ {{ formatMessage(messages.safeLabel) }}
+
+
+ {{ formatMessage(messages.unsafeLabel) }}
+
+
{{ capitalizeString(type) }}
@@ -78,6 +86,7 @@
import {
ArchiveIcon,
BoxIcon,
+ BugIcon,
CalendarIcon,
CheckIcon,
EyeOffIcon,
@@ -86,6 +95,7 @@ import {
LockIcon,
ModrinthIcon,
ScaleIcon,
+ ShieldCheckIcon,
UpdatedIcon,
XIcon,
} from '@modrinth/assets'
@@ -153,6 +163,10 @@ const messages = defineMessages({
id: 'omorphia.component.badge.label.returned',
defaultMessage: 'Returned',
},
+ safeLabel: {
+ id: 'omorphia.component.badge.label.safe',
+ defaultMessage: 'Pass',
+ },
scheduledLabel: {
id: 'omorphia.component.badge.label.scheduled',
defaultMessage: 'Scheduled',
@@ -165,6 +179,10 @@ const messages = defineMessages({
id: 'omorphia.component.badge.label.unlisted',
defaultMessage: 'Unlisted',
},
+ unsafeLabel: {
+ id: 'omorphia.component.badge.label.unsafe',
+ defaultMessage: 'Fail',
+ },
withheldLabel: {
id: 'omorphia.component.badge.label.withheld',
defaultMessage: 'Withheld',
@@ -204,6 +222,7 @@ defineProps<{
&.type--rejected,
&.type--returned,
&.type--failed,
+ &.type--unsafe,
&.red {
--badge-color: var(--color-red);
}
@@ -220,6 +239,7 @@ defineProps<{
&.type--admin,
&.type--processed,
&.type--approved-general,
+ &.type--safe,
&.green {
--badge-color: var(--color-green);
}
diff --git a/packages/ui/src/components/base/Button.vue b/packages/ui/src/components/base/Button.vue
index daeda03f..22f8b4cf 100644
--- a/packages/ui/src/components/base/Button.vue
+++ b/packages/ui/src/components/base/Button.vue
@@ -43,6 +43,10 @@ const props = defineProps({
type: Boolean,
default: false,
},
+ disabled: {
+ type: Boolean,
+ default: false,
+ },
})
const accentedButton = computed(() =>
@@ -69,6 +73,7 @@ const classes = computed(() => {
'btn-hover-filled-only': props.hoverFilledOnly,
'btn-outline': props.outline,
'color-accent-contrast': accentedButton,
+ disabled: props.disabled,
}
})
@@ -78,10 +83,14 @@ const classes = computed(() => {
v-if="link && link.startsWith('/')"
class="btn"
:class="classes"
- :to="link"
+ :to="disabled ? '' : link"
:target="external ? '_blank' : '_self'"
@click="
(event) => {
+ if (disabled) {
+ event.preventDefault()
+ return
+ }
if (action) {
action(event)
}
@@ -96,10 +105,14 @@ const classes = computed(() => {
v-else-if="link"
class="btn"
:class="classes"
- :href="link"
+ :href="disabled ? undefined : link"
:target="external ? '_blank' : '_self'"
@click="
(event) => {
+ if (disabled) {
+ event.preventDefault()
+ return
+ }
if (action) {
action(event)
}
@@ -110,7 +123,7 @@ const classes = computed(() => {
- No results found
+ {{ noOptionsMessage }}
-
@@ -292,11 +292,11 @@ import {
XIcon,
YouTubeIcon,
} from '@modrinth/assets'
+import NewModal from '@modrinth/ui/src/components/modal/NewModal.vue'
import { markdownCommands, modrinthMarkdownEditorKeymap } from '@modrinth/utils/codemirror'
import { renderHighlightedString } from '@modrinth/utils/highlightjs'
import { type Component, computed, onBeforeUnmount, onMounted, ref, toRef, watch } from 'vue'
-import Modal from '../modal/Modal.vue'
import Button from './Button.vue'
import Chips from './Chips.vue'
import FileInput from './FileInput.vue'
@@ -756,9 +756,9 @@ const videoMarkdown = computed(() => {
return ''
})
-const linkModal = ref
@@ -223,10 +223,10 @@
-
-
-
+
+ {{ resolvedTitle }}
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/packages/ui/src/components/base/RadioButtons.vue b/packages/ui/src/components/base/RadioButtons.vue
index b1ec4f1d..f93dc38b 100644
--- a/packages/ui/src/components/base/RadioButtons.vue
+++ b/packages/ui/src/components/base/RadioButtons.vue
@@ -1,9 +1,9 @@
-
+ {{ label }}
+
+
+ {{ Math.round(percent * 100) }}%
+
+
+
+
+
@@ -32,7 +27,7 @@
+
+
+
+
+
diff --git a/packages/ui/src/components/page/SidebarCard.vue b/packages/ui/src/components/page/SidebarCard.vue
new file mode 100644
index 00000000..dc0eb38f
--- /dev/null
+++ b/packages/ui/src/components/page/SidebarCard.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+ {{ title }}
+
+
diff --git a/packages/ui/src/components/page/index.ts b/packages/ui/src/components/page/index.ts
new file mode 100644
index 00000000..80eae38b
--- /dev/null
+++ b/packages/ui/src/components/page/index.ts
@@ -0,0 +1,2 @@
+export { default as NormalPage } from './NormalPage.vue'
+export { default as SidebarCard } from './SidebarCard.vue'
diff --git a/packages/ui/src/components/project/ProjectPageVersions.vue b/packages/ui/src/components/project/ProjectPageVersions.vue
index 6f27fe76..8301ed5c 100644
--- a/packages/ui/src/components/project/ProjectPageVersions.vue
+++ b/packages/ui/src/components/project/ProjectPageVersions.vue
@@ -1,18 +1,44 @@
-
-
+
+
+
+
+
+ Showing {{ (currentPage - 1) * pageSize + 1 }} to
+ {{ Math.min(currentPage * pageSize, filteredVersions.length) }} of
+ {{ filteredVersions.length }}
+
+
+
diff --git a/packages/ui/src/components/search/SearchDropdown.vue b/packages/ui/src/components/search/SearchDropdown.vue
deleted file mode 100644
index 5cd0e381..00000000
--- a/packages/ui/src/components/search/SearchDropdown.vue
+++ /dev/null
@@ -1,346 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/packages/ui/src/components/search/SearchFilter.vue b/packages/ui/src/components/search/SearchFilter.vue
deleted file mode 100644
index aaed9430..00000000
--- a/packages/ui/src/components/search/SearchFilter.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/ui/src/pages/index.ts b/packages/ui/src/pages/index.ts
index c7c34bf8..cebba2a4 100644
--- a/packages/ui/src/pages/index.ts
+++ b/packages/ui/src/pages/index.ts
@@ -1 +1,2 @@
-export { default as ServersManagePageIndex } from './servers/manage/index.vue'
+export { default as ServersManageBackupsPage } from './hosting/manage/backups.vue'
+export { default as ServersManagePageIndex } from './hosting/manage/index.vue'
diff --git a/packages/ui/src/providers/index.ts b/packages/ui/src/providers/index.ts
index 214a0f05..d4a06d62 100644
--- a/packages/ui/src/providers/index.ts
+++ b/packages/ui/src/providers/index.ts
@@ -79,5 +79,7 @@ export function createContext