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

Add new myKV variables, rename app flavor ids

This commit is contained in:
Ramon Wenger 2022-11-30 16:46:54 +01:00
parent a9e9e62100
commit f071e85863
8 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/config/prod-my-kv.env.js
View File

@ -10,8 +10,8 @@ module.exports = {
* Vars used in HTML templates don't need to be stringyfied, as HTML does not need them to have quotes * 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 // 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_32: 'https://skillbox-my-kv-prod.s3-eu-west-1.amazonaws.com/mykv-favicon.png',
VUE_APP_FAVICON_16: '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-favicon.png',
VUE_APP_TITLE: 'myKV' VUE_APP_TITLE: 'myKV'
// ^^^^ HTML PROPERTIES TO HERE, NOT STRINGIFIED ^^^^ // ^^^^ HTML PROPERTIES TO HERE, NOT STRINGIFIED ^^^^
} }

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

@ -29,10 +29,10 @@ switch (process.env.APP_FLAVOR) {
case 'my-kv': case 'my-kv':
module.exports = merge(values, require('./prod-my-kv.env.js')); module.exports = merge(values, require('./prod-my-kv.env.js'));
break; break;
case 'dhf': case 'my-dhf':
module.exports = merge(values, require('./prod-dhf.env.js')); module.exports = merge(values, require('./prod-dhf.env.js'));
break; break;
case 'dha': case 'my-dha':
module.exports = merge(values, require('./prod-dha.env.js')); module.exports = merge(values, require('./prod-dha.env.js'));
break; break;
default: default:

4
client/src/helpers/app-flavor.constants.ts
View File

@ -47,14 +47,14 @@ export const myKvValues: FlavorValues = {
}; };
export const dhfValues: FlavorValues = Object.assign({}, myKvValues, { export const dhfValues: FlavorValues = Object.assign({}, myKvValues, {
appFlavor: 'dhf', appFlavor: 'my-dhf',
appLogo: 'https://skillbox-my-detailhandel-dhf-prod.s3.eu-central-1.amazonaws.com/myDHF-logo.png', appLogo: 'https://skillbox-my-detailhandel-dhf-prod.s3.eu-central-1.amazonaws.com/myDHF-logo.png',
textAppName: 'myDHF', textAppName: 'myDHF',
helloIllustration: () => import('@/components/illustrations/HelloMyDHFIllustration.vue') helloIllustration: () => import('@/components/illustrations/HelloMyDHFIllustration.vue')
}); });
export const dhaValues: FlavorValues = Object.assign({}, myKvValues, { export const dhaValues: FlavorValues = Object.assign({}, myKvValues, {
appFlavor: 'dha', appFlavor: 'my-dha',
appLogo: 'https://skillbox-my-detailhandel-dha-prod.s3.eu-central-1.amazonaws.com/myDHA-logo.png', appLogo: 'https://skillbox-my-detailhandel-dha-prod.s3.eu-central-1.amazonaws.com/myDHA-logo.png',
textAppName: 'myDHA', textAppName: 'myDHA',
helloIllustration: () => import('@/components/illustrations/HelloMyDHAIllustration.vue') helloIllustration: () => import('@/components/illustrations/HelloMyDHAIllustration.vue')

4
client/src/helpers/app-flavor.ts
View File

@ -9,10 +9,10 @@ switch (process.env.VUE_APP_FLAVOR) {
case 'my-kv': case 'my-kv':
flavorValues = myKvValues; flavorValues = myKvValues;
break; break;
case 'dha': case 'my-dha':
flavorValues = dhaValues; flavorValues = dhaValues;
break; break;
case 'dhf': case 'my-dhf':
flavorValues = dhfValues; flavorValues = dhfValues;
break; break;
default: default:

2
client/src/styles/themes/_dha.scss → client/src/styles/themes/_my-dha.scss
View File

@ -1,4 +1,4 @@
/* --- DHA --- */ /* --- myDHA --- */
/* accent */ /* accent */
$color-accent-1-dark: #CB2A79; $color-accent-1-dark: #CB2A79;
$color-accent-1: #E54292; $color-accent-1: #E54292;

2
client/src/styles/themes/_dhf.scss → client/src/styles/themes/_my-dhf.scss
View File

@ -1,4 +1,4 @@
/* --- DHF --- */ /* --- myDHF --- */
/* accent */ /* accent */
$color-accent-1-dark: #CB2A79; $color-accent-1-dark: #CB2A79;
$color-accent-1: #E54292; $color-accent-1: #E54292;

43
client/src/styles/themes/_my-kv.scss
View File

@ -1,21 +1,22 @@
///* accent */ /* --- myKV --- */
//$color-accent-1-dark: #C17300; /* accent */
//$color-accent-1: #F39100; $color-accent-1-dark: #0CA87D;
//$color-accent-1-light: #FFDEAE; $color-accent-1: #0FD6A0;
//$color-accent-2-dark: #46791F; $color-accent-1-light: #CFF2E8;
//$color-accent-2: #66A634; $color-accent-2-dark: #C3A509;
//$color-accent-2-light: #D4EBC2; $color-accent-2: #FBDF4D;
//$color-accent-3-dark: #C7A631; $color-accent-2-light: #FDF7D8;
//$color-accent-3: #F3D56C; $color-accent-3-dark: #D8742C;
//$color-accent-3-light: #FBF2D2; $color-accent-3: #F0924E;
//$color-accent-4-dark: #55A7B2; $color-accent-3-light: #FDEEE3;
//$color-accent-4: #80D5E1; $color-accent-4-dark: #13A2B9;
//$color-accent-4-light: #D4F3F7; $color-accent-4: #6BE7FC;
//$color-accent-5-dark: #A00F3B; $color-accent-4-light: #D7F9FE;
//$color-accent-5: #D1295B; $color-accent-5-dark: #161E5A;
//$color-accent-5: #EFBFCE; $color-accent-5: #212D8C;
// $color-accent-5: #E2EEF8;
///* brand */
//$color-brand-dark: #001F3E; /* brand */
//$color-brand: #013364; $color-brand-dark: #1458C8;
//$color-brand-light: #B6C5D4; $color-brand: #2075FF;
$color-brand-light: #CCDFFF;

4
server/users/licenses.py
View File

@ -4,8 +4,8 @@ TEACHER_KEY = 'teacher'
STUDENT_KEY = 'student' STUDENT_KEY = 'student'
MYSKILLBOX_PLATFORM = 'myskillbox' MYSKILLBOX_PLATFORM = 'myskillbox'
MYKV_PLATFORM = 'my-kv' MYKV_PLATFORM = 'my-kv'
DHA_PLATFORM = 'dha' DHA_PLATFORM = 'my-dha'
DHF_PLATFORM = 'dhf' DHF_PLATFORM = 'my-dhf'
MYSKILLBOX_LICENSES = { MYSKILLBOX_LICENSES = {
"978-3-0355-1397-4": { "978-3-0355-1397-4": {