diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml index 5cf03bd01..6601ece6b 100644 --- a/apps/app/Cargo.toml +++ b/apps/app/Cargo.toml @@ -16,7 +16,7 @@ serde_json.workspace = true serde = { workspace = true, features = ["derive"] } serde_with.workspace = true -tauri = { workspace = true, features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] } +tauri = { workspace = true, features = ["devtools", "macos-private-api", "protocol-asset"] } tauri-plugin-window-state.workspace = true tauri-plugin-deep-link.workspace = true tauri-plugin-os.workspace = true diff --git a/apps/frontend/.env.local b/apps/frontend/.env.local index f764f8513..29aad1d10 100644 --- a/apps/frontend/.env.local +++ b/apps/frontend/.env.local @@ -2,4 +2,3 @@ BASE_URL=http://127.0.0.1:8000/v2/ BROWSER_BASE_URL=http://127.0.0.1:8000/v2/ PYRO_BASE_URL=https://staging-archon.modrinth.com PROD_OVERRIDE=true - diff --git a/apps/frontend/src/components/ui/Avatar.vue b/apps/frontend/src/components/ui/Avatar.vue deleted file mode 100644 index 6216aa5d8..000000000 --- a/apps/frontend/src/components/ui/Avatar.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - diff --git a/apps/frontend/src/components/ui/Badge.vue b/apps/frontend/src/components/ui/Badge.vue deleted file mode 100644 index 1ebb84510..000000000 --- a/apps/frontend/src/components/ui/Badge.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - - diff --git a/apps/frontend/src/components/ui/CopyCode.vue b/apps/frontend/src/components/ui/CopyCode.vue deleted file mode 100644 index 98cb14c06..000000000 --- a/apps/frontend/src/components/ui/CopyCode.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - - diff --git a/apps/frontend/src/components/ui/ModerationChecklist.vue b/apps/frontend/src/components/ui/ModerationChecklist.vue index c4fabfa3b..fa692949f 100644 --- a/apps/frontend/src/components/ui/ModerationChecklist.vue +++ b/apps/frontend/src/components/ui/ModerationChecklist.vue @@ -654,11 +654,11 @@ For a brief rundown of how this works: { name: "Insufficient", resultingMessage: `## Insufficient Gallery Images - We ask that projects like yours show off their content using images in the Gallery, or optionally in the Description, in order to effectively and clearly inform users of its content per section 2.1 of [Modrinth's content rules](https://modrinth.com/legal/rules#general-expectations). - Keep in mind that you should: - - Set a featured image that best represents your project. - - Ensure all your images have titles that accurately label the image, and optionally, details on the contents of the image in the images Description. - - Upload any relevant images in your Description to your Gallery tab for best results.`, +We ask that projects like yours show off their content using images in the Gallery, or optionally in the Description, in order to effectively and clearly inform users of its content per section 2.1 of [Modrinth's content rules](https://modrinth.com/legal/rules#general-expectations). +Keep in mind that you should: +- Set a featured image that best represents your project. +- Ensure all your images have titles that accurately label the image, and optionally, details on the contents of the image in the images Description. +- Upload any relevant images in your Description to your Gallery tab for best results.`, }, { name: "Not relevant", diff --git a/apps/frontend/src/components/ui/NotificationItem.vue b/apps/frontend/src/components/ui/NotificationItem.vue index 1da769a34..4a293684a 100644 --- a/apps/frontend/src/components/ui/NotificationItem.vue +++ b/apps/frontend/src/components/ui/NotificationItem.vue @@ -104,13 +104,13 @@ by the moderators. @@ -331,16 +331,13 @@ import { XIcon, ExternalIcon, } from "@modrinth/assets"; -import { useRelativeTime } from "@modrinth/ui"; +import { Avatar, ProjectStatusBadge, CopyCode, useRelativeTime } from "@modrinth/ui"; import ThreadSummary from "~/components/ui/thread/ThreadSummary.vue"; import { getProjectLink, getVersionLink } from "~/helpers/projects.js"; import { getUserLink } from "~/helpers/users.js"; import { acceptTeamInvite, removeSelfFromTeam } from "~/helpers/teams.js"; import { markAsRead } from "~/helpers/notifications.ts"; import DoubleIcon from "~/components/ui/DoubleIcon.vue"; -import Avatar from "~/components/ui/Avatar.vue"; -import Badge from "~/components/ui/Badge.vue"; -import CopyCode from "~/components/ui/CopyCode.vue"; import Categories from "~/components/ui/search/Categories.vue"; const app = useNuxtApp(); diff --git a/apps/frontend/src/components/ui/Pagination.vue b/apps/frontend/src/components/ui/Pagination.vue deleted file mode 100644 index 99fb555ca..000000000 --- a/apps/frontend/src/components/ui/Pagination.vue +++ /dev/null @@ -1,196 +0,0 @@ - - - - - diff --git a/apps/frontend/src/components/ui/ProjectCard.vue b/apps/frontend/src/components/ui/ProjectCard.vue index fbb147c2a..1be6f86c4 100644 --- a/apps/frontend/src/components/ui/ProjectCard.vue +++ b/apps/frontend/src/components/ui/ProjectCard.vue @@ -29,7 +29,7 @@ {{ author }}

- +

{{ description }} @@ -91,18 +91,16 @@ diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts index 4d5fceb18..bb3aca367 100644 --- a/packages/ui/src/components/index.ts +++ b/packages/ui/src/components/index.ts @@ -16,6 +16,7 @@ export { default as DoubleIcon } from './base/DoubleIcon.vue' export { default as DropArea } from './base/DropArea.vue' export { default as DropdownSelect } from './base/DropdownSelect.vue' export { default as EnvironmentIndicator } from './base/EnvironmentIndicator.vue' +export { default as ErrorInformationCard } from './base/ErrorInformationCard.vue' export { default as FileInput } from './base/FileInput.vue' export { default as FilterBar } from './base/FilterBar.vue' export type { FilterBarOption } from './base/FilterBar.vue' diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts index 434b94d65..b0bde3b77 100644 --- a/packages/utils/changelog.ts +++ b/packages/utils/changelog.ts @@ -11,7 +11,28 @@ export type VersionEntry = { const VERSIONS: VersionEntry[] = [ { - date: `2025-06-14T10:50:00-07:00`, + date: `2025-06-16T11:00:00-07:00`, + product: 'web', + body: `### Improvements +- Rolled out hotfixes with the previous days' updates. +- Failed subscriptions can now be cancelled.`, + }, + { + date: `2025-06-16T11:00:00-07:00`, + product: 'servers', + body: `### Improvements +- Improved error handling. +- Rolled out hotfixes with the previous days' updates.'`, + }, + { + date: `2025-06-15T16:25:00-07:00`, + product: 'servers', + body: `### Improvements +- Fixed installing modpacks from search. +- Fixed setting subdomains.`, + }, + { + date: `2025-06-15T14:30:00-07:00`, product: 'servers', body: `### Improvements - Fixed various issues with the panel loading improperly in certain cases. @@ -19,13 +40,13 @@ const VERSIONS: VersionEntry[] = [ - Server panel performance should be a little faster now.`, }, { - date: `2025-06-14T10:50:00-07:00`, + date: `2025-06-15T14:30:00-07:00`, product: 'web', body: `### Improvements -- Creator analytics charts will now show up to 15 projects in a tooltip instead of 5. (Contributed by [Erb3](https://github.com/modrinth/code/pull/2898)) -- Made certain scrollable containers not have a fixed height, and allow them to be smaller if they have fewer items. +- Creator analytics charts will now show up to 15 projects in a tooltip instead of 5. +- Made certain scrollable containers not have a fixed height, and allow them to be smaller if they have fewer items. (Contributed by [Erb3](https://github.com/modrinth/code/pull/2898)) - Made organizations sort consistently alphabetically. (Contributed by [WorldWidePixel](https://github.com/modrinth/code/pull/3755)) -- Clarified the 'File too large' error message when uploading an image larger than 1MiB in the text editor.`, +- Clarified the 'File too large' error message when uploading an image larger than 1MiB in the text editor. (Contributed by [IThundxr](https://github.com/modrinth/code/pull/3774))`, }, { date: `2025-06-03T14:35:00-07:00`, diff --git a/packages/utils/servers/errors/modrinth-server-error.ts b/packages/utils/servers/errors/modrinth-server-error.ts index ece8825c8..c0a548a77 100644 --- a/packages/utils/servers/errors/modrinth-server-error.ts +++ b/packages/utils/servers/errors/modrinth-server-error.ts @@ -54,6 +54,6 @@ export class ModrinthServerError extends Error { } super(errorMessage) - this.name = 'PyroServersFetchError' + this.name = 'ModrinthServersFetchError' } } diff --git a/packages/utils/servers/errors/modrinth-servers-fetch-error.ts b/packages/utils/servers/errors/modrinth-servers-fetch-error.ts index ce01e737f..a2df7baa3 100644 --- a/packages/utils/servers/errors/modrinth-servers-fetch-error.ts +++ b/packages/utils/servers/errors/modrinth-servers-fetch-error.ts @@ -5,6 +5,6 @@ export class ModrinthServersFetchError extends Error { public originalError?: Error, ) { super(message) - this.name = 'PyroFetchError' + this.name = 'ModrinthFetchError' } }