diff --git a/public/app-dark.css b/public/app-dark.css index e6e9c53f..22c997f6 100644 --- a/public/app-dark.css +++ b/public/app-dark.css @@ -10941,3 +10941,7 @@ button:hover .fill-primary { background: #aa2e28; } +.badge-sm { + font-size: 0.75rem; +} + diff --git a/public/app.css b/public/app.css index 87ff8ffb..f5bbd445 100644 --- a/public/app.css +++ b/public/app.css @@ -10941,3 +10941,7 @@ button:hover .fill-primary { background: #ef5753; } +.badge-sm { + font-size: 0.75rem; +} + diff --git a/public/app.js b/public/app.js index 8dce7ec6..adac12b4 100644 --- a/public/app.js +++ b/public/app.js @@ -62081,7 +62081,11 @@ var render = function() { } } }, - [_vm._v("Load New Entries")] + [ + _vm._v( + "Load New\n Entries" + ) + ] ) : _vm._e() ]), @@ -62127,6 +62131,15 @@ var render = function() { ] ) : _vm._e(), + _vm._v(" "), + job.delayed + ? _c( + "small", + { staticClass: "badge badge-primary badge-sm" }, + [_vm._v("Delayed Job")] + ) + : _vm._e(), + _vm._v(" "), _c("br"), _vm._v(" "), _c( @@ -62153,14 +62166,27 @@ var render = function() { job.payload.tags.length ? _c("span", [ _vm._v( - "| Tags: " + + "\n | Tags: " + _vm._s( job.payload.tags && job.payload.tags.length - ? job.payload.tags.join(", ") + ? job.payload.tags + .slice(0, 3) + .join(", ") : "" ) - ) + ), + job.payload.tags.length > 3 + ? _c("span", [ + _vm._v( + " (" + + _vm._s( + job.payload.tags.length - 3 + ) + + " more)" + ) + ]) + : _vm._e() ]) : _vm._e() ], @@ -62360,7 +62386,19 @@ var render = function() { [ !_vm.ready ? _c("h5", [_vm._v("Job Preview")]) : _vm._e(), _vm._v(" "), - _vm.ready ? _c("h5", [_vm._v(_vm._s(_vm.job.name))]) : _vm._e() + _vm.ready ? _c("h5", [_vm._v(_vm._s(_vm.job.name))]) : _vm._e(), + _vm._v(" "), + _c( + "a", + { + attrs: { + "data-toggle": "collapse", + href: "#collapseDetails", + role: "button" + } + }, + [_vm._v("\n Collapse\n ")] + ) ] ), _vm._v(" "), @@ -62397,41 +62435,54 @@ var render = function() { : _vm._e(), _vm._v(" "), _vm.ready - ? _c("div", { staticClass: "card-body card-bg-secondary" }, [ - _c("div", { staticClass: "row mb-2" }, [ - _vm._m(0), - _vm._v(" "), - _c("div", { staticClass: "col" }, [_vm._v(_vm._s(_vm.job.id))]) - ]), - _vm._v(" "), - _c("div", { staticClass: "row mb-2" }, [ - _vm._m(1), + ? _c( + "div", + { + staticClass: "card-body card-bg-secondary collapse show", + attrs: { id: "collapseDetails" } + }, + [ + _c("div", { staticClass: "row mb-2" }, [ + _vm._m(0), + _vm._v(" "), + _c("div", { staticClass: "col" }, [_vm._v(_vm._s(_vm.job.id))]) + ]), _vm._v(" "), - _c("div", { staticClass: "col" }, [_vm._v(_vm._s(_vm.job.queue))]) - ]), - _vm._v(" "), - _c("div", { staticClass: "row mb-2" }, [ - _vm._m(2), + _c("div", { staticClass: "row mb-2" }, [ + _vm._m(1), + _vm._v(" "), + _c("div", { staticClass: "col" }, [ + _vm._v(_vm._s(_vm.job.queue)) + ]) + ]), _vm._v(" "), - _c("div", { staticClass: "col" }, [ - _vm._v( - _vm._s( - _vm.job.payload.tags && _vm.job.payload.tags.length - ? _vm.job.payload.tags.join(", ") - : "" - ) - ) - ]) - ]), - _vm._v(" "), - _c("div", { staticClass: "row" }, [ - _vm._m(3), + _vm.job.delayed + ? _c("div", { staticClass: "row mb-2" }, [ + _vm._m(2), + _vm._v(" "), + _c("div", { staticClass: "col" }, [ + _vm._v(_vm._s(_vm.readableTimestamp(_vm.job.delayed))) + ]) + ]) + : _vm._e(), _vm._v(" "), - _c("div", { staticClass: "col" }, [ - _vm._v(_vm._s(_vm.readableTimestamp(_vm.job.completed_at))) + _c("div", { staticClass: "row" }, [ + _vm._m(3), + _vm._v(" "), + _vm.job.completed_at + ? _c("div", { staticClass: "col" }, [ + _vm._v( + _vm._s(_vm.readableTimestamp(_vm.job.completed_at)) + ) + ]) + : _vm._e(), + _vm._v(" "), + _c("div", { staticClass: "col", attrs: { else: "" } }, [ + _vm._v("-") + ]) ]) - ]) - ]) + ] + ) : _vm._e() ]), _vm._v(" "), @@ -62441,7 +62492,10 @@ var render = function() { _vm._v(" "), _c( "div", - { staticClass: "card-body code-bg text-white" }, + { + staticClass: "card-body code-bg text-white collapse show", + attrs: { id: "collapseData" } + }, [ _c("vue-json-pretty", { attrs: { data: _vm.prettyPrintJob(_vm.job.payload.data) } @@ -62450,6 +62504,22 @@ var render = function() { 1 ) ]) + : _vm._e(), + _vm._v(" "), + _vm.ready && _vm.job.payload.tags.length + ? _c("div", { staticClass: "card mt-4" }, [ + _vm._m(5), + _vm._v(" "), + _c( + "div", + { + staticClass: "card-body code-bg text-white collapse show", + attrs: { id: "collapseTags" } + }, + [_c("vue-json-pretty", { attrs: { data: _vm.job.payload.tags } })], + 1 + ) + ]) : _vm._e() ]) } @@ -62475,7 +62545,7 @@ var staticRenderFns = [ var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "col-md-2" }, [ - _c("strong", [_vm._v("Tags")]) + _c("strong", [_vm._v("Delayed Until")]) ]) }, function() { @@ -62496,7 +62566,48 @@ var staticRenderFns = [ staticClass: "card-header d-flex align-items-center justify-content-between" }, - [_c("h5", [_vm._v("Data")])] + [ + _c("h5", [_vm._v("Data")]), + _vm._v(" "), + _c( + "a", + { + attrs: { + "data-toggle": "collapse", + href: "#collapseData", + role: "button" + } + }, + [_vm._v("\n Collapse\n ")] + ) + ] + ) + }, + function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c( + "div", + { + staticClass: + "card-header d-flex align-items-center justify-content-between" + }, + [ + _c("h5", [_vm._v("Tags")]), + _vm._v(" "), + _c( + "a", + { + attrs: { + "data-toggle": "collapse", + href: "#collapseTags", + role: "button" + } + }, + [_vm._v("\n Collapse\n ")] + ) + ] ) } ] diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 3a1f7ff4..b1093ec3 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,5 @@ { - "/app.js": "/app.js?id=eccba280ba55711db61c", - "/app.css": "/app.css?id=20e671e17431d40ad2ca", - "/app-dark.css": "/app-dark.css?id=136b4bd41792ef4b5254" + "/app.js": "/app.js?id=681f00751c4fb20ad4d2", + "/app.css": "/app.css?id=f4bfed2b51f0e5e0dcb6", + "/app-dark.css": "/app-dark.css?id=9ef119e56b37b9067363" } diff --git a/webpack.mix.js b/webpack.mix.js index 4c107e21..59cba5db 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -27,7 +27,7 @@ mix.options({ .sass('resources/sass/app-dark.scss', 'public') .version() .copy('resources/img', 'public/img') - .copy('public', '../../horizontest/public/vendor/horizon') + .copy('public', '../../public/vendor/horizon') .webpackConfig({ resolve: { symlinks: false,