MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add sign in redirect path (#5746)

Browse Source
This commit is contained in:
Prospector
2026-04-04 13:33:09 -07:00
committed by GitHub
parent 54c45ac9f3
commit c4b3c6e8d6
9 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/frontend/src/pages/[type]/[id].vue
View File

@@ -647,7 +647,7 @@
<nuxt-link
v-else
v-tooltip="formatMessage(commonMessages.followButton)"
to="/auth/sign-in"
:to="signInRouteObj"
:aria-label="formatMessage(commonMessages.followButton)"
>
<HeartIcon aria-hidden="true" />
@@ -655,7 +655,7 @@
<template #fallback>
<nuxt-link
v-tooltip="formatMessage(commonMessages.followButton)"
to="/auth/sign-in"
:to="signInRouteObj"
:aria-label="formatMessage(commonMessages.followButton)"
>
<HeartIcon aria-hidden="true" />
@@ -715,7 +715,7 @@
</button>
</template>
</PopoutMenu>
<nuxt-link v-else v-tooltip="'Save'" to="/auth/sign-in" aria-label="Save">
<nuxt-link v-else v-tooltip="'Save'" :to="signInRouteObj" aria-label="Save">
<BookmarkIcon aria-hidden="true" />
</nuxt-link>
</ButtonStyled>
@@ -768,7 +768,11 @@
{
id: 'report',
action: () =>
auth.user ? reportProject(project.id) : navigateTo('/auth/sign-in'),
auth.user
? reportProject(project.id)
: navigateTo(
getSignInRouteObj(route, getReportPath('project', project.id)),
),
color: 'red',
hoverOnly: true,
shown: !isMember,
@@ -1117,12 +1121,13 @@ import CollectionCreateModal from '~/components/ui/create/CollectionCreateModal.
import MessageBanner from '~/components/ui/MessageBanner.vue'
import ModerationChecklist from '~/components/ui/moderation/checklist/ModerationChecklist.vue'
import ProjectMemberHeader from '~/components/ui/ProjectMemberHeader.vue'
import { getSignInRouteObj } from '~/composables/auth.js'
import { saveFeatureFlags } from '~/composables/featureFlags.ts'
import { STALE_TIME, STALE_TIME_LONG } from '~/composables/queries/project'
import { versionQueryOptions } from '~/composables/queries/version'
import { userCollectProject, userFollowProject } from '~/composables/user.js'
import { useModerationStore } from '~/store/moderation.ts'
import { reportProject } from '~/utils/report-helpers.ts'
import { getReportPath, reportProject } from '~/utils/report-helpers.ts'
definePageMeta({
key: (route) => `${route.params.id}`,
@@ -1130,6 +1135,7 @@ definePageMeta({
const data = useNuxtApp()
const route = useRoute()
const signInRouteObj = computed(() => getSignInRouteObj(route))
const config = useRuntimeConfig()
const moderationStore = useModerationStore()
const notifications = injectNotificationManager()

6
apps/frontend/src/pages/[type]/[id]/settings/versions.vue
View File

@@ -110,7 +110,8 @@
id: 'report',
color: 'red',
hoverFilled: true,
action: () => (auth.user ? reportVersion(version.id) : navigateTo('/auth/sign-in')),
action: () =>
auth.user ? reportVersion(version.id) : navigateTo(getSignInRouteObj(route)),
shown: !currentMember,
},
{ divider: true, shown: !!currentMember || flags.developerMode },
@@ -307,8 +308,11 @@ import {
import { useTemplateRef } from 'vue'
import CreateProjectVersionModal from '~/components/ui/create-project-version/CreateProjectVersionModal.vue'
import { getSignInRouteObj } from '~/composables/auth.js'
import { reportVersion } from '~/utils/report-helpers.ts'
const route = useRoute()
const client = injectModrinthClient()
const { addNotification } = injectNotificationManager()
const {

4
apps/frontend/src/pages/[type]/[id]/version/[version].vue
View File

@@ -147,7 +147,7 @@
</a>
</ButtonStyled>
<ButtonStyled v-if="!auth.user">
<nuxt-link to="/auth/sign-in">
<nuxt-link :to="signInRouteObj">
<ReportIcon aria-hidden="true" />
Report
</nuxt-link>
@@ -443,6 +443,7 @@ import { formatBytes, renderHighlightedString } from '@modrinth/utils'
import Breadcrumbs from '~/components/ui/Breadcrumbs.vue'
import CreateProjectVersionModal from '~/components/ui/create-project-version/CreateProjectVersionModal.vue'
import Modal from '~/components/ui/Modal.vue'
import { getSignInRouteObj } from '~/composables/auth.js'
import { useImageUpload } from '~/composables/image-upload.ts'
import { inferVersionInfo } from '~/helpers/infer'
import { createDataPackVersion } from '~/helpers/package.js'
@@ -454,6 +455,7 @@ const emit = defineEmits<{
// Composables
const data = useNuxtApp()
const route = useNativeRoute()
const signInRouteObj = computed(() => getSignInRouteObj(route))
const router = useRouter()
const auth = await useAuth()
const tags = useGeneratedState()

5
apps/frontend/src/pages/[type]/[id]/versions.vue
View File

@@ -132,7 +132,7 @@
color: 'red',
hoverFilled: true,
action: () =>
auth.user ? reportVersion(version.id) : navigateTo('/auth/sign-in'),
auth.user ? reportVersion(version.id) : navigateTo(getSignInRouteObj(route)),
shown: !currentMember,
},
{ divider: true, shown: currentMember || flags.developerMode },
@@ -269,8 +269,11 @@ import {
import { onMounted, useTemplateRef } from 'vue'
import CreateProjectVersionModal from '~/components/ui/create-project-version/CreateProjectVersionModal.vue'
import { getSignInRouteObj } from '~/composables/auth.js'
import { reportVersion } from '~/utils/report-helpers.ts'
const route = useRoute()
const tags = useGeneratedState()
const flags = useFeatureFlags()
const auth = await useAuth()

4
apps/frontend/src/pages/user/[id].vue
View File

@@ -199,7 +199,8 @@
{ divider: true, shown: auth.user && auth.user.id === user.id },
{
id: 'report',
action: () => (auth.user ? reportUser(user.id) : navigateTo('/auth/sign-in')),
action: () =>
auth.user ? reportUser(user.id) : navigateTo(getSignInRouteObj(route)),
color: 'red',
hoverOnly: true,
shown: auth.user?.id !== user.id,
@@ -520,6 +521,7 @@ import UpToDate from '~/assets/images/illustrations/up_to_date.svg?component'
import AdPlaceholder from '~/components/ui/AdPlaceholder.vue'
import CollectionCreateModal from '~/components/ui/create/CollectionCreateModal.vue'
import ModalCreation from '~/components/ui/create/ProjectCreateModal.vue'
import { getSignInRouteObj } from '~/composables/auth.js'
import { reportUser } from '~/utils/report-helpers.ts'
const data = useNuxtApp()