Fix styles, add bootstrap

pull/3016/head
Julio Montoya 6 years ago
parent ddb745458e
commit cb2fdd5b54
  1. 2
      assets/css/app.scss
  2. 2
      assets/css/bootstrap.scss
  3. 7
      assets/js/app.js
  4. 54
      assets/js/vendor.js
  5. 6
      package.json
  6. 14
      webpack.config.js
  7. 908
      yarn.lock

@ -10,7 +10,7 @@
yannick.warnier@beeznest.com yannick.warnier@beeznest.com
*/ */
//@import "~bootstrap/scss/bootstrap"; @import "~bootstrap/scss/bootstrap";
@import "~@coreui/coreui/scss/coreui"; @import "~@coreui/coreui/scss/coreui";
@import "~@fortawesome/fontawesome-free/css/all.css"; @import "~@fortawesome/fontawesome-free/css/all.css";
@import '~chosen-js/chosen.css'; @import '~chosen-js/chosen.css';

@ -1,2 +1,2 @@
//@import "~bootstrap/scss/bootstrap"; @import "~bootstrap/scss/bootstrap";
@import "~@fortawesome/fontawesome-free/css/all.css"; @import "~@fortawesome/fontawesome-free/css/all.css";

@ -8,6 +8,11 @@ import Vue from 'vue';
import {VueConfig} from './VueConfig'; import {VueConfig} from './VueConfig';
import Example from './components/Example'; import Example from './components/Example';
import $ from 'jquery';
window.jQuery = $;
window.$ = $;
Routing.setRoutingData(routes); Routing.setRoutingData(routes);
const locale = document.querySelector('html').lang; const locale = document.querySelector('html').lang;
@ -196,7 +201,7 @@ $(function () {
); );
/* Make responsive image maps */ /* Make responsive image maps */
$('map').imageMapResize(); //$('map').imageMapResize();
jQuery.fn.filterByText = function (textbox) { jQuery.fn.filterByText = function (textbox) {
return this.each(function () { return this.each(function () {

@ -1,38 +1,38 @@
var moment = require("moment"); var moment = require('moment');
require("moment/min/locales.min"); require('moment/min/locales.min');
global.moment = moment; global.moment = moment;
require("webpack-jquery-ui"); require('webpack-jquery-ui');
require("webpack-jquery-ui/css"); require('webpack-jquery-ui/css');
// JS is equivalent to the normal "bootstrap" package // JS is equivalent to the normal 'bootstrap' package
// no need to set this to a variable, just require it // no need to set this to a variable, just require it
require("bootstrap"); require('bootstrap');
require("@coreui/coreui/dist/js/coreui.min.js"); require('@coreui/coreui/dist/js/coreui.min.js');
require("chosen-js"); require('chosen-js');
require("mediaelement"); require('mediaelement');
require("pace-js-amd-fix"); require('pace-js-amd-fix');
require("multiselect-two-sides"); require('multiselect-two-sides');
require('@fortawesome/fontawesome-free'); require('@fortawesome/fontawesome-free');
require("qtip2"); require('qtip2');
require("image-map-resizer"); require('image-map-resizer/js/imageMapResizer.js');
require("cropper"); require('cropper');
require("jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon"); require('jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon');
require("jquery.scrollbar"); require('jquery.scrollbar');
require("blueimp-file-upload"); require('blueimp-file-upload');
require("select2"); require('select2');
require("timeago"); require('timeago');
require("sweetalert/dist/sweetalert.min"); require('sweetalert/dist/sweetalert.min');
require('bootstrap-select/dist/js/bootstrap-select.js'); require('bootstrap-select/dist/js/bootstrap-select.js');
require("bootstrap-daterangepicker"); require('bootstrap-daterangepicker');
require("fullcalendar/dist/fullcalendar.js"); require('fullcalendar/dist/fullcalendar.js');
require("fullcalendar/dist/gcal.js"); require('fullcalendar/dist/gcal.js');
require("fullcalendar/dist/locale-all.js"); require('fullcalendar/dist/locale-all.js');
require("easy-pie-chart/dist/jquery.easypiechart.min"); require('easy-pie-chart/dist/jquery.easypiechart.min');
require("jquery-ui-timepicker-addon"); require('jquery-ui-timepicker-addon');
// doesn't work with webpack added directly in /public/libs folder // doesn't work with webpack added directly in /public/libs folder
/* /*
require("ckeditor"); require('ckeditor');
*/ */

@ -5,7 +5,7 @@
"license": "GPL-3.0", "license": "GPL-3.0",
"devDependencies": { "devDependencies": {
"@coreui/coreui": "^2.1.7", "@coreui/coreui": "^2.1.7",
"@fortawesome/fontawesome-free": "^5.7.2", "@fortawesome/fontawesome-free": "^5.11",
"@symfony/webpack-encore": "~0.28", "@symfony/webpack-encore": "~0.28",
"babel-preset-react": "^6.24.1", "babel-preset-react": "^6.24.1",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
@ -33,7 +33,7 @@
"fs": "0.0.1-security", "fs": "0.0.1-security",
"fullcalendar": "^3.0", "fullcalendar": "^3.0",
"highlight.js": "^9.12.0", "highlight.js": "^9.12.0",
"image-map-resizer": "^1.0.7", "image-map-resizer": "^1.0.10",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"jquery-ui-timepicker-addon": "^1.6.3", "jquery-ui-timepicker-addon": "^1.6.3",
"jquery.scrollbar": "^0.2.11", "jquery.scrollbar": "^0.2.11",
@ -50,7 +50,7 @@
"pace-js-amd-fix": "^1.0.5", "pace-js-amd-fix": "^1.0.5",
"perfect-scrollbar": "^1.4.0", "perfect-scrollbar": "^1.4.0",
"pretty-checkbox": "^3.0.3", "pretty-checkbox": "^3.0.3",
"pwstrength-bootstrap": "^3.0.4", "pwstrength-bootstrap": "^3.0.5",
"qtip2": "^3.0.3", "qtip2": "^3.0.3",
"readmore-js": "^2.2.1", "readmore-js": "^2.2.1",
"select2": "^4.0", "select2": "^4.0",

@ -1,6 +1,7 @@
var Encore = require('@symfony/webpack-encore'); var Encore = require('@symfony/webpack-encore');
var copyWebpackPlugin = require('copy-webpack-plugin');
var fileManagerPlugin = require('filemanager-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin');
const FileManagerPlugin = require('filemanager-webpack-plugin');
Encore Encore
.setOutputPath('public/build/') .setOutputPath('public/build/')
@ -36,11 +37,12 @@ Encore
.copyFiles([ .copyFiles([
{ {
from: './node_modules/multiselect-two-sides/dist/js', from: './node_modules/multiselect-two-sides/dist/js',
pattern: /(multiselect.js)$/,
to: 'libs/multiselect-two-sides/dist/js/multiselect.js' to: 'libs/multiselect-two-sides/dist/js/multiselect.js'
}, },
{ {
from: './node_modules/pwstrength-bootstrap/dist/', from: './node_modules/pwstrength-bootstrap/dist/',
pattern: /\.(js)$/, pattern: /(pwstrength-bootstrap.js)$/,
to: 'libs/pwstrength-bootstrap/dist/pwstrength-bootstrap.js' to: 'libs/pwstrength-bootstrap/dist/pwstrength-bootstrap.js'
}, },
{ {
@ -61,7 +63,7 @@ Encore
]) ])
; ;
Encore.addPlugin(new copyWebpackPlugin([ Encore.addPlugin(new CopyWebpackPlugin([
{ {
from: './node_modules/mediaelement/build', from: './node_modules/mediaelement/build',
to: 'libs/mediaelement' to: 'libs/mediaelement'
@ -90,7 +92,7 @@ themes.forEach(function (theme) {
Encore.addStyleEntry('css/themes/' + theme + '/default', './assets/css/themes/' + theme + '/default.css'); Encore.addStyleEntry('css/themes/' + theme + '/default', './assets/css/themes/' + theme + '/default.css');
// Copy images from themes into public/build // Copy images from themes into public/build
Encore.addPlugin(new copyWebpackPlugin([{ Encore.addPlugin(new CopyWebpackPlugin([{
from: 'assets/css/themes/' + theme + '/images', from: 'assets/css/themes/' + theme + '/images',
to: 'css/themes/' + theme + '/images' to: 'css/themes/' + theme + '/images'
}, },
@ -98,7 +100,7 @@ themes.forEach(function (theme) {
}); });
// Fix free-jqgrid languages files // Fix free-jqgrid languages files
Encore.addPlugin(new fileManagerPlugin({ Encore.addPlugin(new FileManagerPlugin({
onEnd: { onEnd: {
move: [ move: [
{ {

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save