@@ -116,7 +116,7 @@ Create @@ -164,7 +164,7 @@ Report - + Report @@ -181,7 +181,7 @@ ({{ $formatBytes(file.size) }}) Upload additional files - + Used for additional files such as required/optional resource packs Used for files such as sources or Javadocs. @@ -566,14 +566,14 @@ v-if="isEditing" v-model="version.loaders" :options=" - $tag.loaders + tags.loaders .filter((x) => x.supported_project_types.includes(project.actualProjectType.toLowerCase()) ) .map((it) => it.name) " :custom-label="(value) => $formatCategory(value)" - :loading="$tag.loaders.length === 0" + :loading="tags.loaders.length === 0" :multiple="true" :searchable="false" :show-no-results="false" @@ -593,12 +593,12 @@ v-model="version.game_versions" :options=" showSnapshots - ? $tag.gameVersions.map((x) => x.version) - : $tag.gameVersions + ? tags.gameVersions.map((x) => x.version) + : tags.gameVersions .filter((it) => it.version_type === 'release') .map((x) => x.version) " - :loading="$tag.gameVersions.length === 0" + :loading="tags.gameVersions.length === 0" :multiple="true" :searchable="true" :show-no-results="false" @@ -772,6 +772,9 @@ export default defineNuxtComponent({ const data = useNuxtApp() const route = useRoute() + const auth = await useAuth() + const tags = useTags() + const path = route.name.split('-') const mode = path[path.length - 1] @@ -828,7 +831,7 @@ export default defineNuxtComponent({ const inferredData = await inferVersionInfo( replaceFile, props.project, - data.$tag.gameVersions + tags.value.gameVersions ) version = { @@ -895,6 +898,8 @@ export default defineNuxtComponent({ const order = ['required', 'optional', 'incompatible', 'embedded'] return { + auth, + tags, fileTypes: ref(fileTypes), oldFileTypes: ref(oldFileTypes), isCreating: ref(isCreating), @@ -1110,7 +1115,6 @@ export default defineNuxtComponent({ body: formData, headers: { 'Content-Disposition': formData, - Authorization: this.$auth.token, }, }) } @@ -1135,13 +1139,11 @@ export default defineNuxtComponent({ } }), }, - ...this.$defaultHeaders(), }) for (const hash of this.deleteFiles) { await useBaseFetch(`version_file/${hash}?version_id=${this.version.id}`, { method: 'DELETE', - ...this.$defaultHeaders(), }) } @@ -1246,7 +1248,6 @@ export default defineNuxtComponent({ body: formData, headers: { 'Content-Disposition': formData, - Authorization: this.$auth.token, }, }) @@ -1263,7 +1264,6 @@ export default defineNuxtComponent({ await useBaseFetch(`version/${this.version.id}`, { method: 'DELETE', - ...this.$defaultHeaders(), }) await this.resetProjectVersions() @@ -1279,7 +1279,7 @@ export default defineNuxtComponent({ this.version, this.primaryFile, this.members, - this.$tag.gameVersions, + this.tags.gameVersions, this.packageLoaders ) @@ -1324,12 +1324,9 @@ export default defineNuxtComponent({ }, async resetProjectVersions() { const [versions, featuredVersions, dependencies] = await Promise.all([ - useBaseFetch(`project/${this.version.project_id}/version`, this.$defaultHeaders()), - useBaseFetch( - `project/${this.version.project_id}/version?featured=true`, - this.$defaultHeaders() - ), - useBaseFetch(`project/${this.version.project_id}/dependencies`, this.$defaultHeaders()), + useBaseFetch(`project/${this.version.project_id}/version`), + useBaseFetch(`project/${this.version.project_id}/version?featured=true`), + useBaseFetch(`project/${this.version.project_id}/dependencies`), ]) const newCreatedVersions = this.$computeVersions(versions, this.members) diff --git a/pages/auth.vue b/pages/auth.vue new file mode 100644 index 0000000000..beb5d8ffb0 --- /dev/null +++ b/pages/auth.vue @@ -0,0 +1,156 @@ + + + + + + + + + diff --git a/pages/auth/reset-password.vue b/pages/auth/reset-password.vue new file mode 100644 index 0000000000..e994c01492 --- /dev/null +++ b/pages/auth/reset-password.vue @@ -0,0 +1,113 @@ + + + Reset your password + + + Enter your email below and we'll send a recovery link to allow you to recover your account. + + + Email or username + + Send recovery email + + + Enter your new password below to gain access to your account. + Password + + Password + + Reset password + + + + diff --git a/pages/auth/sign-in.vue b/pages/auth/sign-in.vue new file mode 100644 index 0000000000..c1bb49d94e --- /dev/null +++ b/pages/auth/sign-in.vue @@ -0,0 +1,195 @@ + + + + + Enter two-factor code + Please enter a two-factor code to proceed. + + + + + Sign in + + + + Continue with + + + Discord + + GitHub + + Microsoft + + + Google + + Steam + + GitLab + + + + or + + + Email or username + + Password + + + + Forgot password? + + + Continue + + + Don't have an account yet? + + Create one. + + + + + + + + diff --git a/pages/auth/sign-up.vue b/pages/auth/sign-up.vue new file mode 100644 index 0000000000..e9b0a404a1 --- /dev/null +++ b/pages/auth/sign-up.vue @@ -0,0 +1,144 @@ + + + Create your account + + + Discord + + GitHub + + Microsoft + + + Google + + Steam + GitLab + + + + or + + + Email + + Username + + Password + + Password + + + + By creating an account, you agree to Modrinth's + terms and + privacy policy. + + + Create account + + + Already have an account yet? + + Sign in. + + + + + + + + diff --git a/pages/auth/verify-email.vue b/pages/auth/verify-email.vue new file mode 100644 index 0000000000..af1cc7e6da --- /dev/null +++ b/pages/auth/verify-email.vue @@ -0,0 +1,78 @@ + + + + Email already verified + Your email is already verified! + + Account settings + + + + Email verification + Your email address has been successfully verified! + + Account settings + + + Sign in + + + + Email verification failed + + We were unable to verify your email. + + Try re-sending the verification email through the button below. + + + Try re-sending the verification email through your dashboard by signing in. + + + + Resend verification email + + + Sign in + + + + + diff --git a/pages/auth/welcome.vue b/pages/auth/welcome.vue new file mode 100644 index 0000000000..e67c560c1d --- /dev/null +++ b/pages/auth/welcome.vue @@ -0,0 +1,46 @@ + + + Welcome to Modrinth! + + Thank you for creating an account. You can now follow and create projects, receive updates + about your favorite projects, and more! + + + Continue + + By creating an account, you agree to Modrinth's + terms and + privacy policy. + + + + diff --git a/pages/dashboard/index.vue b/pages/dashboard/index.vue index 6b960e3d7f..68f57293c1 100644 --- a/pages/dashboard/index.vue +++ b/pages/dashboard/index.vue @@ -1,12 +1,12 @@ - + - {{ $auth.user.username }} + {{ auth.user.username }} - + Visit your profile @@ -26,6 +26,7 @@ v-model:notifications="allNotifs" class="universal-card recessed" :notification="notification" + :auth="auth" raised compact /> @@ -116,14 +117,13 @@ useHead({ }) const auth = await useAuth() -const app = useNuxtApp() const [{ data: projects }, { data: payouts }] = await Promise.all([ useAsyncData(`user/${auth.value.user.id}/projects`, () => - useBaseFetch(`user/${auth.value.user.id}/projects`, app.$defaultHeaders()) + useBaseFetch(`user/${auth.value.user.id}/projects`) ), useAsyncData(`user/${auth.value.user.id}/payouts`, () => - useBaseFetch(`user/${auth.value.user.id}/payouts`, app.$defaultHeaders()) + useBaseFetch(`user/${auth.value.user.id}/payouts`) ), ]) diff --git a/pages/dashboard/notifications.vue b/pages/dashboard/notifications.vue index ace2b8c2ce..735338d386 100644 --- a/pages/dashboard/notifications.vue +++ b/pages/dashboard/notifications.vue @@ -36,6 +36,7 @@ v-model:notifications="allNotifs" class="universal-card recessed" :notification="notification" + :auth="auth" raised /> @@ -55,6 +56,8 @@ useHead({ title: 'Notifications - Modrinth', }) +const auth = await useAuth() + const route = useRoute() const router = useRouter() diff --git a/pages/dashboard/projects.vue b/pages/dashboard/projects.vue index 442773799a..b214a4d5ff 100644 --- a/pages/dashboard/projects.vue +++ b/pages/dashboard/projects.vue @@ -459,7 +459,6 @@ export default defineNuxtComponent({ { method: 'PATCH', body: baseData, - ...this.$defaultHeaders(), } ) diff --git a/pages/dashboard/report/[id].vue b/pages/dashboard/report/[id].vue index 2effb851dd..0107039fb6 100644 --- a/pages/dashboard/report/[id].vue +++ b/pages/dashboard/report/[id].vue @@ -1,5 +1,6 @@ @@ -8,6 +9,7 @@ import ReportView from '~/components/ui/report/ReportView.vue' const route = useRoute() +const auth = await useAuth() useHead({ title: `Report ${route.params.id} - Modrinth`, diff --git a/pages/dashboard/reports.vue b/pages/dashboard/reports.vue index 990376fff9..d05e392f32 100644 --- a/pages/dashboard/reports.vue +++ b/pages/dashboard/reports.vue @@ -2,13 +2,14 @@ Reports you've filed - + diff --git a/pages/settings/account.vue b/pages/settings/account.vue index af45c0baa3..5039f8b7f9 100644 --- a/pages/settings/account.vue +++ b/pages/settings/account.vue @@ -9,54 +9,259 @@ :has-to-type="true" @proceed="deleteAccount" /> - - - - - Revoking your Modrinth token can have unintended consequences. Please be aware that the - following could break: - - - Any application that uses your token to access the API. - Gradle - if Minotaur is given a incorrect token, your Gradle builds could fail. - - GitHub - if you use a GitHub action that uses the Modrinth API, it will cause errors. - + + + Your account information is not displayed publicly. + Email address + + + + + Cancel + + + + Save email + + + + + + + + Input passwords do not match! - If you are willing to continue, complete the following steps: - - - - Head to the Modrinth Application page on GitHub. - - Make sure to be logged into the GitHub account you used for Modrinth! - - Press the big red "Revoke Access" button next to the "Permissions" header. - - Once you have completed those steps, press the continue button below. - - - This will log you out of Modrinth, however, when you log back in, your token will be - regenerated. - - - - - + + Confirm password + Please enter your password to proceed. + + + Old password + + + + New password + + Confirm new password + + + + + + Cancel - - - Log out + + + + Remove password + + + + + + Remove password + + + + Save password + + + + + + + + + + Enter two-factor code + Please enter a two-factor code to proceed. + + + The code entered is incorrect! + + + + Cancel + + + + Remove 2FA + + + + + + + Two-factor authentication keeps your account secure by requiring access to a second + device in order to sign in. + + Scan the QR code with Authy, + + Microsoft Authenticator, or any other 2FA app to begin. + + + + If the QR code does not scan, you can manually enter the secret: + {{ twoFactorSecret }} + + + + + Verify code + Enter the one-time code from authenticator to verify access. + + + + The code entered is incorrect! + + + + Download and save these back-up codes in a safe place. You can use these in-place of a + 2FA code if you ever lose access to your device! You should protect these codes like + your password. + + Backup codes can only be used once. + + {{ code }} + + + + + + Back + + + + Cancel + + + + Continue + + + + Complete setup + + + + + + + + + + Provider + Actions + + + + {{ provider.display }} + + + + Remove + + + Add + + + + + + + + + Finish editing - User profile Visit your user profile to edit your profile information. @@ -66,53 +271,83 @@ - Account information - Your account information is not displayed publicly. - - - You must have an email address set since you are enrolled in the Creator Monetization - Program. - - - Email address - - - - - Save changes - - - + Account security - - Authorization token - - Your authorization token can be used with the Modrinth API, the Minotaur Gradle plugin, and - other applications that interact with Modrinth's API. Be sure to keep this secret! - - - - - - Copied token to clipboard - - Copy token to clipboard - - - - Revoke token - + + + Email + Changes the email associated with your account. + + + + + + Change email + + + + Add email + + + + + + + Password + + Change or remove the + password used to login to your account. + + + Set a permanent password to login to your account. + + + + + + Change password + Add password + + + + + + Two-factor authentication + + Add an additional layer of security to your account during login. + + + + + Remove 2FA + Setup 2FA + + + + + + Manage authentication providers + + Add or remove sign-on methods from your account, including GitHub, GitLab, Microsoft, + Discord, Steam, and Google. + + + + + Manage providers + + @@ -134,128 +369,273 @@ - diff --git a/pages/settings/index.vue b/pages/settings/index.vue index 574b31cf13..0b54a8eb64 100644 --- a/pages/settings/index.vue +++ b/pages/settings/index.vue @@ -34,7 +34,7 @@ { + const types = this.tags.projectTypes.map((type) => { return { id: type.id, name: this.$formatProjectType(type.id) + ' search', diff --git a/pages/settings/monetization.vue b/pages/settings/monetization.vue index 7b4e663c47..680f3c6c62 100644 --- a/pages/settings/monetization.vue +++ b/pages/settings/monetization.vue @@ -184,7 +184,6 @@ export default defineNuxtComponent({ await useBaseFetch(`user/${this.auth.user.id}`, { method: 'PATCH', body: data, - ...this.$defaultHeaders(), }) await useAuth(this.auth.token) diff --git a/pages/settings/pats.vue b/pages/settings/pats.vue new file mode 100644 index 0000000000..5357abd8cf --- /dev/null +++ b/pages/settings/pats.vue @@ -0,0 +1,296 @@ + + + + + Name + + Scopes + + + + Expires + + + + + + Cancel + + + + Save changes + + + + Create PAT + + + + + + + + Personal Access Tokens + + + Create a PAT + + + + PATs can be used to access Modrinth's API. For more information, see + Modrinth's API documentation. They + can be created and revoked at any time. + + + + + {{ pat.name }} + + + + + + + + Last used {{ fromNow(pat.last_used) }} + Never used + + ⋅ + + Expires {{ fromNow(pat.expires) }} + + ⋅ + + Created {{ fromNow(pat.created) }} + + + + + + + Edit token + + + Revoke token + + + + + + + diff --git a/pages/settings/sessions.vue b/pages/settings/sessions.vue new file mode 100644 index 0000000000..5340a76207 --- /dev/null +++ b/pages/settings/sessions.vue @@ -0,0 +1,89 @@ + + + Sessions + + Here are all the devices that are currently logged in with your Modrinth account. You can log + out of each one individually. + + If you see an entry you don't recognize, log out of that device and change your Modrinth + account password immediately. + + + + + + {{ session.os ?? 'Unknown OS' }} ⋅ {{ session.platform ?? 'Unknown platform' }} ⋅ + {{ session.ip }} + + + + {{ session.city }}, {{ session.country }} ⋅ + + Last accessed {{ fromNow(session.last_login) }} + + ⋅ + + Created {{ fromNow(session.created) }} + + + + + Current session + + Revoke session + + + + + + + diff --git a/pages/user/[id].vue b/pages/user/[id].vue index f16f0429e5..55726f230d 100644 --- a/pages/user/[id].vue +++ b/pages/user/[id].vue @@ -46,7 +46,7 @@ @@ -54,7 +54,7 @@ Edit @@ -81,7 +81,7 @@ @click=" () => { isEditing = false - user = JSON.parse(JSON.stringify($auth.user)) + user = JSON.parse(JSON.stringify(auth.user)) previewImage = null icon = null } @@ -96,7 +96,7 @@ - + {{ user.bio }} @@ -129,16 +129,6 @@ User ID: - - - View GitHub profile - @@ -161,7 +151,7 @@ /> @@ -169,13 +159,13 @@ Manage projects - - + + @@ -183,7 +173,7 @@ - + You don't have any projects. Would you like to create one? @@ -242,7 +232,6 @@ import ProjectCard from '~/components/ui/ProjectCard.vue' import Badge from '~/components/ui/Badge.vue' import Promotion from '~/components/ads/Promotion.vue' -import GitHubIcon from '~/assets/images/utils/github.svg' import ReportIcon from '~/assets/images/utils/report.svg' import SunriseIcon from '~/assets/images/utils/sunrise.svg' import DownloadIcon from '~/assets/images/utils/download.svg' @@ -266,23 +255,25 @@ import Avatar from '~/components/ui/Avatar.vue' const data = useNuxtApp() const route = useRoute() +const auth = await useAuth() +const cosmetics = useCosmetics() +const tags = useTags() let user, projects try { ;[{ data: user }, { data: projects }] = await Promise.all([ - useAsyncData(`user/${route.params.id}`, () => - useBaseFetch(`user/${route.params.id}`, data.$defaultHeaders()) - ), + useAsyncData(`user/${route.params.id}`, () => useBaseFetch(`user/${route.params.id}`)), useAsyncData( `user/${route.params.id}/projects`, - () => useBaseFetch(`user/${route.params.id}/projects`, data.$defaultHeaders()), + () => useBaseFetch(`user/${route.params.id}/projects`), { transform: (projects) => { for (const project of projects) { project.categories = project.categories.concat(project.loaders) project.project_type = data.$getProjectTypeForUrl( project.project_type, - project.categories + project.categories, + tags.value ) } @@ -307,12 +298,6 @@ if (!user.value) { }) } -let githubUrl -try { - const githubUser = await $fetch(`https://api.github.com/user/` + user.value.github_id) - githubUrl = ref(githubUser.html_url) -} catch {} - if (user.value.username !== route.params.id) { await navigateTo(`/user/${user.value.username}`, { redirectCode: 301 }) } @@ -369,13 +354,12 @@ async function saveChanges() { try { if (icon.value) { await useBaseFetch( - `user/${data.$auth.user.id}/icon?ext=${ + `user/${auth.value.user.id}/icon?ext=${ icon.value.type.split('/')[icon.value.type.split('/').length - 1] }`, { method: 'PATCH', body: icon.value, - ...data.$defaultHeaders(), } ) } @@ -384,16 +368,15 @@ async function saveChanges() { email: user.value.email, bio: user.value.bio, } - if (user.value.username !== data.$auth.user.username) { + if (user.value.username !== auth.value.user.username) { reqData.username = user.value.username } - await useBaseFetch(`user/${data.$auth.user.id}`, { + await useBaseFetch(`user/${auth.value.user.id}`, { method: 'PATCH', body: reqData, - ...data.$defaultHeaders(), }) - await useAuth(data.$auth.token) + await useAuth(auth.value.token) isEditing.value = false } catch (err) { @@ -409,9 +392,9 @@ async function saveChanges() { } function cycleSearchDisplayMode() { - data.$cosmetics.searchDisplayMode.user = data.$cycleValue( - data.$cosmetics.searchDisplayMode.user, - data.$tag.projectViewModes + cosmetics.value.searchDisplayMode.user = data.$cycleValue( + cosmetics.value.searchDisplayMode.user, + tags.value.projectViewModes ) saveCosmetics() } @@ -504,10 +487,6 @@ export default defineNuxtComponent({ cursor: default; } -.github-button { - display: inline-flex; -} - .inputs { margin-bottom: 1rem; diff --git a/plugins/1.theme.js b/plugins/1.theme.js index 6ed6b4be7f..29fa1cf1c1 100644 --- a/plugins/1.theme.js +++ b/plugins/1.theme.js @@ -1,4 +1,6 @@ -export default defineNuxtPlugin((nuxtApp) => { +export default defineNuxtPlugin(async (nuxtApp) => { + await useAuth() + await useUser() const themeStore = useTheme() nuxtApp.hook('app:mounted', () => { diff --git a/plugins/2.state.js b/plugins/2.state.js deleted file mode 100644 index 85504747c5..0000000000 --- a/plugins/2.state.js +++ /dev/null @@ -1,11 +0,0 @@ -export default defineNuxtPlugin(async (nuxtApp) => { - const authStore = await useAuth() - await useUser() - const cosmeticsStore = useCosmetics() - const tagsStore = useTags() - - nuxtApp.provide('auth', authStore.value) - nuxtApp.provide('cosmetics', cosmeticsStore.value) - nuxtApp.provide('tag', tagsStore.value) - nuxtApp.provide('notify', (notif) => addNotification(notif)) -}) diff --git a/plugins/shorthands.js b/plugins/shorthands.js index 54ba23ada3..b92e269cc8 100644 --- a/plugins/shorthands.js +++ b/plugins/shorthands.js @@ -1,29 +1,10 @@ import { getProjectTypeForUrlShorthand } from '~/helpers/projects.js' export default defineNuxtPlugin((nuxtApp) => { - const tagStore = nuxtApp.$tag - const authStore = nuxtApp.$auth - - nuxtApp.provide('defaultHeaders', () => { - const obj = { headers: {} } - - if (process.server) { - const config = useRuntimeConfig() - if (config.rateLimitKey) { - obj.headers['x-ratelimit-key'] = config.rateLimitKey || '' - } - } - - if (authStore.user) { - obj.headers.Authorization = authStore.token - } - - return obj - }) nuxtApp.provide('formatNumber', formatNumber) nuxtApp.provide('capitalizeString', capitalizeString) nuxtApp.provide('formatMoney', formatMoney) - nuxtApp.provide('formatVersion', (versionsArray) => formatVersions(versionsArray, tagStore)) + nuxtApp.provide('formatVersion', (versionsArray) => formatVersions(versionsArray)) nuxtApp.provide('orElse', (first, otherwise) => first ?? otherwise) nuxtApp.provide('external', () => { const cosmeticsStore = useCosmetics().value @@ -95,15 +76,17 @@ export default defineNuxtPlugin((nuxtApp) => { .sort((a, b) => nuxtApp.$dayjs(b.date_published) - nuxtApp.$dayjs(a.date_published)) }) nuxtApp.provide('getProjectTypeForDisplay', (type, categories) => { + const tagStore = useTags() + if (type === 'mod') { const isPlugin = categories.some((category) => { - return tagStore.loaderData.allPluginLoaders.includes(category) + return tagStore.value.loaderData.allPluginLoaders.includes(category) }) const isMod = categories.some((category) => { - return tagStore.loaderData.modLoaders.includes(category) + return tagStore.value.loaderData.modLoaders.includes(category) }) const isDataPack = categories.some((category) => { - return tagStore.loaderData.dataPackLoaders.includes(category) + return tagStore.value.loaderData.dataPackLoaders.includes(category) }) if (isMod && isPlugin && isDataPack) { @@ -123,25 +106,29 @@ export default defineNuxtPlugin((nuxtApp) => { return type }) - nuxtApp.provide('getProjectTypeForUrl', (type, loaders) => - getProjectTypeForUrlShorthand(nuxtApp, type, loaders) + nuxtApp.provide('getProjectTypeForUrl', (type, loaders, tags) => + getProjectTypeForUrlShorthand(type, loaders, tags) ) nuxtApp.provide('cycleValue', cycleValue) - const sortedCategories = tagStore.categories.slice().sort((a, b) => { - const headerCompare = a.header.localeCompare(b.header) - if (headerCompare !== 0) { - return headerCompare - } - if (a.header === 'resolutions' && b.header === 'resolutions') { - return a.name.replace(/\D/g, '') - b.name.replace(/\D/g, '') - } else if (a.header === 'performance impact' && b.header === 'performance impact') { - const x = ['potato', 'low', 'medium', 'high', 'screenshot'] + nuxtApp.provide('sortedCategories', () => { + const tagStore = useTags() - return x.indexOf(a.name) - x.indexOf(b.name) - } - return 0 + return tagStore.value.categories.slice().sort((a, b) => { + const headerCompare = a.header.localeCompare(b.header) + if (headerCompare !== 0) { + return headerCompare + } + if (a.header === 'resolutions' && b.header === 'resolutions') { + return a.name.replace(/\D/g, '') - b.name.replace(/\D/g, '') + } else if (a.header === 'performance impact' && b.header === 'performance impact') { + const x = ['potato', 'low', 'medium', 'high', 'screenshot'] + + return x.indexOf(a.name) - x.indexOf(b.name) + } + return 0 + }) }) - nuxtApp.provide('sortedCategories', sortedCategories) + nuxtApp.provide('notify', (notif) => addNotification(notif)) }) export const formatNumber = (number, abbreviate = true) => { const x = +number @@ -257,8 +244,9 @@ export const formatProjectStatus = (name) => { return capitalizeString(name) } -export const formatVersions = (versionArray, tag) => { - const allVersions = tag.gameVersions.slice().reverse() +export const formatVersions = (versionArray) => { + const tag = useTags() + const allVersions = tag.value.gameVersions.slice().reverse() const allReleases = allVersions.filter((x) => x.version_type === 'release') const intervals = [] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 070489a30d..970a5f6e09 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,6 +34,9 @@ dependencies: omorphia: specifier: ^0.4.31 version: 0.4.31 + qrcode.vue: + specifier: ^3.4.0 + version: 3.4.0(vue@3.3.4) vue-multiselect: specifier: ^3.0.0-alpha.2 version: 3.0.0-alpha.2 @@ -48,6 +51,9 @@ devDependencies: '@nuxtjs/eslint-config-typescript': specifier: ^12.0.0 version: 12.0.0(eslint@8.41.0)(typescript@5.0.4) + '@nuxtjs/turnstile': + specifier: ^0.5.0 + version: 0.5.0 '@types/node': specifier: ^20.1.0 version: 20.1.0 @@ -1357,6 +1363,17 @@ packages: - supports-color dev: true + /@nuxtjs/turnstile@0.5.0: + resolution: {integrity: sha512-EmEnYNDRavdmv9HXnInHVR5nSvjDG92s6pOrxd+ugqImkrnIQJttSd4DPq9UNhwUI/wLUL7z3VclVyQwNT2O7Q==} + dependencies: + '@nuxt/kit': 3.6.1 + defu: 6.1.2 + pathe: 1.1.1 + transitivePeerDependencies: + - rollup + - supports-color + dev: true + /@pkgjs/parseargs@0.11.0: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -6024,6 +6041,14 @@ packages: engines: {node: '>=6'} dev: true + /qrcode.vue@3.4.0(vue@3.3.4): + resolution: {integrity: sha512-4XeImbv10Fin16Fl2DArCMhGyAdvIg2jb7vDT+hZiIAMg/6H6mz9nUZr/dR8jBcun5VzNzkiwKhiqOGbloinwA==} + peerDependencies: + vue: ^3.0.0 + dependencies: + vue: 3.3.4 + dev: false + /queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true
+ Enter your email below and we'll send a recovery link to allow you to recover your account. + +
Enter your new password below to gain access to your account.
+ Don't have an account yet? + + Create one. + +
+ By creating an account, you agree to Modrinth's + terms and + privacy policy. +
+ Already have an account yet? + + Sign in. + + +
Your email is already verified!
Your email address has been successfully verified!
+ We were unable to verify your email. + + Try re-sending the verification email through the button below. + + + Try re-sending the verification email through your dashboard by signing in. + +
+ Thank you for creating an account. You can now follow and create projects, receive updates + about your favorite projects, and more! +
- Revoking your Modrinth token can have unintended consequences. Please be aware that the - following could break: -
Your account information is not displayed publicly.
If you are willing to continue, complete the following steps:
Once you have completed those steps, press the continue button below.
- - This will log you out of Modrinth, however, when you log back in, your token will be - regenerated. - -
The code entered is incorrect!
+ Two-factor authentication keeps your account secure by requiring access to a second + device in order to sign in. + + Scan the QR code with Authy, + + Microsoft Authenticator, or any other 2FA app to begin. +
+ If the QR code does not scan, you can manually enter the secret: + {{ twoFactorSecret }} +
+ Download and save these back-up codes in a safe place. You can use these in-place of a + 2FA code if you ever lose access to your device! You should protect these codes like + your password. +
Backup codes can only be used once.
Visit your user profile to edit your profile information.
- Your authorization token can be used with the Modrinth API, the Minotaur Gradle plugin, and - other applications that interact with Modrinth's API. Be sure to keep this secret! -
+ PATs can be used to access Modrinth's API. For more information, see + Modrinth's API documentation. They + can be created and revoked at any time. +
+ Here are all the devices that are currently logged in with your Modrinth account. You can log + out of each one individually. + + If you see an entry you don't recognize, log out of that device and change your Modrinth + account password immediately. +