diff --git a/resources/js/router/index.js b/resources/js/router/index.js index 8c828239..5dedfbaa 100644 --- a/resources/js/router/index.js +++ b/resources/js/router/index.js @@ -12,7 +12,7 @@ import noRegistration from './middlewares/noRegistration' import setReturnTo from './middlewares/setReturnTo' const router = createRouter({ - history: createWebHistory('/'), + history: createWebHistory(window.appConfig.subdirectory ? window.appConfig.subdirectory : '/'), routes: [ { path: '/start', name: 'start', component: () => import('../views/Start.vue'), meta: { middlewares: [authGuard, setReturnTo], watchedByKicker: true } }, { path: '/capture', name: 'capture', component: () => import('../views/twofaccounts/Capture.vue'), meta: { middlewares: [authGuard, setReturnTo], watchedByKicker: true } }, diff --git a/resources/js/services/httpClientFactory.js b/resources/js/services/httpClientFactory.js index fab98909..23e56943 100644 --- a/resources/js/services/httpClientFactory.js +++ b/resources/js/services/httpClientFactory.js @@ -4,11 +4,12 @@ import { useNotifyStore } from '@/stores/notify' export const httpClientFactory = (endpoint = 'api') => { let baseURL + const subdir = window.appConfig.subdirectory if (endpoint === 'web') { - baseURL = '/' + baseURL = subdir + '/' } else { - baseURL = '/api/v1' + baseURL = subdir + '/api/v1' } const httpClient = axios.create({ diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php index c8de140f..21606e6f 100644 --- a/resources/views/landing.blade.php +++ b/resources/views/landing.blade.php @@ -15,7 +15,7 @@ - + diff --git a/vite.config.js b/vite.config.js index e41a8f2a..8b29bcf8 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,7 +5,10 @@ import i18n from 'laravel-vue-i18n/vite' import AutoImport from 'unplugin-auto-import/vite' import version from './vite.version' +const ASSET_URL = process.env.ASSET_URL || '' + export default defineConfig({ + base: `${ASSET_URL}`, plugins: [ laravel([ 'resources/js/app.js',