diff --git a/client/config/prod-dha.env.js b/client/config/prod-dha.env.js
index 24689baf..2180d677 100644
--- a/client/config/prod-dha.env.js
+++ b/client/config/prod-dha.env.js
@@ -1,6 +1,6 @@
const config = {
- VUE_APP_FAVICON_32: 'https://skillbox-my-detailhandel-dha-prod.s3.eu-central-1.amazonaws.com/myDHA-favicon.png',
- VUE_APP_FAVICON_16: 'https://skillbox-my-detailhandel-dha-prod.s3.eu-central-1.amazonaws.com/myDHA-favicon.png',
+ VUE_APP_FAVICON_32: 'https://skillbox-my-detailhandel-dha-prod.s3.eu-central-1.amazonaws.com/mydha-32.png',
+ VUE_APP_FAVICON_16: 'https://skillbox-my-detailhandel-dha-prod.s3.eu-central-1.amazonaws.com/mydha-16.png',
VUE_APP_TITLE: 'myDHA',
};
diff --git a/client/config/prod-dhf.env.js b/client/config/prod-dhf.env.js
index 4db3abc8..94953e97 100644
--- a/client/config/prod-dhf.env.js
+++ b/client/config/prod-dhf.env.js
@@ -1,6 +1,6 @@
const config = {
- VUE_APP_FAVICON_32: 'https://skillbox-my-detailhandel-dhf-prod.s3.eu-central-1.amazonaws.com/myDHF-favicon.png',
- VUE_APP_FAVICON_16: 'https://skillbox-my-detailhandel-dhf-prod.s3.eu-central-1.amazonaws.com/myDHF-favicon.png',
+ VUE_APP_FAVICON_32: 'https://skillbox-my-detailhandel-dhf-prod.s3.eu-central-1.amazonaws.com/mydhf-32.png',
+ VUE_APP_FAVICON_16: 'https://skillbox-my-detailhandel-dhf-prod.s3.eu-central-1.amazonaws.com/mydhf-16.png',
VUE_APP_TITLE: 'myDHF',
};
diff --git a/client/config/prod-my-kv.env.js b/client/config/prod-my-kv.env.js
index 26cf4771..48c234f9 100644
--- a/client/config/prod-my-kv.env.js
+++ b/client/config/prod-my-kv.env.js
@@ -1,6 +1,6 @@
const config = {
- 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_FAVICON_32: 'https://skillbox-my-kv-prod.s3.eu-west-1.amazonaws.com/mykv-32.png',
+ VUE_APP_FAVICON_16: 'https://skillbox-my-kv-prod.s3.eu-west-1.amazonaws.com/mykv-16.png',
VUE_APP_TITLE: 'myKV',
};
diff --git a/client/src/components/illustrations/HelloIllustration.vue b/client/src/components/illustrations/HelloIllustration.vue
index 8f129551..81f241bd 100644
--- a/client/src/components/illustrations/HelloIllustration.vue
+++ b/client/src/components/illustrations/HelloIllustration.vue
@@ -5,449 +5,445 @@
viewBox="0 0 378 505"
fill="none"
xmlns="http://www.w3.org/2000/svg"
+ data-v-d831f69a=""
>
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
-
+ data-v-d831f69a=""
+ >
+
+ data-v-d831f69a=""
+ >
-
+
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
+ data-v-d831f69a=""
+ >
-
-
diff --git a/client/src/components/illustrations/HelloMyDHAIllustration.vue b/client/src/components/illustrations/HelloMyDHAIllustration.vue
index 0137ea26..555a2579 100644
--- a/client/src/components/illustrations/HelloMyDHAIllustration.vue
+++ b/client/src/components/illustrations/HelloMyDHAIllustration.vue
@@ -1,331 +1,482 @@
+
+
diff --git a/client/src/components/illustrations/HelloMyDHFIllustration.vue b/client/src/components/illustrations/HelloMyDHFIllustration.vue
index ec643650..711c1e9d 100644
--- a/client/src/components/illustrations/HelloMyDHFIllustration.vue
+++ b/client/src/components/illustrations/HelloMyDHFIllustration.vue
@@ -1,331 +1,487 @@
+
+
diff --git a/client/src/components/illustrations/HelloMyKVIllustration.vue b/client/src/components/illustrations/HelloMyKVIllustration.vue
index b0d7e9aa..4a9955f3 100644
--- a/client/src/components/illustrations/HelloMyKVIllustration.vue
+++ b/client/src/components/illustrations/HelloMyKVIllustration.vue
@@ -1,341 +1,470 @@
+
+
diff --git a/client/src/helpers/app-flavor.constants.ts b/client/src/helpers/app-flavor.constants.ts
index 69989fe8..17476ee1 100644
--- a/client/src/helpers/app-flavor.constants.ts
+++ b/client/src/helpers/app-flavor.constants.ts
@@ -2,7 +2,7 @@ import type { FlavorValues } from '@/helpers/types';
export const defaultFlavorValues: FlavorValues = {
appFlavor: 'skillbox',
- appLogo: '/static/logo.png',
+ appLogo: 'https://skillbox-files-prod.s3.eu-west-1.amazonaws.com/mySkillbox-logo-2024.png',
baseUrl: 'myskillbox.ch',
licenseUrl: 'https://myskillbox.ch/angebot',
@@ -31,7 +31,7 @@ export const defaultFlavorValues: FlavorValues = {
export const myKvValues: FlavorValues = {
appFlavor: 'my-kv',
- appLogo: 'https://skillbox-my-kv-prod.s3-eu-west-1.amazonaws.com/mykv-logo.png',
+ appLogo: 'https://skillbox-my-kv-prod.s3-eu-west-1.amazonaws.com/mykv-logo-2024.png',
baseUrl: 'mykv.ch',
licenseUrl: 'https://hep.plus/mykv-angebot',
@@ -62,7 +62,7 @@ export const dhaValues: FlavorValues = Object.assign({}, myKvValues, {
appFlavor: 'my-dha',
baseUrl: 'mydetailhandel.ch',
licenseUrl: 'https://hep.plus/mydha-angebot',
- 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-2024.png',
textAppName: 'myDHA',
helloIllustration: 'HelloMyDHAIllustration',
showLanguageFilter: false,
@@ -72,7 +72,7 @@ export const dhfValues: FlavorValues = Object.assign({}, myKvValues, {
appFlavor: 'my-dhf',
baseUrl: 'mydetailhandel.ch',
licenseUrl: 'https://hep.plus/mydhf-angebot',
- 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-2024.png',
textAppName: 'myDHF',
helloIllustration: 'HelloMyDHFIllustration',
showLanguageFilter: false,
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 53f5ae6c..66969026 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -1,18 +1,18 @@
-import { defineConfig } from "vite";
-import { sentryVitePlugin } from "@sentry/vite-plugin";
+import { defineConfig } from 'vite';
+import { sentryVitePlugin } from '@sentry/vite-plugin';
-import vue from "@vitejs/plugin-vue";
-import gql from "@rollup/plugin-graphql";
-import path from "path";
+import vue from '@vitejs/plugin-vue';
+import gql from '@rollup/plugin-graphql';
+import path from 'path';
const getFlavorConfig = () => {
switch (process.env.APP_FLAVOR) {
- case "my-kv":
- return require("./config/prod-my-kv.env.js").default;
- case "my-dhf":
- return require("./config/prod-dhf.env.js").default;
- case "my-dha":
- return require("./config/prod-dha.env.js").default;
+ case 'my-kv':
+ return require('./config/prod-my-kv.env.js').default;
+ case 'my-dhf':
+ return require('./config/prod-dhf.env.js').default;
+ case 'my-dha':
+ return require('./config/prod-dha.env.js').default;
}
return {};
};
@@ -22,41 +22,31 @@ function resolve(dir: string) {
}
const define = {
- "import.meta.env.HEP_URL": JSON.stringify(process.env.HEP_URL),
- "import.meta.env.MATOMO_HOST": JSON.stringify(process.env.MATOMO_HOST),
- "import.meta.env.MATOMO_SITE_ID": JSON.stringify(process.env.MATOMO_SITE_ID),
- "import.meta.env.LOGOUT_REDIRECT_URL": JSON.stringify(
- process.env.LOGOUT_REDIRECT_URL
- ),
- "import.meta.env.VUE_APP_FLAVOR": JSON.stringify(process.env.APP_FLAVOR),
- "import.meta.env.SENTRY_DSN": JSON.stringify(
- process.env.SENTRY_JAVASCRIPT_DSN
- ),
- "import.meta.env.SENTRY_ENVIRONMENT": JSON.stringify(process.env.SENTRY_ENV),
+ 'import.meta.env.HEP_URL': JSON.stringify(process.env.HEP_URL),
+ 'import.meta.env.MATOMO_HOST': JSON.stringify(process.env.MATOMO_HOST),
+ 'import.meta.env.MATOMO_SITE_ID': JSON.stringify(process.env.MATOMO_SITE_ID),
+ 'import.meta.env.LOGOUT_REDIRECT_URL': JSON.stringify(process.env.LOGOUT_REDIRECT_URL),
+ 'import.meta.env.VUE_APP_FLAVOR': JSON.stringify(process.env.APP_FLAVOR),
+ 'import.meta.env.SENTRY_DSN': JSON.stringify(process.env.SENTRY_JAVASCRIPT_DSN),
+ 'import.meta.env.SENTRY_ENVIRONMENT': JSON.stringify(process.env.SENTRY_ENV),
/*
* 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
*/
- "import.meta.env.VUE_APP_ENABLE_SPELLCHECK": !!process.env.TASKBASE_BASEURL,
+ 'import.meta.env.VUE_APP_ENABLE_SPELLCHECK': !!process.env.TASKBASE_BASEURL,
};
const flavorConfig = getFlavorConfig();
const htmlPlugin = () => {
return {
- name: "html-transform",
+ name: 'html-transform',
transformIndexHtml(html: string) {
return html
- .replace(/_APP_TITLE_/, flavorConfig.VUE_APP_TITLE || "mySkillbox")
- .replace(
- /_FAVICON_16_/,
- flavorConfig.VUE_APP_FAVICON_16 || "/static/favicon-16x16.png"
- )
- .replace(
- /_FAVICON_32_/,
- flavorConfig.VUE_APP_FAVICON_32 || "/static/favicon-32x32.png"
- );
+ .replace(/_APP_TITLE_/, flavorConfig.VUE_APP_TITLE || 'mySkillbox')
+ .replace(/_FAVICON_16_/, flavorConfig.VUE_APP_FAVICON_16 || '/static/myskillbox-16.png')
+ .replace(/_FAVICON_32_/, flavorConfig.VUE_APP_FAVICON_32 || '/static/myskillbox-32.png');
},
};
};
@@ -66,24 +56,22 @@ const disableSentryPlugin = !process.env.SENTRY_AUTH_TOKEN; // disable the plugi
// https://vitejs.dev/config/
export default defineConfig({
build: {
- assetsDir: "static",
+ assetsDir: 'static',
sourcemap: true, // Source map generation must be turned on
},
css: {
preprocessorOptions: {
scss: {
- additionalData: process.env.THEME
- ? `@import "styles/themes/_${process.env.THEME}.scss";`
- : "",
+ additionalData: process.env.THEME ? `@import "styles/themes/_${process.env.THEME}.scss";` : '',
},
},
devSourcemap: true,
},
resolve: {
alias: {
- "@": resolve("./src"),
- styles: resolve("./src/styles"),
- gql: resolve("./src/graphql/gql"),
+ '@': resolve('./src'),
+ styles: resolve('./src/styles'),
+ gql: resolve('./src/graphql/gql'),
},
},
server: {
@@ -98,9 +86,9 @@ export default defineConfig({
htmlPlugin(),
sentryVitePlugin({
authToken: process.env.SENTRY_AUTH_TOKEN,
- org: "iterativ",
+ org: 'iterativ',
disable: disableSentryPlugin,
- project: "skillbox-vue",
+ project: 'skillbox-vue',
}),
],
define,
diff --git a/server/core/static/myskillbox-16.png b/server/core/static/myskillbox-16.png
new file mode 100644
index 00000000..aee0d03e
Binary files /dev/null and b/server/core/static/myskillbox-16.png differ
diff --git a/server/core/static/myskillbox-32.png b/server/core/static/myskillbox-32.png
new file mode 100644
index 00000000..973727d4
Binary files /dev/null and b/server/core/static/myskillbox-32.png differ