Revert to 281bb9e

.travis.yml

@@ -1,21 +1,9 @@
 language: node_js
 node_js:
-<<<<<<< HEAD
-  - "4.2.6"
-
-before_script:
-  - npm install
-
-script:
-  - npm run test
-  - npm run test-e2e
-
-=======
   - "5.6.0"
 
 before_install:
   - npm install -g bower gulp
 
 script:
-  - npm run test
->>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
+  - npm run test

README.md

@@ -2,15 +2,12 @@
 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/).
@@ -153,8 +150,4 @@ task, which runs `build` and then `compile`:
 
 ```sh
 $ gulp
-<<<<<<< HEAD
 ```
-=======
-```
->>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2

bower.json

@@ -24,31 +24,6 @@
   ],
   "dependencies": {
     "bootstrap": "^3.3.6",
-<<<<<<< HEAD
-    "angular": "^1.5.7",
-    "angular-animate": "^1.5.7",
-    "angular-sanitize": "^1.5.7",
-    "angular-touch": "^1.5.7",
-    "angular-messages": "^1.5.7",
-    "angular-toastr": "^1.7.0",
-    "angular-ui-tree": "^2.16.0",
-    "angular-bootstrap": "^1.3.3",
-    "ordercloud-ng-sdk": "1.0.24",
-    "angular-auto-validate": "^1.19.5",
-    "font-awesome": "^4.6.3",
-    "angular-snap": "^1.8.5",
-    "angular-localforage": "^1.2.5",
-    "underscore": "^1.8.3",
-    "angular-ui-router": "^0.3.1",
-    "angular-busy": "^4.1.3"
-  },
-  "devDependencies": {
-    "angular-mocks": "^1.5.7"
-  },
-  "resolutions": {
-    "angular": "^1.5.7",
-    "angular-animate": "^1.5.7"
-=======
     "angular": "^1.6.0",
     "angular-resource": "^1.6.0",
     "angular-animate": "^1.6.0",
@@ -76,6 +51,5 @@
     "angular-animate": "^1.6.0",
     "angular-resource": "^1.6.0",
     "angular-cookies": "^1.6.0"
->>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
   }
 }

gulp.config.js

@@ -1,9 +1,5 @@
 var source = './src/',
     assets = 'assets/',
-<<<<<<< HEAD
-    components = './../Components/',
-=======
->>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
     build = './build/',
     bowerFiles = './bower_components/',
     npmFiles = './node_modules',
@@ -39,29 +35,11 @@ module.exports = {
         '!' + source + '**/*.spec.js',
         '!' + source + '**/*.test.js'
     ],
-<<<<<<< HEAD
-    components: {
-        dir: components,
-        scripts: [
-            components + '**/*.js',
-            '!' + components + '**/*.spec.js',
-            '!' + components + '**/*.test.js'
-        ],
-        templates: components + '**/*.html',
-        styles: {
-            less: components + '**/*.less',
-            css: components + '**/*.css'
-        }
-    },
-    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'
@@ -90,11 +68,7 @@ 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':

gulp/build/app-config.js

@@ -4,20 +4,12 @@ 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));
 });

gulp/build/inject.js

@@ -11,18 +11,10 @@ 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));
 });

gulp/build/scripts.js

@@ -11,23 +11,14 @@ 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())
@@ -39,12 +30,7 @@ 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())

gulp/build/serve-build.js

@@ -1,31 +1,13 @@
 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
     }
 });

gulp/build/styles.js

@@ -18,12 +18,7 @@ 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'))

gulp/compile/app-css.js

@@ -21,13 +21,7 @@ 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'))

gulp/compile/app-js.js

@@ -24,15 +24,8 @@ 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))
@@ -45,14 +38,10 @@ 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/'))

gulp/serve.js

@@ -30,23 +30,6 @@
     module.exports = function (isDev) {
         if (isDev) {
             gulp.watch([].concat(
-<<<<<<< HEAD
-                config.src + '**/*.html',
-                config.components.templates
-            ))
-                .on('change', browserSync.reload);
-            gulp.watch([].concat(
-                config.scripts,
-                config.components.scripts
-            ), ['rebuild-scripts'])
-                .on('change', browserSync.reload);
-            gulp.watch([].concat(
-                config.styles,
-                config.components.styles.less,
-                config.components.styles.css
-            ), ['styles']);
-            gulp.watch(config.src + '**/app.config.json', ['app-config'])
-=======
                 config.src + '**/*.html'
             ))
                 .on('change', browserSync.reload);
@@ -58,7 +41,6 @@
                 config.styles
             ), ['styles']);
             gulp.watch(config.src + '**/app.constants.json', ['app-config'])
->>>>>>> 281bb9e29d0e44c929457c755c5b59714e368ee2
                 .on('change', browserSync.reload);
         }
         return nodemon ({