mirror of
https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git
synced 2025-08-14 00:25:46 +02:00
чиним билд05
This commit is contained in:
@@ -1,60 +1,22 @@
|
||||
import { createRouter, createWebHistory } from 'vue-router';
|
||||
import { useAuthStore } from '@/stores/auth';
|
||||
|
||||
const router = createRouter({
|
||||
history: createWebHistory(),
|
||||
routes: [
|
||||
{
|
||||
path: '/',
|
||||
component: () => import('@/layouts/MainLayout.vue'),
|
||||
children: [
|
||||
{
|
||||
path: '',
|
||||
name: 'Home',
|
||||
component: () => import('@/views/HomeView.vue')
|
||||
},
|
||||
{
|
||||
path: 'login',
|
||||
name: 'Login',
|
||||
component: () => import('@/views/LoginView.vue')
|
||||
}
|
||||
]
|
||||
name: 'home',
|
||||
component: () => import('@/views/HomeView.vue')
|
||||
},
|
||||
{
|
||||
path: '/login',
|
||||
name: 'login',
|
||||
component: () => import('@/views/LoginView.vue')
|
||||
},
|
||||
{
|
||||
path: '/admin',
|
||||
component: () => import('@/layouts/AdminLayout.vue'),
|
||||
meta: { requiresAdmin: true },
|
||||
children: [
|
||||
{
|
||||
path: '',
|
||||
redirect: '/admin/dashboard'
|
||||
},
|
||||
{
|
||||
path: 'dashboard',
|
||||
name: 'AdminDashboard',
|
||||
component: () => import('@/views/admin/DashboardView.vue')
|
||||
},
|
||||
{
|
||||
path: 'requests',
|
||||
name: 'AdminRequests',
|
||||
component: () => import('@/views/admin/RequestsView.vue')
|
||||
},
|
||||
{
|
||||
path: 'employees',
|
||||
name: 'AdminEmployees',
|
||||
component: () => import('@/views/admin/EmployeesView.vue')
|
||||
},
|
||||
{
|
||||
path: 'employees/add',
|
||||
name: 'AdminEmployeeAdd',
|
||||
component: () => import('@/views/admin/AddEmployeeView.vue')
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: '/admin/login',
|
||||
name: 'AdminLogin',
|
||||
component: () => import('@/views/admin/AdminLoginView.vue')
|
||||
name: 'admin-login',
|
||||
component: () => import('@/views/AdminLoginView.vue')
|
||||
},
|
||||
{
|
||||
path: '/requests',
|
||||
@@ -65,20 +27,23 @@ const router = createRouter({
|
||||
]
|
||||
});
|
||||
|
||||
router.beforeEach((to, _, next) => {
|
||||
const authStore = useAuthStore();
|
||||
|
||||
if (to.meta.requiresAdmin && !authStore.isAdmin) {
|
||||
next({ name: 'AdminLogin' });
|
||||
} else if (to.meta.requiresAuth) {
|
||||
const token = localStorage.getItem('token');
|
||||
router.beforeEach((to, from, next) => {
|
||||
console.log('Проверка маршрута:', to.path)
|
||||
|
||||
if (to.meta.requiresAuth) {
|
||||
console.log('Маршрут требует авторизации')
|
||||
const token = localStorage.getItem('token')
|
||||
console.log('Токен:', token ? 'Присутствует' : 'Отсутствует')
|
||||
|
||||
if (!token) {
|
||||
next('/login');
|
||||
return;
|
||||
console.log('Перенаправление на /login')
|
||||
next('/login')
|
||||
return
|
||||
}
|
||||
} else {
|
||||
next();
|
||||
}
|
||||
});
|
||||
|
||||
console.log('Разрешаем переход')
|
||||
next()
|
||||
})
|
||||
|
||||
export default router;
|
||||
export default router
|
@@ -69,19 +69,23 @@ const handleLogin = async () => {
|
||||
error.value = ''
|
||||
|
||||
try {
|
||||
console.log('Отправка запроса на авторизацию...')
|
||||
const response = await axios.post('/api/auth/login', {
|
||||
last_name: lastName.value,
|
||||
password: password.value
|
||||
})
|
||||
console.log('Ответ от сервера:', response.data)
|
||||
|
||||
// Сохраняем данные сотрудника и токен
|
||||
localStorage.setItem('employee', JSON.stringify(response.data))
|
||||
localStorage.setItem('token', response.data.access_token)
|
||||
|
||||
console.log('Перенаправление на /requests...')
|
||||
// Перенаправляем на страницу заявок
|
||||
router.push('/requests')
|
||||
await router.push('/requests')
|
||||
} catch (e: any) {
|
||||
error.value = e.response?.data?.detail || 'Произошла ошибка при входе'
|
||||
console.error('Ошибка при авторизации:', e)
|
||||
error.value = e.response?.data?.detail || 'Неверная фамилия или пароль'
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
Reference in New Issue
Block a user