status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

import bootstrap in test_app

This commit is contained in:
Iuri Matias 2017-12-13 19:24:20 -05:00
parent 4106531bd7
commit ccb77051f8
5 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pipeline/pipeline.js
View File

@ -106,6 +106,17 @@ class Pipeline {
{ loader: "style-loader" },
{ loader: "css-loader" }
]
},
{
test: /\.scss$/,
use: [
{ loader: "style-loader" },
{ loader: "css-loader" }
]
},
{
test: /\.(png|woff|woff2|eot|ttf|svg)$/,
loader: 'url-loader?limit=100000'
}
]
}

2
package.json
View File

@ -26,6 +26,7 @@
"css-loader": "^0.28.7",
"ejs": "^2.5.7",
"ethereumjs-testrpc": "3.9.2",
"file-loader": "^1.1.5",
"finalhandler": "^0.5.0",
"follow-redirects": "^1.2.4",
"fs-extra": "^2.0.0",
@ -43,6 +44,7 @@
"toposort": "^1.0.0",
"underscore": "^1.8.3",
"underscore.string": "^3.3.4",
"url-loader": "^0.6.2",
"web3": "^0.19.1"
},
"author": "Iuri Matias <iuri.matias@gmail.com>",

4
test_app/app/index.html
View File

@ -1,9 +1,9 @@
<html>
<head>
<title>Embark - SimpleStorage Demo</title>
<link rel="stylesheet" href="css/app.css">
<!-- <link rel="stylesheet" href="css/app.css"> -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js"></script>
<script src="js/bootstrap.js"></script>
<!-- <script src="js/bootstrap.js"></script> -->
<script src="js/app.js"></script>
</head>
<body class="container">

6
test_app/app/js/index.js
View File

@ -1,6 +1,10 @@
/*globals $, SimpleStorage, document*/
import $ from './_vendor/jquery.min';
//import $ from './_vendor/jquery.min';
import $ from 'jquery';
import 'bootstrap';
import 'bootstrap/dist/css/bootstrap.min.css';
//import 'bootstrap/dist/js/bootstrap.min.js';
import EmbarkJS from 'Embark/EmbarkJS';
import SimpleStorage from 'Embark/contracts/SimpleStorage';

4
test_app/package.json
View File

@ -11,7 +11,9 @@
"homepage": "",
"devDependencies": {},
"dependencies": {
"bootstrap": "^3.3.6",
"embark-babel": "^1.0.0",
"embark-service": "./extensions/embark-service"
"embark-service": "./extensions/embark-service",
"jquery": "^1.11.3"
}
}