-
Notifications
You must be signed in to change notification settings - Fork 552
fix authorized apps settings, redesign, fix retro theme vars #6900
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Prospector
wants to merge
3
commits into
main
Choose a base branch
from
prospector/fix-authorized-apps-settings
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+339
−341
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| <template> | ||
| <div class="rounded-2xl border border-solid border-surface-4 bg-surface-3"> | ||
| <div class="flex flex-col gap-2 border-0 border-b border-solid border-surface-4 p-4"> | ||
| <div class="flex flex-wrap justify-between gap-3"> | ||
| <div class="flex items-center gap-3"> | ||
| <Avatar :src="authorization.app.icon_url" size="48px" /> | ||
| <div class="flex flex-col gap-0.5"> | ||
| <h2 class="m-0 flex items-center gap-1 text-base font-semibold"> | ||
| {{ authorization.app.name }} | ||
|
|
||
| <BadgeCheckIcon | ||
| v-if="isOfficial" | ||
| v-tooltip="formatMessage(messages.officialTooltip)" | ||
| class="size-5 text-green" | ||
| fill="currentColor" | ||
| fill-opacity="0.125" | ||
| /> | ||
| </h2> | ||
| <PageHeaderMetadata> | ||
| <PageHeaderMetadataItem> | ||
| <IntlFormatted :message-id="messages.byLabel"> | ||
| <template #~user> | ||
| <nuxt-link | ||
| :to="'/user/' + authorization.owner.id" | ||
| class="flex items-center gap-1 hover:underline" | ||
| target="_blank" | ||
| > | ||
| <Avatar :src="authorization.owner.avatar_url" size="24px" circle /> | ||
| {{ authorization.owner.username }} | ||
| </nuxt-link> | ||
| </template> | ||
| </IntlFormatted> | ||
| </PageHeaderMetadataItem> | ||
| <PageHeaderMetadataItem v-if="authorization.app.url"> | ||
| <a class="text-link" :to="authorization.app.url" target="_blank"> | ||
| {{ authorization.app.url }} | ||
| </a> | ||
| </PageHeaderMetadataItem> | ||
| </PageHeaderMetadata> | ||
| </div> | ||
| </div> | ||
| <div> | ||
| <ButtonStyled color="red"> | ||
| <button @click="emit('revoke', authorization.app_id)"> | ||
| <XCircleIcon /> | ||
| {{ formatMessage(messages.revokeAction) }} | ||
| </button> | ||
| </ButtonStyled> | ||
| </div> | ||
| </div> | ||
| <div v-if="showUnofficialDisclosure" class="flex items-center gap-1 text-orange"> | ||
| <IssuesIcon /> | ||
| {{ formatMessage(messages.unofficialDisclosure) }} | ||
| </div> | ||
| </div> | ||
| <div class="rounded-b-2xl bg-surface-2 p-4"> | ||
| <template v-if="authorization.app.description"> | ||
| <label :for="descriptionId" class="mb-1 flex font-semibold text-contrast"> | ||
| {{ formatMessage(messages.aboutThisAppLabel) }} | ||
| </label> | ||
| <div :id="descriptionId" class="mb-4">{{ authorization.app.description }}</div> | ||
| </template> | ||
|
|
||
| <label :for="scopeListId" class="mb-1 flex font-semibold text-contrast"> | ||
| {{ formatMessage(commonMessages.permissionsLabel) }} | ||
| </label> | ||
| <div :id="scopeListId" class="grid gap-1 sm:grid-cols-2"> | ||
| <div | ||
| v-for="scope in scopesToDefinitions(BigInt(authorization.scopes || 0))" | ||
| :key="scope" | ||
| class="flex items-center gap-1" | ||
| > | ||
| <CheckIcon class="size-5 shrink-0 text-green" /> | ||
| {{ scope }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </template> | ||
| <script setup lang="ts"> | ||
| import type { Labrinth } from '@modrinth/api-client' | ||
| import { BadgeCheckIcon, CheckIcon, IssuesIcon, XCircleIcon } from '@modrinth/assets' | ||
| import { | ||
| Avatar, | ||
| ButtonStyled, | ||
| commonMessages, | ||
| defineMessages, | ||
| IntlFormatted, | ||
| PageHeaderMetadata, | ||
| PageHeaderMetadataItem, | ||
| useVIntl, | ||
| } from '@modrinth/ui' | ||
| import { isOfficialAccount } from '@modrinth/utils' | ||
|
|
||
| import { useScopes } from '~/composables/auth/scopes.ts' | ||
|
|
||
| export type AuthorizationCardData = Labrinth.OAuth.Internal.OAuthClientAuthorization & { | ||
| app: Labrinth.OAuth.Internal.OAuthClient | ||
| owner: Labrinth.Users.v2.User | ||
| } | ||
|
|
||
| const props = defineProps<{ | ||
| authorization: AuthorizationCardData | ||
| }>() | ||
|
|
||
| const emit = defineEmits<{ | ||
| revoke: [appId: string] | ||
| }>() | ||
|
|
||
| const { formatMessage } = useVIntl() | ||
| const { scopesToDefinitions } = useScopes() | ||
|
|
||
| const descriptionId = computed(() => `app-description-${props.authorization.id}`) | ||
| const scopeListId = computed(() => `app-scope-list-${props.authorization.id}`) | ||
|
|
||
| const unofficialTriggerWords = [ | ||
| 'modrinth', | ||
| 'mod rinth', | ||
| 'rnodrinth', | ||
| 'rinth', | ||
| 'modrith', | ||
| 'official', | ||
| 'verified', | ||
| 'verification', | ||
| ] | ||
|
|
||
| const showUnofficialDisclosure = computed(() => { | ||
| return ( | ||
| (unofficialTriggerWords.some((word) => | ||
| props.authorization.app.name.toLowerCase().includes(word), | ||
| ) || | ||
| unofficialTriggerWords.some((word) => | ||
| props.authorization.owner.username?.toLowerCase().includes(word), | ||
| )) && | ||
| !isOfficial.value | ||
| ) | ||
| }) | ||
|
|
||
| const isOfficial = computed(() => { | ||
| return isOfficialAccount(props.authorization.owner.id) | ||
| }) | ||
|
|
||
| const messages = defineMessages({ | ||
| revokeAction: { | ||
| id: 'settings.authorizations.revoke.action', | ||
| defaultMessage: 'Revoke', | ||
| }, | ||
| byLabel: { | ||
| id: 'settings.authorizations.created-by', | ||
| defaultMessage: 'Created by {user}', | ||
| }, | ||
| aboutThisAppLabel: { | ||
| id: 'settings.authorizations.about-this-app', | ||
| defaultMessage: 'About this app', | ||
| }, | ||
| unofficialDisclosure: { | ||
| id: 'settings.authorizations.unofficial-disclosure', | ||
| defaultMessage: 'This app is not affiliated with Modrinth in any way, despite its name.', | ||
| }, | ||
| officialTooltip: { | ||
| id: 'settings.authorizations.official-tooltip', | ||
| defaultMessage: 'This app is created by an official Modrinth account.', | ||
| }, | ||
| }) | ||
| </script> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
retro in app 👀 ?