resolve merge conflict on release

ottemo · Apr 5, 2016 · 1d65ca8 · 1d65ca8
2 parents 8abfb05 + ca42060
commit 1d65ca8
Show file tree

Hide file tree

Showing 133 changed files with 1,737 additions and 1,281 deletions.
diff --git a/config/demo-prod.json b/config/demo-prod.json
@@ -1,6 +1,6 @@
 {
     "useStrict"    : "use strict",
-    "apiUrl"       : "https://api.demo.ottemo.io",
+    "apiUrl"       : "https://api-demo.ottemo.io",
     "mediaPath"    : "https://demo.ottemo.io/media/",
     "itemsPerPage" : "15"
 }
diff --git a/config/kg-prod.json b/config/kg-prod.json
@@ -1,6 +1,6 @@
 {
     "useStrict"    : "",
     "apiUrl"       : "https://api.karigran.com",
-    "mediaPath"    : "media/",
+    "mediaPath"    : "https://karigran.com/media/",
     "itemsPerPage" : "15"
 }
diff --git a/config/mp-prod.json b/config/mp-prod.json
@@ -1,6 +1,6 @@
 {
     "useStrict"    : "",
     "apiUrl"       : "https://api.poconovapes.com",
-    "mediaPath"    : "media/",
+    "mediaPath"    : "https://poconovapes.com/media/",
     "itemsPerPage" : "15"
 }
diff --git a/config/mp-staging.json b/config/mp-staging.json
@@ -1,6 +1,6 @@
 {
     "useStrict"    : "use strict",
-    "apiUrl"     : "http://api.mp.staging.ottemo.io",
+    "apiUrl"       : "http://api.mp.staging.ottemo.io",
     "mediaPath"    : "http://mp.staging.ottemo.io/media/",
     "itemsPerPage" : "15"
 }
diff --git a/config/rk-prod.json b/config/rk-prod.json
@@ -1,6 +1,6 @@
 {
     "useStrict"    : "",
     "apiUrl"       : "https://api.richkidsbrand.com",
-    "mediaPath"    : "media/",
+    "mediaPath"    : "https://richkidsbrand.com/media/",
     "itemsPerPage" : "15"
 }
diff --git a/config/rk-staging.json b/config/rk-staging.json
@@ -1,6 +1,6 @@
 {
     "useStrict"    : "use strict",
-    "apiUrl"     : "http://api.rk.staging.ottemo.io",
+    "apiUrl"       : "http://api.rk.staging.ottemo.io",
     "mediaPath"    : "http://rk.staging.ottemo.io/media/",
     "itemsPerPage" : "15"
 }

diff --git a/deploy.sh b/deploy.sh
@@ -26,7 +26,7 @@ if [ "$BRANCH" == 'develop'  ]; then
         HOST=mp-staging    
     fi
     # gulp build on remote host
-    ssh ottemo@$REMOTE_HOST "cd $SRCDIR && npm install && gulp build --api=${HOST}"
+    ssh ottemo@$REMOTE_HOST "cd $SRCDIR && npm install && gulp build --env=staging --config=${HOST}"
 
     echo ""
     echo RESTORING DIST DIRECTORY.

diff --git a/gulp.config.js b/gulp.config.js
@@ -1,67 +1,86 @@
+/*jshint node:true */
+
 module.exports = function() {
 
     var src = './src/';
     var app = src + 'app/';
+    var email = src +'email/';
+
     var temp = './tmp/';
 
     var config = {
+        // Reserved and written to in gulpfile.js
+        env: '',
+        settings: '',
 
         /************** Paths ****************/
         build: 'dist/',
+
+        // App
         fonts: app + '_fonts/**/*.{otf,svg,eot,ttf,woff,woff2}',
         html: {
-            all: app + '**/*.html',
-            root: app + '*.html'
+            root: app + '*.html',
+            nonRoot: [
+                app + '**/*.html',
+                '!' + email + '**/*',
+                '!' + app + '*.html',
+            ],
         },
         media: [
             // Ignore media, declaring the _images folder directly moves all of its contents
             // without the container folder getting in the way
-            '!' + app + '_fonts/*',
             app + '_images/**/*.{png,gif,jpg,jpeg,ico,svg,mp4,ogv,webm,pdf}',
             app + '**/*.{png,gif,jpg,jpeg,ico,svg,mp4,ogv,webm,pdf}',
+            '!' + app + '_fonts/*',
         ],
         misc: app + '*.{htaccess,ico,xml}',
         robots: {
             default: app + 'robots.txt',
-            prod: app + 'robots.txt'
+            prod: app + 'robots.txt',
         },
         styles: {
             root: app + 'app.scss',
             all: [
                 app + '**/*.scss',
-                app + '**/*.css'
-            ]
+                app + '**/*.css',
+            ],
         },
         scripts: {
             app: [
-                '!' + app + '_lib/**/*',    // don't grab libs
-                temp + 'config.js',         // this is a built file
-                app + '_scripts/*.js',
+                temp + 'config.js', // this is a built file
                 app + '**/init.js',
-                app + '**/*.js'
+                app + '**/*.js',
+                '!' + app + '_lib/**/*', // don't clobber lib
             ],
             lib: [
-                // We only grab libs that are minified
-                // so feel free to include non-minified reference files
                 app + '_lib/jquery.min.js',
                 app + '_lib/angular.min.js',
-                app + '_lib/**/*.min.js'
-            ]
+                app + '_lib/**/*.min.js',
+            ],
         },
+
+        // Emails
+        email: [
+            // ignore built files
+            email + '*.html',
+            '!' + email + '*.inline.html',
+        ],
+
+        // Temp
         temp: temp,
 
         /************** Settings ****************/
         node: {
             port: '9000',
-            lrPort: '35729' // not used?
+            lrPort: '35729', // not used?
         },
         sassSettings: {
             // outputStyle: 'compressed',
             // precision: 8,
         },
         uglifySettings: {
-            mangle: false
-        }
+            mangle: false,
+        },
     };
 
     return config;