diff --git a/apps/api/src/modules/auth/scripts/provision-initial-admin.js b/apps/api/src/modules/auth/scripts/provision-initial-admin.js index 7854c71..ef04963 100644 --- a/apps/api/src/modules/auth/scripts/provision-initial-admin.js +++ b/apps/api/src/modules/auth/scripts/provision-initial-admin.js @@ -1,4 +1,7 @@ -import 'dotenv/config'; +import dotenv from 'dotenv'; +import { fileURLToPath } from 'node:url'; + +dotenv.config({ path: fileURLToPath(new URL('../../../../../../.env', import.meta.url)) }); import { createDatabase } from '../../../infrastructure/database/client.js'; import { createUserRepository } from '../repositories/user-repository.js'; diff --git a/apps/web/src/router/index.js b/apps/web/src/router/index.js index 4c72835..efb4dce 100644 --- a/apps/web/src/router/index.js +++ b/apps/web/src/router/index.js @@ -9,7 +9,7 @@ import LoginPage from '@/pages/LoginPage.vue'; import { useAuth } from '@/composables/useAuth.js'; import AdminImagePage from '@/pages/AdminImagePage.vue'; -export default createRouter({ +const router = createRouter({ history: createWebHistory(), routes: [ { path: '/', name: 'catalog', component: CatalogPage }, @@ -27,6 +27,8 @@ export default createRouter({ ], }); +export default router; + const auth = useAuth(); router.beforeEach(async (to) => { if (!to.path.startsWith('/admin')) return true; diff --git a/playwright.config.js b/playwright.config.js index a11e262..097b8eb 100644 --- a/playwright.config.js +++ b/playwright.config.js @@ -4,9 +4,15 @@ export default defineConfig({ testDir: './apps/web/tests/e2e', timeout: 30_000, use: { - baseURL: process.env.E2E_BASE_URL ?? 'http://127.0.0.1:5173', + baseURL: process.env.E2E_BASE_URL ?? 'http://localhost:5173', trace: 'on-first-retry', screenshot: 'only-on-failure', }, + webServer: { + command: 'npm run dev:web', + url: 'http://localhost:5173', + reuseExistingServer: true, + timeout: 30_000, + }, reporter: [['list']], });