diff --git a/gulp/backbone.js b/gulp/backbone.js index cf04631..6772f7c 100644 --- a/gulp/backbone.js +++ b/gulp/backbone.js @@ -20,12 +20,12 @@ gulp.task('bundleBackbone', function () { return b.bundle() .pipe(source('app.js')) .pipe(buffer()) - // .pipe(stripDebug()) + .pipe(stripDebug()) .pipe(rename('bundle.js')) .pipe(sourcemaps.init({ 'loadMaps': true })) // Add transformation tasks to the pipeline here. - // .pipe(uglify()) + .pipe(uglify()) .on('error', gutil.log) .pipe(sourcemaps.write('.')) .pipe(gulp.dest('./live/js')); diff --git a/src/gfx/stars_00.png b/src/gfx/stars_00.png index 5d65fc4..aff4bb2 100644 Binary files a/src/gfx/stars_00.png and b/src/gfx/stars_00.png differ diff --git a/src/gfx/stars_10.png b/src/gfx/stars_10.png index a214688..5374a34 100644 Binary files a/src/gfx/stars_10.png and b/src/gfx/stars_10.png differ diff --git a/src/gfx/stars_15.png b/src/gfx/stars_15.png index fd95a4c..9d5a0b2 100644 Binary files a/src/gfx/stars_15.png and b/src/gfx/stars_15.png differ diff --git a/src/gfx/stars_20.png b/src/gfx/stars_20.png index c6f8df0..1dbb2a6 100644 Binary files a/src/gfx/stars_20.png and b/src/gfx/stars_20.png differ diff --git a/src/gfx/stars_25.png b/src/gfx/stars_25.png index 5640357..bdaae73 100644 Binary files a/src/gfx/stars_25.png and b/src/gfx/stars_25.png differ diff --git a/src/gfx/stars_30.png b/src/gfx/stars_30.png index c54f98f..ecd31df 100644 Binary files a/src/gfx/stars_30.png and b/src/gfx/stars_30.png differ diff --git a/src/gfx/stars_35.png b/src/gfx/stars_35.png index 9b397c0..734c3c3 100644 Binary files a/src/gfx/stars_35.png and b/src/gfx/stars_35.png differ diff --git a/src/gfx/stars_40.png b/src/gfx/stars_40.png index fa1322b..77e49f6 100644 Binary files a/src/gfx/stars_40.png and b/src/gfx/stars_40.png differ diff --git a/src/gfx/stars_45.png b/src/gfx/stars_45.png index ff03dcb..a2ac7ce 100644 Binary files a/src/gfx/stars_45.png and b/src/gfx/stars_45.png differ diff --git a/src/gfx/stars_50.png b/src/gfx/stars_50.png index 1cfd836..322bfaa 100644 Binary files a/src/gfx/stars_50.png and b/src/gfx/stars_50.png differ diff --git a/src/gfx/yelp_logo.jpg b/src/gfx/yelp_logo.jpg index 5f259ac..f855429 100644 Binary files a/src/gfx/yelp_logo.jpg and b/src/gfx/yelp_logo.jpg differ diff --git a/src/gfx/yssdk_yelp_logo.png b/src/gfx/yssdk_yelp_logo.png index 112209b..cdb6840 100755 Binary files a/src/gfx/yssdk_yelp_logo.png and b/src/gfx/yssdk_yelp_logo.png differ diff --git a/src/img/android-chrome-192x192.png b/src/img/android-chrome-192x192.png index 511dc63..c927e7d 100644 Binary files a/src/img/android-chrome-192x192.png and b/src/img/android-chrome-192x192.png differ diff --git a/src/img/android-chrome-512x512.png b/src/img/android-chrome-512x512.png index 8ae4162..183c8c3 100644 Binary files a/src/img/android-chrome-512x512.png and b/src/img/android-chrome-512x512.png differ diff --git a/src/img/apple-touch-icon.png b/src/img/apple-touch-icon.png index 15d9f65..e754e6e 100644 Binary files a/src/img/apple-touch-icon.png and b/src/img/apple-touch-icon.png differ diff --git a/src/img/favicon-16x16.png b/src/img/favicon-16x16.png index 6cec02d..044d6df 100644 Binary files a/src/img/favicon-16x16.png and b/src/img/favicon-16x16.png differ diff --git a/src/img/favicon-32x32.png b/src/img/favicon-32x32.png index 48620a4..b0a96f0 100644 Binary files a/src/img/favicon-32x32.png and b/src/img/favicon-32x32.png differ diff --git a/src/img/mstile-150x150.png b/src/img/mstile-150x150.png index 12dc957..7607e6e 100644 Binary files a/src/img/mstile-150x150.png and b/src/img/mstile-150x150.png differ diff --git a/src/v1/js/Greet.js b/src/v1/js/Greet.js index 1575fe0..b01e405 100644 --- a/src/v1/js/Greet.js +++ b/src/v1/js/Greet.js @@ -44,6 +44,7 @@ const GreetView = Backbone.View.extend({ }, 'updateLocation': function(l) { console.log('>> Location has changed...'); + console.log(JSON.stringify(l.changed)); if (l.has('location')) { const location = l.get('location'); @@ -56,7 +57,7 @@ const GreetView = Backbone.View.extend({ console.log('>> No location yet'); }, 'render': function() { - console.log('>> Render greet'); + console.info('>> Greet:Render'); const todaySegment = this.model.get('todaySegment'); const atHome = this.model.get('atHome'); const atWork = this.model.get('atWork'); diff --git a/src/v1/js/Location.js b/src/v1/js/Location.js index 9c0ea66..d092357 100644 --- a/src/v1/js/Location.js +++ b/src/v1/js/Location.js @@ -97,7 +97,8 @@ const LocationModel = Backbone.Model.extend({ // console.log('>> NewLocation', JSON.stringify(newLocation)); // const distanceFromLast = distance(current.latitude, current.longitude, latitude, longitude); - if (!current /* || distanceFromLast > 1.5*/) + if (!current /* || distanceFromLast > 1.5*/) { + console.info('>> Location:geocoder request'); geocoder.reverse(latlong) .then(function(res) { console.log(JSON.stringify(res)); @@ -112,6 +113,8 @@ const LocationModel = Backbone.Model.extend({ console.error(err); this.set('location', newLocation); }); + + } else { newLocation.city = current.city; const distanceFromLast = distance(current.latitude, current.longitude, latitude, longitude); @@ -128,6 +131,7 @@ const LocationModel = Backbone.Model.extend({ } else if (distanceFromLastGeocode >= 2.0 || (timestamp - lastGeocode.timestamp > 1.8e+6) ) { console.log('Moved from previous', (timestamp - lastGeocode.timestamp > 1.8e+6)); + console.info('>> Location:geocoder request'); geocoder.reverse(latlong) .then(function(res) { newLocation.city = res[0].city; diff --git a/src/v1/js/Nearby.js b/src/v1/js/Nearby.js index a412950..28a0576 100644 --- a/src/v1/js/Nearby.js +++ b/src/v1/js/Nearby.js @@ -67,6 +67,7 @@ const NearbyModel = Backbone.Model.extend({ const hour = parseInt((new Date()).getHours().toString(), 10); const section = this.get('section'); console.log('>> Nearby section:', hour, section); + console.info('>> Nearby:request'); request({ 'url': `${window.loc}/fsexplore`, 'method': 'GET', @@ -129,7 +130,7 @@ const NearbyView = Backbone.View.extend({ console.log('nearby render'); }, 'render': function() { - console.log('Nearby:Render'); + console.info('>> Nearby:Render'); const totalResults = this.model.get('totalResults'); console.log('>> totalResults', totalResults); this.$el.empty(); diff --git a/src/v1/js/News.js b/src/v1/js/News.js index f18271d..bb88b42 100644 --- a/src/v1/js/News.js +++ b/src/v1/js/News.js @@ -57,6 +57,7 @@ const NewsModel = Backbone.Model.extend({ }, 'getNews': function() { // const ll = this.get('llShort'); + console.info('>> News:request'); request({ 'url': `${window.loc}/news`, 'method': 'GET' @@ -115,7 +116,7 @@ const NewsView = Backbone.View.extend({ }, 'render': function() { - console.log('News:Render'); + console.info('>> News:Render'); this.$el.empty(); diff --git a/src/v1/js/RightByMe.js b/src/v1/js/RightByMe.js index 46aedf3..14d85d1 100644 --- a/src/v1/js/RightByMe.js +++ b/src/v1/js/RightByMe.js @@ -29,7 +29,7 @@ const ByMeModel = Backbone.Model.extend({ }, 'getByMe': function() { const llSix = this.get('llFixed'); - + console.info('>> ByMe:request'); // const section = (partOfDay >= 11 && partOfDay <= 14) ? 'food' : 'topPicks'; request({ 'url': `${window.loc}/rightbyme`, @@ -124,7 +124,7 @@ const ByMeView = Backbone.View.extend({ console.log('>> ByMe No location yet'); }, 'render': function() { - console.log('>> ByMe render'); + console.info('>> ByMe:render'); // console.log(this.model); // console.log(this.model); diff --git a/src/v1/js/Weather.js b/src/v1/js/Weather.js index c5bd303..6f3ac72 100644 --- a/src/v1/js/Weather.js +++ b/src/v1/js/Weather.js @@ -92,6 +92,7 @@ const WeatherModel = Backbone.Model.extend({ }, 'getWeather': function() { // const ll = this.get('llShort'); + console.info('>> Weather:request'); const llFixed = this.get('llFixed'); request({ 'url': `${window.loc}/weather`, @@ -174,7 +175,7 @@ const WeatherView = Backbone.View.extend({ console.log('>> Weather No location yet'); }, 'render': function() { - console.log('Weather:Render'); + console.info('>> Weather:Render'); this.$el.empty(); const item = this.wCollection.first();