fixup! feat: multitheme logos

intershop · Feb 24, 2020 · 2a4ac2f · 2a4ac2f
1 parent 1daafe8
commit 2a4ac2f
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 11 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -379,7 +379,7 @@ deploy_demo_b2b:
       --name ${SERVICE}
       --env ICM_BASE_URL=$ICM_BASE_URL
       --env LOGGING=true
-      --env THEME=blue
+      --env THEME=blue|688dc3
       --env FEATURES=quoting,compare,recently,businessCustomerRegistration,advancedVariationHandling,sentry
       --env ICM_CHANNEL=inSPIRED-inTRONICS_Business-Site
       --env SENTRY_DSN=${SENTRY_DSN}
@@ -547,7 +547,7 @@ deploy_review_b2c:
       -e PWA_2_SUBDOMAIN=b2b
       -e PWA_2_CHANNEL=inSPIRED-inTRONICS_Business-Site
       -e PWA_2_FEATURES=quoting,recently,compare,businessCustomerRegistration,advancedVariationHandling,sentry
-      -e PWA_2_THEME=blue
+      -e PWA_2_THEME=blue|688dc3
       -e PWA_3_SUBDOMAIN=de
       -e PWA_3_CHANNEL=inSPIRED-inTRONICS-Site
       -e PWA_3_LANG=de_DE
@@ -556,7 +556,7 @@ deploy_review_b2c:
       -e PWA_4_CHANNEL=inSPIRED-inTRONICS-Site
       -e PWA_4_APPLICATION=smb-responsive
       -e PWA_4_FEATURES=quoting
-      -e PWA_4_THEME=blue
+      -e PWA_4_THEME=blue|688dc3
       ${CI_REGISTRY_IMAGE}:nginx-${CI_COMMIT_REF_SLUG}
     - sleep 10
     - docker run --rm --add-host $DEMO_SERVER_NAME:$DEMO_SERVER_IP mwendler/wget --wait 10 --tries 10 --retry-connrefused "http://$DEMO_SERVER_NAME:3000/${CI_COMMIT_REF_SLUG}-pwa-b2c"
@@ -614,7 +614,7 @@ deploy_review_b2b:
       -e LOGGING=true
       -e SENTRY_DSN=${SENTRY_DSN}
       -e ICM_BASE_URL=${ICM_BASE_URL}
-      -e THEME=blue
+      -e THEME=blue|688dc3
       -e ICM_CHANNEL=inSPIRED-inTRONICS_Business-Site
       -e FEATURES=quoting,recently,compare,businessCustomerRegistration,advancedVariationHandling,sentry
       --add-host $ICM_HOST:$ICM_IP

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,9 +11,6 @@
   "[handlebars]": {
     "editor.formatOnSave": false
   },
-  "[typescript]": {
-    "editor.formatOnSave": false
-  },
 
   "files.associations": {
     "__*.*": "ng-template"

diff --git a/src/app/core/utils/theme/theme.service.ts b/src/app/core/utils/theme/theme.service.ts
@@ -50,7 +50,7 @@ export class ThemeService {
         filter(x => !!x)
       )
       .subscribe(async theme => {
-        const themeData = theme.split(',');
+        const themeData = theme.split('|');
         const themeName = themeData[0];
         const themeColor = themeData[1];
 

diff --git a/src/assets/themes/blue/img/logo_192x192.png b/src/assets/themes/blue/img/logo_192x192.png
diff --git a/src/assets/themes/blue/img/logo_256x256.png b/src/assets/themes/blue/img/logo_256x256.png
diff --git a/src/assets/themes/blue/img/logo_384x384.png b/src/assets/themes/blue/img/logo_384x384.png
diff --git a/src/assets/themes/blue/img/logo_512x512.png b/src/assets/themes/blue/img/logo_512x512.png
diff --git a/src/assets/themes/blue/img/logo_apple_120x120.png b/src/assets/themes/blue/img/logo_apple_120x120.png
diff --git a/src/assets/themes/blue/img/logo_apple_152x152.png b/src/assets/themes/blue/img/logo_apple_152x152.png
diff --git a/src/assets/themes/blue/img/logo_apple_167x167.png b/src/assets/themes/blue/img/logo_apple_167x167.png
diff --git a/src/assets/themes/blue/img/logo_apple_180x180.png b/src/assets/themes/blue/img/logo_apple_180x180.png
diff --git a/src/assets/themes/blue/manifest.webmanifest b/src/assets/themes/blue/manifest.webmanifest
@@ -24,7 +24,7 @@
       "type": "image/png"
     }
   ],
-  "theme_color": "#ff6d00",
+  "theme_color": "#688dc3",
   "background_color": "#FFFFFF",
   "display": "standalone",
   "start_url": "/home?utm_source=homescreen"

diff --git a/src/environments/environment.model.ts b/src/environments/environment.model.ts
@@ -77,5 +77,6 @@ export interface Environment {
   locales: Locale[];
 
   // configuration of the styling theme ('default' if not configured)
+  // format: 'themeName|themeColor' e.g. theme: 'blue|688dc3',
   theme?: string;
 }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -4,7 +4,7 @@ export const environment: Environment = {
   production: true,
 
   /* INTERSHOP COMMERCE MANAGEMENT REST API CONFIGURATION */
-  icmBaseURL: 'http://localhost:8080',
+  icmBaseURL: 'https://intershoppwa.azurewebsites.net',
   icmServer: 'INTERSHOP/rest/WFS',
   icmServerStatic: 'INTERSHOP/static/WFS',
   icmChannel: 'inSPIRED-inTRONICS-Site',

diff --git a/src/index.html b/src/index.html
@@ -19,7 +19,7 @@
     </style>
   </head>
   <body>
-    <ish-root>Intershfoooop Progressive Web App is loading ...</ish-root>
+    <ish-root>Intershop Progressive Web App is loading ...</ish-root>
     <noscript>Please enable JavaScript to continue using this application.</noscript>
   </body>
 </html>