diff --git a/.eslintrc.js b/.eslintrc.js
index 4a70929..e82baea 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,84 +2,159 @@
module.exports = {
- "extends": "eslint:recommended",
+ extends: 'eslint:recommended',
- "parser": "espree",
+ parser: 'espree',
- "parserOptions": {
- "ecmaVersion": 8,
- "sourceType": "module"
+ parserOptions: {
+ 'ecmaVersion': 8,
+ 'sourceType': 'module',
+ 'ecmaFeatures': {
+ 'experimentalObjectRestSpread': true
+ }
},
- "env": {
- "browser": true,
- "es6": true,
- "jasmine": true
+ env: {
+ 'browser': true,
+ 'es6': true,
+ 'jasmine': true
},
- "globals": {
- "angular": true,
- "_": true,
- "$": true,
- "jQuery": true,
- "moment": true
+ plugins: ['angular'],
+
+ globals: {
+ 'angular': true,
+ '_': true,
+ '$': true,
+ 'jQuery': true,
+ 'moment': true
},
- "rules": {
+ rules: {
+ /* Angular linting rules */
+ //'angular/avoid-scope-typos': 0, TODO : check for bug fix for this rule
+ 'angular/module-getter': 1,
+ 'angular/module-setter': 1,
+ //'angular/no-private-call': [2,{'allow':['$$parentForm', '$$value$$', '$$phase']}],
+ 'angular/no-private-call': 0,
+
+ /* Best practises */
+ 'angular/component-limit': 0,
+ 'angular/controller-as-route': 2,
+ 'angular/controller-as': 0,
+ 'angular/di-unused': 2,
+ 'angular/directive-restrict': 0,
+ 'angular/empty-controller': 2,
+ 'angular/no-controller': 0,
+ 'angular/no-inline-template': 2,
+ 'angular/no-run-logic': 2,
+ 'angular/no-services': [2,['$q', '$filter']],
+ 'angular/on-watch': 0,
+ 'angular/prefer-component': 0,
+
+ /* Avoid deprecated features */
+ 'angular/no-cookiestore': 0,
+ 'angular/no-directive-replace': 0,
+ 'angular/no-http-callback': 0,
+
+ /* Naming */
+ 'angular/component-name': 0,
+ 'angular/constant-name': 0,
+ 'angular/controller-name': 0,
+ 'angular/directive-name': 0,
+ 'angular/factory-name': 0,
+ 'angular/file-name': 0,
+ 'angular/filter-name': 0,
+ 'angular/module-name': 0,
+ 'angular/provider-name': 0,
+ 'angular/service-name': 0,
+ 'angular/value-name': 0,
+
+ /* Conventions */
+ 'angular/di-order': 0,
+ 'angular/di': 0,
+ 'angular/dumb-inject': 0,
+ 'angular/function-type': 0,
+ 'angular/module-dependency-order': 0,
+ 'angular/no-service-method': 0,
+ 'angular/one-dependency-per-line': 0,
+ 'angular/rest-service': 0,
+ 'angular/watchers-execution': 0,
+
+ /* Angular wrappers */
+ 'angular/angularelement': 0,
+ 'angular/definedundefined': 0,
+ 'angular/document-service': 0,
+ 'angular/foreach': 0,
+ 'angular/interval-service': 0,
+ 'angular/json-function': 0,
+ 'angular/log': 0,
+ 'angular/no-angular-mock': 0,
+ 'angular/no-jquery-angularelement': 0,
+ 'angular/timeout-service': 0,
+ 'angular/typecheck-array': 0,
+ 'angular/typecheck-date': 0,
+ 'angular/typecheck-function': 0,
+ 'angular/typecheck-number': 0,
+ 'angular/typecheck-object': 0,
+ 'angular/typecheck-string': 0,
+ 'angular/typecheck-service': 0,
+
+ 'angular/on-destroy': 0,
- "semi": "error",
+ 'semi': 'error',
- "block-spacing": "error", // warn if no space in braces like {key: val}
+ 'block-spacing': 'error', // warn if no space in braces like {key: val}
- "brace-style": ["error", "1tbs"], // warn for not using "one true brace style"
+ 'brace-style': ['error', '1tbs'], // warn for not using 'one true brace style'
- "comma-spacing": ["error", {"before": false, "after": true}], // warn if no space after comma [thing1,thing2,...]
+ 'comma-spacing': ['error', {'before': false, 'after': true}], // warn if no space after comma [thing1,thing2,...]
- "indent": ["off", 4], // TODO
+ 'indent': ['off', 4], // TODO
- "key-spacing": ["error", {"beforeColon": false, "afterColon": true}], // warn if space before colon & not after colon in object literals like { key : val } or { key:val }
+ 'key-spacing': ['error', {'beforeColon': false, 'afterColon': true}], // warn if space before colon & not after colon in object literals like { key : val } or { key:val }
- "keyword-spacing": ["error", {"before": true, "after": true}],
+ 'keyword-spacing': ['error', {'before': true, 'after': true}],
- "no-console": ["off", {}], // TODO
+ 'no-console': ['off', {}], // TODO
- "no-empty": ["error", {"allowEmptyCatch": true}],
+ 'no-empty': ['error', {'allowEmptyCatch': true}],
- "no-undef": ["off", {}], // TODO
+ 'no-undef': ['off', {}], // TODO
- "no-unused-vars": ["error", {"vars": "all", "args": "none", "ignoreRestSiblings": false}],
+ 'no-unused-vars': ['error', {'vars': 'all', 'args': 'none', 'ignoreRestSiblings': true}],
- "space-before-function-paren": ["error", {
- "anonymous": "always",
- "named": "never",
- "asyncArrow": "always"
+ 'space-before-function-paren': ['error', {
+ 'anonymous': 'always',
+ 'named': 'never',
+ 'asyncArrow': 'always'
}],
- "no-useless-escape": ["off",{}], //TODO
+ 'no-useless-escape': ['off',{}], //TODO
- "quotes": ["error", "single"],
+ 'quotes': ['error', 'single'],
- "arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }],
+ 'arrow-parens': ['error', 'as-needed', { 'requireForBlockBody': true }],
- "prefer-const": ["error", { "destructuring": "all", "ignoreReadBeforeAssign": true }],
+ 'prefer-const': ['error', { 'destructuring': 'all', 'ignoreReadBeforeAssign': true }],
- "no-new-object": "error",
+ 'no-new-object': 'error',
- "no-var": "error",
+ 'no-var': 'error',
- "no-confusing-arrow": ['error', {
- "allowParens": true,
+ 'no-confusing-arrow': ['error', {
+ 'allowParens': true,
}],
-
- "prefer-arrow-callback": ['error', {
- "allowNamedFunctions": false,
- "allowUnboundThis": true,
+
+ 'prefer-arrow-callback': ['error', {
+ 'allowNamedFunctions': false,
+ 'allowUnboundThis': true,
}],
- "arrow-spacing": ['error', { "before": true, "after": true }],
-
- "object-shorthand": ['error', 'always', {"ignoreConstructors": false, "avoidQuotes": true,}],
+ 'arrow-spacing': ['error', { 'before': true, 'after': true }],
+
+ 'object-shorthand': ['error', 'always', {'ignoreConstructors': false, 'avoidQuotes': true,}],
- "quote-props": ['error', 'as-needed', { "keywords": false, "unnecessary": true, "numbers": false }],
+ 'quote-props': ['error', 'as-needed', { 'keywords': false, 'unnecessary': true, 'numbers': false }],
}
};
diff --git a/docs/migrating_v2_to_v3.md b/docs/migrating_v2_to_v3.md
index cc993b6..8a23ee0 100755
--- a/docs/migrating_v2_to_v3.md
+++ b/docs/migrating_v2_to_v3.md
@@ -2,6 +2,8 @@
## Migrating SDK v2 to SDK v3
+## These instructions assume that you have downloaded the demo project from here: https://github.com/BookingBug/demo ##
+
We want to keep all projects created for one client inside one repository.
If you're migrating a bespoke 'studio' project, take [studio](https://github.com/BookingBug/demo/tree/master/src/studio) as an example.
diff --git a/package.json b/package.json
index 68487eb..7444a81 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,7 @@
"ignore-loader": "~0.1.2",
"import-glob-loader": "~1.1.0",
"include-all": "~4.0.3",
+ "inject-sass-imports-loader": "^1.0.5",
"inquirer": "~3.2.1",
"ip": "~1.1.5",
"isparta": "~4.0.0",
@@ -92,6 +93,7 @@
"ng-cache-loader": "~0.0.26",
"node-sass": "~4.7.1",
"open-browser-webpack-plugin": "~0.0.5",
+ "optimize-css-assets-webpack-plugin": "^3.2.0",
"path": "~0.12.7",
"postcss-loader": "~2.0.6",
"progress-bar-webpack-plugin": "~1.10.0",
@@ -106,6 +108,7 @@
"webpack-bundle-analyzer": "~2.9.1",
"webpack-dev-server": "~2.9.7",
"webpack-require-http": "~0.4.3",
+ "wrap-loader": "^0.2.0",
"yargs": "~10.0.3"
}
}
diff --git a/src/public/config.json b/src/public/config.json
index e483c10..55a3982 100644
--- a/src/public/config.json
+++ b/src/public/config.json
@@ -11,7 +11,7 @@
"uglify": true
},
"core": {
- "google_maps_key": "AIzaSyDFAIV9IW8riXGAzlupPb9_6X14dxmUMt8",
+ "google_maps_key": "AIzaSyDqsstcumrpBVUW8t3yEM9-AeTK87zxuUI",
"analytics": {
"enable_piwik": false
},
diff --git a/src/public/images/bb-logo.svg b/src/public/images/bb-logo.svg
deleted file mode 100644
index 0cc433a..0000000
--- a/src/public/images/bb-logo.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/src/public/main.module.js b/src/public/main.module.js
index 2dacb47..2f05b6f 100644
--- a/src/public/main.module.js
+++ b/src/public/main.module.js
@@ -1,27 +1,32 @@
+// Public booking dashboard module.
import bbPublicBookingModule from 'bookingbug-angular/src/public-booking/entry.module';
+// Template overrides.
import './sdk-templates/**/*.html';
+
+// Configuration.
import '../../tmp/config.constants';
-//templates
+// Injected variables need to be imported explicitly so that they can be watched.
+import './stylesheets/_client-variables.scss';
+
+// Additional templates.
import './templates/main-steps/main_appointment.html';
-// fonts
+// Additional fonts.
import './fonts/bb-icons.eot';
import './fonts/bb-icons.ttf';
import './fonts/bb-icons.woff';
import 'file-loader?name=fonts/[name].[ext]!./fonts/bb-icons.svg';
-// images
-import './images/bb-logo.svg';
-
-// styles
+// Styles.
import './main.scss';
-// chosen angular translations
+// 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';
+// Studio module bootstrap files.
import config from './main.config';
import run from './main.run';
import versionModule from './version/version.module';
diff --git a/src/public/main.run.js b/src/public/main.run.js
index a07a3cc..de7de63 100644
--- a/src/public/main.run.js
+++ b/src/public/main.run.js
@@ -1,6 +1,5 @@
function moduleRun(bbConfig) {
'ngInject';
-
}
export default moduleRun;
diff --git a/src/public/main.scss b/src/public/main.scss
index d798609..b0f4ead 100644
--- a/src/public/main.scss
+++ b/src/public/main.scss
@@ -1,22 +1,5 @@
-//bootstrap
-@import "./stylesheets/bootstrap-variables";
-@import "~bookingbug-angular/node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
-@import "~bookingbug-angular/node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
-//bb
-@import "./stylesheets/bb-variables";
-@import '~bookingbug-angular/src/core/_stylesheets/project_version';
+// Actual booking journey styles.
+@import "~bookingbug-angular/src/public-booking/main";
-#bb {
- //bb
- @import "~bookingbug-angular/src/public-booking/main";
-
- margin: 0;
- font-family: $font-family-base;
- font-size: $font-size-base;
- line-height: $line-height-base;
- color: $text-color;
- background-color: $body-bg;
-
- //client
- @import "./stylesheets/client_theme";
-}
\ No newline at end of file
+// Client theme for customization.
+@import "./stylesheets/client_theme";
\ No newline at end of file
diff --git a/src/public/stylesheets/_bb-variables.scss b/src/public/stylesheets/_bb-variables.scss
deleted file mode 100644
index caa1a9d..0000000
--- a/src/public/stylesheets/_bb-variables.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-$gray-dark: #333;
-$panel-default-border: #ddd;
-$link-color: $gray-dark;
-$link-hover-color: $gray-dark;
-$link-hover-decoration: none;
-$bb-gray: #ccc;
-$bb-border: $panel-default-border;
-$secondary-border-color: $panel-default-border;
-$hyperlink-color: $link-color;
\ No newline at end of file
diff --git a/src/public/stylesheets/_bootstrap-variables.scss b/src/public/stylesheets/_bootstrap-variables.scss
deleted file mode 100644
index cd26734..0000000
--- a/src/public/stylesheets/_bootstrap-variables.scss
+++ /dev/null
@@ -1,874 +0,0 @@
-$bootstrap-sass-asset-helper: true !default;
-//
-// Variables
-// --------------------------------------------------
-
-
-//== Colors
-//
-//## Gray and brand colors for use across Bootstrap.
-
-$gray-base: #000 !default;
-$gray-darker: lighten($gray-base, 13.5%) !default; // #222
-$gray-dark: lighten($gray-base, 20%) !default; // #333
-$gray: lighten($gray-base, 33.5%) !default; // #555
-$gray-light: lighten($gray-base, 46.7%) !default; // #777
-$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
-
-$brand-primary: darken(#428bca, 6.5%) !default; // #337ab7
-$brand-success: #5cb85c !default;
-$brand-info: #5bc0de !default;
-$brand-warning: #f0ad4e !default;
-$brand-danger: #d9534f !default;
-
-
-//== Scaffolding
-//
-//## Settings for some of the most global styles.
-
-//** Background color for ``.
-$body-bg: #fff !default;
-//** Global text color on ``.
-$text-color: $gray-dark !default;
-
-//** Global textual link color.
-$link-color: $brand-primary !default;
-//** Link hover color set via `darken()` function.
-$link-hover-color: darken($link-color, 15%) !default;
-//** Link hover decoration.
-$link-hover-decoration: underline !default;
-
-
-//== Typography
-//
-//## Font, line-height, and color for body text, headings, and more.
-
-$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
-//** Default monospace fonts for ``, ``, and `
`.
-$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
-$font-family-base: $font-family-sans-serif !default;
-
-$font-size-base: 14px !default;
-$font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px
-$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px
-
-$font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px
-$font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px
-$font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px
-$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px
-$font-size-h5: $font-size-base !default;
-$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px
-
-//** Unit-less `line-height` for use in components like buttons.
-$line-height-base: 1.428571429 !default; // 20/14
-//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
-$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px
-
-//** By default, this inherits from the ``.
-$headings-font-family: inherit !default;
-$headings-font-weight: 500 !default;
-$headings-line-height: 1.1 !default;
-$headings-color: inherit !default;
-
-
-//== Iconography
-//
-//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
-
-//** Load fonts from this directory.
-
-// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
-// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
-$icon-font-path: if($bootstrap-sass-asset-helper, "~bootstrap-sass/assets/fonts/bootstrap/", "/fonts/") !default;
-
-//** File name for all font files.
-$icon-font-name: "glyphicons-halflings-regular" !default;
-//** Element ID within SVG icon file.
-$icon-font-svg-id: "glyphicons_halflingsregular" !default;
-
-
-//== Components
-//
-//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-
-$padding-base-vertical: 6px !default;
-$padding-base-horizontal: 12px !default;
-
-$padding-large-vertical: 10px !default;
-$padding-large-horizontal: 16px !default;
-
-$padding-small-vertical: 5px !default;
-$padding-small-horizontal: 10px !default;
-
-$padding-xs-vertical: 1px !default;
-$padding-xs-horizontal: 5px !default;
-
-$line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
-$line-height-small: 1.5 !default;
-
-$border-radius-base: 4px !default;
-$border-radius-large: 6px !default;
-$border-radius-small: 3px !default;
-
-//** Global color for active items (e.g., navs or dropdowns).
-$component-active-color: #fff !default;
-//** Global background color for active items (e.g., navs or dropdowns).
-$component-active-bg: $brand-primary !default;
-
-//** Width of the `border` for generating carets that indicator dropdowns.
-$caret-width-base: 4px !default;
-//** Carets increase slightly in size for larger components.
-$caret-width-large: 5px !default;
-
-
-//== Tables
-//
-//## Customizes the `.table` component with basic values, each used across all table variations.
-
-//** Padding for `
`s and `
`s.
-$table-cell-padding: 8px !default;
-//** Padding for cells in `.table-condensed`.
-$table-condensed-cell-padding: 5px !default;
-
-//** Default background color used for all tables.
-$table-bg: transparent !default;
-//** Background color used for `.table-striped`.
-$table-bg-accent: #f9f9f9 !default;
-//** Background color used for `.table-hover`.
-$table-bg-hover: #f5f5f5 !default;
-$table-bg-active: $table-bg-hover !default;
-
-//** Border color for table and cell borders.
-$table-border-color: #ddd !default;
-
-
-//== Buttons
-//
-//## For each of Bootstrap's buttons, define text, background and border color.
-
-$btn-font-weight: normal !default;
-
-$btn-default-color: #333 !default;
-$btn-default-bg: #fff !default;
-$btn-default-border: #ccc !default;
-
-$btn-primary-color: #fff !default;
-$btn-primary-bg: $brand-primary !default;
-$btn-primary-border: darken($btn-primary-bg, 5%) !default;
-
-$btn-success-color: #fff !default;
-$btn-success-bg: $brand-success !default;
-$btn-success-border: darken($btn-success-bg, 5%) !default;
-
-$btn-info-color: #fff !default;
-$btn-info-bg: $brand-info !default;
-$btn-info-border: darken($btn-info-bg, 5%) !default;
-
-$btn-warning-color: #fff !default;
-$btn-warning-bg: $brand-warning !default;
-$btn-warning-border: darken($btn-warning-bg, 5%) !default;
-
-$btn-danger-color: #fff !default;
-$btn-danger-bg: $brand-danger !default;
-$btn-danger-border: darken($btn-danger-bg, 5%) !default;
-
-$btn-link-disabled-color: $gray-light !default;
-
-// Allows for customizing button radius independently from global border radius
-$btn-border-radius-base: $border-radius-base !default;
-$btn-border-radius-large: $border-radius-large !default;
-$btn-border-radius-small: $border-radius-small !default;
-
-
-//== Forms
-//
-//##
-
-//** `` background color
-$input-bg: #fff !default;
-//** `` background color
-$input-bg-disabled: $gray-lighter !default;
-
-//** Text color for ``s
-$input-color: $gray !default;
-//** `` border color
-$input-border: #ccc !default;
-
-// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
-//** Default `.form-control` border radius
-// This has no effect on `