8000 A fresh coat of paint · laravel/horizon@35cb682 · GitHub
[go: up one dir, main page]
Skip to content

Commit 35cb682

Browse files
jessarcherjessarcher
committed
A fresh coat of paint
1 parent 287b929 commit 35cb682

28 files changed

+602
-359
lines changed

‎public/app-dark.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/app.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/mix-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"/app.js": "/app.js?id=d771ecef70ba42f5cd96a3e4e342bd06",
3-
"/app-dark.css": "/app-dark.css?id=796af76ce8c445651baf66c67de3eea4",
4-
"/app.css": "/app.css?id=a19518e2122467d2e842f411ca5b65e4",
2+
"/app.js": "/app.js?id=d476ad3a5f41bc023ff3ad7c4eb6ad58",
3+
"/app-dark.css": "/app-dark.css?id=15c72df05e2b1147fa3e4b0670cfb435",
4+
"/app.css": "/app.css?id=4d6a1a7fe095eedc2cb2a4ce822ea8a5",
55
"/img/favicon.png": "/img/favicon.png?id=1542bfe8a0010dcbee710da13cce367f",
66
"/img/horizon.svg": "/img/horizon.svg?id=904d5b5185fefb09035384e15bfca765",
77
"/img/sprite.svg": "/img/sprite.svg?id=afc4952b74895bdef3ab4ebe9adb746f"

‎resources/js/components/Alert.vue

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,27 +74,27 @@
7474
<div class="modal" id="alertModal" tabindex="-1" role="dialog" aria-labelledby="alertModalLabel" aria-hidden="true">
7575
<div class="modal-dialog" role="document">
7676
<div class="modal-content">
77-
<div class="modal-body text-center">
78-
<p class="mt-3 mb-0">{{message}}</p>
77+
<div class="modal-body">
78+
<p class="m-0 py-4">{{message}}</p>
7979
</div>
8080

8181

82-
<div class="modal-footer justify-content-center">
82+
<div class="modal-footer justify-content-start flex-row-reverse">
8383

84-
<button v-if="type == 'error'" class="btn btn-secondary btn-sm" @click="close">
85-
CLOSE
84+
<button v-if="type == 'error'" class="btn btn-primary" @click="close">
85+
Close
8686
</button>
8787

88-
<button v-if="type == 'success'" class="btn btn-secondary btn-sm" @click="close">
89-
OK
88+
<button v-if="type == 'success'" class="btn btn-primary" @click="close">
89+
Okay
9090
</button>
9191

9292

93-
<button v-if="type == 'confirmation'" class="btn btn-danger btn-sm" @click="confirm">
94-
YES
93+
<button v-if="type == 'confirmation'" class="btn btn-danger" @click="confirm">
94+
Yes
9595
</button>
96-
<button v-if="type == 'confirmation'" class="btn btn-secondary btn-sm" @click="cancel">
97-
NO, CANCEL
96+
<button v-if="type == 'confirmation'" class="btn" @click="cancel">
97+
Cancel
9898
</button>
9999

100100
</div>

‎resources/js/components/Stacktrace.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<table class="table mb-0">
2828
<tbody>
2929
<tr v-for="line in lines">
30-
<td class="card-bg-secondary">{{line}}</td>
30+
<td class="card-bg-secondary"><code>{{line}}</code></td>
3131
</tr>
3232

3333
<tr v-if="! showAll">

‎resources/js/screens/batches/index.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@
127127

128128
<template>
129129
<div>
130-
<div class="card">
130+
<div class="card overflow-hidden">
131131
<div class="card-header d-flex align-items-center justify-content-between">
132-
<h5>Batches</h5>
132+
<h2 class="h6 m-0">Batches</h2>
133133
</div>
134134

135135
<div v-if="!ready" class="d-flex align-items-center justify-content-center card-bg-secondary p-5 bottom-radius">
@@ -145,20 +145,20 @@
145145
<span>There aren't any batches.</span>
146146
</div>
147147

148-
<table v-if="ready && batches.length > 0" class="table table-hover table-sm mb-0">
148+
<table v-if="ready && batches.length > 0" class="table table-hover mb-0">
149149
<thead>
150150
<tr>
151151
<th>Batch</th>
152152
<th>Status</th>
153-
<th>Size</th>
154-
<th>Completion</th>
155-
<th class="text-right">Created At</th>
153+
<th class="text-right">Size</th>
154+
<th class="text-right">Completion</th>
155+
<th class="text-right">Created</th>
156156
</tr>
157157
</thead>
158158

159159
<tbody>
160160
<tr v-if="hasNewEntries" key="newEntries" class="dontanimate">
161-
<td colspan="100" class="text-center card-bg-secondary py-1">
161+
<td colspan="100" class="text-center card-bg-secondary py-2">
162162
<small><a href="#" v-on:click.prevent="loadNewEntries" v-if="!loadingNewEntries">Load New Entries</a></small>
163163

164164
<small v-if="loadingNewEntries">Loading...</small>
@@ -182,19 +182,19 @@
182182
Pending
183183
</small>
184184
</td>
185-
<td>{{batch.totalJobs}}</td>
186-
<td>{{batch.progress}}%</td>
185+
<td class="text-right text-muted">{{batch.totalJobs}}</td>
186+
<td class="text-right text-muted">{{batch.progress}}%</td>
187187

188-
<td class="text-right table-fit">
188+
<td class="text-right text-muted table-fit">
189189
{{ formatDateIso(batch.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
190190
</td>
191191
</tr>
192192
</tbody>
193193
</table>
194194

195195
<div v-if="ready && batches.length" class="p-3 d-flex justify-content-between border-top">
196-
<button @click="previous" class="btn btn-secondary btn-md" :disabled="page==1">Previous</button>
197-
<button @click="next" class="btn btn-secondary btn-md" :disabled="batches.length < 50">Next</button>
196+
<button @click="previous" class="btn btn-secondary btn-sm" :disabled="page==1">Previous</button>
197+
<button @click="next" class="btn btn-secondary btn-sm" :disabled="batches.length < 50">Next</button>
198198
</div>
199199
</div>
200200

‎resources/js/screens/batches/preview.vue

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@
7777

7878
<template>
7979
<div>
80-
<div class="card">
80+
<div class="card overflow-hidden">
8181
<div class="card-header d-flex align-items-center justify-content-between">
82-
<h5 v-if="!ready">Batch Preview</h5>
83-
<h5 v-if="ready">{{batch.name || batch.id}}</h5>
82+
<h2 class="h6 m-0" v-if="!ready">Batch Preview</h2>
83+
<h2 class="h6 m-0" v-if="ready">{{batch.name || batch.id}}</h2>
8484

85-
<button class="btn btn-outline-primary" v-if="failedJobs.length > 0" v-on:click.prevent="retry(batch.id)">
86-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" class="icon fill-primary" :class="{spin: retrying}">
87-
<path d="M10 3v2a5 5 0 0 0-3.54 8.54l-1.41 1.41A7 7 0 0 1 10 3zm4.95 2.05A7 7 0 0 1 10 17v-2a5 5 0 0 0 3.54-8.54l1.41-1.41zM10 20l-4-4 4-4v8zm0-12V0l4 4-4 4z"/>
85+
<button class="btn btn-primary" v-if="failedJobs.length > 0" v-on:click.prevent="retry(batch.id)">
86+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" class="icon" fill="currentColor" :class="{spin: retrying}">
87+
<path fill-rule="evenodd" d="M15.312 11.424a5.5 5.5 0 01-9.201 2.466l-.312-.311h2.433a.75.75 0 000-1.5H3.989a.75.75 0 00-.75.75v4.242a.75.75 0 001.5 0v-2.43l.31.31a7 7 0 0011.712-3.138.75.75 0 00-1.449-.39zm1.23-3.723a.75.75 0 00.219-.53V2.929a.75.75 0 00-1.5 0V5.36l-.31-.31A7 7 0 003.239 8.188a.75.75 0 101.448.389A5.5 5.5 0 0113.89 6.11l.311.31h-2.432a.75.75 0 000 1.5h4.243a.75.75 0 00.53-.219z" clip-rule="evenodd" />
8888
</svg>
8989

9090
Retry Failed Jobs
@@ -101,76 +101,76 @@
101101

102102
<div class="card-body card-bg-secondary" v-if="ready">
103103
<div class="row mb-2">
104-
<div class="col-md-2"><strong>ID</strong></div>
104+
<div class="col-md-2 text-muted">ID</div>
105105
<div class="col">
106106
{{batch.id}}
107107

108-
<small class="badge badge-danger badge-sm" v-if="batch.failedJobs > 0 && batch.totalJobs - batch.pendingJobs < batch.totalJobs">
108+
<small class="ml-1 badge badge-danger badge-sm" v-if="batch.failedJobs > 0 && batch.totalJobs - batch.pendingJobs < batch.totalJobs">
109109
Failures
110110
</small>
111-
<small class="badge badge-success badge-sm" v-if="batch.totalJobs - batch.pendingJobs == batch.totalJobs">
111+
<small class="ml-1 badge badge-success badge-sm" v-if="batch.totalJobs - batch.pendingJobs == batch.totalJobs">
112112
Finished
113113
</small>
114-
<small class="badge badge-secondary badge-sm" v-if="batch.pendingJobs > 0 && !batch.failedJobs">
114+
<small class="ml-1 badge badge-secondary badge-sm" v-if="batch.pendingJobs > 0 && !batch.failedJobs">
115115
Pending
116116
</small>
117117
</div>
118118
</div>
119119
<div class="row mb-2" v-if="batch.name">
120-
<div class="col-md-2"><strong>Name</strong></div>
120+
<div class="col-md-2 text-muted">Name</div>
121121
<div class="col">{{batch.name}}</div>
122122
</div>
123123
<div class="row mb-2" v-if="batch.options.queue">
124-
<div class="col-md-2"><strong>Queue</strong></div>
124+
<div class="col-md-2 text-muted">Queue</div>
125125
<div class="col">{{batch.options.queue}}</div>
126126
</div>
127127
<div class="row mb-2" v-if="batch.options.connection">
128-
<div class="col-md-2"><strong>Connection</strong></div>
128+
<div class="col-md-2 text-muted">Connection</div>
129129
<div class="col">{{batch.options.connection}}</div>
130130
</div>
131131
<div class="row mb-2">
132-
<div class="col-md-2"><strong>Created At</strong></div>
132+
<div class="col-md-2 text-muted">Created</div>
133133
<div class="col">{{ formatDateIso(batch.createdAt).format('YYYY-MM-DD HH:mm:ss') }}</div>
134134
</div>
135135
<div class="row mb-2" v-if="batch.finishedAt">
136-
<div class="col-md-2"><strong>Finished At</strong></div>
136+
<div class="col-md-2 text-muted">Finished</div>
137137
<div class="col">{{ formatDateIso(batch.finishedAt).format('YYYY-MM-DD HH:mm:ss') }}</div>
138138
</div>
139139
<div class="row mb-2" v-if="batch.cancelledAt">
140-
<div class="col-md-2"><strong>Cancelled At</strong></div>
140+
<div class="col-md-2 text-muted">Cancelled</div>
141141
<div class="col">{{ formatDateIso(batch.cancelledAt).format('YYYY-MM-DD HH:mm:ss') }}</div>
142142
</div>
143143
<div class="row mb-2">
144-
<div class="col-md-2"><strong>Total Jobs</strong></div>
144+
<div class="col-md-2 text-muted">Total Jobs</div>
145145
<div class="col">{{batch.totalJobs}}</div>
146146
</div>
147147
<div class="row mb-2">
148-
<div class="col-md-2"><strong>Pending Jobs</strong></div>
148+
<div class="col-md-2 text-muted">Pending Jobs</div>
149149
<div class="col">{{batch.pendingJobs}}</div>
150150
</div>
151151
<div class="row mb-2">
152-
<div class="col-md-2"><strong>Failed Jobs</strong></div>
152+
<div class="col-md-2 text-muted">Failed Jobs</div>
153153
<div class="col">{{batch.failedJobs}}</div>
154154
</div>
155155
<div class="row">
156-
<div class="col-md-2"><strong>Completed Jobs (Including Failed)</strong></div>
156+
<div class="col-md-2 text-muted">Completed Jobs<br><small>(Including Failed)</small></div>
157157
<div class="col">{{ (batch.totalJobs-batch.pendingJobs) }} ({{batch.progress}}%)</div>
158158
</div>
159159
</div>
160160
</div>
161161

162162

163-
<div class="card mt-4" v-if="ready && failedJobs.length">
163+
<div class="card overflow-hidden mt-4" v-if="ready && failedJobs.length">
164164
<div class="card-header d-flex align-items-center justify-content-between">
165-
<h5>Failed Jobs</h5>
165+
<h2 class="h6 m-0">Failed Jobs</h2>
166166
</div>
167167

168-
<table class="table table-hover table-sm mb-0">
168+
<table class="table table-hover mb-0">
169169
<thead>
170170
<tr>
171171
<th>Job</th>
172-
<th>Runtime</th>
173-
<th class="text-right">Failed At</th>
172+
<th class="text-right">Runtime</th>
173+
<th class="text-right">Failed</th>
174174
</tr>
175175
</thead>
176176

@@ -183,11 +183,11 @@
183183
</router-link>
184184
</td>
185185

186-
<td class="table-fit">
186+
<td class="text-right text-muted table-fit">
187187
<span>{{ failedJob.failed_at && failedJob.reserved_at ? String((failedJob.failed_at - failedJob.reserved_at).toFixed(2))+'s' : '-' }}</span>
188188
</td>
189189

190-
<td class="text-right table-fit">
190+
<td class="text-right text-muted table-fit">
191191
{{ readableTimestamp(failedJob.failed_at) }}
192192
</td>
193193
</tr>

0 commit comments

Comments
 (0)
0