ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Move "my-kv" values to seperate file

This commit is contained in:
Daniel Egger 2022-05-10 12:18:09 +02:00
parent 637c3994a5
commit 67d7da5d9c
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/config/prod-my-kv.env.js Normal file
View File

@ -0,0 +1,20 @@
'use strict'
module.exports = {
/*
* ENV variables used in JS code need to be stringyfied, as they will be replaced in the code, and JS needs quotes
* around strings
*/
VUE_APP_LOGO: '"https://skillbox-my-kv-prod.s3-eu-west-1.amazonaws.com/mykv-logo.png"',
VUE_APP_ENABLE_PORTFOLIO: "true",
VUE_APP_ENABLE_SPELLCHECK: !!process.env.TASKBASE_BASEURL,
VUE_APP_JS_TITLE: '"My KV"',
VUE_APP_ENABLE_FOOTER: "false",
/*
* Vars used in HTML templates don't need to be stringyfied, as HTML does not need them to have quotes
*/
// vvvv HTML PROPERTIES FROM HERE, NOT STRINGIFIED vvvv
VUE_APP_FAVICON_32: 'https://skillbox-my-kv-prod.s3-eu-west-1.amazonaws.com/mykv-fav.png',
VUE_APP_FAVICON_16: 'https://skillbox-my-kv-prod.s3-eu-west-1.amazonaws.com/mykv-fav.png',
VUE_APP_TITLE: 'My KV'
// ^^^^ HTML PROPERTIES TO HERE, NOT STRINGIFIED ^^^^
}

32
client/config/prod.env.js
View File

@ -1,25 +1,37 @@
'use strict'
module.exports = {
const { merge } = require('webpack-merge')
const values = {
NODE_ENV: '"production"',
HEP_URL: JSON.stringify(process.env.HEP_URL),
MATOMO_HOST: JSON.stringify(process.env.MATOMO_HOST),
MATOMO_SITE_ID: JSON.stringify(process.env.MATOMO_SITE_ID),
LOGOUT_REDIRECT_URL: JSON.stringify(process.env.LOGOUT_REDIRECT_URL),
/*
* ENV variables used in JS code need to be stringyfied, as they will be replaced in the code, and JS needs quotes
* around strings
* ENV variables used in JS code need to be stringyfied, as they will be replaced (in place) in the code,
* and JS needs quotes around strings
* see https://cli.vuejs.org/guide/mode-and-env.html#using-env-variables-in-client-side-code
*/
VUE_APP_LOGO: JSON.stringify(process.env.VUE_APP_LOGO) || '"/static/logo.png"',
VUE_APP_ENABLE_PORTFOLIO: process.env.ENABLE_PORTFOLIO || "true",
VUE_APP_LOGO: '"/static/logo.png"',
VUE_APP_ENABLE_PORTFOLIO: "true",
VUE_APP_ENABLE_SPELLCHECK: !!process.env.TASKBASE_BASEURL,
VUE_APP_JS_TITLE: JSON.stringify(process.env.VUE_APP_TITLE) || '"mySkillbox"',
VUE_APP_ENABLE_FOOTER: process.env.ENABLE_FOOTER || "true",
VUE_APP_JS_TITLE: '"mySkillbox"',
VUE_APP_ENABLE_FOOTER: "true",
/*
* Vars used in HTML templates don't need to be stringyfied, as HTML does not need them to have quotes
*/
// vvvv HTML PROPERTIES FROM HERE, NOT STRINGIFIED vvvv
VUE_APP_FAVICON_32: process.env.VUE_APP_FAVICON_32 || '/static/favicon-32x32.png',
VUE_APP_FAVICON_16: process.env.VUE_APP_FAVICON_16 || '/static/favicon-16x16.png',
VUE_APP_TITLE: process.env.VUE_APP_TITLE || 'mySkillbox'
VUE_APP_FAVICON_32: '/static/favicon-32x32.png',
VUE_APP_FAVICON_16: '/static/favicon-16x16.png',
VUE_APP_TITLE: 'mySkillbox'
// ^^^^ HTML PROPERTIES TO HERE, NOT STRINGIFIED ^^^^
}
if (process.env.APP_TYPE === 'my-kv') {
module.exports = merge(values, require('./prod-my-kv.env.js'));
} else {
// we are on the skillbox APP_TYPE
module.exports = values;
}