diff --git a/layouts/default.vue b/layouts/default.vue index 2871fbac5..ebbe7e02b 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -91,7 +91,7 @@ export default dark.extend({ return !!this.$config.ads?.enabled && process.env.NODE_ENV !== 'development'; }, requiresLogin(): boolean { - return process.env.ENV === 'test' || + return process.env.NODE_ENV === 'test' || this.$config.locale !== '_' && !this.$locales[this.$config.locale]?.published; }, testerPasswordValid(): boolean { diff --git a/nuxt.config.ts b/nuxt.config.ts index fb7c12832..f49a8b349 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -46,7 +46,7 @@ const allVersionsUrls = buildList(function*() { yield process.env.BASE_URL; yield 'http://pronouns.test:3000'; yield 'http://localhost:3000'; - } else if (process.env.ENV === 'test') { + } else if (process.env.NODE_ENV === 'test') { yield process.env.BASE_URL; } else { yield 'https://pronouns.page'; @@ -314,7 +314,7 @@ const nuxtConfig: NuxtConfig = { transpile: ['markdown-it'], }, env: { - ENV: process.env.ENV!, + NODE_ENV: process.env.NODE_ENV!, BASE_URL: process.env.BASE_URL!, HOME_URL: process.env.HOME_URL || 'https://pronouns.page', PUBLIC_KEY: fs.readFileSync(`${__dirname}/keys/public.pem`).toString(), diff --git a/server/routes/user.ts b/server/routes/user.ts index a7ce5c71e..bb0903e8a 100644 --- a/server/routes/user.ts +++ b/server/routes/user.ts @@ -753,7 +753,7 @@ router.get('/user/social/:provider', handleErrorAsync(async (req, res) => { if (!req.session.socialRedirect) { return `/${config.user.route}`; } - const host = process.env.NODE_ENV === 'development' || process.env.ENV === 'test' + const host = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test' ? '' : buildLocaleList(config.locale, true)[req.session.socialRedirect].url; delete req.session.socialRedirect;