diff options
| -rw-r--r-- | src/web/js/actions/MenuActions.js | 1 | ||||
| -rw-r--r-- | src/web/js/components/Menu.react.js | 38 | ||||
| -rw-r--r-- | src/web/js/stores/MenuStore.js | 4 | ||||
| -rw-r--r-- | src/web/views/views.py | 4 |
4 files changed, 33 insertions, 14 deletions
diff --git a/src/web/js/actions/MenuActions.js b/src/web/js/actions/MenuActions.js index 9502eb6d..c3cc95bc 100644 --- a/src/web/js/actions/MenuActions.js +++ b/src/web/js/actions/MenuActions.js @@ -10,6 +10,7 @@ var MenuActions = { JarrDispatcher.dispatch({ type: MenuActionTypes.RELOAD_MENU, categories: payload.categories, + feed_in_error: payload.feed_in_error, all_unread_count: payload.all_unread_count, }); }); diff --git a/src/web/js/components/Menu.react.js b/src/web/js/components/Menu.react.js index 7f5f17bc..d44e7bd3 100644 --- a/src/web/js/components/Menu.react.js +++ b/src/web/js/components/Menu.react.js @@ -1,6 +1,7 @@ var React = require('react'); var Button = require('react-bootstrap/lib/Button'); var ButtonGroup = require('react-bootstrap/lib/ButtonGroup'); +var Badge = require('react-bootstrap/lib/Badge'); var MenuStore = require('../stores/MenuStore'); var MenuActions = require('../actions/MenuActions'); @@ -10,25 +11,28 @@ var FeedItem = React.createClass({ propTypes: {feed_id: React.PropTypes.number.isRequired, title: React.PropTypes.string.isRequired, unread: React.PropTypes.number.isRequired, + error_count: React.PropTypes.number.isRequired, icon_url: React.PropTypes.string, }, render: function() { - var unread = undefined; - var icon = undefined; + var icon = null; + var badge_unread = null; + var badge_error = null; if(this.props.icon_url){ icon = (<img width="16px" src={this.props.icon_url} />); } else { icon = (<span className="glyphicon glyphicon-ban-circle" />); } if(this.props.unread){ - unread = ( - <span className="badge pull-right"> - {this.props.unread} - </span> - ); + badge_unread = <Badge pullRight>{this.props.unread}</Badge>; + } + if(this.props.error_count == 6) { + badge_unread = <Badge pullRight error>error</Badge>; + } else if(this.props.error_count > 3) { + badge_unread = <Badge pullRight warning>warn</Badge>; } return (<li onMouseDown={this.handleClick}> - {icon} {this.props.title} {unread} + {icon}{this.props.title}{badge_unread}{badge_error} </li> ); }, @@ -56,6 +60,7 @@ var Category = React.createClass({ }).map(function(feed) { return (<FeedItem key={"feed" + feed.id} feed_id={feed.id} title={feed.title} unread={feed.unread} + error_count={feed.error_count} icon_url={feed.icon_url} />); }); var unread = undefined; @@ -79,10 +84,18 @@ var Category = React.createClass({ var Menu = React.createClass({ getInitialState: function() { - return {filter: 'all', categories: [], all_unread_count: 0}; + return {filter: 'all', categories: [], + feed_in_error: false, all_unread_count: 0}; }, render: function() { var filter = this.state.filter; + var error_button = null; + if (this.state.feed_in_error) { + error_button = (<Button active={this.state.filter == "error"} + onMouseDown={MenuActions.setFilterError} + bsSize="small" bsStyle="warning">Error</Button> + ); + } return (<div id="sidebar" data-spy="affix" role="navigation" className="col-md-2 sidebar sidebar-offcanvas pre-scrollable hidden-sm hidden-xs affix"> <ButtonGroup> @@ -92,10 +105,8 @@ var Menu = React.createClass({ <Button active={this.state.filter == "unread"} onMouseDown={MenuActions.setFilterUnread} bsSize="small">Unread</Button> - <Button active={this.state.filter == "error"} - onMouseDown={MenuActions.setFilterError} - bsSize="small" bsStyle="warning">Error</Button> - </ButtonGroup> + {error_button} + </ButtonGroup> {this.state.categories.map(function(category){ return (<Category key={"cat" + category.id} filter={filter} @@ -119,6 +130,7 @@ var Menu = React.createClass({ var datas = MenuStore.getAll(); this.setState({filter: datas.filter, categories: datas.categories, + feed_in_error: datas.feed_in_error, all_unread_count: datas.all_unread_count}); }, }); diff --git a/src/web/js/stores/MenuStore.js b/src/web/js/stores/MenuStore.js index d7478091..016b33f2 100644 --- a/src/web/js/stores/MenuStore.js +++ b/src/web/js/stores/MenuStore.js @@ -6,7 +6,8 @@ var assign = require('object-assign'); var MenuStore = assign({}, EventEmitter.prototype, { - _datas: {filter: 'all', categories: [], all_unread_count: 0}, + _datas: {filter: 'all', categories: [], + all_unread_count: 0, feed_in_error: false}, getAll: function() { return this._datas; }, @@ -35,6 +36,7 @@ MenuStore.dispatchToken = JarrDispatcher.register(function(action) { switch(action.type) { case MenuActionTypes.RELOAD_MENU: MenuStore._datas['categories'] = action.categories; + MenuStore._datas['feed_in_error'] = action.feed_in_error; MenuStore._datas['all_unread_count'] = action.all_unread_count; MenuStore.emitChange(); break; diff --git a/src/web/views/views.py b/src/web/views/views.py index cc9b421c..1b079d9f 100644 --- a/src/web/views/views.py +++ b/src/web/views/views.py @@ -244,10 +244,13 @@ def get_menu(): categories = {c.id: c.dump() for c in CategoryController(g.user.id).read()} categories[0] = {'name': 'No category', 'id': 0} unread = ArticleController(g.user.id).count_by_feed(readed=False) + feed_in_error = False for cat_id in categories: categories[cat_id]['unread'] = 0 categories[cat_id]['feeds'] = [] for feed in FeedController(g.user.id).read(): + if feed.error_count > 3: + feed_in_error = True feed = feed.dump() feed['category_id'] = feed['category_id'] or 0 feed['unread'] = unread.get(feed['id'], 0) @@ -256,6 +259,7 @@ def get_menu(): categories[feed['category_id']]['unread'] += feed['unread'] categories[feed['category_id']]['feeds'].append(feed) return jsonify(**{'categories': list(categories.values()), + 'feed_in_error': feed_in_error, 'all_unread_count': sum(unread.values())}) |