From 40fe596e1100091debbb1a7af8e627241d452540 Mon Sep 17 00:00:00 2001
From: Chaim Lev-Ari <chiptus@gmail.com>
Date: Sun, 14 Oct 2018 19:45:54 +0300
Subject: [PATCH] feat(build): fix styles

---
 app/__module.js                                          | 4 ++--
 .../components/datatables/genericDatatableController.js  | 1 +
 app/portainer/services/codeMirror.js                     | 4 ++++
 app/vendors.js                                           | 4 ++++
 assets/css/vendor.css                                    | 4 ++--
 webpack.config.js                                        | 9 ++++++++-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/__module.js b/app/__module.js
index 32e3c9e0c..4dd0aa99f 100644
--- a/app/__module.js
+++ b/app/__module.js
@@ -2,8 +2,7 @@ import '../assets/css/vendor.css';
 import '../assets/css/app.css';
 
 import angular from 'angular';
-
-import 'angular-ui-bootstrap';
+window.angular = angular;
 import '@uirouter/angularjs';
 import 'ui-select';
 import 'isteven-angular-multiselect/isteven-multi-select.js';
@@ -23,6 +22,7 @@ import 'angular-file-saver';
 import 'angularjs-scroll-glue';
 import 'angularjs-slider';
 
+import './vendors';
 import './agent/_module';
 import './azure/_module';
 import './docker/__module';
diff --git a/app/portainer/components/datatables/genericDatatableController.js b/app/portainer/components/datatables/genericDatatableController.js
index b04fe6216..aa4383fc1 100644
--- a/app/portainer/components/datatables/genericDatatableController.js
+++ b/app/portainer/components/datatables/genericDatatableController.js
@@ -1,4 +1,5 @@
 import angular from 'angular';
+import './datatable.css';
 
 angular.module('portainer.app')
 .controller('GenericDatatableController', ['PaginationService', 'DatatableService',
diff --git a/app/portainer/services/codeMirror.js b/app/portainer/services/codeMirror.js
index fb265e1b6..233507bdc 100644
--- a/app/portainer/services/codeMirror.js
+++ b/app/portainer/services/codeMirror.js
@@ -1,6 +1,10 @@
 import angular from 'angular';
 import _ from 'lodash';
 import CodeMirror from 'codemirror';
+import 'codemirror/mode/yaml/yaml.js';
+import 'codemirror/addon/lint/lint.js';
+import 'codemirror/addon/lint/yaml-lint.js';
+import 'codemirror/addon/display/placeholder.js';
 
 angular.module('portainer.app')
 .factory('CodeMirrorService', function CodeMirrorService() {
diff --git a/app/vendors.js b/app/vendors.js
index e69de29bb..c960115f4 100644
--- a/app/vendors.js
+++ b/app/vendors.js
@@ -0,0 +1,4 @@
+
+import 'bootstrap/dist/js/bootstrap.js';
+import 'js-yaml/dist/js-yaml.js'
+import 'angular-ui-bootstrap';
diff --git a/assets/css/vendor.css b/assets/css/vendor.css
index dd795ac4a..340d0c7ec 100644
--- a/assets/css/vendor.css
+++ b/assets/css/vendor.css
@@ -1,4 +1,3 @@
-@import url('../../node_modules/rdash-ui/dist/css/rdash.css');
 @import url('../../node_modules/ui-select/dist/select.css');
 @import url('../../node_modules/bootstrap/dist/css/bootstrap.css');
 @import url('../../node_modules/isteven-angular-multiselect/isteven-multi-select.css');
@@ -11,4 +10,5 @@
 @import url('../../node_modules/codemirror/lib/codemirror.css');
 @import url('../../node_modules/codemirror/addon/lint/lint.css');
 @import url('../../node_modules/angular-json-tree/dist/angular-json-tree.css');
-@import url('../../node_modules/angular-loading-bar/build/loading-bar.css');
\ No newline at end of file
+@import url('../../node_modules/angular-loading-bar/build/loading-bar.css');
+@import url('../../node_modules/rdash-ui/dist/css/rdash.css');
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 42b9fe51d..fc95562bd 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,6 +2,7 @@ const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const WebpackBuildNotifierPlugin = require('webpack-build-notifier');
 const CleanTerminalPlugin = require('clean-terminal-webpack-plugin');
+const { ProvidePlugin } = require('webpack');
 
 module.exports = {
   entry: './app/__module.js',
@@ -58,6 +59,12 @@ module.exports = {
       logo: path.resolve('./assets/favicon-32x32.png'),
       suppressSuccess: true
     }),
-    new CleanTerminalPlugin()
+    new CleanTerminalPlugin(),
+    new ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery',
+      'window.jQuery': 'jquery',
+      // angular: 'angular'
+    })
   ]
 };