Skip to content

Commit

Permalink
New horizon & laravel version
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cannonb4ll
Cannonb4ll committed Feb 4, 2020
1 parent f09eefd commit 78f83ea
Show file tree
Hide file tree
Showing 5 changed files with 162 additions and 43 deletions.
4 changes: 4 additions & 0 deletions public/app-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10941,3 +10941,7 @@ button:hover .fill-primary {
background: #aa2e28;
}

.badge-sm {
font-size: 0.75rem;
}

4 changes: 4 additions & 0 deletions public/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10941,3 +10941,7 @@ button:hover .fill-primary {
background: #ef5753;
}

.badge-sm {
font-size: 0.75rem;
}

189 changes: 150 additions & 39 deletions public/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62081,7 +62081,11 @@ var render = function() {
}
}
},
[_vm._v("Load New Entries")]
[
_vm._v(
"Load New\n Entries"
)
]
)
: _vm._e()
]),
Expand Down Expand Up @@ -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(
Expand All @@ -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()
],
Expand Down Expand Up @@ -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(" "),
Expand Down Expand Up @@ -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(" "),
Expand All @@ -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) }
Expand All @@ -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()
])
}
Expand All @@ -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() {
Expand All @@ -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 ")]
)
]
)
}
]
Expand Down
6 changes: 3 additions & 3 deletions public/mix-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion webpack.mix.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 78f83ea

Please sign in to comment.