Commit 1e33f5d4 authored by Simon de la Rouviere's avatar Simon de la Rouviere

added bootstrap js

parent 93b93b23
module.exports = {
// ### Scripts
// Any scripts here set to false will never
// make it to the client, it's not packaged
// by webpack.
scripts: {
'transition': true,
'alert': true,
'button': true,
'carousel': true,
'collapse': true,
'dropdown': true,
'modal': true,
'tooltip': true,
'popover': true,
'scrollspy': true,
'tab': true,
'affix': true
},
// ### Styles
// Enable or disable certain less components and thus remove
// the css for them from the build.
styles: {
"mixins": true,
"normalize": true,
"print": true,
"scaffolding": true,
"type": true,
"code": true,
"grid": true,
"tables": true,
"forms": true,
"buttons": true,
"component-animations": true,
"glyphicons": true,
"dropdowns": true,
"button-groups": true,
"input-groups": true,
"navs": true,
"navbar": true,
"breadcrumbs": true,
"pagination": true,
"pager": true,
"labels": true,
"badges": true,
"jumbotron": true,
"thumbnails": true,
"alerts": true,
"progress-bars": true,
"media": true,
"list-group": true,
"panels": true,
"wells": true,
"close": true,
"modals": true,
"tooltip": true,
"popovers": true,
"carousel": true,
"utilities": true,
"responsive-utilities": true
}
};
@pre-border-color: @pre-bg; // hide the border.
......@@ -8,7 +8,7 @@ import { TXActions } from 'reflux-tx';
//import TXActions from "reflux-tx".TXActions;
//import TXComponent from "reflux-tx".TXComponent;
//import AccountBadge from "react-account-badge";
var web3 = require("./bootstrap.js");
var web3 = require("./web3_bootstrap.js");
//import Web3 from "web3";
//web3? Apparently it is "provided"?
......@@ -18,6 +18,9 @@ import FactoryPage from "./factorypage.jsx";
import FrontPage from "./frontpage.jsx";
import TokenPage from "./tokenpage.jsx";
import TokenSearchPage from "./tokensearchpage.jsx";
require('bootstrap-webpack!./bootstrap.config.js');
var $ = require('jquery');
console.log($);
//feels like webpack anti-pattern??
......
......@@ -3,11 +3,6 @@ import { Link } from "react-router";
//import AccountBadge from "react-account-badge";
//<AccountBadge web3={web3_rab} />
var NavBar = React.createClass({
getInitialState: function() {
return {
blockNumber: 0,
};
},
render: function() {
return (
<div>
......@@ -21,6 +16,7 @@ var NavBar = React.createClass({
<span className="icon-bar"></span>
</button>
<a className="navbar-brand" href="#">Factory</a>
<p className="navbar-text">Block Number: {this.props.blockNumber}</p>
</div>
<div className="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
......@@ -29,10 +25,6 @@ var NavBar = React.createClass({
<li><Link to={'/tokensearch'}>Interact With Token Contract</Link></li>
<li><Link to={'/factory'}>Create Token Contract</Link></li>
</ul>
<p className="navbar-text">Block Number: {this.props.blockNumber}</p>
</div>
</div>
</nav>
......
......@@ -28,6 +28,7 @@ module.exports = {
module: {
loaders: [
//{ test: /\.(js|jsx|es6)$/, exclude: /node_modules/, include: [/reflux-tx/], loader: "babel-loader"},
{ test: /bootstrap\/js\//, loader: 'imports?jQuery=jquery' },
{ test: /\.(js|jsx|es6)$/, exclude: /node_modules/, loader: "babel-loader"},
//localforage excluded due to "loose" option in babelrc being changed in babel 6.
//https://github.com/mozilla/localForage/issues/496
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment