fixing js dependencies
authorHarris Baptiste <harris.baptiste@iri.centrepompidou.fr>
Fri, 01 Jul 2016 11:15:37 +0200
changeset 44 6730ec4d7e37
parent 43 ccc449ef6f16
child 45 ca0bb73ac8b5
fixing js dependencies
README.md
src/iconolab/static/iconolab/js/iconolab-bundle/package.json
src/iconolab/templates/iconolab_base.html
--- a/README.md	Fri Jul 01 10:40:02 2016 +0200
+++ b/README.md	Fri Jul 01 11:15:37 2016 +0200
@@ -7,7 +7,7 @@
 
 ```
 
-2. Move to src/iconolab/static/js to install js dependencies.
+2. Move to src/iconolab/static/js/iconolab-bundle to install js dependencies.
 Make sure your have installed nodejs then run the command bellow
 
 ```
@@ -17,7 +17,7 @@
 3. To recreate the bundle file that lives in dist/
 
 ```
-npm build
+npm run sbuild
 
 ```
 
--- a/src/iconolab/static/iconolab/js/iconolab-bundle/package.json	Fri Jul 01 10:40:02 2016 +0200
+++ b/src/iconolab/static/iconolab/js/iconolab-bundle/package.json	Fri Jul 01 11:15:37 2016 +0200
@@ -9,7 +9,13 @@
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
   },
   "dependencies": {
+    "bootstrap": "^3.3.6",
+    "event-emitter": "^0.3.4",
+    "expose-loader": "^0.7.1",
+    "font-awesome": "^4.6.3",
     "import": "0.0.6",
+    "imports-loader": "^0.6.5",
+    "jquery": "^3.0.0",
     "loader": "^2.1.1",
     "snapsvg": "^0.4.0",
     "vue": "^2.0.0-alpha.8",
--- a/src/iconolab/templates/iconolab_base.html	Fri Jul 01 10:40:02 2016 +0200
+++ b/src/iconolab/templates/iconolab_base.html	Fri Jul 01 11:15:37 2016 +0200
@@ -13,8 +13,8 @@
 		{% block page_js %} {% endblock %}
 
 		{% block main_css %}		
-			<link rel="stylesheet" href="{% static 'iconolab/js/node_modules/bootstrap/dist/css/bootstrap.min.css' %}">
-			<link rel="stylesheet" href="{% static 'iconolab/js/node_modules/font-awesome/css/font-awesome.min.css' %}">
+			<link rel="stylesheet" href="{% static 'iconolab/js/iconolab-bundle/node_modules/bootstrap/dist/css/bootstrap.min.css' %}">
+			<link rel="stylesheet" href="{% static 'iconolab/js/iconolab-bundle/node_modules/font-awesome/css/font-awesome.min.css' %}">
 			<link rel="stylesheet" href="{% static 'iconolab/css/iconolab.css' %}">
 		{% endblock %}