From 414e2ed2cd92b2dba38525a782d6a4c0762b89d7 Mon Sep 17 00:00:00 2001 From: Erb3 <49862976+Erb3@users.noreply.github.com> Date: Sat, 7 Dec 2024 20:44:45 +0100 Subject: [PATCH 01/90] fix: issue templates used outdated label names (#2991) --- .github/ISSUE_TEMPLATE/2-web-bug.yml | 4 ++-- .github/ISSUE_TEMPLATE/3-api-bug.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/2-web-bug.yml b/.github/ISSUE_TEMPLATE/2-web-bug.yml index 669225fc7..dcef0bb7e 100644 --- a/.github/ISSUE_TEMPLATE/2-web-bug.yml +++ b/.github/ISSUE_TEMPLATE/2-web-bug.yml @@ -1,6 +1,6 @@ name: 🌐 Website bug (modrinth.com) description: Report an issue on the Modrinth website. -labels: [bug, frontend] +labels: [bug, web] body: - type: checkboxes attributes: @@ -49,4 +49,4 @@ body: label: Additional context description: Add any other context about the problem here. validations: - required: false \ No newline at end of file + required: false diff --git a/.github/ISSUE_TEMPLATE/3-api-bug.yml b/.github/ISSUE_TEMPLATE/3-api-bug.yml index f76a5f166..a17ed85ef 100644 --- a/.github/ISSUE_TEMPLATE/3-api-bug.yml +++ b/.github/ISSUE_TEMPLATE/3-api-bug.yml @@ -1,6 +1,6 @@ name: 🛠️ API issue (api.modrinth.com) description: Report an issue regarding the Modrinth API. -labels: [bug, api] +labels: [bug, backend] body: - type: checkboxes attributes: @@ -38,4 +38,4 @@ body: label: Additional context description: Add any other context about the problem here. validations: - required: false \ No newline at end of file + required: false From b8957d386acffefc706e28b43654d07b9689fced Mon Sep 17 00:00:00 2001 From: Erb3 <49862976+Erb3@users.noreply.github.com> Date: Sat, 7 Dec 2024 20:45:02 +0100 Subject: [PATCH 02/90] fix(frontend): internal server error on 404 (#2990) --- apps/frontend/src/layouts/default.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue index e70191c04..d764d4a68 100644 --- a/apps/frontend/src/layouts/default.vue +++ b/apps/frontend/src/layouts/default.vue @@ -203,7 +203,7 @@ Date: Sat, 7 Dec 2024 20:45:32 +0100 Subject: [PATCH 03/90] fix(frontend): redirect report button to signin if needed (#2953) Fixes #2951 --- apps/frontend/src/pages/[type]/[id]/versions.vue | 4 +++- apps/frontend/src/pages/user/[id].vue | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/frontend/src/pages/[type]/[id]/versions.vue b/apps/frontend/src/pages/[type]/[id]/versions.vue index 1abdf5d12..734b51efa 100644 --- a/apps/frontend/src/pages/[type]/[id]/versions.vue +++ b/apps/frontend/src/pages/[type]/[id]/versions.vue @@ -204,7 +204,8 @@ id: 'report', color: 'red', hoverFilled: true, - action: () => reportVersion(version.id), + action: () => + auth.user ? reportVersion(version.id) : navigateTo('/auth/sign-in'), shown: !currentMember, }, { divider: true, shown: currentMember }, @@ -339,6 +340,7 @@ const props = defineProps({ const tags = useTags(); const flags = useFeatureFlags(); const formatRelativeTime = useRelativeTime(); +const auth = await useAuth(); const emits = defineEmits(["onDownload"]); diff --git a/apps/frontend/src/pages/user/[id].vue b/apps/frontend/src/pages/user/[id].vue index 40069d039..328b0eb90 100644 --- a/apps/frontend/src/pages/user/[id].vue +++ b/apps/frontend/src/pages/user/[id].vue @@ -68,7 +68,7 @@ { divider: true, shown: auth.user && auth.user.id === user.id }, { id: 'report', - action: () => reportUser(user.id), + action: () => (auth.user ? reportUser(user.id) : navigateTo('/auth/sign-in')), color: 'red', hoverOnly: true, shown: auth.user?.id !== user.id, From d851f32ea0fd6b5c35e40ba10558e73f63113467 Mon Sep 17 00:00:00 2001 From: Evan Song <52982404+ferothefox@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:10:36 -0700 Subject: [PATCH 04/90] fix: do not consider backup limit in reinstall prompt (#2994) Signed-off-by: Evan Song --- apps/frontend/src/pages/servers/manage/[id]/options/loader.vue | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue b/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue index 18781fc64..06273a94e 100644 --- a/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue +++ b/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue @@ -272,6 +272,7 @@ const backupServer = ref(false); const isError = computed(() => props.server.general?.status === "error"); const isDangerous = computed(() => hardReset.value); +// eslint-disable-next-line @typescript-eslint/no-unused-vars const isBackupLimited = computed(() => (props.server.backups?.data?.length || 0) >= 15); const versionStrings = ["forge", "fabric", "quilt", "neo"] as const; @@ -318,7 +319,6 @@ const mrpackModal = ref(); const canInstall = computed(() => { const conds = !selectedMCVersion.value || - isBackupLimited.value || isLoading.value || loadingServerCheck.value || serverCheckError.value.trim().length > 0; diff --git a/package.json b/package.json index be16cf3f9..ee9ec0373 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "turbo": "^2.2.3", "vue": "^3.4.31" }, - "packageManager": "pnpm@9.4.0", + "packageManager": "pnpm@9.15.0", "pnpm": { "patchedDependencies": { "readable-stream@2.3.8": "patches/readable-stream@2.3.8.patch" From 7d480ffbd62f578d5f39d022bcdd318ad0dd9b9a Mon Sep 17 00:00:00 2001 From: Erb3 <49862976+Erb3@users.noreply.github.com> Date: Tue, 10 Dec 2024 21:16:13 +0100 Subject: [PATCH 05/90] fix(frontend): remove duplicate id for searchbars (#3000) Only one element should have the same id. The id is used to link with the label's `for` attribute. There may be similar issues other places, but this is the one that was brought to my attention. Resolves #2999 --- .../src/pages/search/[searchProjectType].vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/frontend/src/pages/search/[searchProjectType].vue b/apps/frontend/src/pages/search/[searchProjectType].vue index aaac004e3..407d7523d 100644 --- a/apps/frontend/src/pages/search/[searchProjectType].vue +++ b/apps/frontend/src/pages/search/[searchProjectType].vue @@ -48,12 +48,12 @@
- +