diff --git a/.github/workflows/check-generic.yml b/.github/workflows/check-generic.yml index 35e99c1328..03e3dc649a 100644 --- a/.github/workflows/check-generic.yml +++ b/.github/workflows/check-generic.yml @@ -13,13 +13,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: crate-ci/typos@master + - uses: crate-ci/typos@v1.43.1 - # broken: - # tombi: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # - uses: tombi-toml/setup-tombi@v1 - # - run: tombi lint - # - run: tombi fmt --check + # see + tombi: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: taiki-e/install-action@v2 + with: + tool: tombi + - run: tombi lint + - run: tombi fmt --check diff --git a/Cargo.toml b/Cargo.toml index 3b1e5553e1..d5d9ba9131 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,7 +60,7 @@ const_format = "0.2.34" daedalus = { path = "packages/daedalus" } dashmap = "6.1.0" data-url = "0.3.2" -deadpool-redis = { version = "0.22.1", git = "https://github.com/modrinth/deadpool", rev = "db5fb00b036ecc8fe5f18853c559b745ffe47bde" } +deadpool-redis = { git = "https://github.com/modrinth/deadpool", rev = "db5fb00b036ecc8fe5f18853c559b745ffe47bde", version = "0.22.1" } derive_more = "2.0.1" directories = "6.0.0" dirs = "6.0.0" diff --git a/apps/frontend/src/pages/auth/reset-password.vue b/apps/frontend/src/pages/auth/reset-password.vue index 2318d88d55..2a94afda99 100644 --- a/apps/frontend/src/pages/auth/reset-password.vue +++ b/apps/frontend/src/pages/auth/reset-password.vue @@ -22,9 +22,13 @@ /> - + - @@ -158,6 +162,15 @@ if (route.query.flow) { const captcha = ref() +const { data: globals } = await useAsyncData('auth-globals', async () => { + try { + return await useBaseFetch('globals', { internal: true }) + } catch (err) { + console.error('Error fetching globals:', err) + return { captcha_enabled: true } + } +}) + const email = ref('') const token = ref('') diff --git a/apps/frontend/src/pages/auth/sign-in.vue b/apps/frontend/src/pages/auth/sign-in.vue index 6bdc2002db..927eba7448 100644 --- a/apps/frontend/src/pages/auth/sign-in.vue +++ b/apps/frontend/src/pages/auth/sign-in.vue @@ -89,11 +89,11 @@ /> - +