Make code default for React things.

This commit is contained in:
James Cole 2019-01-03 19:01:15 +01:00
parent 1c2206cb9f
commit 577f024310
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
6 changed files with 30 additions and 6848 deletions

View File

@ -12,21 +12,17 @@
"devDependencies": {
"@babel/preset-react": "^7.0.0",
"axios": "^0.18",
"babel-preset-react": "^6.24.1",
"babel-preset-react": "^6.23.0",
"bootstrap": "^4.0.0",
"cross-env": "^5.1",
"jquery": "^3.2",
"laravel-mix": "^4.0.7",
"lodash": "^4.17.5",
"popper.js": "^1.12",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"resolve-url-loader": "^2.3.1",
"sass": "^1.15.2",
"sass-loader": "^7.1.0"
},
"dependencies": {
"tabler-react": "^1.27.0",
"font-awesome": "4.7.0"
}
}

View File

@ -1,24 +1,24 @@
require.config({
shim: {
'bootstrap': ['jquery'],
'sparkline': ['jquery'],
'tablesorter': ['jquery'],
'vector-map': ['jquery'],
'vector-map-de': ['vector-map', 'jquery'],
'vector-map-world': ['vector-map', 'jquery'],
'core': ['bootstrap', 'jquery'],
'bootstrap': ['jquery'],
// 'sparkline': ['jquery'],
// 'tablesorter': ['jquery'],
// 'vector-map': ['jquery'],
// 'vector-map-de': ['vector-map', 'jquery'],
// 'vector-map-world': ['vector-map', 'jquery'],
'core': ['bootstrap', 'jquery'],
},
paths: {
'core': 'v2/assets/js/core',
'jquery': 'v2/assets/js/vendors/jquery-3.2.1.min',
'bootstrap': 'v2/assets/js/vendors/bootstrap.bundle.min',
'sparkline': 'v2/assets/js/vendors/jquery.sparkline.min',
'selectize': 'v2/assets/js/vendors/selectize.min',
'tablesorter': 'v2/assets/js/vendors/jquery.tablesorter.min',
'vector-map': 'v2/assets/js/vendors/jquery-jvectormap-2.0.3.min',
'vector-map-de': 'v2/assets/js/vendors/jquery-jvectormap-de-merc',
'vector-map-world': 'v2/assets/js/vendors/jquery-jvectormap-world-mill',
'circle-progress': 'v2/assets/js/vendors/circle-progress.min',
'core': 'v2/assets/js/core',
'jquery': 'v2/assets/js/vendors/jquery-3.2.1.min',
'bootstrap': 'v2/assets/js/vendors/bootstrap.bundle.min',
// 'sparkline': 'v2/assets/js/vendors/jquery.sparkline.min',
// 'selectize': 'v2/assets/js/vendors/selectize.min',
// 'tablesorter': 'v2/assets/js/vendors/jquery.tablesorter.min',
// 'vector-map': 'v2/assets/js/vendors/jquery-jvectormap-2.0.3.min',
// 'vector-map-de': 'v2/assets/js/vendors/jquery-jvectormap-de-merc',
// 'vector-map-world': 'v2/assets/js/vendors/jquery-jvectormap-world-mill',
// 'circle-progress': 'v2/assets/js/vendors/circle-progress.min',
}
});
window.tabler = {

5
resources/js/app.js vendored
View File

@ -33,7 +33,4 @@ require('./bootstrap');
* or customize the JavaScript scaffolding to fit your unique needs.
*/
require('./components/Main');
require('./components/TopMenu');
//require('./app');

View File

@ -1,4 +1,3 @@
/*
* bootstrap.js
* Copyright (c) 2018 thegrumpydictator@gmail.com
@ -26,13 +25,13 @@ window._ = require('lodash');
* for JavaScript based Bootstrap features such as modals and tabs. This
* code may be modified to fit the specific needs of your application.
*/
try {
window.Popper = require('popper.js').default;
window.$ = window.jQuery = require('jquery');
require('bootstrap');
} catch (e) {}
require('bootstrap/dist/js/bootstrap.bundle.js');
} catch (e) {
console.error('No bootstrap?');
}
/**
* We'll load the axios HTTP library which allows us to easily issue requests
@ -58,6 +57,8 @@ if (token) {
console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
}
/**
* Echo exposes an expressive API for subscribing to channels and listening
* for events that are broadcast by Laravel. Echo and event broadcasting

3
webpack.mix.js vendored
View File

@ -13,3 +13,6 @@ const mix = require('laravel-mix');
mix.react('resources/js/app.js', 'public/v2/assets/js')
.sass('resources/sass/app.scss', 'public/v2/assets/css');

6815
yarn.lock

File diff suppressed because it is too large Load Diff