diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue index 90d74b137..ace0514e1 100644 --- a/webapp/components/PageFooter/PageFooter.vue +++ b/webapp/components/PageFooter/PageFooter.vue @@ -31,7 +31,7 @@ import links from '~/constants/links.js' export default { data() { - return { links, version: `v${this.$env.RELEASE}` } + return { links, version: `v${this.$env.VERSION}` } }, } diff --git a/webapp/config/index.js b/webapp/config/index.js index 827943ef8..dd5a5e04d 100644 --- a/webapp/config/index.js +++ b/webapp/config/index.js @@ -29,7 +29,7 @@ const options = { VERSION: process.env.VERSION || pkg.version, DESCRIPTION: process.env.DESCRIPTION || pkg.description, PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true' || false, - INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', //default = true + INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', // default = true // Cookies COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 6d5247df0..625710f97 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -27,9 +27,7 @@ export default { }, env: { - RELEASE: CONFIG.VERSION, - PUBLIC_REGISTRATION: CONFIG.PUBLIC_REGISTRATION, - INVITE_REGISTRATION: CONFIG.INVITE_REGISTRATION, + ...CONFIG, // pages which do NOT require a login publicPages: [ 'login',