From 5a10292add0a734b3ab25eb240c6054050961ca6 Mon Sep 17 00:00:00 2001 From: didirus4 Date: Wed, 16 Jul 2025 20:33:58 +0300 Subject: [PATCH 01/22] feat: add support for multiple account types in database --- .../src/components/ui/AccountsCard.vue | 218 +++++++++++------- apps/app/tauri.conf.json | 2 +- ...a706cbc4a4f5190c9320d1ad6111b9711d63.json} | 10 +- ...34d3801bc38c23e1e02fbd8fa08ae51e8f08.json} | 10 +- ...8ffb21c4e22c7ff33459df5049ee441fa0467.json | 12 + ...1828ee58a724f06a91633b8a40b4e04d0b9a0.json | 12 - ...pdate_minecraft_users_add_account_type.sql | 5 + .../app-lib/src/state/legacy_converter.rs | 2 + packages/app-lib/src/state/minecraft_auth.rs | 42 +++- packages/assets/icons/elyby-icon.svg | 64 +++++ packages/assets/index.ts | 2 + 11 files changed, 274 insertions(+), 105 deletions(-) rename packages/app-lib/.sqlx/{query-bf7d47350092d87c478009adaab131168e87bb37aa65c2156ad2cb6198426d8c.json => query-57214178fb3a0ccd8f67457e9732a706cbc4a4f5190c9320d1ad6111b9711d63.json} (72%) rename packages/app-lib/.sqlx/{query-727e3e1bc8625bbcb833920059bb8cea926ac6c65d613904eff1d740df30acda.json => query-5c803f3d90c147210e8e7a7a6d7234d3801bc38c23e1e02fbd8fa08ae51e8f08.json} (74%) create mode 100644 packages/app-lib/.sqlx/query-8f7d4406ddae4a158eabb20fc6a8ffb21c4e22c7ff33459df5049ee441fa0467.json delete mode 100644 packages/app-lib/.sqlx/query-d719cf2f6f87c5ea7ea6ace2d6a1828ee58a724f06a91633b8a40b4e04d0b9a0.json create mode 100644 packages/app-lib/migrations/20250716135844_update_minecraft_users_add_account_type.sql create mode 100644 packages/assets/icons/elyby-icon.svg diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue index 69ee0e01..f7a6326d 100644 --- a/apps/app-frontend/src/components/ui/AccountsCard.vue +++ b/apps/app-frontend/src/components/ui/AccountsCard.vue @@ -1,17 +1,9 @@ diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json index e6a708f7..bf910c1e 100644 --- a/apps/frontend/src/locales/en-US/index.json +++ b/apps/frontend/src/locales/en-US/index.json @@ -533,6 +533,69 @@ "profile.user-id": { "message": "User ID: {id}" }, + "project-member-header.accept": { + "message": "Accept" + }, + "project-member-header.decline": { + "message": "Decline" + }, + "project-member-header.error": { + "message": "Error" + }, + "project-member-header.error-decline": { + "message": "Failed to decline team invitation" + }, + "project-member-header.error-join": { + "message": "Failed to accept team invitation" + }, + "project-member-header.invitation-no-role": { + "message": "You've been invited to join this project. Please accept or decline the invitation." + }, + "project-member-header.invitation-title": { + "message": "Invitation to join project" + }, + "project-member-header.invitation-with-role": { + "message": "You've been invited be a member of this project with the role of '{role}'." + }, + "project-member-header.publishing-checklist": { + "message": "Publishing checklist" + }, + "project-member-header.required": { + "message": "Required" + }, + "project-member-header.resubmit-for-review": { + "message": "Resubmit for review" + }, + "project-member-header.resubmit-for-review-desc": { + "message": "Your project has been {status} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message." + }, + "project-member-header.submit-checklist-tooltip": { + "message": "You must complete the required steps in the publishing checklist!" + }, + "project-member-header.submit-for-review": { + "message": "Submit for review" + }, + "project-member-header.submit-for-review-desc": { + "message": "Your project is only viewable by members of the project. It must be reviewed by moderators in order to be published." + }, + "project-member-header.success": { + "message": "Success" + }, + "project-member-header.success-decline": { + "message": "You have declined the team invitation" + }, + "project-member-header.success-join": { + "message": "You have joined the project team" + }, + "project-member-header.suggestion": { + "message": "Suggestion" + }, + "project-member-header.visit-moderation-page": { + "message": "Visit moderation page" + }, + "project-member-header.warning": { + "message": "Warning" + }, "project-type.collection.plural": { "message": "Collections" }, diff --git a/apps/frontend/src/pages/[type]/[id]/settings/description.vue b/apps/frontend/src/pages/[type]/[id]/settings/description.vue index 174d4bc9..45f0a8eb 100644 --- a/apps/frontend/src/pages/[type]/[id]/settings/description.vue +++ b/apps/frontend/src/pages/[type]/[id]/settings/description.vue @@ -22,6 +22,10 @@ " :on-image-upload="onUploadHandler" /> +
+ + {{ descriptionWarning }} +