Merge remote-tracking branch 'origin/main' into prospector/disclosures-frontend

# Conflicts: # apps/frontend/src/pages/[type]/[project].vue # apps/frontend/src/pages/[type]/[project]/settings/tags.vue
2026-08-31 03:55:59 +00:00 · 2026-08-07 15:16:40 -07:00
parent b4d1eef9c7 e4cbec6b2c
commit 4d481acd41
253 changed files with 8101 additions and 5756 deletions
@@ -73,7 +73,7 @@
 				<div class="grid grid-cols-1 gap-2 sm:grid-cols-2">
 					<Button type="outlined" class="w-full" native-type="button" @click="modal?.hide()">
 						<XIcon aria-hidden="true" />
-						{{ formatMessage(messages.cancelButton) }}
+						{{ formatMessage(commonMessages.cancelButton) }}
 					</Button>
 					<Button
 						class="w-full"
@@ -106,7 +106,14 @@

 <script setup lang="ts">
 import { LogInIcon, RefreshCwIcon, SpinnerIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
-import { Button, defineMessages, IntlFormatted, NewModal, useVIntl } from '@modrinth/ui'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	IntlFormatted,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { ref } from 'vue'

@@ -245,10 +252,6 @@ const messages = defineMessages({
 		id: 'modal.modrinth-account-required.waiting-for-browser',
 		defaultMessage: 'Waiting for browser confirmation...',
 	},
-	cancelButton: {
-		id: 'modal.modrinth-account-required.cancel-button',
-		defaultMessage: 'Cancel',
-	},
 	openBrowserAgainButton: {
 		id: 'modal.modrinth-account-required.open-browser-again-button',
 		defaultMessage: 'Open browser again',
@@ -1112,9 +1112,6 @@
  "minecraft-required.sign-in": {
    "message": "Log ind på Microsoft"
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuller"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Fortsæt i din browser"
  },
@@ -1853,9 +1853,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "Ein neuer Tab zum Anmelden wurde geöffnet. Schließe die Anmeldung dort ab und kehren anschließend zur App zurück."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Abbrechen"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Im Browser fortfahren"
  },
@@ -1853,9 +1853,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "Ein neuer Tab zum Anmelden wurde geöffnet. Schließe die Anmeldung dort ab und kehren anschließend zur App zurück."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Abbrechen"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Im Browser fortfahren"
  },
@@ -1880,9 +1880,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "A new tab opened to sign in. Complete the sign in there, then return to the app."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancel"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Continue in your browser"
  },
@@ -1481,9 +1481,6 @@
  "minecraft-required.sign-in": {
    "message": "Iniciar sesión con Microsoft"
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancelar"
-  },
  "modal.modrinth-account-required.header": {
    "message": "Cuenta requerida"
  },
@@ -1754,9 +1754,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "A nouvel onglet a été ouvert pour vous connecter. Finissez la connexion, puis retournez dans l'application."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuler"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Continuer dans votre navigateur"
  },
@@ -1856,9 +1856,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "Megnyílt egy új lap a bejelentkezéshez. Végezd el ott a bejelentkezést, majd térj vissza az alkalmazásba."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Mégse"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Folytatás a böngészőben"
  },
@@ -1853,9 +1853,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "Si è aperta una nuova scheda per effettuare l'accesso. Poi torna all'app."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annulla"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Continua nel browser"
  },
@@ -1853,9 +1853,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "サインイン用のタブが開きました。そちらでサインインを完了してから、アプリに戻ってください。"
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "キャンセル"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "ブラウザで続行"
  },
@@ -1853,9 +1853,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "로그인을 위한 새 탭이 열렸습니다. 해당 탭에서 로그인을 완료한 후 앱 돌아오세요."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "취소"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "브라우저에서 계속 진행"
  },
@@ -1763,9 +1763,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "Er is een nieuw tabblad geopend om je aan te melden. Log daar in en ga vervolgens terug naar de app."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuleren"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Doorgaan in je browser"
  },
@@ -1619,9 +1619,6 @@
  "minecraft-required.sign-in": {
    "message": "Zaloguj się do Microsoft"
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Anuluj"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Kontynuuj w przeglądarce"
  },
@@ -1856,9 +1856,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "Uma nova aba foi aberta para iniciar sessão. Conclua lá, então volte ao aplicativo."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancelar"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Continuar em seu navegador"
  },
@@ -1844,9 +1844,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "Открылась вкладка для входа. Завершение вход и вернитесь в приложение."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Отмена"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Продолжите в браузере"
  },
@@ -1640,9 +1640,6 @@
  "minecraft-required.sign-in": {
    "message": "Logga in på Microsoft"
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Avbryt"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Fortsätt i din webbläsare"
  },
@@ -1457,9 +1457,6 @@
  "minecraft-required.sign-in": {
    "message": "Microsoft'a giriş yap"
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "İptal"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Tarayıcında devam et"
  },
@@ -1853,9 +1853,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "Відкрилася нова вкладка, де ви зможете ввійти. Увійдіть, тоді поверніться до застосунку."
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Скасувати"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "Продовжити у браузері"
  },
@@ -1856,9 +1856,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "一个新的标签页已打开，你需要在那里完成登录，然后回到Modrinth app。"
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "取消"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "请在你的浏览器中继续"
  },
@@ -1856,9 +1856,6 @@
  "modal.modrinth-account-required.browser-description": {
    "message": "一個新分頁已開啟供你登入。請在該分頁完成登入，然後返回應用程式。"
  },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "取消"
-  },
  "modal.modrinth-account-required.continue-in-browser-heading": {
    "message": "在瀏覽器中繼續"
  },
@@ -52,6 +52,8 @@ import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'

 import {
 	block_user,
+	change_user_avatar,
+	delete_user_avatar,
 	get_blocked_users,
 	get_user_collections,
 	get_user_organizations,
@@ -119,6 +121,10 @@ const userProfile = provideUserProfile({
 	getOrganizations: get_user_organizations,
 	getCollections: get_user_collections,
 	patchUser: patch_user,
+	changeAvatar: async (userId, file, extension) => {
+		await change_user_avatar(userId, new Uint8Array(await file.arrayBuffer()), extension)
+	},
+	deleteAvatar: delete_user_avatar,
 	getBlockedUsers: get_blocked_users,
 	blockUser: block_user,
 	unblockUser: unblock_user,
@@ -55,8 +55,8 @@
 				</PageHeaderMetadataItem>
 				<PageHeaderMetadataItem
 					v-if="sharedInstanceManager?.type !== 'user'"
-					:icon="ServerLoaderIcon"
-					:icon-props="{ loader: loaderDisplayName }"
+					:icon="TagIcon"
+					:icon-props="{ tag: loaderDisplayName, enforceType: 'loader' }"
 					tooltip="Mod loader"
 				>
 					{{ loaderLabel }}
@@ -205,7 +205,6 @@ import {
 	commonMessages,
 	defineMessages,
 	formatLoaderLabel,
-	LoaderIcon as ServerLoaderIcon,
 	type OverflowMenuOption,
 	PageHeader,
 	PageHeaderActions,
@@ -213,6 +212,7 @@ import {
 	PageHeaderMetadata,
 	PageHeaderMetadataItem,
 	type ServerLoader,
+	TagIcon,
 	useVIntl,
 } from '@modrinth/ui'
 import { computed } from 'vue'
@@ -283,7 +283,7 @@ function filterClass(active: boolean) {
 	return [
 		'cursor-pointer rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-all duration-100 active:scale-[0.97]',
 		active
-			? 'border-green bg-brand-highlight text-brand'
+			? 'border-brand bg-brand-highlight text-brand'
 			: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5',
 	]
 }
@@ -263,7 +263,7 @@ function filterPillClass(isActive: boolean) {
 	return [
 		'cursor-pointer rounded-full border border-solid px-3 py-1.5 text-base font-semibold leading-5 transition-all duration-100 active:scale-[0.97]',
 		isActive
-			? 'border-green bg-brand-highlight text-brand'
+			? 'border-brand bg-brand-highlight text-brand'
 			: 'border-surface-5 bg-surface-4 text-primary hover:bg-surface-5',
 	]
 }