Merge branch 'trunk'
This commit is contained in:
commit
29558da930
2 changed files with 12 additions and 4 deletions
8
resources/js/app.js
vendored
8
resources/js/app.js
vendored
|
|
@ -6,7 +6,13 @@
|
|||
|
||||
require('./bootstrap');
|
||||
|
||||
window.Vue = require('vue');
|
||||
import Vue from 'vue';
|
||||
window.Vue = Vue;
|
||||
|
||||
if (window.vueDebug) {
|
||||
Vue.config.devtools = true;
|
||||
Vue.config.debug = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* The following block of code may be used to automatically register your
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@
|
|||
|
||||
<title>{{ config('app.name', 'Laravel') }}</title>
|
||||
|
||||
<!-- Scripts -->
|
||||
<script src="{{ asset('js/app.js') }}" defer></script>
|
||||
|
||||
<!-- Fonts -->
|
||||
<link rel="dns-prefetch" href="//fonts.gstatic.com">
|
||||
<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
|
||||
|
|
@ -84,6 +81,11 @@
|
|||
<main class="py-4">
|
||||
@yield('content')
|
||||
</main>
|
||||
<script>
|
||||
let vueDebug = {{ config('app.debug') == 1 ? 'true' : 'false' }};
|
||||
</script>
|
||||
<!-- Scripts -->
|
||||
<script src="{{ asset('js/app.js') }}" defer></script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue