From ced073d26c7f119d275fbc4519eca67d0dd2abc3 Mon Sep 17 00:00:00 2001 From: Prospector <6166773+Prospector@users.noreply.github.com> Date: Sat, 21 Jun 2025 07:35:42 -0700 Subject: [PATCH] Add colors for new loaders, reduce utility redundancy (#3820) * Add colors to some newer loaders * Make loader formatting consistent everywhere, remove redundant utilities --- .../ui/OrganizationProjectTransferModal.vue | 3 +- .../src/components/ui/ProjectMemberHeader.vue | 2 +- .../src/components/ui/report/ReportInfo.vue | 10 ++- .../src/components/ui/search/Categories.vue | 5 +- apps/frontend/src/helpers/fileUtils.js | 2 +- apps/frontend/src/pages/[type]/[id].vue | 11 ++- .../src/pages/[type]/[id]/settings/index.vue | 6 +- .../src/pages/[type]/[id]/settings/tags.vue | 26 +++--- .../pages/[type]/[id]/version/[version].vue | 13 +-- .../src/pages/dashboard/notifications.vue | 3 +- .../frontend/src/pages/dashboard/projects.vue | 12 ++- .../src/pages/dashboard/revenue/transfers.vue | 4 +- .../src/pages/dashboard/revenue/withdraw.vue | 11 ++- apps/frontend/src/pages/moderation/index.vue | 2 +- apps/frontend/src/pages/moderation/review.vue | 6 +- .../organization/[id]/settings/projects.vue | 3 +- apps/frontend/src/pages/settings/index.vue | 2 +- apps/frontend/src/plugins/shorthands.js | 84 ------------------- packages/assets/styles/variables.scss | 8 ++ packages/utils/utils.ts | 6 ++ 20 files changed, 87 insertions(+), 132 deletions(-) diff --git a/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue b/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue index 59dc4cea2..73ded4559 100644 --- a/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue +++ b/apps/frontend/src/components/ui/OrganizationProjectTransferModal.vue @@ -57,7 +57,7 @@
{{ - $formatProjectType( + formatProjectType( $getProjectTypeForDisplay( project.project_types?.[0] ?? "project", project.loaders, @@ -111,6 +111,7 @@ diff --git a/apps/frontend/src/helpers/fileUtils.js b/apps/frontend/src/helpers/fileUtils.js index 5d21ee0b2..3f97618a8 100644 --- a/apps/frontend/src/helpers/fileUtils.js +++ b/apps/frontend/src/helpers/fileUtils.js @@ -1,4 +1,4 @@ -import { formatBytes } from "~/plugins/shorthands.js"; +import { formatBytes } from "@modrinth/utils"; export const fileIsValid = (file, validationOptions) => { const { maxSize, alertOnInvalid } = validationOptions; diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue index bce77e7f8..7edde26fe 100644 --- a/apps/frontend/src/pages/[type]/[id].vue +++ b/apps/frontend/src/pages/[type]/[id].vue @@ -875,7 +875,14 @@ import { useRelativeTime, } from "@modrinth/ui"; import VersionSummary from "@modrinth/ui/src/components/version/VersionSummary.vue"; -import { formatCategory, isRejected, isStaff, isUnderReview, renderString } from "@modrinth/utils"; +import { + formatCategory, + formatProjectType, + isRejected, + isStaff, + isUnderReview, + renderString, +} from "@modrinth/utils"; import { navigateTo } from "#app"; import dayjs from "dayjs"; import Accordion from "~/components/ui/Accordion.vue"; @@ -1286,7 +1293,7 @@ featuredVersions.value.sort((a, b) => { }); const projectTypeDisplay = computed(() => - data.$formatProjectType( + formatProjectType( data.$getProjectTypeForDisplay(project.value.project_type, project.value.loaders), ), ); diff --git a/apps/frontend/src/pages/[type]/[id]/settings/index.vue b/apps/frontend/src/pages/[type]/[id]/settings/index.vue index a0593483c..9b01da2a3 100644 --- a/apps/frontend/src/pages/[type]/[id]/settings/index.vue +++ b/apps/frontend/src/pages/[type]/[id]/settings/index.vue @@ -104,7 +104,7 @@ Client-side Select based on if the - {{ $formatProjectType(project.project_type).toLowerCase() }} has functionality on the + {{ formatProjectType(project.project_type).toLowerCase() }} has functionality on the client side. Just because a mod works in Singleplayer doesn't mean it has actual client-side functionality. @@ -128,7 +128,7 @@ Server-side Select based on if the - {{ $formatProjectType(project.project_type).toLowerCase() }} has functionality on the + {{ formatProjectType(project.project_type).toLowerCase() }} has functionality on the logical server. Remember that Singleplayer contains an integrated server. @@ -239,7 +239,7 @@