Merge pull request #140 from ordercloud-api/v1.0.1

v1.0.1
ordercloud-api · Jun 20, 2017 · 842aa83 · 842aa83
2 parents 595fb1e + fe7c01f
commit 842aa83
Show file tree

Hide file tree

Showing 173 changed files with 11,587 additions and 3,596 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,4 @@ errorShots/
 plato/
 .publish/
 .vscode/
-/src/app/saas/themes/lib.less
+/src/app/saas/theme/*
diff --git a/bower.json b/bower.json
@@ -33,7 +33,7 @@
     "angular-messages": "^1.6.0",
     "angular-toastr": "^1.7.0",
     "angular-ui-tree": "^2.16.0",
-    "angular-bootstrap": "^1.3.3",
+    "angular-bootstrap": "2.5.0",
     "angular-auto-validate": "^1.19.5",
     "font-awesome": "^4.6.3",
     "angular-localforage": "^1.2.5",
@@ -43,9 +43,12 @@
     "angular-sticky": "angular-sticky-plugin#^0.3.0",
     "angular-busy2": "^5.2.0",
     "jasny-bootstrap": "3.1.3",
+    "angular-slick": "^0.2.1",
+    "slick-carousel": "^1.6.0",
     "angular-payments": "*",
     "bootswatch": "^3.3.7",
-    "ordercloud-angular-sdk": "1.0.50"
+    "ordercloud-angular-sdk": "1.0.51",
+    "textAngular": "^1.5.16"
   },
   "devDependencies": {
     "angular-mocks": "^1.6.0"
@@ -54,6 +57,7 @@
     "angular": "^1.6.0",
     "angular-animate": "^1.6.0",
     "angular-resource": "^1.6.0",
-    "angular-cookies": "^1.6.0"
+    "angular-cookies": "^1.6.0",
+    "slick-carousel": "^1.6.0"
   }
 }
diff --git a/gulp.config.js b/gulp.config.js
@@ -33,7 +33,8 @@ module.exports = {
     index: source + index,
     styles: [
         source + '**/*.css',
-        source + '**/*.less'
+        source + '**/*.less',
+        '!' + source + '**/saas/theme/*.less'
     ],
     templates: [
         '!' + source + index,
@@ -94,6 +95,7 @@ function getConstants() {
     var result = {};
     var constants = JSON.parse(fs.readFileSync(source + 'app/app.constants.json'));
     var environment = process.env.environment || constants.environment;
+    var node_env = process.env.NODE_ENV || 'development';
     switch (environment) {
         case 'local':
             result.authurl = 'http://core.four51.com:11629';
@@ -127,8 +129,12 @@ function getConstants() {
     if (process.env.ocscope) result.ocscope = process.env.ocscope;
     if (process.env.html5mode) result.html5mode = process.env.html5mode;
     if (process.env.bootswatchtheme) result.bootswatchtheme = process.env.bootswatchtheme;
-    if (process.env.buyerid) result.buyerid = process.env.buyerid;
-    if (process.env.catalogid) result.catalogid = process.env.catalogid;
+    if (process.env.awsaccesskeyid) result.awsaccesskeyid = process.env.awsaccesskeyid;
+    if (process.env.awssecretaccesskey) result.awssecretaccesskey = process.env.awssecretaccesskey;
+    if (process.env.awsregion) result.awsregion = process.env.awsregion;
+    if (process.env.awsbucket) result.awsbucket = process.env.awsbucket;
+    result.node_env = node_env;
+    result.environment = environment;
     return result;
 }
 
@@ -140,9 +146,9 @@ function _checkBootswatchTheme() {
 
     if (theme) {
         bootswatchBower.main = [
-            "./" + theme + "/bootswatch.less",
-            "./" + theme + "/variables.less"
-        ]
+            './' + theme + '/bootswatch.less',
+            './' + theme + '/variables.less'
+        ];
     }
 
     return bootswatchBower;

diff --git a/gulp/build/styles.js b/gulp/build/styles.js
@@ -9,7 +9,7 @@ var gulp = require('gulp'),
     mainBowerFiles = require('main-bower-files');
 
 gulp.task('clean:styles', function() {
-    return del([config.build + '**/*.css', config.compile + '**/*.css', config.root + '/themes/lib.less']);
+    return del([config.build + '**/*.css', config.compile + '**/*.css']);
 });
 
 gulp.task('styles', ['clean:styles'], config.saas.styles ? config.saas.styles.libLess : StylesFunction);
@@ -23,8 +23,22 @@ function StylesFunction() {
                 overrides: {
                     'jasny-bootstrap': {
                         main: [
-                            "./dist/js/jasny-bootstrap.js",
-                            "./less/jasny-bootstrap.less"
+                            './dist/js/jasny-bootstrap.js',
+                            './less/jasny-bootstrap.less'
+                        ]
+                    },
+                    'slick-carousel': {
+                        main: [
+                            'slick/slick.js',
+                            'slick/slick.less',
+                            'slick/slick-theme.less'
+                        ]
+                    },
+                    'slick-carousel': {
+                        main: [
+                            "slick/slick.js",
+                            "slick/slick.less",
+                            "slick/slick-theme.less"
                         ]
                     },
                     'bootswatch': config.checkBootswatchTheme()

diff --git a/gulp/compile/app-css.js b/gulp/compile/app-css.js
@@ -22,8 +22,15 @@ function AppCssFunction() {
                 overrides: {
                     'jasny-bootstrap': {
                         main: [
-                            "./dist/js/jasny-bootstrap.js",
-                            "./less/jasny-bootstrap.less"
+                            './dist/js/jasny-bootstrap.js',
+                            './less/jasny-bootstrap.less'
+                        ]
+                    },
+                    'slick-carousel': {
+                        main: [
+                            'slick/slick.js',
+                            'slick/slick.less',
+                            'slick/slick-theme.less'
                         ]
                     },
                     'bootswatch': config.checkBootswatchTheme()