Jannex
/
admin-dashboard-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed row width

main
alex 2024-02-18 20:37:53 +01:00
parent 4746e3e892
commit 66e131c83a
3 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nginx.conf
View File

@ -4,7 +4,7 @@ server {
location /api/ { # api server location /api/ { # api server
client_max_body_size 0; client_max_body_size 0;
proxy_http_version 1.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 location /ws { # websocket server
@ -12,7 +12,7 @@ server {
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $host; 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; proxy_http_version 1.1;
} }
@ -20,24 +20,24 @@ server {
client_max_body_size 0; client_max_body_size 0;
proxy_http_version 1.0; proxy_http_version 1.0;
proxy_set_header Connection ""; # needed for sse 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 #location /tm/ { # telegram bot manager
client_max_body_size 0; # client_max_body_size 0;
proxy_http_version 1.0; # proxy_http_version 1.0;
proxy_set_header Connection ""; # needed for sse # proxy_set_header Connection ""; # needed for sse
proxy_pass http://jnx-telegram-bot-manager/; # proxy_pass http://jnx-telegram-bot-manager/;
} #}
location /rcm/ { # robot control manager #location /rcm/ { # robot control manager
proxy_read_timeout 10800s; # proxy_read_timeout 10800s;
client_max_body_size 0; # client_max_body_size 0;
proxy_http_version 1.0; # proxy_http_version 1.0;
proxy_set_header Connection ""; # needed for sse # proxy_set_header Connection ""; # needed for sse
proxy_set_header X-Real-IP $remote_addr; # needed to get the robot ip address # proxy_set_header X-Real-IP $remote_addr; # needed to get the robot ip address
proxy_pass http://jnx-robot-control-manager/; # proxy_pass http://jnx-robot-control-manager/;
} #}
location / { # frontend location / { # frontend
root /usr/share/nginx/html; root /usr/share/nginx/html;

4
src/Components/LogCard/index.js
View File

@ -137,11 +137,11 @@ export default function LogCard({
<Card <Card
title={ title={
<Row> <Row>
<Col xs={24} xl={12}> <Col xs={24} xl={15}>
{title} {title}
</Col> </Col>
<Col xs={24} xl={12}> <Col xs={24} xl={9}>
<Row xs={24} justify="end" align="middle"> <Row xs={24} justify="end" align="middle">
<Col> <Col>
<Checkbox <Checkbox

62
src/Pages/Consoles/index.js
View File

@ -90,41 +90,37 @@ export default function Consoles() {
) )
} }
title={ title={
<Space> <Row gutter={[16, 16]}>
<Row> <Col xs={24} sm={6}>
<Col> <Select
<Select disabled={consolesContext.connectedLogManagerServers.length === 0}
disabled={ style={{ width: "100%", marginRight: AppStyle.app.margin }}
consolesContext.connectedLogManagerServers.length === 0 options={consolesContext.connectedLogManagerServers.map(
(connection) => {
return {
label: connection.DisplayName,
value: connection.Address,
};
} }
style={{ width: 200, marginRight: AppStyle.app.margin }} )}
options={consolesContext.connectedLogManagerServers.map( value={selectedLogServer}
(connection) => { onChange={(value) => setSelectedLogServer(value)}
return { />
label: connection.DisplayName, </Col>
value: connection.Address,
};
}
)}
value={selectedLogServer}
onChange={(value) => setSelectedLogServer(value)}
/>
</Col>
<Col> <Col xs={24} sm={18}>
<Select <Select
disabled={ disabled={
result !== undefined || result !== undefined ||
consolesContext.connectedLogManagerServers.length === 0 consolesContext.connectedLogManagerServers.length === 0
} }
style={{ width: 200 }} style={{ width: "100%" }}
options={availableLogTypes} options={availableLogTypes}
value={selectedLogType} value={selectedLogType}
onChange={(value) => setSelectedLogType(value)} onChange={(value) => setSelectedLogType(value)}
/> />
</Col> </Col>
</Row> </Row>
</Space>
} }
/> />
); );