переработка модальных окон6

frontend/src/components/admin/EmployeesModal.vue

@@ -6,83 +6,52 @@
         <button class="close-button" @click="closeModal">&times;</button>
       </div>
 
-      <div class="employees-container">
+      <div class="search-bar">
-        <div class="search-bar">
+        <input
-          <input
+          type="text"
-            type="text"
+          v-model="searchQuery"
-            v-model="searchQuery"
+          placeholder="Поиск сотрудников..."
-            placeholder="Поиск по имени или отделу..."
+          class="search-input"
-            class="search-input"
+        >
-          >
-        </div>
-
-        <div class="employees-list" v-if="filteredEmployees.length">
-          <div v-for="employee in filteredEmployees" :key="employee.id" class="employee-card">
-            <div class="employee-info">
-              <h3>{{ employee.last_name }} {{ employee.first_name }}</h3>
-              <p class="department">{{ employee.department }}</p>
-            </div>
-
-            <div class="employee-actions">
-              <button class="edit-button" @click="editEmployee(employee)">
-                Изменить
-              </button>
-              <button class="delete-button" @click="deleteEmployee(employee.id)">
-                Удалить
-              </button>
-            </div>
-          </div>
-        </div>
-        
-        <div v-else class="no-employees">
-          <p>Сотрудники не найдены</p>
-        </div>
       </div>
-    </div>
 
-    <!-- Модальное окно редактирования -->
+      <div class="employees-list">
-    <div v-if="editingEmployee" class="edit-modal">
+        <div v-for="employee in filteredEmployees" :key="employee.id" class="employee-card">
-      <div class="edit-modal-content" @click.stop>
+          <div class="employee-info">
-        <h3>Редактировать сотрудника</h3>
+            <h3>{{ employee.last_name }} {{ employee.first_name }}</h3>
-        
+            <p>Отдел: {{ employee.department }}</p>
-        <form @submit.prevent="saveEmployee" class="edit-form">
+            <p>Кабинет: {{ employee.office }}</p>
-          <div class="form-group">
-            <label>Имя</label>
-            <input
-              type="text"
-              v-model="editingEmployee.first_name"
-              required
-              class="form-input"
-            >
           </div>
-
+          <div class="employee-actions">
-          <div class="form-group">
+            <button @click="editEmployee(employee)" class="edit-button">
-            <label>Фамилия</label>
+              Изменить
-            <input
+            </button>
-              type="text"
+            <button @click="confirmDelete(employee)" class="delete-button">
-              v-model="editingEmployee.last_name"
+              Удалить
-              required
-              class="form-input"
-            >
-          </div>
-
-          <div class="form-group">
-            <label>Отдел</label>
-            <input
-              type="text"
-              v-model="editingEmployee.department"
-              required
-              class="form-input"
-            >
-          </div>
-
-          <div class="form-actions">
-            <button type="submit" class="save-button">Сохранить</button>
-            <button type="button" class="cancel-button" @click="cancelEdit">
-              Отмена
             </button>
           </div>
-        </form>
+        </div>
+      </div>
+
+      <!-- Модальное окно редактирования -->
+      <EditEmployeeModal
+        v-if="showEditModal"
+        :isOpen="showEditModal"
+        :employee="selectedEmployee"
+        @close="closeEditModal"
+        @employee-updated="handleEmployeeUpdated"
+      />
+
+      <!-- Модальное окно подтверждения удаления -->
+      <div v-if="showDeleteConfirm" class="confirm-modal">
+        <div class="confirm-content">
+          <h3>Подтверждение удаления</h3>
+          <p>Вы действительно хотите удалить сотрудника {{ selectedEmployee?.last_name }} {{ selectedEmployee?.first_name }}?</p>
+          <div class="confirm-actions">
+            <button @click="deleteEmployee" class="delete-button">Удалить</button>
+            <button @click="cancelDelete" class="cancel-button">Отмена</button>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -90,9 +59,13 @@
 
 <script>
 import axios from 'axios'
+import EditEmployeeModal from './EditEmployeeModal.vue'
 
 export default {
   name: 'EmployeesModal',
+  components: {
+    EditEmployeeModal
+  },
   props: {
     isOpen: {
       type: Boolean,
@@ -103,18 +76,20 @@ export default {
     return {
       employees: [],
       searchQuery: '',
-      editingEmployee: null,
+      showEditModal: false,
-      isLoading: false
+      showDeleteConfirm: false,
+      selectedEmployee: null,
+      error: ''
     }
   },
   computed: {
     filteredEmployees() {
       const query = this.searchQuery.toLowerCase()
-      return this.employees.filter(employee => {
+      return this.employees.filter(employee => 
-        const fullName = `${employee.last_name} ${employee.first_name}`.toLowerCase()
+        employee.last_name.toLowerCase().includes(query) ||
-        const department = employee.department.toLowerCase()
+        employee.first_name.toLowerCase().includes(query) ||
-        return fullName.includes(query) || department.includes(query)
+        employee.department.toLowerCase().includes(query)
-      })
+      )
     }
   },
   methods: {
@@ -134,49 +109,43 @@ export default {
       }
     },
     editEmployee(employee) {
-      this.editingEmployee = { ...employee }
+      this.selectedEmployee = employee
+      this.showEditModal = true
     },
-    cancelEdit() {
+    closeEditModal() {
-      this.editingEmployee = null
+      this.showEditModal = false
+      this.selectedEmployee = null
     },
-    async saveEmployee() {
+    handleEmployeeUpdated() {
+      this.fetchEmployees()
+      this.closeEditModal()
+    },
+    confirmDelete(employee) {
+      this.selectedEmployee = employee
+      this.showDeleteConfirm = true
+    },
+    cancelDelete() {
+      this.showDeleteConfirm = false
+      this.selectedEmployee = null
+    },
+    async deleteEmployee() {
       try {
-        await axios.put(`/api/employees/${this.editingEmployee.id}`,
+        await axios.delete(`/api/employees/${this.selectedEmployee.id}`, {
-          this.editingEmployee,
-          {
-            headers: {
-              Authorization: `Bearer ${localStorage.getItem('admin_token')}`
-            }
-          }
-        )
-        
-        await this.fetchEmployees()
-        this.editingEmployee = null
-      } catch (error) {
-        console.error('Error updating employee:', error)
-      }
-    },
-    async deleteEmployee(employeeId) {
-      if (!confirm('Вы уверены, что хотите удалить этого сотрудника?')) {
-        return
-      }
-
-      try {
-        await axios.delete(`/api/employees/${employeeId}`, {
           headers: {
             Authorization: `Bearer ${localStorage.getItem('admin_token')}`
           }
         })
-        
+        this.showDeleteConfirm = false
-        await this.fetchEmployees()
+        this.selectedEmployee = null
+        this.fetchEmployees()
       } catch (error) {
         console.error('Error deleting employee:', error)
       }
     }
   },
   watch: {
-    isOpen(newValue) {
+    isOpen(newVal) {
-      if (newValue) {
+      if (newVal) {
         this.fetchEmployees()
       }
     }
@@ -204,7 +173,7 @@ export default {
   padding: 2rem;
   width: 90%;
   max-width: 800px;
-  max-height: 90vh;
+  max-height: 80vh;
   overflow-y: auto;
   box-shadow: 0 8px 24px rgba(0, 0, 0, 0.15);
 }
@@ -237,7 +206,7 @@ export default {
 }
 
 .search-bar {
-  margin-bottom: 1.5rem;
+  margin-bottom: 2rem;
 }
 
 .search-input {
@@ -256,41 +225,41 @@ export default {
 
 .employees-list {
   display: grid;
-  gap: 1rem;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  gap: 1.5rem;
 }
 
 .employee-card {
-  background: #f8f9fa;
+  background: #f5f5f5;
   border-radius: 8px;
   padding: 1.5rem;
-  border: 1px solid #e0e0e0;
   display: flex;
-  justify-content: space-between;
+  flex-direction: column;
-  align-items: center;
+  gap: 1rem;
 }
 
 .employee-info h3 {
-  margin: 0 0 0.5rem 0;
+  margin: 0;
   color: #1a237e;
   font-size: 1.2rem;
 }
 
-.department {
+.employee-info p {
-  margin: 0;
+  margin: 0.5rem 0;
   color: #666;
 }
 
 .employee-actions {
   display: flex;
-  gap: 0.5rem;
+  gap: 1rem;
 }
 
 .edit-button, .delete-button {
-  padding: 0.5rem 1rem;
+  flex: 1;
+  padding: 0.5rem;
   border: none;
-  border-radius: 6px;
+  border-radius: 4px;
-  font-size: 0.875rem;
+  font-size: 0.9rem;
-  font-weight: 500;
   cursor: pointer;
   transition: all 0.3s;
 }
@@ -305,21 +274,15 @@ export default {
 }
 
 .delete-button {
-  background-color: #fbe9e7;
+  background-color: #f44336;
-  color: #d32f2f;
+  color: white;
 }
 
 .delete-button:hover {
-  background-color: #ffcdd2;
+  background-color: #d32f2f;
 }
 
-.no-employees {
+.confirm-modal {
-  text-align: center;
-  padding: 2rem;
-  color: #666;
-}
-
-.edit-modal {
   position: fixed;
   top: 0;
   left: 0;
@@ -332,101 +295,38 @@ export default {
   z-index: 1100;
 }
 
-.edit-modal-content {
+.confirm-content {
   background: white;
-  border-radius: 12px;
+  border-radius: 8px;
   padding: 2rem;
   width: 100%;
-  max-width: 500px;
+  max-width: 400px;
-  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.15);
+  text-align: center;
 }
 
-.edit-form {
+.confirm-content h3 {
-  display: flex;
+  margin: 0 0 1rem;
-  flex-direction: column;
-  gap: 1.5rem;
-}
-
-.form-group {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-}
-
-.form-group label {
   color: #1a237e;
-  font-weight: 500;
 }
 
-.form-input {
+.confirm-actions {
-  padding: 0.75rem;
-  border: 2px solid #e0e0e0;
-  border-radius: 6px;
-  font-size: 1rem;
-  transition: border-color 0.3s;
-}
-
-.form-input:focus {
-  outline: none;
-  border-color: #1a237e;
-}
-
-.form-actions {
   display: flex;
   gap: 1rem;
-  margin-top: 1rem;
+  margin-top: 2rem;
-}
-
-.save-button {
-  flex: 1;
-  background-color: #1a237e;
-  color: white;
-  padding: 0.75rem;
-  border: none;
-  border-radius: 6px;
-  font-size: 1rem;
-  font-weight: 500;
-  cursor: pointer;
-  transition: background-color 0.3s;
-}
-
-.save-button:hover {
-  background-color: #283593;
 }
 
 .cancel-button {
   flex: 1;
-  background-color: #f5f5f5;
+  background-color: #9e9e9e;
-  color: #666;
+  color: white;
   padding: 0.75rem;
   border: none;
-  border-radius: 6px;
+  border-radius: 4px;
-  font-size: 1rem;
-  font-weight: 500;
   cursor: pointer;
-  transition: all 0.3s;
+  transition: background-color 0.3s;
 }
 
 .cancel-button:hover {
-  background-color: #e0e0e0;
+  background-color: #757575;
-  color: #1a237e;
-}
-
-@media (max-width: 768px) {
-  .modal-content {
-    padding: 1rem;
-    width: 95%;
-  }
-
-  .employee-card {
-    flex-direction: column;
-    gap: 1rem;
-    text-align: center;
-  }
-
-  .employee-actions {
-    width: 100%;
-    justify-content: center;
-  }
 }
 </style> 

frontend/src/views/admin/AdminDashboardView.vue

@@ -1,244 +1,163 @@
 <template>
-  <div class="admin-layout">
+  <div class="admin-dashboard">
-    <AdminHeader />
+    <div class="dashboard-header">
-    <main class="admin-main">
+      <h1>Панель администратора</h1>
-      <div class="dashboard-container">
+      <button @click="logout" class="logout-button">Выйти</button>
-        <h1 class="dashboard-title">Панель управления</h1>
+    </div>
-        
-        <div class="stats-grid">
-          <div class="stat-card">
-            <h3>Всего заявок</h3>
-            <p class="stat-number">{{ statistics.total_requests || 0 }}</p>
-          </div>
-          
-          <div class="stat-card">
-            <h3>Новые заявки</h3>
-            <p class="stat-number">{{ statistics.by_status?.new || 0 }}</p>
-          </div>
-          
-          <div class="stat-card">
-            <h3>В работе</h3>
-            <p class="stat-number">{{ statistics.by_status?.in_progress || 0 }}</p>
-          </div>
-          
-          <div class="stat-card">
-            <h3>Завершенные</h3>
-            <p class="stat-number">{{ statistics.by_status?.completed || 0 }}</p>
-          </div>
-        </div>
 
-        <div class="actions-grid">
+    <div class="dashboard-content">
-          <div class="action-card" @click="showAddEmployeeModal">
+      <div class="action-buttons">
-            <div class="action-icon">👥</div>
+        <button @click="showAddEmployeeModal = true" class="action-button">
-            <h3>Добавить сотрудника</h3>
+          Добавить сотрудника
-            <p>Регистрация нового сотрудника в системе</p>
+        </button>
-          </div>
+        <button @click="showEmployeesModal = true" class="action-button">
-
+          Список сотрудников
-          <div class="action-card" @click="showRequestsModal">
+        </button>
-            <div class="action-icon">📝</div>
+        <button @click="showRequestsModal = true" class="action-button">
-            <h3>Управление заявками</h3>
+          Управление заявками
-            <p>Просмотр и обработка заявок</p>
+        </button>
-          </div>
-
-          <div class="action-card" @click="showEmployeesModal">
-            <div class="action-icon">👤</div>
-            <h3>Список сотрудников</h3>
-            <p>Управление учетными записями</p>
-          </div>
-        </div>
       </div>
-    </main>
-    <AdminFooter />
-    
-    <AddEmployeeModal 
-      :is-open="isAddEmployeeModalOpen"
-      @close="closeAddEmployeeModal"
-      @employee-added="handleEmployeeAdded"
-    />
 
-    <RequestsModal
+      <!-- Модальные окна -->
-      :is-open="isRequestsModalOpen"
+      <AddEmployeeModal
-      @close="closeRequestsModal"
+        v-if="showAddEmployeeModal"
-    />
+        :isOpen="showAddEmployeeModal"
+        @close="showAddEmployeeModal = false"
+        @employee-added="handleEmployeeAdded"
+      />
 
-    <EmployeesModal
+      <EmployeesModal
-      :is-open="isEmployeesModalOpen"
+        v-if="showEmployeesModal"
-      @close="closeEmployeesModal"
+        :isOpen="showEmployeesModal"
-    />
+        @close="showEmployeesModal = false"
+      />
+
+      <RequestsModal
+        v-if="showRequestsModal"
+        :isOpen="showRequestsModal"
+        @close="showRequestsModal = false"
+      />
+    </div>
   </div>
 </template>
 
 <script>
-import AdminHeader from '@/components/AdminHeader.vue'
-import AdminFooter from '@/components/AdminFooter.vue'
 import AddEmployeeModal from '@/components/admin/AddEmployeeModal.vue'
-import RequestsModal from '@/components/admin/RequestsModal.vue'
 import EmployeesModal from '@/components/admin/EmployeesModal.vue'
-import axios from 'axios'
+import RequestsModal from '@/components/admin/RequestsModal.vue'
 
 export default {
   name: 'AdminDashboardView',
   components: {
-    AdminHeader,
-    AdminFooter,
     AddEmployeeModal,
-    RequestsModal,
+    EmployeesModal,
-    EmployeesModal
+    RequestsModal
   },
   data() {
     return {
-      statistics: {
+      showAddEmployeeModal: false,
-        total_requests: 0,
+      showEmployeesModal: false,
-        by_status: {},
+      showRequestsModal: false
-        by_priority: {}
-      },
-      isAddEmployeeModalOpen: false,
-      isRequestsModalOpen: false,
-      isEmployeesModalOpen: false
     }
   },
   methods: {
-    showAddEmployeeModal() {
+    logout() {
-      this.isAddEmployeeModalOpen = true
+      localStorage.removeItem('admin_token')
-    },
+      this.$router.push('/admin/login')
-    closeAddEmployeeModal() {
-      this.isAddEmployeeModalOpen = false
-    },
-    showRequestsModal() {
-      this.isRequestsModalOpen = true
-    },
-    closeRequestsModal() {
-      this.isRequestsModalOpen = false
-    },
-    showEmployeesModal() {
-      this.isEmployeesModalOpen = true
-    },
-    closeEmployeesModal() {
-      this.isEmployeesModalOpen = false
     },
     handleEmployeeAdded() {
-      // Можно добавить уведомление об успешном добавлении
+      // Обновляем список сотрудников, если модальное окно списка открыто
-      console.log('Сотрудник успешно добавлен')
+      if (this.showEmployeesModal) {
-    },
+        this.$refs.employeesModal?.fetchEmployees()
-    async fetchStatistics() {
-      try {
-        const response = await axios.get('/api/requests/statistics', {
-          headers: {
-            Authorization: `Bearer ${localStorage.getItem('admin_token')}`
-          }
-        });
-        this.statistics = response.data;
-      } catch (error) {
-        console.error('Error fetching statistics:', error);
       }
     }
-  },
-  async created() {
-    await this.fetchStatistics()
   }
 }
 </script>
 
 <style scoped>
-.admin-layout {
+.admin-dashboard {
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  background-color: #f5f5f5;
-}
-
-.admin-main {
-  flex: 1;
   padding: 2rem;
-}
-
-.dashboard-container {
   max-width: 1200px;
   margin: 0 auto;
 }
 
-.dashboard-title {
+.dashboard-header {
-  color: #1a237e;
+  display: flex;
-  margin-bottom: 2rem;
+  justify-content: space-between;
-  font-size: 2rem;
+  align-items: center;
+  margin-bottom: 3rem;
 }
 
-.stats-grid {
+.dashboard-header h1 {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-  gap: 1.5rem;
-  margin-bottom: 2rem;
-}
-
-.stat-card {
-  background: white;
-  padding: 1.5rem;
-  border-radius: 8px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  text-align: center;
-}
-
-.stat-card h3 {
-  color: #1a237e;
-  margin: 0 0 1rem 0;
-  font-size: 1.1rem;
-}
-
-.stat-number {
-  font-size: 2rem;
-  font-weight: bold;
-  color: #1a237e;
   margin: 0;
+  color: #1a237e;
+  font-size: 2rem;
 }
 
-.actions-grid {
+.logout-button {
-  display: grid;
+  background-color: #f44336;
-  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+  color: white;
-  gap: 1.5rem;
+  padding: 0.75rem 1.5rem;
-}
+  border: none;
-
+  border-radius: 6px;
-.action-card {
+  font-size: 1rem;
-  background: white;
-  padding: 2rem;
-  border-radius: 8px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  text-decoration: none;
-  color: inherit;
-  transition: transform 0.3s, box-shadow 0.3s;
   cursor: pointer;
+  transition: background-color 0.3s;
 }
 
-.action-card:hover {
+.logout-button:hover {
-  transform: translateY(-4px);
+  background-color: #d32f2f;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
 }
 
-.action-icon {
+.action-buttons {
-  font-size: 2rem;
+  display: grid;
-  margin-bottom: 1rem;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 1.5rem;
+  margin-bottom: 2rem;
 }
 
-.action-card h3 {
+.action-button {
-  color: #1a237e;
+  background-color: #1a237e;
-  margin: 0 0 0.5rem 0;
+  color: white;
+  padding: 1.5rem;
+  border: none;
+  border-radius: 8px;
+  font-size: 1.1rem;
+  cursor: pointer;
+  transition: all 0.3s;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  min-height: 100px;
 }
 
-.action-card p {
+.action-button:hover {
-  margin: 0;
+  background-color: #283593;
-  color: #666;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
 }
 
 @media (max-width: 768px) {
-  .admin-main {
+  .admin-dashboard {
     padding: 1rem;
   }
 
-  .stats-grid {
+  .dashboard-header {
+    flex-direction: column;
+    gap: 1rem;
+    text-align: center;
+    margin-bottom: 2rem;
+  }
+
+  .action-buttons {
     grid-template-columns: 1fr;
   }
 
-  .actions-grid {
+  .action-button {
-    grid-template-columns: 1fr;
+    padding: 1rem;
+    min-height: 80px;
   }
 }
 </style>