From f071e85863e6fbce94de24b568ccf195c53013e8 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 30 Nov 2022 16:46:54 +0100 Subject: [PATCH] Add new myKV variables, rename app flavor ids --- client/config/prod-my-kv.env.js | 4 +- client/config/prod.env.js | 4 +- client/src/helpers/app-flavor.constants.ts | 4 +- client/src/helpers/app-flavor.ts | 4 +- .../styles/themes/{_dha.scss => _my-dha.scss} | 2 +- .../styles/themes/{_dhf.scss => _my-dhf.scss} | 2 +- client/src/styles/themes/_my-kv.scss | 43 ++++++++++--------- server/users/licenses.py | 4 +- 8 files changed, 34 insertions(+), 33 deletions(-) rename client/src/styles/themes/{_dha.scss => _my-dha.scss} (96%) rename client/src/styles/themes/{_dhf.scss => _my-dhf.scss} (96%) diff --git a/client/config/prod-my-kv.env.js b/client/config/prod-my-kv.env.js index ae01153a..7b7d560a 100644 --- a/client/config/prod-my-kv.env.js +++ b/client/config/prod-my-kv.env.js @@ -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 */ // 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_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-favicon.png', VUE_APP_TITLE: 'myKV' // ^^^^ HTML PROPERTIES TO HERE, NOT STRINGIFIED ^^^^ } diff --git a/client/config/prod.env.js b/client/config/prod.env.js index d49f9567..7ff19464 100644 --- a/client/config/prod.env.js +++ b/client/config/prod.env.js @@ -29,10 +29,10 @@ switch (process.env.APP_FLAVOR) { case 'my-kv': module.exports = merge(values, require('./prod-my-kv.env.js')); break; - case 'dhf': + case 'my-dhf': module.exports = merge(values, require('./prod-dhf.env.js')); break; - case 'dha': + case 'my-dha': module.exports = merge(values, require('./prod-dha.env.js')); break; default: diff --git a/client/src/helpers/app-flavor.constants.ts b/client/src/helpers/app-flavor.constants.ts index a8e21625..f986aab8 100644 --- a/client/src/helpers/app-flavor.constants.ts +++ b/client/src/helpers/app-flavor.constants.ts @@ -47,14 +47,14 @@ export const myKvValues: FlavorValues = { }; 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', textAppName: 'myDHF', helloIllustration: () => import('@/components/illustrations/HelloMyDHFIllustration.vue') }); 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', textAppName: 'myDHA', helloIllustration: () => import('@/components/illustrations/HelloMyDHAIllustration.vue') diff --git a/client/src/helpers/app-flavor.ts b/client/src/helpers/app-flavor.ts index e594d260..59eaf39d 100644 --- a/client/src/helpers/app-flavor.ts +++ b/client/src/helpers/app-flavor.ts @@ -9,10 +9,10 @@ switch (process.env.VUE_APP_FLAVOR) { case 'my-kv': flavorValues = myKvValues; break; - case 'dha': + case 'my-dha': flavorValues = dhaValues; break; - case 'dhf': + case 'my-dhf': flavorValues = dhfValues; break; default: diff --git a/client/src/styles/themes/_dha.scss b/client/src/styles/themes/_my-dha.scss similarity index 96% rename from client/src/styles/themes/_dha.scss rename to client/src/styles/themes/_my-dha.scss index 6917d701..9b3af1f1 100644 --- a/client/src/styles/themes/_dha.scss +++ b/client/src/styles/themes/_my-dha.scss @@ -1,4 +1,4 @@ -/* --- DHA --- */ +/* --- myDHA --- */ /* accent */ $color-accent-1-dark: #CB2A79; $color-accent-1: #E54292; diff --git a/client/src/styles/themes/_dhf.scss b/client/src/styles/themes/_my-dhf.scss similarity index 96% rename from client/src/styles/themes/_dhf.scss rename to client/src/styles/themes/_my-dhf.scss index 990e6cf7..8267ad4a 100644 --- a/client/src/styles/themes/_dhf.scss +++ b/client/src/styles/themes/_my-dhf.scss @@ -1,4 +1,4 @@ -/* --- DHF --- */ +/* --- myDHF --- */ /* accent */ $color-accent-1-dark: #CB2A79; $color-accent-1: #E54292; diff --git a/client/src/styles/themes/_my-kv.scss b/client/src/styles/themes/_my-kv.scss index 99db3e2a..30901bb0 100644 --- a/client/src/styles/themes/_my-kv.scss +++ b/client/src/styles/themes/_my-kv.scss @@ -1,21 +1,22 @@ -///* accent */ -//$color-accent-1-dark: #C17300; -//$color-accent-1: #F39100; -//$color-accent-1-light: #FFDEAE; -//$color-accent-2-dark: #46791F; -//$color-accent-2: #66A634; -//$color-accent-2-light: #D4EBC2; -//$color-accent-3-dark: #C7A631; -//$color-accent-3: #F3D56C; -//$color-accent-3-light: #FBF2D2; -//$color-accent-4-dark: #55A7B2; -//$color-accent-4: #80D5E1; -//$color-accent-4-light: #D4F3F7; -//$color-accent-5-dark: #A00F3B; -//$color-accent-5: #D1295B; -//$color-accent-5: #EFBFCE; -// -///* brand */ -//$color-brand-dark: #001F3E; -//$color-brand: #013364; -//$color-brand-light: #B6C5D4; +/* --- myKV --- */ +/* accent */ +$color-accent-1-dark: #0CA87D; +$color-accent-1: #0FD6A0; +$color-accent-1-light: #CFF2E8; +$color-accent-2-dark: #C3A509; +$color-accent-2: #FBDF4D; +$color-accent-2-light: #FDF7D8; +$color-accent-3-dark: #D8742C; +$color-accent-3: #F0924E; +$color-accent-3-light: #FDEEE3; +$color-accent-4-dark: #13A2B9; +$color-accent-4: #6BE7FC; +$color-accent-4-light: #D7F9FE; +$color-accent-5-dark: #161E5A; +$color-accent-5: #212D8C; +$color-accent-5: #E2EEF8; + +/* brand */ +$color-brand-dark: #1458C8; +$color-brand: #2075FF; +$color-brand-light: #CCDFFF; diff --git a/server/users/licenses.py b/server/users/licenses.py index e3764062..7f5a3c3c 100644 --- a/server/users/licenses.py +++ b/server/users/licenses.py @@ -4,8 +4,8 @@ TEACHER_KEY = 'teacher' STUDENT_KEY = 'student' MYSKILLBOX_PLATFORM = 'myskillbox' MYKV_PLATFORM = 'my-kv' -DHA_PLATFORM = 'dha' -DHF_PLATFORM = 'dhf' +DHA_PLATFORM = 'my-dha' +DHF_PLATFORM = 'my-dhf' MYSKILLBOX_LICENSES = { "978-3-0355-1397-4": {