From 7c18258b8c507cc80992925ca3447f0e486390b3 Mon Sep 17 00:00:00 2001 From: RemixDev Date: Fri, 29 Jul 2022 16:29:02 +0000 Subject: [PATCH] Revert "Merge branch 'main' into 'main'" This reverts merge request !40 --- src/router.js | 1 - src/utils/socket.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/router.js b/src/router.js index 9e3cc3f..8418efb 100644 --- a/src/router.js +++ b/src/router.js @@ -120,7 +120,6 @@ const routes = [ const router = new VueRouter({ mode: 'history', - base: process.env.BASE_URL || '', routes, scrollBehavior() { return { x: 0, y: 0 } diff --git a/src/utils/socket.js b/src/utils/socket.js index 363c087..7f56ce6 100644 --- a/src/utils/socket.js +++ b/src/utils/socket.js @@ -33,5 +33,5 @@ class CustomSocket extends WebSocket { } } } -const domain = process.env.WEBSOCKET_URL || location.host -export const socket = new CustomSocket((location.protocol === 'https:' ? 'wss://' : 'ws://') + domain + '/') + +export const socket = new CustomSocket((location.protocol === 'https:' ? 'wss://' : 'ws://') + location.host + '/')