From bd37335b1ee040bc57c81fedc7a6eee1e24fbb6e Mon Sep 17 00:00:00 2001
From: Leandro Roberto <leandroroberto.br@gmail.com>
Date: Sun, 13 Jan 2019 02:04:15 -0200
Subject: [PATCH] =?UTF-8?q?add=20bootstrap=20ao=20projeto=20e=20a=20config?=
 =?UTF-8?q?ura=C3=A7=C3=A3o=20fixa=20de=20temas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl-frontend/package.json      | 3 +++
 sapl-frontend/src/theme/main.js | 5 +++++
 sapl-frontend/vue.config.js     | 1 -
 sapl/templates/base.html        | 4 ++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sapl-frontend/package.json b/sapl-frontend/package.json
index e2d9fa5a9..c08b966a7 100644
--- a/sapl-frontend/package.json
+++ b/sapl-frontend/package.json
@@ -8,7 +8,10 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "bootstrap": "^4.2.1",
     "dotenv": "^6.2.0",
+    "jquery": "^3.3.1",
+    "popper.js": "^1.14.6",
     "vue": "^2.5.21",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1",
diff --git a/sapl-frontend/src/theme/main.js b/sapl-frontend/src/theme/main.js
index e69de29bb..e6d46edb2 100644
--- a/sapl-frontend/src/theme/main.js
+++ b/sapl-frontend/src/theme/main.js
@@ -0,0 +1,5 @@
+import './scss/app.scss'
+
+//eslint-disable-next-line
+let theme_lib = THEME_CUSTOM
+console.log(theme_lib);
diff --git a/sapl-frontend/vue.config.js b/sapl-frontend/vue.config.js
index 996418949..72f7ca134 100644
--- a/sapl-frontend/vue.config.js
+++ b/sapl-frontend/vue.config.js
@@ -46,6 +46,5 @@ module.exports = {
         THEME_CUSTOM: JSON.stringify(process.env.THEME_CUSTOM)
       }])
       .end()
-      
   }
 }
diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index a27c70253..08ca060cb 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -29,7 +29,7 @@
                               {# Scripts #}
                               {# modernizr must be in head (see http://modernizr.com/docs/#installing) #}
       {% endcomment %}
-            {% render_bundle 'hellow' 'css' %}
+            {% render_bundle 'theme' 'css' %}
 
     {% endblock %}
   </head>
@@ -238,7 +238,7 @@
     {% endif %}
 
     {% block foot_js %}
-      {% render_bundle 'hellow' 'js' %}
+      {% render_bundle 'theme' 'js' %}
 
       {% comment "" %}