');
html.push(this.templateCurrently(currently));
html.push(this.templateForecast(forcastToday));
html.push(this.templateDetails(details));
diff --git a/src/v1/js/Nearby.js b/src/v1/js/Nearby.js
index bc0ca88..68fb729 100644
--- a/src/v1/js/Nearby.js
+++ b/src/v1/js/Nearby.js
@@ -25,7 +25,7 @@ const fsItemView = Backbone.View.extend({
'tagName': 'div',
'className': 'itemRow mui--align-middle',
'template': _.template(`
-<%= name %> <%= category %> `),
+
<%= name %> <%= category %> `),
'initialize': function() {
this.render();
},
@@ -36,6 +36,7 @@ const fsItemView = Backbone.View.extend({
},
'render': function() {
+ console.log(this.model.attributes);
this.$el.html(this.template(this.model.toJSON()));
}
});
@@ -136,7 +137,7 @@ const NearbyView = Backbone.View.extend({
this.fsCollection.bind('reset', this.render, this);
this.eventBus.on('focused', this.focused, this);
- this.other = $('
arrow_forward Other locations
');
+ this.other = $(' Other locations
');
},
'events': {
'click .itemRow': 'doClick'
@@ -176,7 +177,7 @@ const NearbyView = Backbone.View.extend({
console.log('Do click', d);
const id = get(d, 'currentTarget.dataset.id', '');
console.log(id);
-
+ this.eventBus.trigger('showVenueDetail', id);
const fsdetail = new FSDetailView({ 'fsID':id });
}, 'focused': function() {
console.log('>> Nearby received focus msg');
diff --git a/src/v1/js/News.js b/src/v1/js/News.js
index 5a8a5b8..09b2e35 100644
--- a/src/v1/js/News.js
+++ b/src/v1/js/News.js
@@ -108,7 +108,7 @@ const NewsView = Backbone.View.extend({
Latest news
- arrow_forward More news
+ More news
`),
diff --git a/src/v1/js/NewsList.js b/src/v1/js/NewsList.js
index ec560c4..70d7b08 100644
--- a/src/v1/js/NewsList.js
+++ b/src/v1/js/NewsList.js
@@ -18,7 +18,7 @@ const newsCollection = new NewsCollection();
const NewsItemView = Backbone.View.extend({
'tagName': 'div',
- 'className' : 'newsItem mui-container',
+ 'className' : 'newsItem',
'template': _.template(`
<%=title%>
diff --git a/src/v1/js/RightByMe.js b/src/v1/js/RightByMe.js
index 08095f9..8ba8fa3 100644
--- a/src/v1/js/RightByMe.js
+++ b/src/v1/js/RightByMe.js
@@ -4,6 +4,7 @@ const Backbone = require('backbone');
const request = require('request');
const { get, isEmpty } = require('lodash');
const { maybePluralize } = require('./libs/utils');
+const templates = require('./libs/templates');
const ByMeModel = Backbone.Model.extend({
'initialize': function() {
@@ -77,53 +78,7 @@ const ByMeView = Backbone.View.extend({
'id':'byme',
'className': '',
'template': _.template(''),
- 'yelpTemplate': _.template(`
-
- `),
- 'tipsTemplate': _.template(`
-
-
-
-
-
-<%= yelp.reviewCount %> review
-
-
-
-
-
-
-
- `),
- 'imagesTemplate': _.template(`
- Tips
-
- <%_.forEach(tips, function(i) {%>
-
-
- <%=i %>
-
- <%}) %>
-
-
- `),
- 'tweetsTemplate': _.template(`
-
- <%_.forEach(images, function(i) {%>
-
-
- 
-
- <%}) %>
-
-
- `),
+
'initialize': function(options) {
this.eventBus = options.eventBus;
this.location = options.location;
@@ -169,16 +124,16 @@ const ByMeView = Backbone.View.extend({
// this.imagesTemplate(this.model.toJSON()), this.yelpTemplate(this.model.toJSON()), this.tipsTemplate(this.model.toJSON())
if (!isEmpty(m.images))
- contents.push(this.imagesTemplate(m));
+ contents.push(templates.imagesTemplate(m));
if (!isEmpty(m.yelp))
- contents.push(this.yelpTemplate(m));
+ contents.push(templates.yelpTemplate(m));
if (!isEmpty(m.tips))
- contents.push(this.tipsTemplate(m));
+ contents.push(templates.tipsTemplate(m));
if (!isEmpty(m.tweets))
- contents.push(this.tweetsTemplate(m));
+ contents.push(templates.tweetsTemplate(m));
this.$el.html(contents.join(''));
// console.log(this.el);
diff --git a/src/v1/js/Traffic.js b/src/v1/js/Traffic.js
index 65aaf7a..8a54631 100644
--- a/src/v1/js/Traffic.js
+++ b/src/v1/js/Traffic.js
@@ -37,9 +37,9 @@ const TrafficModel = Backbone.Model.extend({
console.log('((hour >= 7) && (hour <= 9))', ((hour >= 7) && (hour <= 9)));
console.log('((hour >= 17) && (hour <= 19))', ((hour >= 17) && (hour <= 19)));
let delay;
- if (day === 0 || day === 6)
+ if (day === 0 || day === 6)
delay = toHour();
- else
+ else
delay = ( ((hour >= 7) && (hour <= 9)) || ((hour >= 17) && (hour <= 19)) ) ? 600000 : toHour();
console.log('Delay', delay);
@@ -141,7 +141,7 @@ const TrafficView = Backbone.View.extend({
},
'template': _.template(`
Tweets
-
- <%_.forEach(tweets, function(i) {%>
-
-
- <%=i %>
-
- <%}) %>
-
-
diff --git a/src/v1/js/VenueDetail.js b/src/v1/js/VenueDetail.js
new file mode 100644
index 0000000..1f38fcf
--- /dev/null
+++ b/src/v1/js/VenueDetail.js
@@ -0,0 +1,106 @@
+const $ = require('jquery');
+const _ = require('underscore');
+const Backbone = require('backbone');
+const request = require('request');
+const { get, isEmpty } = require('lodash');
+const { createPanel, addPanel } = require('./libs/panel');
+
+const templates = require('./libs/templates');
+
+const VenueDetailModel = Backbone.Model.extend({
+ 'initialize': function() {
+ this.listenTo(this, 'change:id', this.newId);
+ },
+ 'newId': function() {
+ console.log('>> ID changed:', this.get('id'));
+ this.getVenue();
+ },
+ 'getVenue': function() {
+ const id = this.get('id');
+ request({
+ 'url': `${window.loc}/nearbydetail`,
+ 'method': 'GET',
+ 'qs': {
+ 'id': id
+ }
+ }, function(err, res, body) {
+ console.log('statusCode', res.statusCode);
+ if (err)
+ console.error(err);
+ else{
+ // console.log(body);
+ const fsJSON = JSON.parse(body);
+ // console.log(fsJSON);
+
+ this.set('details', fsJSON);
+ // console.log(body);
+ }
+ }.bind(this));
+ }
+
+});
+
+const VenueDetailView = Backbone.View.extend({
+ 'initialize': function(options) {
+ this.eventBus = options.eventBus;
+
+ this.model.bind('change:details', this.doRender, this);
+ this.eventBus.on('showVenueDetail', this.showNewsPanel, this);
+ },
+
+ 'showNewsPanel': function(id) {
+ console.log('Showing venue details', id);
+ const prevId = this.model.get('id');
+
+ this.model.set('id', id);
+
+ this.$newPanel = createPanel({ 'title':'Venue details', 'divId':'VenueDetail' });
+
+ this.$el = addPanel(this.$newPanel);
+
+ this.$el.empty();
+ this.$newPanel.show();
+
+ if (prevId === id)
+ this.doRender();
+ },
+ 'events': {
+ 'click .closebutton': 'doClick'
+ },
+ 'doClick': function(d) {
+ console.log('Do click', d);
+ const id = get(d, 'currentTarget', '');
+ console.log(id);
+ // this.eventBus.trigger('showNews', id);
+ },
+ 'doClose': function(d) {
+ console.log('close??');
+ },
+ 'doRender': function() {
+ const contents = [];
+ const m = this.model.get('details');
+ // this.imagesTemplate(this.model.toJSON()), this.yelpTemplate(this.model.toJSON()), this.tipsTemplate(this.model.toJSON())
+
+ contents.push(templates.venueTitle(m));
+
+ if (!isEmpty(m.images))
+ contents.push(templates.imagesTemplate(m));
+
+ if (!isEmpty(m.yelp))
+ contents.push(templates.yelpTemplate(m));
+
+ if (!isEmpty(m.tips))
+ contents.push(templates.tipsTemplate(m));
+
+ if (!isEmpty(m.tweets))
+ contents.push(templates.tweetsTemplate(m));
+
+ contents.push(templates.openInFS(m));
+ this.$el.html(contents.join(''));
+
+ }
+
+});
+
+module.exports = { VenueDetailModel, VenueDetailView };
+
diff --git a/src/v1/js/Weather.js b/src/v1/js/Weather.js
index 8bb8004..68d43a6 100644
--- a/src/v1/js/Weather.js
+++ b/src/v1/js/Weather.js
@@ -40,7 +40,7 @@ const weatherItemView = Backbone.View.extend({
For <%=city%> to <%= readdate %>
<%= dest.toLowerCase() %> <%=readable%> to <%= dest.toLowerCase() %>
+ mui--align-middle "> <%=readable%> to <%= dest.toLowerCase() %>
<%=traffic %>
- arrow_forward See forecast
+ See forecast
`),
'initialize': function() {
@@ -201,7 +201,7 @@ const WeatherView = Backbone.View.extend({
console.log('>> Weather received focus msg');
if (!this.model.has('log')) {
console.log('No log yet');
-
+
return ;
}
const now = new Date().getTime();
diff --git a/src/v1/js/app.js b/src/v1/js/app.js
index b3174c3..d400364 100644
--- a/src/v1/js/app.js
+++ b/src/v1/js/app.js
@@ -14,6 +14,7 @@ const { NewsModel, NewsView } = require('./News');
const { NewsCardModel, NewsCardView } = require('./NewsViewer');
const { NewsListModel, NewsListView } = require('./NewsList');
const { ByMeModel, ByMeView } = require('./RightByMe');
+const { VenueDetailModel, VenueDetailView } = require('./VenueDetail');
const { AgendaModel, AgendaView } = require('./Agenda');
const { TrafficModel, TrafficView } = require('./Traffic');
var app = app || {};
@@ -60,7 +61,7 @@ else
app.newsCard = new NewsCardView({ 'model': new NewsCardModel(), 'eventBus': app.eventBus });
- app.newsList = new NewsListView({'model': new NewsListModel(), 'eventBus' : app.eventBus});
+ app.newsList = new NewsListView({ 'model': new NewsListModel(), 'eventBus' : app.eventBus });
app.news = new NewsView({ 'model': new NewsModel(), 'eventBus': app.eventBus, 'el':'#newsShell' });
@@ -70,6 +71,8 @@ else
app.traffic = new TrafficView({ 'model': new TrafficModel(), 'eventBus': app.eventBus, 'location': app.locationModel, 'el':'#traffic' });
+ app.newsCard = new VenueDetailView({ 'model': new VenueDetailModel(), 'eventBus': app.eventBus });
+
app.updateOnlineStatus = function(event) {
if (navigator.onLine)
// handle online status
diff --git a/src/v1/js/libs/panel.js b/src/v1/js/libs/panel.js
index 63b4850..dd00ddc 100644
--- a/src/v1/js/libs/panel.js
+++ b/src/v1/js/libs/panel.js
@@ -10,7 +10,7 @@ function createPanel(params) {
@@ -22,7 +22,7 @@ function createPanel(params) {
-
+
diff --git a/src/v1/js/libs/reducers.js b/src/v1/js/libs/reducers.js
index fe35174..08b8d29 100644
--- a/src/v1/js/libs/reducers.js
+++ b/src/v1/js/libs/reducers.js
@@ -88,7 +88,7 @@ const reduceNearby = function(item) {
obj.id = get(item, 'venue.id', '');
obj.name = get(item, 'venue.name', '');
obj.category = get(categories[0], 'name', '');
- obj.icon = `${get(categories[0], 'icon.prefix', '')}${get(categories[0], 'icon.suffix', '')}`;
+ obj.icon = `${get(categories[0], 'icon.prefix', '')}32${get(categories[0], 'icon.suffix', '')}`;
return obj;
};
diff --git a/src/v1/js/libs/templates.js b/src/v1/js/libs/templates.js
new file mode 100644
index 0000000..0092f0b
--- /dev/null
+++ b/src/v1/js/libs/templates.js
@@ -0,0 +1,67 @@
+const _ = require('underscore');
+
+const templates = {
+
+ 'empty': _.template(''),
+ 'yelpTemplate': _.template(`
+
+ `),
+ 'tipsTemplate': _.template(`
+
+
+
+
+
+<%= yelp.reviewCount %> review
+
+
+
+
+
+
+
+ `),
+ 'imagesTemplate': _.template(`
+
+
+ Tips
+
+
+ <%_.forEach(tips, function(i) {%>
+
+
+ <%=i %>
+
+ <%}) %>
+
+
+ `),
+ 'tweetsTemplate': _.template(`
+
+ <%_.forEach(images, function(i) {%>
+
+
+
+
+ <%}) %>
+
+
+ `),
+ 'venueTitle' : _.template(`
+
+
+ Tweets
+
+
+ <%_.forEach(tweets, function(i) {%>
+
+
+ <%=i %>
+
+ <%}) %>
+ <%=name %>
+ `),
+ 'openInFS' : _.template(`
+
+ `)
+};
+
+module.exports = templates;