From b473b148379bfecd584c58c667c371eaae767b64 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Fri, 3 Jan 2025 03:53:31 +0600
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=B2=20=D1=83=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=81=D0=BE?=
 =?UTF-8?q?=D1=82=D1=80=D1=83=D0=B4=D0=BD=D0=B8=D0=BAaa1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/frontend/Dockerfile                    | 29 ++++++++++++++-----
 frontend/.dockerignore                        | 20 +++++++++++++
 .../src/components/admin/RequestsModal.vue    | 10 ++++++-
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 frontend/.dockerignore

diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index a1eaa07..3ead535 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -1,23 +1,38 @@
-FROM node:20-alpine as build
+# Build stage
+FROM node:18-alpine as build
 
 WORKDIR /app
 
+# Копируем только файлы для установки зависимостей
 COPY frontend/package*.json ./
 
-RUN npm install
+# Устанавливаем зависимости
+RUN npm ci
 
-COPY frontend .
+# Копируем остальные файлы проекта
+COPY frontend/ .
 
+# Собираем приложение
 RUN npm run build
 
+# Production stage
 FROM nginx:alpine
 
-COPY --from=build /app/dist /usr/share/nginx/html
+# Устанавливаем certbot и необходимые пакеты
+RUN apk add --no-cache certbot certbot-nginx
+
+# Копируем конфигурацию nginx
 COPY docker/frontend/nginx.conf /etc/nginx/conf.d/default.conf
 
-# Создаем директории для сертификатов
-RUN mkdir -p /etc/letsencrypt
-RUN mkdir -p /var/www/certbot
+# Копируем скрипт инициализации SSL
+COPY docker/frontend/init-ssl.sh /docker-entrypoint.d/init-ssl.sh
+RUN chmod +x /docker-entrypoint.d/init-ssl.sh
+
+# Копируем только собранные файлы из build stage
+COPY --from=build /app/dist /usr/share/nginx/html
+
+# Создаем директории для Let's Encrypt
+RUN mkdir -p /var/www/certbot /etc/letsencrypt
 
 EXPOSE 80 443
 
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
new file mode 100644
index 0000000..9c0367b
--- /dev/null
+++ b/frontend/.dockerignore
@@ -0,0 +1,20 @@
+node_modules
+dist
+.git
+.gitignore
+README.md
+.env
+.env.*
+*.log
+.DS_Store
+coverage
+.vscode
+.idea
+*.md
+*.test.js
+*.spec.js
+__tests__
+tests
+test
+.npm
+.eslintcache 
\ No newline at end of file
diff --git a/frontend/src/components/admin/RequestsModal.vue b/frontend/src/components/admin/RequestsModal.vue
index d604b34..e7dbbbb 100644
--- a/frontend/src/components/admin/RequestsModal.vue
+++ b/frontend/src/components/admin/RequestsModal.vue
@@ -113,8 +113,9 @@ export default {
     async fetchRequests() {
       this.isLoading = true
       try {
+        console.log('Token:', localStorage.getItem('admin_token')) // Для отладки токена
         console.log('Fetching requests...') // Для отладки
-        const response = await axios.get('/api/requests', {
+        const response = await axios.get('/api/admin/requests', {
           headers: {
             Authorization: `Bearer ${localStorage.getItem('admin_token')}`
           },
@@ -140,6 +141,13 @@ export default {
           requestsData = Array.isArray(response.data) ? response.data : []
         }
 
+        console.log('Requests data after processing:', requestsData) // Для отладки
+
+        if (requestsData.length === 0) {
+          console.log('No requests found in the response') // Для отладки
+          return
+        }
+
         // Получаем информацию о сотрудниках для отображения имен
         const employeesResponse = await axios.get('/api/employees', {
           headers: {