@@ -667,8 +684,9 @@ import {
ScaleIcon,
} from "@modrinth/assets";
import { Button, ButtonStyled, OverflowMenu, Avatar, commonMessages } from "@modrinth/ui";
-
import { isAdmin, isStaff } from "@modrinth/utils";
+import { errors as generatedStateErrors } from "~/generated/state.json";
+
import ModalCreation from "~/components/ui/ModalCreation.vue";
import { getProjectTypeMessage } from "~/utils/i18n-project-type.ts";
import CollectionCreateModal from "~/components/ui/CollectionCreateModal.vue";
@@ -737,6 +755,18 @@ const stagingBannerMessages = defineMessages({
},
});
+const failedToBuildBannerMessages = defineMessages({
+ title: {
+ id: "layout.banner.build-fail.title",
+ defaultMessage: "Error generating state from API when building.",
+ },
+ description: {
+ id: "layout.banner.build-fail.description",
+ defaultMessage:
+ "This deploy of Modrinth's frontend failed to generate state from the API. This may be due to an outage or an error in configuration. Rebuild when the API is available. Error codes: {errors}; Current API URL is: {url}",
+ },
+});
+
const navMenuMessages = defineMessages({
home: {
id: "layout.nav.home",
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 478b01b8..998d2265 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -239,6 +239,87 @@
"dashboard.collections.long-title": {
"message": "Your collections"
},
+ "error.collection.404.list_item.1": {
+ "message": "You may have mistyped the collection's URL."
+ },
+ "error.collection.404.list_item.2": {
+ "message": "The collection may be private."
+ },
+ "error.collection.404.list_item.3": {
+ "message": "The collection may have been taken down by Modrinth's moderation team for violating our
Terms of Use."
+ },
+ "error.collection.404.list_title": {
+ "message": "Why?"
+ },
+ "error.collection.404.title": {
+ "message": "Collection not found"
+ },
+ "error.generic.404.subtitle": {
+ "message": "The page you were looking for doesn't seem to exist."
+ },
+ "error.generic.404.title": {
+ "message": "Page not found"
+ },
+ "error.generic.default.list_item.1": {
+ "message": "Check if Modrinth is down on our
Status page."
+ },
+ "error.generic.default.list_item.2": {
+ "message": "If this keeps happening, you may want to let the Modrinth Team know by joining our
Discord server."
+ },
+ "error.generic.default.list_title": {
+ "message": "Please try again in a few minutes."
+ },
+ "error.generic.default.subtitle": {
+ "message": "Something went wrong."
+ },
+ "error.generic.default.title": {
+ "message": "Uh oh!"
+ },
+ "error.organization.404.list_item.1": {
+ "message": "You may have mistyped the organization's URL."
+ },
+ "error.organization.404.list_item.2": {
+ "message": "The organization's owner may have changed the URL or deleted it."
+ },
+ "error.organization.404.list_item.3": {
+ "message": "The organization may have been removed by Modrinth's moderation team for violating our
Terms of Use."
+ },
+ "error.organization.404.list_title": {
+ "message": "Why?"
+ },
+ "error.organization.404.title": {
+ "message": "Organization not found"
+ },
+ "error.project.404.list_item.1": {
+ "message": "You may have mistyped the project's URL."
+ },
+ "error.project.404.list_item.2": {
+ "message": "The project's owner may have changed the URL, made the project private, or deleted it."
+ },
+ "error.project.404.list_item.3": {
+ "message": "The project may have been taken down by Modrinth's moderation team for violating our
Terms of Use."
+ },
+ "error.project.404.list_title": {
+ "message": "Why?"
+ },
+ "error.project.404.title": {
+ "message": "Project not found"
+ },
+ "error.user.404.list_item.1": {
+ "message": "You may have mistyped the user's username."
+ },
+ "error.user.404.list_item.2": {
+ "message": "The user may have changed their username or deleted their account."
+ },
+ "error.user.404.list_item.3": {
+ "message": "The user's account may have been terminated for violating Modrinth's
Terms of Use."
+ },
+ "error.user.404.list_title": {
+ "message": "Why?"
+ },
+ "error.user.404.title": {
+ "message": "User not found"
+ },
"frog": {
"message": "You've been frogged! 🐸"
},
@@ -269,6 +350,12 @@
"layout.banner.add-email.title": {
"message": "For security purposes, please enter your email on Modrinth."
},
+ "layout.banner.build-fail.description": {
+ "message": "This deploy of Modrinth's frontend failed to generate state from the API. This may be due to an outage or an error in configuration. Rebuild when the API is available. Error codes: {errors}; Current API URL is: {url}"
+ },
+ "layout.banner.build-fail.title": {
+ "message": "Error generating state from API when building."
+ },
"layout.banner.staging.description": {
"message": "The staging environment is completely separate from the production Modrinth database. This is used for testing and debugging purposes, and may be running in-development versions of the Modrinth backend or frontend newer than the production instance."
},
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index d09142cb..847f25ca 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -850,6 +850,7 @@ import {
UsersIcon,
VersionIcon,
WrenchIcon,
+ ModrinthIcon,
} from "@modrinth/assets";
import {
Avatar,
@@ -870,7 +871,6 @@ import VersionSummary from "@modrinth/ui/src/components/version/VersionSummary.v
import { formatCategory, isRejected, isStaff, isUnderReview, renderString } from "@modrinth/utils";
import { navigateTo } from "#app";
import dayjs from "dayjs";
-import ModrinthIcon from "~/assets/images/utils/modrinth.svg?component";
import Accordion from "~/components/ui/Accordion.vue";
// import AdPlaceholder from "~/components/ui/AdPlaceholder.vue";
import AutomaticAccordion from "~/components/ui/AutomaticAccordion.vue";
@@ -1105,14 +1105,19 @@ let project,
featuredVersions,
versions,
organization,
- resetOrganization;
+ resetOrganization,
+ projectError,
+ membersError,
+ dependenciesError,
+ featuredVersionsError,
+ versionsError;
try {
[
- { data: project, refresh: resetProject },
- { data: allMembers, refresh: resetMembers },
- { data: dependencies },
- { data: featuredVersions },
- { data: versions },
+ { data: project, error: projectError, refresh: resetProject },
+ { data: allMembers, error: membersError, refresh: resetMembers },
+ { data: dependencies, error: dependenciesError },
+ { data: featuredVersions, error: featuredVersionsError },
+ { data: versions, error: versionsError },
{ data: organization, refresh: resetOrganization },
] = await Promise.all([
useAsyncData(`project/${route.params.id}`, () => useBaseFetch(`project/${route.params.id}`), {
@@ -1159,14 +1164,30 @@ try {
versions = shallowRef(toRaw(versions));
featuredVersions = shallowRef(toRaw(featuredVersions));
-} catch {
+} catch (err) {
throw createError({
fatal: true,
- statusCode: 404,
- message: "Project not found",
+ statusCode: err.statusCode ?? 500,
+ message: "Error loading project data" + (err.message ? `: ${err.message}` : ""),
});
}
+function handleError(err, project = false) {
+ if (err.value && err.value.statusCode) {
+ throw createError({
+ fatal: true,
+ statusCode: err.value.statusCode,
+ message: err.value.statusCode === 404 && project ? "Project not found" : err.value.message,
+ });
+ }
+}
+
+handleError(projectError, true);
+handleError(membersError);
+handleError(dependenciesError);
+handleError(featuredVersionsError);
+handleError(versionsError);
+
if (!project.value) {
throw createError({
fatal: true,
@@ -1605,10 +1626,12 @@ const navLinks = computed(() => {
width: 25rem;
height: 25rem;
}
+
.animation-ring-2 {
width: 50rem;
height: 50rem;
}
+
.animation-ring-3 {
width: 100rem;
height: 100rem;
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/index.vue b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
index 11d38289..8312caa2 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/index.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
@@ -163,14 +163,11 @@
v-if="visibility === 'approved' || visibility === 'archived'"
class="good"
/>
-
+
{{ hasModifiedVisibility() ? "Will be v" : "V" }}isible in search
-
+
{{ hasModifiedVisibility() ? "Will be v" : "V" }}isible on profile
@@ -242,20 +239,13 @@
@@ -1112,6 +1131,7 @@ async function updateSearchProjects() {
background: var(--landing-green-label-bg);
color: var(--landing-green-label);
}
+
&.blue {
background: var(--landing-blue-label-bg);
color: var(--landing-blue-label);
@@ -1228,6 +1248,7 @@ async function updateSearchProjects() {
h3 {
font-size: 3rem;
}
+
p {
font-size: 1.5rem;
}
@@ -1295,6 +1316,7 @@ async function updateSearchProjects() {
h3 {
font-size: 4rem;
}
+
p {
font-size: 1.625rem;
}
diff --git a/apps/frontend/src/pages/legal/ccpa.vue b/apps/frontend/src/pages/legal/ccpa.vue
index d1487ec3..885f67d1 100644
--- a/apps/frontend/src/pages/legal/ccpa.vue
+++ b/apps/frontend/src/pages/legal/ccpa.vue
@@ -2,7 +2,7 @@
Privacy Notice for California Residents
Effective Date: August 5th, 2023
-
Last reviewed on: August 5th, 2023
+
Last reviewed on: March 11th, 2025
This Privacy Notice for California Residents supplements the information contained in the
Privacy Policy of Rinth, Inc. (the "Company," "we,"
@@ -49,7 +49,7 @@
information, medical information, or health insurance information.
Some personal information included in this category may overlap with other categories.
-
NO |
+
YES |
| C. Protected classification characteristics. |
@@ -68,7 +68,7 @@
Records of personal property, products or services purchased, obtained, or considered,
or other purchasing or consuming histories or tendencies.
- NO |
+ YES |
| E. Biometric information. |
diff --git a/apps/frontend/src/pages/legal/cmp-info.vue b/apps/frontend/src/pages/legal/cmp-info.vue
index 0a10b3be..d08bec90 100644
--- a/apps/frontend/src/pages/legal/cmp-info.vue
+++ b/apps/frontend/src/pages/legal/cmp-info.vue
@@ -92,32 +92,38 @@
+
How do I know Modrinth is being transparent about revenue?
We aim to be as transparent as possible with creator revenue. All of our code is open source,
@@ -125,9 +131,9 @@
revenue distribution system. We also have an
- API route that allows users
- to query exact daily revenue for the site - so far, Modrinth has generated
- {{ formatMoney(platformRevenue) }} in revenue.
+ API route
+ to query the exact daily advertising revenue for the site - so far, creators on Modrinth have
+ earned a total of {{ formatMoney(platformRevenue) }} in ad revenue.
Modrinth's total revenue in the previous 5 days, for the entire dataset, use the
+ >Modrinth's total ad revenue in the previous 5 days, for the entire dataset, use the
aforementioned
API route.
diff --git a/apps/frontend/src/pages/moderation.vue b/apps/frontend/src/pages/moderation.vue
index 4dcd6f88..4dbb509d 100644
--- a/apps/frontend/src/pages/moderation.vue
+++ b/apps/frontend/src/pages/moderation.vue
@@ -8,7 +8,7 @@
-
+
@@ -21,14 +21,12 @@
+