diff --git a/docker-compose.yml b/docker-compose.yml index f263b92..7051c0a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -147,10 +147,9 @@ services: volumes: - ./id_rsa:/key:ro command: > - sh -c "apk add --no-cache openssh && ssh -i /key -o StrictHostKeyChecking=no -N -R 0.0.0.0:9000:host.docker.internal:5173 root@185.221.214.140" + sh -c "apk add --no-cache openssh && ssh -i /key -o StrictHostKeyChecking=no -N -R 0.0.0.0:9000:host.docker.internal:9000 root@185.221.214.140" restart: unless-stopped - # network_mode: host <-- Эту строку удаляем - extra_hosts: # <-- Эту секцию добавляем + extra_hosts: - "host.docker.internal:host-gateway" ssh-tunnel-backend: @@ -161,10 +160,20 @@ services: command: > sh -c "apk add --no-cache openssh && ssh -i /key -o StrictHostKeyChecking=no -N -R 0.0.0.0:8000:host.docker.internal:8000 root@185.221.214.140" restart: unless-stopped - # network_mode: host <-- Эту строку удаляем - extra_hosts: # <-- Эту секцию добавляем + extra_hosts: - "host.docker.internal:host-gateway" + frontend-nginx: + build: + context: ./frontend + dockerfile: nginx.Dockerfile + container_name: dapp-frontend-nginx + restart: unless-stopped + ports: + - "9000:80" # 9000 — порт, который пробрасывается наружу/через туннель + depends_on: + - backend + volumes: postgres_data: null ollama_data: null diff --git a/nginx-optimized.conf b/frontend/nginx-optimized.conf similarity index 100% rename from nginx-optimized.conf rename to frontend/nginx-optimized.conf diff --git a/frontend/nginx-tunnel.conf b/frontend/nginx-tunnel.conf new file mode 100644 index 0000000..9fbef86 --- /dev/null +++ b/frontend/nginx-tunnel.conf @@ -0,0 +1,32 @@ +server { + listen 80; + server_name _; + + root /usr/share/nginx/html; + index index.html; + + location / { + try_files $uri $uri/ /index.html; + } + + # Прокси для API (если нужно) + location /api/ { + proxy_pass http://backend:8000/api/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + # Прокси для WebSocket (если нужно) + location /ws { + proxy_pass http://backend:8000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} diff --git a/frontend/nginx.Dockerfile b/frontend/nginx.Dockerfile new file mode 100644 index 0000000..7210d04 --- /dev/null +++ b/frontend/nginx.Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:alpine +COPY dist/ /usr/share/nginx/html/ +COPY nginx-tunnel.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/public/index.html b/frontend/public/index.html deleted file mode 100644 index 226d2cc..0000000 --- a/frontend/public/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - DApp for Business - - -
- - - \ No newline at end of file diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index bca724d..167d84f 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -169,6 +169,11 @@ const routes = [ name: 'email-settings', component: () => import('@/views/settings/AI/EmailSettingsView.vue'), }, + { + path: '/content', + name: 'content-page', + component: () => import('../views/ContentPageView.vue'), + }, ]; const router = createRouter({ diff --git a/frontend/src/views/ContentPageView.vue b/frontend/src/views/ContentPageView.vue new file mode 100644 index 0000000..67ea936 --- /dev/null +++ b/frontend/src/views/ContentPageView.vue @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/CrmView.vue b/frontend/src/views/CrmView.vue index 012d2b4..a7ed3f0 100644 --- a/frontend/src/views/CrmView.vue +++ b/frontend/src/views/CrmView.vue @@ -25,6 +25,13 @@ Подробнее + +
+

Контент

+ +
@@ -195,6 +202,10 @@ function goToDleManagement() { function goToContactsList() { router.push({ name: 'contacts-list' }); } + +function goToContent() { + router.push({ name: 'content-page' }); +} \ No newline at end of file diff --git a/frontend/src/views/settings/SettingsIndexView.vue b/frontend/src/views/settings/SettingsIndexView.vue index 011486d..d126736 100644 --- a/frontend/src/views/settings/SettingsIndexView.vue +++ b/frontend/src/views/settings/SettingsIndexView.vue @@ -16,8 +16,8 @@
-

Интерфейс

-

Настройки внешнего вида, локализации и пользовательского опыта.

+

Сервер

+

Настройки серверов, хостинга и публикации приложения.

diff --git a/frontend/vite.config.js b/frontend/vite.config.js index c9c40cc..46a07df 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -53,6 +53,7 @@ export default defineConfig({ usePolling: true, interval: 1000, ignored: ['**/node_modules/**', '**/.git/**', '**/dist/**', '**/.idea/**', '**/.vscode/**'] - } + }, + hmr: false }, });