diff --git a/package.json b/package.json index 9ede3d0..5fa9500 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "dependencies": { "bootstrap": "^4.5.0", "jquery": "^3.5.1", + "popper.js": "^1.16.1", "vue": "^2.6.11", "vue-draggable-resizable": "^2.2.0" } diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index 4b43786..e957d54 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -9,6 +9,12 @@ window._ = require('lodash'); window.Vue = require('vue'); window.axios = require('axios'); +try { + window.$ = window.jQuery = require('jquery'); + + require('bootstrap'); +} catch (e) {} + window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; Vue.component('appbar', require('./components/appbar.vue').default); diff --git a/resources/views/layouts/site.blade.php b/resources/views/layouts/site.blade.php index 7b079ce..4edf976 100644 --- a/resources/views/layouts/site.blade.php +++ b/resources/views/layouts/site.blade.php @@ -50,28 +50,27 @@ @@ -92,7 +91,7 @@
-
+
diff --git a/resources/views/pages/site/index.blade.php b/resources/views/pages/site/index.blade.php index 50b7c4b..17b9395 100644 --- a/resources/views/pages/site/index.blade.php +++ b/resources/views/pages/site/index.blade.php @@ -2,12 +2,14 @@ @section('content') -@foreach ($res as $r) -
-
- {{ $r->title }} +
+ @foreach ($res as $k => $r) + + @endforeach
-@endforeach @endsection