From 84afc32d845958829555fb2a24bd3be8f0c6baaa Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Wed, 27 Nov 2019 23:55:25 +0800 Subject: [PATCH] Revert "Specify base URL at element" This reverts commit f8844cb54924c45a5406c77df9d140e8f907f2b5. --- app/Http/Controllers/AdminController.php | 2 +- .../assets/src/components/ApplyToPlayerDialog.vue | 2 +- resources/assets/src/components/Captcha.vue | 4 ++-- resources/assets/src/components/ClosetItem.vue | 4 ++-- resources/assets/src/components/SkinLibItem.vue | 4 ++-- resources/assets/src/scripts/check-updates.ts | 8 ++++---- resources/assets/src/scripts/init.ts | 4 ++-- resources/assets/src/scripts/logout.ts | 2 +- resources/assets/src/scripts/net.ts | 6 ++---- resources/assets/src/views/admin/Players.vue | 12 ++++++------ resources/assets/src/views/admin/Plugins.vue | 4 ++-- resources/assets/src/views/admin/Reports.vue | 4 ++-- resources/assets/src/views/admin/Update.vue | 2 +- resources/assets/src/views/admin/Users.vue | 2 +- resources/assets/src/views/auth/Forgot.vue | 4 ++-- resources/assets/src/views/auth/Login.vue | 4 ++-- resources/assets/src/views/auth/Register.vue | 6 +++--- resources/assets/src/views/auth/Reset.vue | 2 +- resources/assets/src/views/skinlib/Show.vue | 10 +++++----- resources/assets/src/views/skinlib/Upload.vue | 2 +- resources/assets/src/views/user/Bind.vue | 2 +- resources/assets/src/views/user/Closet.vue | 8 ++++---- resources/assets/src/views/user/Players.vue | 14 +++++++------- resources/assets/src/views/user/Profile.vue | 6 +++--- resources/assets/src/views/user/Report.vue | 4 ++-- resources/assets/tests/setup.ts | 4 ---- resources/views/shared/head.twig | 1 - 27 files changed, 60 insertions(+), 67 deletions(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 8b5ec7de..b45f8547 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -367,7 +367,7 @@ class AdminController extends Controller 'type' => 'a', 'class' => 'float-right', 'style' => 'warning', - 'href' => $request->url().'?clear-cache', + 'href' => '?clear-cache', ]) ->addMessage(trans('options.cache.driver', ['driver' => config('cache.default')]), 'info'); diff --git a/resources/assets/src/components/ApplyToPlayerDialog.vue b/resources/assets/src/components/ApplyToPlayerDialog.vue index 43dc81cb..4bc5cb09 100644 --- a/resources/assets/src/components/ApplyToPlayerDialog.vue +++ b/resources/assets/src/components/ApplyToPlayerDialog.vue @@ -98,7 +98,7 @@ export default { } }, avatarUrl(player) { - return `${document.baseURI}avatar/35/${player.tid_skin}` + return `${blessing.base_url}/avatar/35/${player.tid_skin}` }, }, } diff --git a/resources/assets/src/components/Captcha.vue b/resources/assets/src/components/Captcha.vue index 653d6db5..eb216c66 100644 --- a/resources/assets/src/components/Captcha.vue +++ b/resources/assets/src/components/Captcha.vue @@ -23,7 +23,7 @@
CAPTCHA { - const response = await fetch(`${document.baseURI}admin/update/check`, init) + const response = await fetch(`${blessing.base_url}/admin/update/check`, init) if (response.ok) { const data = await response.json() - const el = document.querySelector(`[href="${document.baseURI}admin/update"] p`) + const el = document.querySelector(`[href="${blessing.base_url}/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(`${document.baseURI}admin/plugins/market/check`, init) + const response = await fetch(`${blessing.base_url}/admin/plugins/market/check`, init) if (response.ok) { const data = await response.json() - const el = document.querySelector(`[href="${document.baseURI}admin/plugins/market"] p`) + const el = document.querySelector(`[href="${blessing.base_url}/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 8c3060ef..0e55e4b3 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(document.baseURI) +const url = new URL(blessing.base_url) url.port = '8080' __webpack_public_path__ = process.env.NODE_ENV === 'development' ? url.toString() - : `${document.baseURI}app/` + : `${blessing.base_url}/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 fce7bea0..56b35ca6 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 = document.baseURI), 1000) + setTimeout(() => (window.location.href = blessing.base_url), 1000) Message.success(message) } diff --git a/resources/assets/src/scripts/net.ts b/resources/assets/src/scripts/net.ts index 632ef9cf..583492bd 100644 --- a/resources/assets/src/scripts/net.ts +++ b/resources/assets/src/scripts/net.ts @@ -79,9 +79,7 @@ export function get(url: string, params = empty): Promise { const qs = queryStringify(params) - return walkFetch( - new Request(`${document.baseURI.slice(0, -1)}${url}${qs && `?${qs}`}`, init), - ) + return walkFetch(new Request(`${blessing.base_url}${url}${qs && `?${qs}`}`, init)) } function nonGet(method: string, url: string, data: any): Promise { @@ -93,7 +91,7 @@ function nonGet(method: string, url: string, data: any): Promise { const isFormData = data instanceof FormData - const request = new Request(`${document.baseURI.slice(0, -1)}${url}`, { + const request = new Request(`${blessing.base_url}${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 f07ea9c0..041525d7 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: document.baseURI, + default: blessing.base_url, }, }, data() { diff --git a/resources/assets/src/views/admin/Plugins.vue b/resources/assets/src/views/admin/Plugins.vue index a630a948..b3ca4bc6 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: document.baseURI, + default: blessing.base_url, }, }, data() { diff --git a/resources/assets/src/views/admin/Update.vue b/resources/assets/src/views/admin/Update.vue index ca3793f1..12d664ba 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 = document.baseURI + window.location = blessing.base_url }, 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 23f6ad57..a83e2942 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 `${document.baseURI}admin/players?uid=${user.uid}` + return `${blessing.base_url}/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 44282cd4..2f8739a6 100644 --- a/resources/assets/src/views/auth/Forgot.vue +++ b/resources/assets/src/views/auth/Forgot.vue @@ -27,7 +27,7 @@
- +
- +