IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed frontend config value evaluation & default values for INVITE_REGISTRATION. Unified the way the config is accessed

Browse Source
This commit is contained in:
Ulf Gebhardt 2021-03-18 12:34:03 +01:00 committed by Moriz Wahl
parent 6584151a39
commit 2e65f8df80
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/PageFooter/PageFooter.vue
View File

@ -31,7 +31,7 @@
import links from '~/constants/links.js' import links from '~/constants/links.js'
export default { export default {
data() { data() {
return { links, version: `v${process.env.release}` } return { links, version: `v${this.$env.RELEASE}` }
}, },
} }
</script> </script>

5
webapp/config/index.js
View File

@ -12,7 +12,6 @@ const environment = {
PRODUCTION: process.env.NODE_ENV === 'production' || false, PRODUCTION: process.env.NODE_ENV === 'production' || false,
NUXT_BUILD: process.env.NUXT_BUILD || '.nuxt', NUXT_BUILD: process.env.NUXT_BUILD || '.nuxt',
STYLEGUIDE_DEV: process.env.STYLEGUIDE_DEV || false, STYLEGUIDE_DEV: process.env.STYLEGUIDE_DEV || false,
RELEASE: process.env.release,
} }
const server = { const server = {
@ -29,8 +28,8 @@ const sentry = {
const options = { const options = {
VERSION: process.env.VERSION || pkg.version, VERSION: process.env.VERSION || pkg.version,
DESCRIPTION: process.env.DESCRIPTION || pkg.description, DESCRIPTION: process.env.DESCRIPTION || pkg.description,
PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION, PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true' || false,
INVITE_REGISTRATION: process.env.INVITE_REGISTRATION, INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', //default = true
// Cookies // Cookies
COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default 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 COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly

2
webapp/layouts/default.vue
View File

@ -108,7 +108,7 @@ export default {
return { return {
mobileSearchVisible: false, mobileSearchVisible: false,
toggleMobileMenu: false, toggleMobileMenu: false,
inviteRegistration: this.$env.inviteRegistration, inviteRegistration: this.$env.INVITE_REGISTRATION,
} }
}, },
computed: { computed: {

6
webapp/nuxt.config.js
View File

@ -27,9 +27,9 @@ export default {
}, },
env: { env: {
release: CONFIG.VERSION, RELEASE: CONFIG.VERSION,
publicRegistration: String(CONFIG.PUBLIC_REGISTRATION) === 'true', PUBLIC_REGISTRATION: CONFIG.PUBLIC_REGISTRATION,
inviteRegistration: String(CONFIG.INVITE_REGISTRATION) === 'true', INVITE_REGISTRATION: CONFIG.INVITE_REGISTRATION,
// pages which do NOT require a login // pages which do NOT require a login
publicPages: [ publicPages: [
'login', 'login',

2
webapp/pages/registration/signup.vue
View File

@ -22,7 +22,7 @@ export default {
}, },
asyncData({ app }) { asyncData({ app }) {
return { return {
publicRegistration: app.$env.PUBLIC_REGISTRATION === 'true', publicRegistration: app.$env.PUBLIC_REGISTRATION,
} }
}, },
methods: { methods: {