diff --git a/resources/js/app.js b/resources/js/app.js index 908aa130..38fc889e 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -43,9 +43,6 @@ const router = new VueRouter({ Vue.component('vue-json-pretty', VueJsonPretty); Vue.component('alert', require('./components/Alert.vue').default); -const app = Vue.component('app', require('./components/App.vue').default); -const root = document.getElementById('horizon'); - Vue.mixin(Base); Vue.directive('tooltip', function (el, binding) { @@ -57,16 +54,10 @@ Vue.directive('tooltip', function (el, binding) { }); new Vue({ - el: root, + el: '#horizon', + router, - render: (createElement) => - createElement(app, { - props: { - appName: root.dataset.appName, - assetsAreCurrent: root.dataset.assetsAreCurrent, - isDownForMaintenance: root.dataset.isDownForMaintenance, - }, - }), + data() { return { alert: { diff --git a/resources/js/base.js b/resources/js/base.js index 44e6aeed..dab7123e 100644 --- a/resources/js/base.js +++ b/resources/js/base.js @@ -37,11 +37,11 @@ export default { * Autoload new entries in listing screens. */ autoLoadNewEntries() { - if (!this.$root.autoLoadsNewEntries) { - this.$root.autoLoadsNewEntries = true; + if (!this.autoLoadsNewEntries) { + this.autoLoadsNewEntries = true; localStorage.autoLoadsNewEntries = 1; } else { - this.$root.autoLoadsNewEntries = false; + this.autoLoadsNewEntries = false; localStorage.autoLoadsNewEntries = 0; } }, diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue deleted file mode 100644 index 8e8cabea..00000000 --- a/resources/js/components/App.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - \ No newline at end of file diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php index fc37264f..52a4f7f8 100644 --- a/resources/views/layout.blade.php +++ b/resources/views/layout.blade.php @@ -14,13 +14,111 @@ -
+
+ + +
+
+ + +

+ Laravel Horizon{{ config('app.name') ? ' - ' . config('app.name') : '' }}

+ + +
+ +
+ + +
+ @if (! $assetsAreCurrent) +
+ The published Horizon assets are not up-to-date with the installed version. To update, run:
php artisan horizon:publish +
+ @endif + + @if ($isDownForMaintenance) +
+ This application is in "maintenance mode". Queued jobs may not be processed unless your worker is using the "force" flag. +
+ @endif + + +
+
+
+