From c542f58b99e0bd625f52e1ac9c3d2ad7d9ee4bd5 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Fri, 22 Jan 2016 17:26:56 +0100 Subject: adding basic bootstrap --- package.json | 4 +- src/web/js/actions/MenuActions.js | 1 - src/web/js/components/Menu.react.js | 20 ++- src/web/js/components/MiddlePanel.react.js | 20 ++- src/web/static/js/articles.js | 191 ----------------------------- src/web/static/js/bootstrap.min.js | 1 - src/web/static/js/jquery.js | 4 - src/web/templates/layout.html | 2 +- 8 files changed, 38 insertions(+), 205 deletions(-) delete mode 100644 src/web/static/js/articles.js delete mode 120000 src/web/static/js/bootstrap.min.js delete mode 100644 src/web/static/js/jquery.js diff --git a/package.json b/package.json index e9c12b31..e5a3b0d1 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,9 @@ "jquery": "^2.2.0", "keymirror": "~0.1.0", "object-assign": "^1.0.0", - "react": "^0.12.0" + "react": "^0.14.0", + "react-dom": "^0.14.0", + "react-bootstrap": "^0.14.0" }, "devDependencies": { "browserify": "^6.2.0", diff --git a/src/web/js/actions/MenuActions.js b/src/web/js/actions/MenuActions.js index f02ea5a0..558bd857 100644 --- a/src/web/js/actions/MenuActions.js +++ b/src/web/js/actions/MenuActions.js @@ -3,7 +3,6 @@ var MenuActionTypes = require('../constants/JarrConstants').MenuActionTypes; var jquery = require('jquery'); - var MenuActions = { // PARENT FILTERS reload: function() { diff --git a/src/web/js/components/Menu.react.js b/src/web/js/components/Menu.react.js index caf8c3a8..c1cee9de 100644 --- a/src/web/js/components/Menu.react.js +++ b/src/web/js/components/Menu.react.js @@ -1,4 +1,7 @@ var React = require('react'); +var Button = require('react-bootstrap/lib/Button'); +var ButtonGroup = require('react-bootstrap/lib/ButtonGroup'); + var MenuStore = require('../stores/MenuStore'); var MenuActions = require('../actions/MenuActions'); var MiddlePanelActions = require('../actions/MiddlePanelActions'); @@ -85,11 +88,22 @@ var Category = React.createClass({ var Menu = React.createClass({ getInitialState: function() { - return {categories: [], all_unread_count: 0}; + return {filter: 'all', categories: [], all_unread_count: 0}; }, render: function() { return (