diff --git a/client/src/components/illustrations/HelloMyDHAIllustration.vue b/client/src/components/illustrations/HelloMyDHAIllustration.vue new file mode 100644 index 00000000..0137ea26 --- /dev/null +++ b/client/src/components/illustrations/HelloMyDHAIllustration.vue @@ -0,0 +1,331 @@ + diff --git a/client/src/components/illustrations/HelloMyDHFIllustration.vue b/client/src/components/illustrations/HelloMyDHFIllustration.vue new file mode 100644 index 00000000..ec643650 --- /dev/null +++ b/client/src/components/illustrations/HelloMyDHFIllustration.vue @@ -0,0 +1,331 @@ + diff --git a/client/src/components/illustrations/HelloMyKVIllustration.vue b/client/src/components/illustrations/HelloMyKVIllustration.vue index 8a1a7bdf..b0d7e9aa 100644 --- a/client/src/components/illustrations/HelloMyKVIllustration.vue +++ b/client/src/components/illustrations/HelloMyKVIllustration.vue @@ -1,356 +1,341 @@ diff --git a/client/src/helpers/app-flavor.constants.ts b/client/src/helpers/app-flavor.constants.ts index f38fd403..a8e21625 100644 --- a/client/src/helpers/app-flavor.constants.ts +++ b/client/src/helpers/app-flavor.constants.ts @@ -20,37 +20,42 @@ export const defaultFlavorValues: FlavorValues = { showInstrumentFilterSidebar: true, showPortfolio: true, showEHB: true, + helloIllustration: () => import('@/components/illustrations/HelloIllustration.vue') }; export const myKvValues: FlavorValues = { - appFlavor: 'my-kv', - appLogo: 'https://skillbox-my-kv-prod.s3-eu-west-1.amazonaws.com/mykv-logo.png', - supportLink: 'https://www.mykv.ch/support', + appFlavor: 'my-kv', + appLogo: 'https://skillbox-my-kv-prod.s3-eu-west-1.amazonaws.com/mykv-logo.png', + supportLink: 'https://www.mykv.ch/support', - // myKV texts - textAppName: 'myKV', - textTopic: 'HKB', - textTopics: 'HKB', - textModule: 'Lernfeld', - textModules: 'Lernfelder', - textInstrument: 'Grundlagenwissen', - textInstruments: 'Grundlagenwissen', + // myKV texts + textAppName: 'myKV', + textTopic: 'HKB', + textTopics: 'HKB', + textModule: 'Lernfeld', + textModules: 'Lernfelder', + textInstrument: 'Grundlagenwissen', + textInstruments: 'Grundlagenwissen', - // myKV flags - showFooter: false, - showObjectivesTitle: false, - showInstrumentFilterSidebar: true, - showPortfolio: true, - showEHB: false, - }; + // myKV flags + showFooter: false, + showObjectivesTitle: false, + showInstrumentFilterSidebar: true, + showPortfolio: true, + showEHB: false, + helloIllustration: () => import('@/components/illustrations/HelloMyKVIllustration.vue') +}; export const dhfValues: FlavorValues = Object.assign({}, myKvValues, { appFlavor: 'dhf', 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') + }); export const dhaValues: FlavorValues = Object.assign({}, myKvValues, { appFlavor: 'dha', 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') }); diff --git a/client/src/helpers/types.ts b/client/src/helpers/types.ts index 86538400..79a75b30 100644 --- a/client/src/helpers/types.ts +++ b/client/src/helpers/types.ts @@ -14,4 +14,5 @@ export interface FlavorValues { showInstrumentFilterSidebar: boolean; showPortfolio: boolean; showEHB: boolean; + helloIllustration: () => Promise } diff --git a/client/src/layouts/SplitLayout.vue b/client/src/layouts/SplitLayout.vue index cf85e2b7..f8ac6b7a 100644 --- a/client/src/layouts/SplitLayout.vue +++ b/client/src/layouts/SplitLayout.vue @@ -14,16 +14,14 @@ const ContentsIllustration = () => import(/* webpackChunkName: "illustrations" */'@/components/illustrations/ContentsIllustration'); const PortfolioIllustration = () => import(/* webpackChunkName: "illustrations" */'@/components/illustrations/PortfolioIllustration'); const RoomsIllustration = () => import(/* webpackChunkName: "illustrations" */'@/components/illustrations/RoomsIllustration'); - const HelloIllustration = () => import(/* webpackChunkName: "illustrations" */'@/components/illustrations/HelloIllustration'); - const HelloMyKVIllustration = () => import(/* webpackChunkName: "illustrations" */'@/components/illustrations/HelloMyKVIllustration'); - const Hello = flavorValues.appFlavor === 'my-kv' ? HelloMyKVIllustration : HelloIllustration; + export default { components: { contents: ContentsIllustration, portfolio: PortfolioIllustration, rooms: RoomsIllustration, - hello: Hello + hello: flavorValues.helloIllustration }, computed: { diff --git a/client/tsconfig.json b/client/tsconfig.json index d1f7b104..70cae8ab 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -5,7 +5,7 @@ "resolveJsonModule": true, "lib": ["es2017", "dom"], "target": "es5", - "module": "es2015", + "module": "es2022", "strict": true, "moduleResolution": "node", "baseUrl": "./src",