Skip to content
This repository has been archived by the owner on Aug 3, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into seo-cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
triphora authored Sep 17, 2023
2 parents 6b3c2f0 + bd4da4f commit b70a0b4
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ blank_issues_enabled: true
contact_links:
- name: Discord
about: Ask questions on our Discord Server.
url: https://discord.gg/modrinth-734077874708938864
url: https://discord.modrinth.com
- name: Roadmap
about: View our Roadmap. Please do not open issues for items on our roadmap.
url: https://roadmap.modrinth.com
Expand Down
2 changes: 1 addition & 1 deletion error.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Go home
</nuxt-link>
<a
href="https://discord.gg/EUHuJHt"
href="https://discord.modrinth.com"
class="iconified-button raised-button"
rel="noopener"
>
Expand Down
2 changes: 1 addition & 1 deletion layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
</div>
<div class="links links-3" role="region" aria-label="Interact">
<h4 aria-hidden="true">Interact</h4>
<a rel="noopener" :target="$external()" href="https://discord.gg/EUHuJHt"> Discord </a>
<a rel="noopener" :target="$external()" href="https://discord.modrinth.com"> Discord </a>
<a rel="noopener" :target="$external()" href="https://twitter.com/modrinth"> Twitter </a>
<a rel="noopener" :target="$external()" href="https://floss.social/@modrinth"> Mastodon </a>
<a rel="noopener" :target="$external()" href="https://crowdin.com/project/modrinth">
Expand Down
13 changes: 13 additions & 0 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,21 @@ export default defineNuxtConfig({
modules: ['@vintl/nuxt', '@nuxtjs/turnstile'],
vintl: {
defaultLocale: 'en-US',
locales: [
{
tag: 'en-US',
meta: {
static: {
iso: 'en',
},
},
},
],
storage: 'cookie',
parserless: 'only-prod',
seo: {
defaultLocaleHasParameter: false,
},
},
turnstile: {
siteKey: '0x4AAAAAAAHWfmKCm7cUG869',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@typescript-eslint/parser": "^5.59.8",
"@vintl/compact-number": "^2.0.4",
"@vintl/how-ago": "^2.0.1",
"@vintl/nuxt": "^1.3.0",
"@vintl/nuxt": "^1.5.0",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-typescript": "^3.5.5",
Expand Down
2 changes: 1 addition & 1 deletion pages/settings/account.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ModalConfirm
ref="modal_confirm"
title="Are you sure you want to delete your account?"
description="This will **immediately delete all of your user data and follows**. This will not delete your projects. Deleting your account cannot be reversed.<br><br>If you need help with your account, get support on the [Modrinth Discord](https://discord.gg/EUHuJHt)."
description="This will **immediately delete all of your user data and follows**. This will not delete your projects. Deleting your account cannot be reversed.<br><br>If you need help with your account, get support on the [Modrinth Discord](https://discord.modrinth.com)."
proceed-label="Delete this account"
:confirmation-text="auth.user.username"
:has-to-type="true"
Expand Down
2 changes: 1 addition & 1 deletion pages/user/[id].vue
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ async function saveChanges() {
console.error(err)
data.$notify({
group: 'main',
title: commonMessages.errorNotificationTitle,
title: formatMessage(commonMessages.errorNotificationTitle),
text: err.data.description,
type: 'error',
})
Expand Down
15 changes: 8 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions server/routes/.well-known/change-password.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default defineEventHandler((event) => {
return sendRedirect(event, '/settings/account')
})

0 comments on commit b70a0b4

Please sign in to comment.