diff --git a/frontend/src/core/components/ui/button/index.ts b/frontend/src/core/components/ui/button/index.ts index d81b656..f9686f4 100644 --- a/frontend/src/core/components/ui/button/index.ts +++ b/frontend/src/core/components/ui/button/index.ts @@ -17,8 +17,8 @@ export const buttonVariants = cva( size: { default: 'h-14 px-4 py-4', xs: 'h-7 rounded px-2', - sm: 'h-9 rounded-md px-3', - lg: 'h-14 rounded-md px-8', + sm: 'h-9 px-3', + lg: 'h-14 px-8', icon: 'h-10 w-10', }, }, diff --git a/frontend/src/modules/auth/service/auth.service.ts b/frontend/src/modules/auth/service/auth.service.ts index fc3c1f9..34bffd8 100644 --- a/frontend/src/modules/auth/service/auth.service.ts +++ b/frontend/src/modules/auth/service/auth.service.ts @@ -13,7 +13,7 @@ class AuthService { } async getCurrentUser() { - return axios.get(`${this.baseUrl}/current`).then(res => res.data) + return axios.get(`${this.baseUrl}/current-user`) } } diff --git a/frontend/src/modules/errors/pages/internal-error-page.vue b/frontend/src/modules/errors/pages/internal-error-page.vue index 1daf5d1..6380df6 100644 --- a/frontend/src/modules/errors/pages/internal-error-page.vue +++ b/frontend/src/modules/errors/pages/internal-error-page.vue @@ -1,7 +1,24 @@ - + diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 77c62a4..4c16388 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -29,12 +29,12 @@ export default defineConfig({ }, }, server: { - // proxy: { - // '/api': { - // target: 'http://localhost:5173', - // changeOrigin: true, - // secure: false, - // }, - // }, + proxy: { + '/api': { + target: 'http://localhost:8080', + changeOrigin: true, + secure: false, + }, + }, }, })