Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Horizon to be used on a subdomain without a subfolder #749

Merged
merged 1 commit into from
Jan 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion resources/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,19 @@ window.Popper = require('popper.js').default;

Vue.prototype.$http = axios.create();

window.Horizon.basePath = '/' + window.Horizon.path;

let routerBasePath = window.Horizon.basePath + '/';

if (window.Horizon.path === '' || window.Horizon.path === '/') {
routerBasePath = '/';
window.Horizon.basePath = '';
}

const router = new VueRouter({
routes: Routes,
mode: 'history',
base: '/' + window.Horizon.path + '/',
base: routerBasePath,
});

Vue.component('vue-json-pretty', VueJsonPretty);
Expand Down
6 changes: 3 additions & 3 deletions resources/js/screens/dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
* Load the general stats.
*/
loadStats() {
return this.$http.get('/' + Horizon.path + '/api/stats')
return this.$http.get(Horizon.basePath + '/api/stats')
.then(response => {
this.stats = response.data;

Expand All @@ -80,7 +80,7 @@
* Load the workers stats.
*/
loadWorkers() {
return this.$http.get('/' + Horizon.path + '/api/masters')
return this.$http.get(Horizon.basePath + '/api/masters')
.then(response => {
this.workers = response.data;
});
Expand All @@ -91,7 +91,7 @@
* Load the workload stats.
*/
loadWorkload() {
return this.$http.get('/' + Horizon.path + '/api/workload')
return this.$http.get(Horizon.basePath + '/api/workload')
.then(response => {
this.workload = response.data;
});
Expand Down
4 changes: 2 additions & 2 deletions resources/js/screens/failedJobs/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

var tagQuery = this.tagSearchPhrase ? 'tag=' + this.tagSearchPhrase + '&' : '';

this.$http.get('/' + Horizon.path + '/api/jobs/failed?' + tagQuery + 'starting_at=' + starting)
this.$http.get(Horizon.basePath + '/api/jobs/failed?' + tagQuery + 'starting_at=' + starting)
.then(response => {
if (!this.$root.autoLoadsNewEntries && refreshing && !response.data.jobs.length) {
return;
Expand Down Expand Up @@ -109,7 +109,7 @@

this.retryingJobs.push(id);

this.$http.post('/' + Horizon.path + '/api/jobs/retry/' + id)
this.$http.post(Horizon.basePath + '/api/jobs/retry/' + id)
.then((response) => {
setTimeout(() => {
this.retryingJobs = _.reject(this.retryingJobs, job => job == id);
Expand Down
8 changes: 4 additions & 4 deletions resources/js/screens/failedJobs/job.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
loadFailedJob(id) {
this.ready = false;

this.$http.get('/' + Horizon.path + '/api/jobs/failed/' + id)
this.$http.get(Horizon.basePath + '/api/jobs/failed/' + id)
.then(response => {
this.job = response.data;

Expand All @@ -57,7 +57,7 @@
* Reload the job retries.
*/
reloadRetries() {
this.$http.get('/' + Horizon.path + '/api/jobs/failed/' + this.$route.params.jobId)
this.$http.get(Horizon.basePath + '/api/jobs/failed/' + this.$route.params.jobId)
.then(response => {
this.job.retried_by = response.data.retried_by;

Expand All @@ -75,7 +75,7 @@

this.retrying = true;

this.$http.post('/' + Horizon.path + '/api/jobs/retry/' + id)
this.$http.post(Horizon.basePath + '/api/jobs/retry/' + id)
.then(() => {
setTimeout(() => {
this.reloadRetries();
Expand Down Expand Up @@ -211,7 +211,7 @@
</td>

<td class="table-fit">
<a v-if="retry.status == 'failed'" :href="'/' + Horizon.path + '/failed/'+retry.id">
<a v-if="retry.status == 'failed'" :href="Horizon.basePath + '/failed/'+retry.id">
{{ retry.id }}
</a>
<span v-else>{{ retry.id }}</span>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/screens/metrics/jobs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
loadJobs() {
this.ready = false;

this.$http.get('/' + Horizon.path + '/api/metrics/jobs')
this.$http.get(Horizon.basePath + '/api/metrics/jobs')
.then(response => {
this.jobs = response.data;

Expand Down
2 changes: 1 addition & 1 deletion resources/js/screens/metrics/preview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
loadMetric() {
this.ready = false;

this.$http.get('/' + Horizon.path + '/api/metrics/' + this.$route.params.type + '/' + encodeURIComponent(this.$route.params.slug))
this.$http.get(Horizon.basePath + '/api/metrics/' + this.$route.params.type + '/' + encodeURIComponent(this.$route.params.slug))
.then(response => {
let data = this.prepareData(response.data);

Expand Down
2 changes: 1 addition & 1 deletion resources/js/screens/metrics/queues.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
loadQueues() {
this.ready = false;

this.$http.get('/' + Horizon.path + '/api/metrics/queues')
this.$http.get(Horizon.basePath + '/api/metrics/queues')
.then(response => {
this.queues = response.data;

Expand Down
6 changes: 3 additions & 3 deletions resources/js/screens/monitoring/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
loadTags() {
this.ready = false;

this.$http.get('/' + Horizon.path + '/api/monitoring')
this.$http.get(Horizon.basePath + '/api/monitoring')
.then(response => {
this.tags = response.data;

Expand Down Expand Up @@ -66,7 +66,7 @@
return;
}

this.$http.post('/' + Horizon.path + '/api/monitoring', {'tag': this.newTag})
this.$http.post(Horizon.basePath + '/api/monitoring', {'tag': this.newTag})
.then(response => {
$('#addTagModal').modal('hide');

Expand All @@ -92,7 +92,7 @@
* Stop monitoring the given tag.
*/
stopMonitoring(tag) {
this.$http.delete('/' + Horizon.path + '/api/monitoring/' + encodeURIComponent(tag))
this.$http.delete(Horizon.basePath + '/api/monitoring/' + encodeURIComponent(tag))
.then(() => {
this.tags = _.reject(this.tags, existing => existing.tag == tag)
})
Expand Down
2 changes: 1 addition & 1 deletion resources/js/screens/monitoring/tag-jobs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

tag = this.type == 'failed' ? 'failed:' + tag : tag;

this.$http.get('/' + Horizon.path + '/api/monitoring/' + encodeURIComponent(tag) + '?starting_at=' + starting + '&limit=' + this.perPage)
this.$http.get(Horizon.basePath + '/api/monitoring/' + encodeURIComponent(tag) + '?starting_at=' + starting + '&limit=' + this.perPage)
.then(response => {
if (!this.$root.autoLoadsNewEntries && refreshing && this.jobs.length && _.first(response.data.jobs).id !== _.first(this.jobs).id) {
this.hasNewEntries = true;
Expand Down
2 changes: 1 addition & 1 deletion resources/js/screens/recentJobs/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
this.ready = false;
}

this.$http.get('/' + Horizon.path + '/api/jobs/recent?starting_at=' + starting + '&limit=' + this.perPage)
this.$http.get(Horizon.basePath + '/api/jobs/recent?starting_at=' + starting + '&limit=' + this.perPage)
.then(response => {
if (!this.$root.autoLoadsNewEntries && refreshing && this.jobs.length && _.first(response.data.jobs).id !== _.first(this.jobs).id) {
this.hasNewEntries = true;
Expand Down