Browse Source

Update js, move bootstrap.js to app.js

Daniel Supernault 6 years ago
parent
commit
5d24b254e5
2 changed files with 15 additions and 16 deletions
  1. 15 1
      resources/assets/js/app.js
  2. 0 15
      resources/assets/js/bootstrap.js

+ 15 - 1
resources/assets/js/app.js

@@ -1 +1,15 @@
-require('./bootstrap');
+window._ = require('lodash');
+window.Popper = require('popper.js').default;
+window.pixelfed = window.pixelfed || {};
+window.$ = window.jQuery = require('jquery');
+require('bootstrap');
+window.axios = require('axios');
+window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+require('readmore-js');
+
+let token = document.head.querySelector('meta[name="csrf-token"]');
+if (token) {
+    window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
+} else {
+    console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
+}

+ 0 - 15
resources/assets/js/bootstrap.js

@@ -1,15 +0,0 @@
-window._ = require('lodash');
-window.Popper = require('popper.js').default;
-window.pixelfed = window.pixelfed || {};
-window.$ = window.jQuery = require('jquery');
-require('bootstrap');
-window.axios = require('axios');
-window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
-require('readmore-js');
-
-let token = document.head.querySelector('meta[name="csrf-token"]');
-if (token) {
-    window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
-} else {
-    console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
-}