deploy android

1 files changed, 55 insertions, 37 deletions

diff --git a/StoneIsland/platforms/android/assets/www/js/lib/_router.js b/StoneIsland/platforms/android/assets/www/js/lib/_router.js
index 19bd3247..91f29b55 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/_router.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/_router.js
@@ -4,53 +4,57 @@ var SiteRouter = Router.extend({
 	routeByHash: true,
 	
 	routes: {
-		'/':                  'intro',
-		'/intro':             'intro',
-    '/hub':               'hub',
-    '/story':             'story',
-    '/archive':           'archive',
+		'/':                   'intro',
+		'/intro':              'intro',
+    '/hub':                'hub',
+    '/story':              'story',
+    '/archive':            'archive',
 
-    '/store':             'collection',
-    '/store/closed':      'closed',
-    '/store/:code':       'product',
+    '/store':              'collection',
+    '/store/closed':       'closed',
+    '/store/:code':        'product',
 
-    '/account/login':     'login',
-    '/account/logout':    'logout',
-    '/account/signup':    'signup',
-    '/account/profile':   'profile',
-    '/account/payment':   'payment',
-    '/account/shipping':  'shipping',
-    '/account/orders':    'orders',
-    '/account/settings':  'settings',
+    '/account/login':      'login',
+    '/account/logout':     'logout',
+    '/account/signup':     'signup',
+    '/account/profile':    'profile',
+    '/account/payment':    'payment',
+    '/account/shipping':   'shipping',
+    '/account/orders':     'orders',
+    '/account/settings':   'settings',
 
-    '/page/terms':        'terms',
-    '/page/privacy':      'privacy',
-    '/page/returns':      'returns',
-    '/page/care':         'care',
+    '/page/terms':         'terms',
+    '/page/account_terms': 'account_terms',
+    '/page/privacy':       'privacy',
+    '/page/returns':       'returns',
+    '/page/care':          'care',
     
-    '/search':            'search',
+    '/search':             'search',
 
-    '/cart':              'cart.summary',
-    '/cart/summary':      'cart.summary',
-    '/cart/payment':      'cart.payment',
-    '/cart/shipping':     'cart.shipping',
-    '/cart/confirm':      'cart.confirm',
-    '/cart/thanks':       'cart.thanks',
-    '/cart/error':        'cart.error',
+    '/cart':               'cart.summary',
+    '/cart/summary':       'cart.summary',
+    '/cart/payment':       'cart.payment',
+    '/cart/shipping':      'cart.shipping',
+    '/cart/confirm':       'cart.confirm',
+    '/cart/thanks':        'cart.thanks',
+    '/cart/error':         'cart.error',
 	},
-	
+
+  terms_routes: ['terms','account_terms','privacy','returns','care','logout'],
+
 	initialize: function(){
 	  var fn
-	  for (var route in this.routes) {
-	    fn = this.routes[route]
-	    if (! this[fn]) {
-	      this[fn] = this.default_view(fn)
-	    }
-	  }
+    for (var route in this.routes) {
+      fn = this.routes[route]
+      if (! this[fn]) {
+        this[fn] = this.default_view(fn)
+      }
+    }
 	},
 	
   initial_route: null,
 	launch: function(){
+    console.log("LAUNCH!")
 	  if (this.initial_route) {
       this.parseRoute( this.initial_route )
 	  }
@@ -73,6 +77,7 @@ var SiteRouter = Router.extend({
   default_view: function(name){
     var fn = function(){
       console.log(name)
+      var n = [name]
       if (app.view != app.login && app.view != app.signin) {
         app.last_view = app.view
       }
@@ -80,7 +85,7 @@ var SiteRouter = Router.extend({
         app.view.hide()
       }
       if (name.match(/\./)) {
-        var n = name.split(".")
+        n = name.split(".")
         console.log(name, n)
         app.view = app[n[0]][n[1]]
       }
@@ -89,9 +94,22 @@ var SiteRouter = Router.extend({
       }
 
       // window.FirebasePlugin && window.FirebasePlugin.setScreenName(name)
-
+      console.log("view >>", app.view)
       app.header.set_back( !! app.view.back )
       app.view.show()
+
+      // var isTermsRoute = this.terms_routes.indexOf(name) !== -1
+      // var isCartRoute = n[0] === 'cart'
+      // if ( (isCartRoute || app.demand_consent && !isTermsRoute) && app.account.consent.check()) {
+      //   console.log('showed consent modal')
+      //   return
+      // }
+
+      var isTermsRoute = this.terms_routes.indexOf(name) !== -1
+      if (app.demand_consent && !isTermsRoute && app.account.consent.check()) {
+        console.log('showed consent modal')
+        return
+      }
     }.bind(this)
     return fn
   },