diff --git a/resources/assets/src/components/ApplyToPlayerDialog.vue b/resources/assets/src/components/ApplyToPlayerDialog.vue index 4bc5cb09..43dc81cb 100644 --- a/resources/assets/src/components/ApplyToPlayerDialog.vue +++ b/resources/assets/src/components/ApplyToPlayerDialog.vue @@ -98,7 +98,7 @@ export default { } }, avatarUrl(player) { - return `${blessing.base_url}/avatar/35/${player.tid_skin}` + return `${document.baseURI}avatar/35/${player.tid_skin}` }, }, } diff --git a/resources/assets/src/components/Captcha.vue b/resources/assets/src/components/Captcha.vue index eb216c66..653d6db5 100644 --- a/resources/assets/src/components/Captcha.vue +++ b/resources/assets/src/components/Captcha.vue @@ -23,7 +23,7 @@
CAPTCHA { - const response = await fetch(`${blessing.base_url}/admin/update/check`, init) + const response = await fetch(`${document.baseURI}admin/update/check`, init) if (response.ok) { const data = await response.json() - const el = document.querySelector(`[href="${blessing.base_url}/admin/update"] p`) + const el = document.querySelector(`[href="${document.baseURI}admin/update"] p`) if (data.available && el) { el.innerHTML += 'New' } @@ -20,11 +20,11 @@ export async function checkForUpdates(): Promise { } export async function checkForPluginUpdates(): Promise { - const response = await fetch(`${blessing.base_url}/admin/plugins/market/check`, init) + const response = await fetch(`${document.baseURI}admin/plugins/market/check`, init) if (response.ok) { const data = await response.json() - const el = document.querySelector(`[href="${blessing.base_url}/admin/plugins/market"] p`) + const el = document.querySelector(`[href="${document.baseURI}admin/plugins/market"] p`) if (data.available && el) { const length = data.plugins.length as number el.innerHTML += `${length}` diff --git a/resources/assets/src/scripts/init.ts b/resources/assets/src/scripts/init.ts index 0e55e4b3..8c3060ef 100644 --- a/resources/assets/src/scripts/init.ts +++ b/resources/assets/src/scripts/init.ts @@ -6,12 +6,12 @@ import $ from 'jquery' // @ts-ignore declare let __webpack_public_path__: string -const url = new URL(blessing.base_url) +const url = new URL(document.baseURI) url.port = '8080' __webpack_public_path__ = process.env.NODE_ENV === 'development' ? url.toString() - : `${blessing.base_url}/app/` + : `${document.baseURI}app/` // @ts-ignore window.$ = window.jQuery = $ // eslint-disable-line diff --git a/resources/assets/src/scripts/logout.ts b/resources/assets/src/scripts/logout.ts index 56b35ca6..fce7bea0 100644 --- a/resources/assets/src/scripts/logout.ts +++ b/resources/assets/src/scripts/logout.ts @@ -12,7 +12,7 @@ export async function logout() { } const { message } = await post('/auth/logout') - setTimeout(() => (window.location.href = blessing.base_url), 1000) + setTimeout(() => (window.location.href = document.baseURI), 1000) Message.success(message) } diff --git a/resources/assets/src/scripts/net.ts b/resources/assets/src/scripts/net.ts index 583492bd..632ef9cf 100644 --- a/resources/assets/src/scripts/net.ts +++ b/resources/assets/src/scripts/net.ts @@ -79,7 +79,9 @@ export function get(url: string, params = empty): Promise { const qs = queryStringify(params) - return walkFetch(new Request(`${blessing.base_url}${url}${qs && `?${qs}`}`, init)) + return walkFetch( + new Request(`${document.baseURI.slice(0, -1)}${url}${qs && `?${qs}`}`, init), + ) } function nonGet(method: string, url: string, data: any): Promise { @@ -91,7 +93,7 @@ function nonGet(method: string, url: string, data: any): Promise { const isFormData = data instanceof FormData - const request = new Request(`${blessing.base_url}${url}`, { + const request = new Request(`${document.baseURI.slice(0, -1)}${url}`, { body: isFormData ? data : JSON.stringify(data), method: method.toUpperCase(), ...init, diff --git a/resources/assets/src/views/admin/Players.vue b/resources/assets/src/views/admin/Players.vue index 041525d7..f07ea9c0 100644 --- a/resources/assets/src/views/admin/Players.vue +++ b/resources/assets/src/views/admin/Players.vue @@ -22,7 +22,7 @@ - + - + @@ -133,7 +133,7 @@ export default { props: { baseUrl: { type: String, - default: blessing.base_url, + default: document.baseURI, }, }, data() { diff --git a/resources/assets/src/views/admin/Plugins.vue b/resources/assets/src/views/admin/Plugins.vue index b3ca4bc6..a630a948 100644 --- a/resources/assets/src/views/admin/Plugins.vue +++ b/resources/assets/src/views/admin/Plugins.vue @@ -16,7 +16,7 @@ | {{ props.formattedRow[props.column.field] }} - {{ $t('report.check') }} + {{ $t('report.check') }} {{ $t('report.delete') }} @@ -66,7 +66,7 @@ export default { props: { baseUrl: { type: String, - default: blessing.base_url, + default: document.baseURI, }, }, data() { diff --git a/resources/assets/src/views/admin/Update.vue b/resources/assets/src/views/admin/Update.vue index 12d664ba..ca3793f1 100644 --- a/resources/assets/src/views/admin/Update.vue +++ b/resources/assets/src/views/admin/Update.vue @@ -77,7 +77,7 @@ export default { return } await this.$alert(this.$t('admin.updateCompleted'), { type: 'success' }) - window.location = blessing.base_url + window.location = document.baseURI }, async polling() { const percentage = await this.$http.get( diff --git a/resources/assets/src/views/admin/Users.vue b/resources/assets/src/views/admin/Users.vue index a83e2942..23f6ad57 100644 --- a/resources/assets/src/views/admin/Users.vue +++ b/resources/assets/src/views/admin/Users.vue @@ -113,7 +113,7 @@ export default { } }, playersLink(user) { - return `${blessing.base_url}/admin/players?uid=${user.uid}` + return `${document.baseURI}admin/players?uid=${user.uid}` }, }, mixins: [ diff --git a/resources/assets/src/views/auth/Forgot.vue b/resources/assets/src/views/auth/Forgot.vue index 2f8739a6..44282cd4 100644 --- a/resources/assets/src/views/auth/Forgot.vue +++ b/resources/assets/src/views/auth/Forgot.vue @@ -27,7 +27,7 @@
- +