Merge branch 'master' of https://github.com/BuildFire/sdk

.gitignore

@@ -25,11 +25,12 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+bower_components
 .idea
 /zip.cmd
 /fonticons.zip
 /styles.zip
 /scripts.zip
 plugins
 !/plugins/myPlugin/
-!/plugins/testPlugin/
+!/plugins/testPlugin/

gulpfile.js

@@ -0,0 +1,48 @@
+var gulp = require('gulp');
+var runSequence = require('run-sequence');
+var concat = require('gulp-concat');
+var uglify = require('gulp-uglify');
+
+//Minify files, and bundle together
+gulp.task('bundle1_step1', function(){
+    var sdkBundle1 = [
+        "scripts/angular/ng-infinite-scroll.custom.js",
+        "scripts/owlCarousel/owlCarousel.js",
+        "scripts/buildfire/components/carousel/carousel.js"
+    ];
+
+    return gulp.src(sdkBundle1, {base: '.'})
+
+        /// obfuscate and minify the JS files
+        .pipe(uglify())
+
+        /// merge all the JS files together. If the
+        .pipe(concat('bundle1.min.js'))
+
+        ///output here
+        .pipe(gulp.dest('scripts/_bundles'));
+});
+
+//Concat the remaining files
+gulp.task('bundle1_step2', function(){
+    var sdkBundle1 = [
+        "scripts/buildfire.js",
+        "scripts/jquery/jquery-1.11.2.min.js",
+        "scripts/angular/angular.min.js",
+        "scripts/angular/ui-bootstrap.min.js",
+        "scripts/jquery/jquery-ui.min.js",
+        "scripts/_bundles/bundle1.min.js"
+    ];
+
+    return gulp.src(sdkBundle1, {base: '.'})
+
+        /// merge all the JS files together.
+        .pipe(concat('bundle1.min.js'))
+
+        ///output here
+        .pipe(gulp.dest('scripts/_bundles'));
+});
+
+gulp.task('build', function(callback){
+    runSequence('bundle1_step1', 'bundle1_step2', callback);
+});

package.json

@@ -22,23 +22,27 @@
   "author": "Daniel Hindi",
   "license": "ISC",
   "devDependencies": {
+    "body-parser": "1.11.0",
     "chai": "^3.3.0",
-    "jasmine-core": "^2.3.4",
+    "express": "4.0.0",
+    "gulp": "^3.9.1",
+    "gulp-concat": "^2.6.1",
+    "gulp-uglify": "^3.0.0",
+    "jasmine-core": "^2.8.0",
     "karma": "^0.13.10",
     "karma-chai": "^0.1.0",
-    "karma-jasmine": "^0.3.6",
-    "karma-coverage": "^0.5.1",
-    "karma-junit-reporter": "^0.3.3",
     "karma-chrome-launcher": "^0.2.1",
+    "karma-coverage": "^0.5.1",
     "karma-firefox-launcher": "^0.1.6",
     "karma-ie-launcher": "^0.2.0",
-    "karma-safari-launcher": "^0.1.1",
+    "karma-jasmine": "^0.3.6",
+    "karma-junit-reporter": "^0.3.3",
+    "karma-mocha": "^0.2.0",
     "karma-phantomjs-launcher": "^0.2.1",
+    "karma-safari-launcher": "^0.1.1",
     "mocha": "^2.2.5",
-    "karma-mocha": "^0.2.0",
+    "phantom": "0.8.4",
     "phantomjs": "^1.9.17",
-    "express": "4.0.0",
-    "body-parser": "1.11.0",
-    "phantom": "0.8.4"
+    "run-sequence": "^2.1.0"
   }
 }

pluginTester/index.html

@@ -16,7 +16,7 @@
     <link href="../styles/loading.css" rel="stylesheet">
     <link href="../styles/helper.css" rel="stylesheet">
     <link href="../styles/siteIcons.css" rel="stylesheet">
-    <link href="http://app.buildfire.com/styles/siteScreen.css" rel="stylesheet">
+    <link href="https://app.buildfire.com/styles/siteScreen.css" rel="stylesheet">
 
     <link href="styles/pulldown.css" rel="stylesheet">
 
@@ -65,7 +65,7 @@
                 </a>
             </li>
             <li>
-                <a ng-href="http://dev.buildfire.com" target="_blank"
+                <a ng-href="https://dev.buildfire.com" target="_blank"
                    class="parent primary-color-hover transition-third">
                     <p class="text margin-zero ellipsis transition-third">Submit Plugin</p>
                     <span class="icon icon-check-square transition-third"></span>
@@ -79,7 +79,7 @@
             </li>
             <li>
                 <a target="_blank" class="parent primary-color-hover transition-third"
-                   href="http://app.buildfire.com">
+                   href="https://app.buildfire.com">
                     <p class="text margin-zero ellipsis transition-third">Control Panel</p>
                     <span class="icon icon-window transition-third"></span>
                 </a>
@@ -182,6 +182,6 @@
 <script type="text/javascript" src="scripts/pullDownToRefresh.js"></script>
 
 
-<link href="http://app.buildfire.com/styles/bootstrapIcons.css" rel="stylesheet">
+<link href="https://app.buildfire.com/styles/bootstrapIcons.css" rel="stylesheet">
 </body>
 </html>

pluginTester/pages/controllers/indexCtrl.js

@@ -20,7 +20,7 @@ $app.controller('indexCtrl', ['$scope', function ($scope) {
     $scope.recentPlugins = recentPlugins;
 
 
-    $scope.dataTracer = "http://dev.buildfire.com/#/dataTracer/" + window.appContext.currentApp.appId
+    $scope.dataTracer = "https://dev.buildfire.com/#/dataTracer/" + window.appContext.currentApp.appId
         + "/" + window.appContext.currentPlugin.pluginPath
         + "/" + window.appContext.currentPlugin.instanceId
         + "/" + window.appContext.currentApp.keys.datastoreKey;

pluginTester/pages/controllers/loginCtrl.js

@@ -7,7 +7,7 @@
 			if ($scope.validate()) {
 				$scope.loggingIn = true;
 
-				$http.post('http://app.buildfire.com/api/login/controlPanel/', {
+				$http.post('https://app.buildfire.com/api/login/controlPanel/', {
 					email: $scope.username,
 					password: $scope.password
 				}, {bypassInterceptorForStatus: 404})

pluginTester/pages/templates/login.html

@@ -55,7 +55,7 @@
             </button>
         </div>
         <div class="bottom">
-            <a href="http://app.buildfire.com/pages/forgotPassword.html" class="access">I can't access my account.</a>
+            <a href="https://app.buildfire.com/pages/forgotPassword.html" class="access">I can't access my account.</a>
         </div>
     </form>
 </div>

pluginTester/scripts/loadScripts.js

@@ -1,5 +1,5 @@
 function _ScriptLoader(){
-    this.domain="http://app.buildfire.com/";
+    this.domain="https://app.buildfire.com/";
     window._appRoot = 'app/';
 
     this.scripts = [

pluginTester/scripts/overrides.js

@@ -27,7 +27,7 @@ postMaster.servicePluginAPIs.service.tag = 'service';
 				title: notification.title,
 				body: notification.text
 			}
-			, templateUrl: 'http://app.buildfire.com/app/pages/templates/modal.html'
+			, templateUrl: 'https://app.buildfire.com/app/pages/templates/modal.html'
 			, controller: 'modalCtrl'
 		};
 
@@ -110,10 +110,10 @@ postMaster.servicePluginAPIs.service.tag = 'service';
 	///
 
 //override the imageLibTemplate url
-	imageLibCurrentApp.imageLibTemplate = 'http://app.buildfire.com/pages/imageLib/imageLib.html';
-	postMaster.controlPluginAPI.actionItems.templateUrl = 'http://app.buildfire.com/pages/share/actionBuilder.html';
-	postMaster.widgetPluginAPI.actionItems.listTemplateUrl = 'http://app.buildfire.com/app/pages/templates/actionItemsListDialog.html';
-	postMaster.controlPluginAPI.pluginInstances.templateUrl = "http://app.buildfire.com/pages/plugins/pluginInstanceDialog/pluginInstanceDialog.html";
+	imageLibCurrentApp.imageLibTemplate = 'https://app.buildfire.com/pages/imageLib/imageLib.html';
+	postMaster.controlPluginAPI.actionItems.templateUrl = 'https://app.buildfire.com/pages/share/actionBuilder.html';
+	postMaster.widgetPluginAPI.actionItems.listTemplateUrl = 'https://app.buildfire.com/app/pages/templates/actionItemsListDialog.html';
+	postMaster.controlPluginAPI.pluginInstances.templateUrl = "https://app.buildfire.com/pages/plugins/pluginInstanceDialog/pluginInstanceDialog.html";
 	window.appContext.currentPlugin.pluginAPI = postMaster.controlPluginAPI;
 })();
 

pluginTester/scripts/siteConfig.js

@@ -1,12 +1,12 @@
 window.siteConfig = {
 	appId: 202
 	, endPoints: {
-		datastoreHost: 'http://datastore.buildfire.com',
+		datastoreHost: 'https://datastore.buildfire.com',
 		appHost: 'https://app.buildfire.com',
 		auth: "auth.buildfire.com",
-		authHost: "http://auth.buildfire.com",
+		authHost: "https://auth.buildfire.com",
 		pluginHost : "http://s3-us-west-2.amazonaws.com/pluginserver.prod/plugins",
-        socialHost : "http://social.buildfire.com"
+        socialHost : "https://social.buildfire.com"
 	}
 	, keys: {
 		datastoreKey: '123-ASD-TEST'