Close #591 - Add jquery, bootstrap and material to base bundle

eventoL · Oct 19, 2019 · 5a23f9e · 5a23f9e
1 parent 614480e
commit 5a23f9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/eventol/front/src/libs/base.js b/eventol/front/src/libs/base.js
@@ -1 +1,10 @@
 import './base.scss';
+
+import $ from 'jquery';
+
+window.jQuery = $;
+window.$ = $;
+
+require('bootstrap/dist/js/bootstrap');
+require('bootstrap-material-design/dist/js/ripples');
+require('bootstrap-material-design/dist/js/material');
diff --git a/eventol/manager/templates/base-main.html b/eventol/manager/templates/base-main.html
@@ -23,7 +23,6 @@
         <link rel="shortcut icon" type="image/png" href="{% static "favicon.ico" %}"/>
         {% render_bundle 'base' %}
 
-        <script src="{% static "manager/bower_components/jquery/dist/jquery.min.js" %}"></script>
         <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
 
         <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/icon?family=Material+Icons">
@@ -332,9 +331,6 @@
 </footer>
 
 {% block script %}
-    <script src="{% static "manager/bower_components/bootstrap/dist/js/bootstrap.min.js" %}"></script>
-    <script src="{% static "manager/bower_components/bootstrap-material-design/dist/js/ripples.min.js" %}"></script>
-    <script src="{% static "manager/bower_components/bootstrap-material-design/dist/js/material.min.js" %}"></script>
     {% block material %}
         <script>
             $(document).ready(function () {