From 049bb1f0ca2092a4781975e1c6ac4c8d373944ff Mon Sep 17 00:00:00 2001 From: Flavio Tulino Date: Mon, 29 Jan 2018 10:14:49 +0000 Subject: [PATCH 1/3] added support for scss versioning --- src/public/main.module.js | 10 +++++++++- src/public/main_v2.scss | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/public/main_v2.scss diff --git a/src/public/main.module.js b/src/public/main.module.js index 2dacb47..84eef3b 100644 --- a/src/public/main.module.js +++ b/src/public/main.module.js @@ -16,7 +16,7 @@ import 'file-loader?name=fonts/[name].[ext]!./fonts/bb-icons.svg'; import './images/bb-logo.svg'; // styles -import './main.scss'; +//import './main.scss'; // chosen angular translations import 'file-loader?name=angular-i18n/[name].[ext]!bookingbug-angular/node_modules/angular-i18n/angular-locale_en.js'; @@ -26,6 +26,14 @@ import config from './main.config'; import run from './main.run'; import versionModule from './version/version.module'; +// Try to load a versioned scss file, otherwise load the default one +try { + require('./main_v' + versioning.getUIVersion() + '.scss'); +} catch (ex) { + require('./main.scss'); +} + + export default angular .module('public', [ bbPublicBookingModule, diff --git a/src/public/main_v2.scss b/src/public/main_v2.scss new file mode 100644 index 0000000..fccec84 --- /dev/null +++ b/src/public/main_v2.scss @@ -0,0 +1 @@ +@import "~bookingbug-angular/src/public-booking/main_v2.scss"; \ No newline at end of file From d89e2d8b35c91f5dffc979552a6f22921afc3de6 Mon Sep 17 00:00:00 2001 From: Flavio Tulino Date: Mon, 29 Jan 2018 16:30:05 +0000 Subject: [PATCH 2/3] added missing BBUIVersionService --- src/public/main.module.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/public/main.module.js b/src/public/main.module.js index 84eef3b..a7eed13 100644 --- a/src/public/main.module.js +++ b/src/public/main.module.js @@ -27,8 +27,9 @@ import run from './main.run'; import versionModule from './version/version.module'; // Try to load a versioned scss file, otherwise load the default one +import BBUIVersionService from 'bookingbug-angular/src/public-booking/-versioning/ui_version.service'; try { - require('./main_v' + versioning.getUIVersion() + '.scss'); + require('./main_v' + BBUIVersionService.getUIVersion() + '.scss'); } catch (ex) { require('./main.scss'); } From fca23055b46a7b8f4467e4ad3a65431ff37c7b72 Mon Sep 17 00:00:00 2001 From: Flavio Tulino Date: Tue, 30 Jan 2018 10:08:13 +0000 Subject: [PATCH 3/3] removed unused line --- src/public/main.module.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/public/main.module.js b/src/public/main.module.js index a7eed13..ba97315 100644 --- a/src/public/main.module.js +++ b/src/public/main.module.js @@ -15,9 +15,6 @@ import 'file-loader?name=fonts/[name].[ext]!./fonts/bb-icons.svg'; // images import './images/bb-logo.svg'; -// styles -//import './main.scss'; - // chosen angular translations import 'file-loader?name=angular-i18n/[name].[ext]!bookingbug-angular/node_modules/angular-i18n/angular-locale_en.js'; import 'file-loader?name=angular-i18n/[name].[ext]!bookingbug-angular/node_modules/angular-i18n/angular-locale_fr.js';