up

frontend/src/components/Layout/AppLayout.vue

@@ -146,4 +146,9 @@ onMounted(async () => {
 const userInitials = computed(() => {
   return (userName.value[0] || 'U').toUpperCase()
 })
+
+async function logout() {
+  await fetch('/api/logout', { method: 'POST' })
+  router.push('/login')
+}
 </script>

frontend/src/views/Users.vue

@@ -24,15 +24,26 @@
             <td class="px-6 py-4 whitespace-nowrap text-sm">{{ user.login }}</td>
             <td class="px-6 py-4 whitespace-nowrap text-sm">{{ user.email }}</td>
             <td class="px-6 py-4 whitespace-nowrap text-sm">
-              <button @click="toggleActive(user)" :class="user.active ? 'text-green-600' : 'text-red-600'">
+              <button
+                v-if="user.id !== currentUserId"
+                @click="toggleActive(user)"
+                :class="user.active ? 'text-green-600' : 'text-red-600'"
+              >
                 {{ user.active ? 'Active' : 'Inactive' }}
               </button>
+              <span v-else class="text-gray-400 text-sm">(You)</span>
             </td>
             <td class="px-6 py-4 whitespace-nowrap text-sm">{{ user.ip || '-' }}</td>
             <td class="px-6 py-4 whitespace-nowrap text-sm">{{ formatDate(user.created) }}</td>
             <td class="px-6 py-4 whitespace-nowrap text-sm space-x-2">
               <button @click="openModal('edit', user)" class="text-blue-600">Edit</button>
-              <button @click="deleteUser(user.id)" class="text-red-600">Delete</button>
+              <button
+                v-if="user.id !== currentUserId"
+                @click="deleteUser(user.id)"
+                class="text-red-600"
+              >
+                Delete
+              </button>
             </td>
           </tr>
         </tbody>
@@ -71,10 +82,24 @@
 import { ref, onMounted } from 'vue';
 import AppLayout from '../components/Layout/AppLayout.vue';
 
+const currentUserId = ref<number | null>(null);
+
+async function loadCurrentUser() {
+  try {
+    const res = await fetch('/api/admin/me');
+    if (res.ok) {
+      const data = await res.json();
+      currentUserId.value = data.id;
+    }
+  } catch (e) {
+    console.error('Failed to load current user', e);
+  }
+}
+
 const users = ref([]);
 const modalOpen = ref(false);
 const modalMode = ref<'create' | 'edit'>('create');
-const form = ref({ id: null, login: '', password: '' });
+const form = ref({ id: null, login: '', email: '', password: '' });
 const modalTitle = ref('');
 
 async function loadUsers() {
@@ -95,10 +120,10 @@ async function toggleActive(user: any) {
 function openModal(mode: 'create' | 'edit', user: any = null) {
   modalMode.value = mode;
   if (mode === 'create') {
-    form.value = { id: null, login: '', password: '' };
+    form.value = { id: null, login: '', email: '', password: '' };
     modalTitle.value = 'Create User';
   } else {
-    form.value = { id: user.id, login: user.login, password: '' };
+    form.value = { id: user.id, login: user.login, email: user.email, password: '' }; // добавлен email
     modalTitle.value = 'Edit User';
   }
   modalOpen.value = true;
@@ -110,23 +135,36 @@ function closeModal() {
 
 async function submitUser() {
   try {
+    const payload: any = {
+      login: form.value.login,
+      email: form.value.email,
+    };
+    if (form.value.password) {
+      payload.password = form.value.password;
+    }
     if (modalMode.value === 'create') {
-      await fetch('/api/admin/users', {
+      if (!form.value.password) {
+        alert('Password is required');
+        return;
+      }
+      const res = await fetch('/api/admin/users', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ login: form.value.login, password: form.value.password })
+        body: JSON.stringify(payload),
       });
+      if (!res.ok) throw new Error('Create failed');
     } else {
-      await fetch(`/api/admin/users/${form.value.id}`, {
+      const res = await fetch(`/api/admin/users/${form.value.id}`, {
         method: 'PUT',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ login: form.value.login, password: form.value.password || undefined })
+        body: JSON.stringify(payload),
       });
+      if (!res.ok) throw new Error('Update failed');
     }
     await loadUsers();
     closeModal();
   } catch (e) {
-    alert('Operation failed');
+    alert('Operation failed: ' + e.message);
   }
 }
 
@@ -137,5 +175,8 @@ async function deleteUser(id: number) {
   }
 }
 
-onMounted(loadUsers);
+onMounted(async () => {
+  await loadCurrentUser();
+  await loadUsers();
+});
 </script>

frontend/src/views/auth/Login.vue

@@ -16,7 +16,7 @@
       <div class="bg-white rounded-2xl shadow-xl p-8">
         <form @submit.prevent="handleLogin" class="space-y-6">
           <div>
-            <label class="block text-sm font-medium text-gray-700 mb-2">Username</label>
+            <label class="block text-sm font-medium text-gray-700 mb-2">Username or Email</label>
             <div class="relative">
               <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
                 <svg class="h-5 w-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -28,7 +28,7 @@
                 type="text"
                 required
                 class="input-field pl-10"
-                placeholder="Enter your username"
+                placeholder="Enter your username or email"
               />
             </div>
           </div>
@@ -120,7 +120,13 @@ async function handleLogin() {
     if (res.ok) {
       router.push('/dashboard')
     } else {
-      error.value = 'Invalid username or password'
+      // Пытаемся получить текст ошибки от сервера
+      const text = await res.text()
+      if (text && text.trim()) {
+        error.value = text
+      } else {
+        error.value = 'Invalid username or password'
+      }
     }
   } catch (e) {
     error.value = 'Network error. Please try again.'