diff --git a/nginx.conf b/nginx.conf index 0a812a6..cf448e8 100644 --- a/nginx.conf +++ b/nginx.conf @@ -4,7 +4,7 @@ server { location /api/ { # api server client_max_body_size 0; proxy_http_version 1.0; - proxy_pass http://jnx-admin-dashboard-server/; + proxy_pass http://jannex-admin-dashboard-backend-service/; } location /ws { # websocket server @@ -12,7 +12,7 @@ server { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header Host $host; - proxy_pass http://jnx-admin-dashboard-server/ws/; + proxy_pass http://jannex-admin-dashboard-backend-service/ws/; proxy_http_version 1.1; } @@ -20,24 +20,24 @@ server { client_max_body_size 0; proxy_http_version 1.0; proxy_set_header Connection ""; # needed for sse - proxy_pass http://jnx-log-manager-server/; + proxy_pass http://jannex-log-manager-server-service/; } - location /tm/ { # telegram bot manager - client_max_body_size 0; - proxy_http_version 1.0; - proxy_set_header Connection ""; # needed for sse - proxy_pass http://jnx-telegram-bot-manager/; - } + #location /tm/ { # telegram bot manager + # client_max_body_size 0; + # proxy_http_version 1.0; + # proxy_set_header Connection ""; # needed for sse + # proxy_pass http://jnx-telegram-bot-manager/; + #} - location /rcm/ { # robot control manager - proxy_read_timeout 10800s; - client_max_body_size 0; - proxy_http_version 1.0; - proxy_set_header Connection ""; # needed for sse - proxy_set_header X-Real-IP $remote_addr; # needed to get the robot ip address - proxy_pass http://jnx-robot-control-manager/; - } + #location /rcm/ { # robot control manager + # proxy_read_timeout 10800s; + # client_max_body_size 0; + # proxy_http_version 1.0; + # proxy_set_header Connection ""; # needed for sse + # proxy_set_header X-Real-IP $remote_addr; # needed to get the robot ip address + # proxy_pass http://jnx-robot-control-manager/; + #} location / { # frontend root /usr/share/nginx/html; diff --git a/src/Components/LogCard/index.js b/src/Components/LogCard/index.js index 3aef7e7..bf7b1d9 100644 --- a/src/Components/LogCard/index.js +++ b/src/Components/LogCard/index.js @@ -137,11 +137,11 @@ export default function LogCard({ - + {title} - + - - - { + return { + label: connection.DisplayName, + value: connection.Address, + }; } - style={{ width: 200, marginRight: AppStyle.app.margin }} - options={consolesContext.connectedLogManagerServers.map( - (connection) => { - return { - label: connection.DisplayName, - value: connection.Address, - }; - } - )} - value={selectedLogServer} - onChange={(value) => setSelectedLogServer(value)} - /> - + )} + value={selectedLogServer} + onChange={(value) => setSelectedLogServer(value)} + /> + - - setSelectedLogType(value)} + /> + + } /> );