diff --git a/bower.json b/bower.json index d4bc7dc..d38c65f 100644 --- a/bower.json +++ b/bower.json @@ -28,7 +28,8 @@ "fontawesome": "~4.3.0", "less": "~2.4.0", "angular-bootstrap-slider": "~0.1.1", - "angulartics": "~0.17.2" + "angulartics": "~0.17.2", + "MoltinSDK": "git@github.com:moltin/js-sdk.git" }, "devDependencies": { "angular-mocks": "~1.2.29" diff --git a/gulpfile.js b/gulpfile.js index 295343e..a858537 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -20,10 +20,10 @@ var gulp = require('gulp'), url = require('url'), flatten = require('gulp-flatten'), connect = require('gulp-connect'), - _ = require('lodash'); + _ = require('lodash'), + webserver = require('gulp-webserver'); //Configure your proxy for integrating with services -// var configuration = { proxyOptions: _.extend(url.parse('http://demo-venkatvp.rhcloud.com/services'), { route: '/services', @@ -31,6 +31,16 @@ var configuration = { custom: 'My Custom Header' } }), + rootFolder : ['./.tmp', './.tmp/src/app', './src/app', './bower_components'], + proxies : [{ + source: '/services', + target: 'http://demo-venkatvp.rhcloud.com/services', + options: { + headers: { + 'ABC_HEADER': 'abc' + } + } + }], htmlminOpts: { removeComments: true, collapseWhitespace: true, @@ -210,7 +220,7 @@ gulp.task('release', ['dist'], function() { */ gulp.task('statics', function() { connect.server({ - root: ['./.tmp', './.tmp/src/app', './src/app', './bower_components'], + root: configuration.rootFolder, port: 3000, livereload: true, middleware: function() { @@ -221,12 +231,21 @@ gulp.task('statics', function() { }); }); +gulp.task('webserver', function() { + gulp.src(configuration.rootFolder) + .pipe(webserver({ + livereload: true, + directoryListing: true, + port : 3000, + proxies : configuration.proxies, + })); +}); /** * Watch */ gulp.task('serve', ['watch']); -gulp.task('watch', ['statics', 'default'], function() { +gulp.task('watch', ['default', 'statics'], function() { isWatching = true; // Initiate livereload server: gulp.watch('./src/app/**/*.js', ['jshint']); diff --git a/src/app/cart/__init__.py b/src/app/cart/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/app/cart/cart.js b/src/app/cart/cart.js new file mode 100644 index 0000000..4a7034e --- /dev/null +++ b/src/app/cart/cart.js @@ -0,0 +1,11 @@ +angular.module('ng-gulp.cart', []).config(['$routeProvider', + function($routeProvider) { + 'use strict'; + $routeProvider + .when('/cart', { //Default + controller: 'CartCtrl', + templateUrl: 'cart/cart.html' + }); + } + ]); + diff --git a/src/app/cart/moltin_service.js b/src/app/cart/moltin_service.js new file mode 100644 index 0000000..031cb65 --- /dev/null +++ b/src/app/cart/moltin_service.js @@ -0,0 +1,14 @@ +angular + .module('ng-gulp.cart').service('CartService', ['$http', + function($http) { + 'use strict'; + var moltin = new Moltin({publicId: 'OLxDs9cNgzqc6R0sg1n75qqNTbih26K2J9zVjVyy'}); + moltin.Authenticate(function() { + + + + }); + + + } + ]); diff --git a/src/app/home/home-nav-directive.js b/src/app/home/home-nav-directive.js index 92f5d77..6d63637 100644 --- a/src/app/home/home-nav-directive.js +++ b/src/app/home/home-nav-directive.js @@ -24,7 +24,7 @@ angular.module('ng-gulp.home').directive('navHeader', function() { } return active; - } + }; } - } + }; }); diff --git a/src/app/index.html b/src/app/index.html index 1b431b2..55f0897 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -15,8 +15,8 @@ - +