Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Token-Factory
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bitsoko services
Token-Factory
Commits
1e33f5d4
Commit
1e33f5d4
authored
Apr 14, 2016
by
Simon de la Rouviere
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added bootstrap js
parent
93b93b23
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
74 additions
and
10 deletions
+74
-10
bootstrap.config.js
app/javascripts/bootstrap.config.js
+67
-0
bootstrap.config.less
app/javascripts/bootstrap.config.less
+1
-0
main.jsx
app/javascripts/main.jsx
+4
-1
navbar.jsx
app/javascripts/navbar.jsx
+1
-9
web3_bootstrap.js
app/javascripts/web3_bootstrap.js
+0
-0
webpack.config.js
webpack.config.js
+1
-0
No files found.
app/javascripts/bootstrap.config.js
0 → 100644
View file @
1e33f5d4
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
}
};
app/javascripts/bootstrap.config.less
0 → 100644
View file @
1e33f5d4
@pre-border-color: @pre-bg; // hide the border.
app/javascripts/main.jsx
View file @
1e33f5d4
...
...
@@ -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??
...
...
app/javascripts/navbar.jsx
View file @
1e33f5d4
...
...
@@ -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
>
...
...
app/javascripts/bootstrap.js
→
app/javascripts/
web3_
bootstrap.js
View file @
1e33f5d4
File moved
webpack.config.js
View file @
1e33f5d4
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment