From b9fbad1d20da7c5e566e6eb5dbfffd4edac4b845 Mon Sep 17 00:00:00 2001 From: MoonTestUse1 Date: Fri, 3 Jan 2025 20:38:16 +0600 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B0=D0=B2=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/main.py | 2 +- frontend/nginx.conf | 10 ++++++++++ frontend/src/views/admin/AdminLoginView.vue | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/backend/app/main.py b/backend/app/main.py index c8ff9a0..c8cd12a 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -19,7 +19,7 @@ app.add_middleware( ) # Include routers -app.include_router(auth.router, prefix="/api/auth", tags=["auth"]) +app.include_router(auth.router, prefix="/auth", tags=["auth"]) app.include_router(admin.router, prefix="/api/admin", tags=["admin"]) app.include_router(employees.router, prefix="/api/employees", tags=["employees"]) app.include_router(requests.router, prefix="/api/requests", tags=["requests"]) diff --git a/frontend/nginx.conf b/frontend/nginx.conf index 5cbaeb5..3bf1dd0 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -5,6 +5,16 @@ server { root /usr/share/nginx/html; index index.html; + # Auth proxy + location /auth/ { + proxy_pass http://backend:8000/auth/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + } + # API proxy location /api/ { proxy_pass http://backend:8000/api/; diff --git a/frontend/src/views/admin/AdminLoginView.vue b/frontend/src/views/admin/AdminLoginView.vue index 4026f59..bf0bd90 100644 --- a/frontend/src/views/admin/AdminLoginView.vue +++ b/frontend/src/views/admin/AdminLoginView.vue @@ -64,7 +64,7 @@ export default { formData.append('username', this.username) formData.append('password', this.password) - const response = await axios.post('/api/auth/admin/login', formData) + const response = await axios.post('/auth/admin/login', formData) localStorage.setItem('admin_token', response.data.access_token) this.$router.push('/admin/dashboard')