From c0323ecd5e865802bb1dcd047e5b9b83169e487a Mon Sep 17 00:00:00 2001 From: leandrofars Date: Thu, 5 Sep 2024 15:23:05 -0300 Subject: [PATCH] fix(frontend): devices list pagination + nginx edge routes --- deploy/compose/nginx.conf | 18 ------------------ frontend/src/pages/devices.js | 6 +++--- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/deploy/compose/nginx.conf b/deploy/compose/nginx.conf index b4fccac..987a82d 100644 --- a/deploy/compose/nginx.conf +++ b/deploy/compose/nginx.conf @@ -28,30 +28,12 @@ server { proxy_connect_timeout 60; proxy_redirect off; } - location /custom-frontend { - proxy_pass http://host.docker.internal:8005; - proxy_read_timeout 60; - proxy_connect_timeout 60; - proxy_redirect off; - } location /images { proxy_pass http://host.docker.internal:8004; proxy_read_timeout 60; proxy_connect_timeout 60; proxy_redirect off; } - location /socket.io { - proxy_pass http://host.docker.internal:5000; - proxy_read_timeout 60; - proxy_connect_timeout 60; - proxy_redirect off; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - } location /companylink { return 301 https://oktopus.app.br/controller; } diff --git a/frontend/src/pages/devices.js b/frontend/src/pages/devices.js index 29d0b2f..1f91311 100644 --- a/frontend/src/pages/devices.js +++ b/frontend/src/pages/devices.js @@ -426,10 +426,10 @@ const Page = () => { }} > - + @@ -698,7 +698,7 @@ const Page = () => { } - {(pages.lenght > 0) && total && 0) && total &&