Merge branch 'development' of https://github.com/ordercloud-api/angul…

…ar-buyer Conflicts: .travis.yml README.md bower.json gulp.config.js gulp/build/app-config.js gulp/build/inject.js gulp/build/scripts.js gulp/build/serve-build.js gulp/build/styles.js gulp/compile/app-css.js gulp/compile/app-js.js gulp/serve.js gulp/test/e2e.js gulp/test/unit.js package.json server.js src/README.md src/app/README.md src/app/account/account.js src/app/account/templates/account.tpl.html src/app/account/templates/confirmPassword.modal.tpl.html src/app/account/tests/account.spec.js src/app/base/base.js src/app/base/templates/base.tpl.html src/app/base/tests/base.spec.js src/app/base/tests/base.test.js src/app/home/home.js src/app/home/templates/home.tpl.html src/app/login/login.js src/app/login/templates/login.tpl.html src/app/login/tests/login.spec.js src/index.html
ordercloud-api · Jan 13, 2017 · 990241f · 990241f
2 parents 8bd7ef6 + 281bb9e
commit 990241f
Show file tree

Hide file tree

Showing 203 changed files with 12,982 additions and 3 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+save-exact=true
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: node_js
 node_js:
+<<<<<<< HEAD
   - "4.2.6"
 
 before_script:
@@ -9,3 +10,12 @@ script:
   - npm run test
   - npm run test-e2e
 
+=======
+  - "5.6.0"
+
+before_install:
+  - npm install -g bower gulp
+
+script:
+  - npm run test
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
diff --git a/README.md b/README.md
@@ -2,6 +2,15 @@
 A seed project for custom Four51 Solutions built on AngularJS
 ***
 
+<<<<<<< HEAD
+=======
+## Build Status
+### development
+[![Build Status](https://travis-ci.org/ordercloud-api/angular-buyer.svg?branch=development)](https://travis-ci.org/ordercloud-api/angular-buyer)
+### master
+[![Build Status](https://travis-ci.org/ordercloud-api/angular-buyer.svg?branch=master)](https://travis-ci.org/ordercloud-api/angular-buyer)
+
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
 ## Get started
 
 Node.js is required for the following node package manager (npm) tasks. If you don't have node.js installed, you can download it [here](http://nodejs.org/).
@@ -144,4 +153,8 @@ task, which runs `build` and then `compile`:
 
 ```sh
 $ gulp
-```
+<<<<<<< HEAD
+```
+=======
+```
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
diff --git a/bower.json b/bower.json
@@ -24,6 +24,7 @@
   ],
   "dependencies": {
     "bootstrap": "^3.3.6",
+<<<<<<< HEAD
     "angular": "^1.5.7",
     "angular-animate": "^1.5.7",
     "angular-sanitize": "^1.5.7",
@@ -47,5 +48,34 @@
   "resolutions": {
     "angular": "^1.5.7",
     "angular-animate": "^1.5.7"
+=======
+    "angular": "^1.6.0",
+    "angular-resource": "^1.6.0",
+    "angular-animate": "^1.6.0",
+    "angular-sanitize": "^1.6.0",
+    "angular-touch": "^1.6.0",
+    "angular-messages": "^1.6.0",
+    "angular-toastr": "^1.7.0",
+    "angular-ui-tree": "^2.16.0",
+    "angular-bootstrap": "^1.3.3",
+    "ordercloud-ng-sdk": "1.0.27",
+    "angular-auto-validate": "^1.19.5",
+    "font-awesome": "^4.6.3",
+    "angular-localforage": "^1.2.5",
+    "underscore": "^1.8.3",
+    "angular-ui-router": "^0.3.1",
+    "angular-tree-control": "^0.2.28",
+    "angular-sticky": "angular-sticky-plugin#^0.3.0",
+    "angular-busy2": "^5.2.0"
+  },
+  "devDependencies": {
+    "angular-mocks": "^1.6.0"
+  },
+  "resolutions": {
+    "angular": "^1.6.0",
+    "angular-animate": "^1.6.0",
+    "angular-resource": "^1.6.0",
+    "angular-cookies": "^1.6.0"
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
   }
 }
diff --git a/gulp.config.js b/gulp.config.js
@@ -1,6 +1,9 @@
 var source = './src/',
     assets = 'assets/',
+<<<<<<< HEAD
     components = './../Components/',
+=======
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
     build = './build/',
     bowerFiles = './bower_components/',
     npmFiles = './node_modules',
@@ -36,6 +39,7 @@ module.exports = {
         '!' + source + '**/*.spec.js',
         '!' + source + '**/*.test.js'
     ],
+<<<<<<< HEAD
     components: {
         dir: components,
         scripts: [
@@ -51,6 +55,13 @@ module.exports = {
     },
     appFiles: [
         build + '**/app.js',
+=======
+    appFiles: [
+        build + '**/app.module.js',
+        build + '**/app.config.js',
+        build + '**/app.run.js',
+        build + '**/app.controller.js',
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         build + '**/*.js',
         build + '**/*.css',
         source + '**/*.css'
@@ -79,7 +90,11 @@ module.exports = {
 
 function getConstants() {
     var result = {};
+<<<<<<< HEAD
     var constants = JSON.parse(fs.readFileSync(source + 'app/app.config.json'));
+=======
+    var constants = JSON.parse(fs.readFileSync(source + 'app/app.constants.json'));
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
     var environment = process.env.environment || constants.environment;
     switch (environment) {
         case 'local':

diff --git a/gulp/build/app-config.js b/gulp/build/app-config.js
@@ -4,12 +4,20 @@ var gulp = require('gulp'),
     ngConstant = require('gulp-ng-constant');
 
 gulp.task('clean:app-config', function() {
+<<<<<<< HEAD
     return del(config.build + '**/app.config.js');
+=======
+    return del(config.build + '**/app.constants.js');
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
 });
 
 gulp.task('app-config', ['clean:app-config'], function() {
     return gulp
+<<<<<<< HEAD
         .src(config.src + '**/app.config.json')
+=======
+        .src(config.src + '**/app.constants.json')
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         .pipe(ngConstant(config.ngConstantSettings))
         .pipe(gulp.dest(config.build));
 });
diff --git a/gulp/build/inject.js b/gulp/build/inject.js
@@ -11,10 +11,18 @@ gulp.task('clean:inject', function() {
 gulp.task('inject', ['clean:inject', 'scripts', 'assets', 'app-config', 'bower-fonts', 'styles'], function() {
     var target = gulp.src(config.index),
         bowerFiles = gulp.src(mainBowerFiles({filter: ['**/*.js', '**/*.css']}), {read: false}),
+<<<<<<< HEAD
         appFiles = gulp.src([].concat(config.appFiles, config.components.styles.css), {read: false});
 
     return target
         .pipe(inject(bowerFiles, {name: 'bower'}))
         .pipe(inject(appFiles))
+=======
+        appFiles = gulp.src([].concat(config.appFiles), {read: false});
+
+    return target
+        .pipe(inject(bowerFiles, {name: 'bower', ignorePath: config.bowerFiles.replace('.', ''), addPrefix: 'bower_files'}))
+        .pipe(inject(appFiles, {ignorePath: config.build.replace('.', '')}))
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         .pipe(gulp.dest(config.build));
 });
diff --git a/gulp/build/scripts.js b/gulp/build/scripts.js
@@ -11,15 +11,23 @@ var gulp = require('gulp'),
 gulp.task('clean:scripts', function() {
     return del([
         config.build + '**/*.js',
+<<<<<<< HEAD
         '!' + config.build + '**/app.config.js'
+=======
+        '!' + config.build + '**/app.constants.js'
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
     ]);
 });
 
 gulp.task('scripts', ['clean:scripts'], function() {
     return gulp
         .src([].concat(
+<<<<<<< HEAD
             config.scripts,
             config.components.scripts
+=======
+            config.scripts
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         ))
         .pipe(cache(config.jsCache))
         .pipe(ngAnnotate())
@@ -31,8 +39,12 @@ gulp.task('scripts', ['clean:scripts'], function() {
 gulp.task('rebuild-scripts', function() {
     return gulp
         .src([].concat(
+<<<<<<< HEAD
             config.scripts,
             config.components.scripts
+=======
+            config.scripts
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         ))
         .pipe(cache('jsscripts'))
         .pipe(ngAnnotate())

diff --git a/gulp/build/serve-build.js b/gulp/build/serve-build.js
@@ -1,21 +1,31 @@
 var gulp = require('gulp'),
     config = require('../../gulp.config'),
+<<<<<<< HEAD
     browserSync = require('browser-sync'),
+=======
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
     argv = require('yargs')
         .count('debug')
         .alias('d', 'debug')
         .argv,
+<<<<<<< HEAD
     serve = require('../serve'),
     unit = require('../test/unit'),
     plato = require('../test/plato');
+=======
+    serve = require('../serve');
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
 
 gulp.task('serve-build', ['inject'], function() {
     serve(true /*isDev*/);
     if (argv.debug) {
+<<<<<<< HEAD
         unit.RunUnitTests();
         unit.ServeTests();
         plato.GenerateReport(function () {
             plato.OpenReport();
         });
+=======
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
     }
 });
diff --git a/gulp/build/styles.js b/gulp/build/styles.js
@@ -18,8 +18,12 @@ gulp.task('styles', ['clean:styles'], function() {
     return gulp
         .src([].concat(
             mainBowerFiles({filter: '**/*.less'}),
+<<<<<<< HEAD
             config.src + '**/*.less',
             config.components.styles.less
+=======
+            './src/app/styles/main.less'
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         ))
         .pipe(sourcemaps.init())
         .pipe(lessImport('oc-import.less'))

diff --git a/gulp/compile/app-css.js b/gulp/compile/app-css.js
@@ -21,9 +21,13 @@ gulp.task('app-css', ['clean:app-css'], function() {
     return gulp
         .src([].concat(
             mainBowerFiles({filter: ['**/*.css', '**/*.less']}),
+<<<<<<< HEAD
             config.components.styles.less,
             config.components.styles.css,
             config.styles
+=======
+            './src/app/styles/main.less'
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         ))
         .pipe(lessFilter)
         .pipe(lessImport('app.less'))

diff --git a/gulp/compile/app-js.js b/gulp/compile/app-js.js
@@ -24,10 +24,15 @@ gulp.task('app-js', ['clean:app-js'], function() {
     return gulp
         .src([].concat(
             config.scripts,
+<<<<<<< HEAD
             config.components.scripts,
             config.templates,
             config.components.templates,
             config.src + '**/app.config.json'
+=======
+            config.templates,
+            config.src + '**/app.constants.json'
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         ))
         .pipe(jsonFilter)
         .pipe(ngConstant(config.ngConstantSettings))
@@ -40,7 +45,14 @@ gulp.task('app-js', ['clean:app-js'], function() {
         .pipe(fileSort())
         .pipe(wrapper(config.wrapper))
         .pipe(ngAnnotate())
+<<<<<<< HEAD
         .pipe(concat('app.js'))
+=======
+        .pipe(concat('app.module.js'))
+        .pipe(concat('app.config.js'))
+        .pipe(concat('app.run.js'))
+        .pipe(concat('app.controller.js'))
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         .pipe(rev())
         .pipe(uglify({mangle:false})) //turning off mangle to fix the compile error
         .pipe(gulp.dest(config.compile + 'js/'))

diff --git a/gulp/serve.js b/gulp/serve.js
@@ -30,6 +30,7 @@
     module.exports = function (isDev) {
         if (isDev) {
             gulp.watch([].concat(
+<<<<<<< HEAD
                 config.src + '**/*.html',
                 config.components.templates
             ))
@@ -45,6 +46,19 @@
                 config.components.styles.css
             ), ['styles']);
             gulp.watch(config.src + '**/app.config.json', ['app-config'])
+=======
+                config.src + '**/*.html'
+            ))
+                .on('change', browserSync.reload);
+            gulp.watch([].concat(
+                config.scripts
+            ), ['rebuild-scripts'])
+                .on('change', browserSync.reload);
+            gulp.watch([].concat(
+                config.styles
+            ), ['styles']);
+            gulp.watch(config.src + '**/app.constants.json', ['app-config'])
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
                 .on('change', browserSync.reload);
         }
         return nodemon ({

diff --git a/gulp/test/e2e.js b/gulp/test/e2e.js
@@ -1,4 +1,5 @@
 var gulp = require('gulp'),
+<<<<<<< HEAD
     argv = require('yargs').argv,
     selenium = require('selenium-standalone'),
     config = require('../../gulp.config'),
@@ -59,5 +60,38 @@ gulp.task('test:e2e', ['http'/*, 'selenium'*/], function() {
         .once('end', function() {
             browserSync.exit();
             selenium.child.kill();
+=======
+    browserSync = require('browser-sync').create(),
+    argv = require('yargs').argv,
+    config = require('../../gulp.config'),
+    protractor = require("gulp-protractor").protractor;
+
+gulp.task('start-localhost', ['inject'], function() {
+	browserSync.init({
+        server: {
+            baseDir: [
+                config.root + config.build.replace('.', ''),
+                config.root + config.src.replace('.', '') + 'app/'
+            ],
+            routes: {
+                '/bower_files': config.root + config.bowerFiles.replace('.', '')
+            }
+        },
+        open: false
+    });
+});
+
+gulp.task('test:e2e', ['start-localhost'], function() {
+	gulp.src([config.src + '**/*.test.js'])
+        .pipe(protractor({
+            configFile: config.root + '/protractor.conf.js',
+            args: [
+                '--suite', argv.suite || 'all'
+            ]
+        }))
+        .on('end', browserSync.exit)
+        .on('error', function (e) {
+            throw e;
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
         });
 });
diff --git a/gulp/test/unit.js b/gulp/test/unit.js
@@ -1,4 +1,5 @@
 var gulp = require('gulp'),
+<<<<<<< HEAD
     inject = require('gulp-inject'),
     browserSync = require('browser-sync').create(),
     config = require('../../gulp.config'),
@@ -63,3 +64,14 @@ module.exports = {
     ServeTests: serveTests
 };
 
+=======
+    config = require('../../gulp.config'),
+    Server = require('karma').Server;
+
+gulp.task('test:unit', ['scripts', 'app-config'], function(done) {
+    new Server({
+        configFile: config.root + '/karma.conf.js',
+        singleRun: true
+    }, done).start();
+});
+>>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2