diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json index 648f67c..b6f4d27 100644 --- a/public/locales/en/translations.json +++ b/public/locales/en/translations.json @@ -138,6 +138,8 @@ "Wizard": "wizard", "HostName": "Server host", "SessionsCount": "Sessions count", + "IsChainMember": "Is chain member", + "IsChainMemberTooltip": "If the proxy is a chain member, it runs behind another proxy; if it isn't, it’s the first or only proxy receiving the request.", "Domain": "Domain", "ActiveSession": "Active session", "ActiveSessionSubtitle": "Expand to see forwards", diff --git a/public/locales/ro/translations.json b/public/locales/ro/translations.json index 2520503..cf2bbd7 100644 --- a/public/locales/ro/translations.json +++ b/public/locales/ro/translations.json @@ -129,6 +129,8 @@ "Wizard": "vrăjitor", "HostName": "Gazdă server", "SessionsCount": "Număr sesiuni", + "IsChainMember": "Este membru al unui lanț", + "IsChainMemberTooltip": "Dacă proxy-ul este membru al lanțului, acesta rulează în spatele unui alt proxy; dacă nu este, este primul sau singurul proxy care primește cererea.", "Domain": "Domeniu", "ActiveSession": "Sesiune activă", "ActiveSessionSubtitle": "Extindeţi pentru a vedea redirectările", diff --git a/src/components/common/ActiveIcon.js b/src/components/common/ActiveIcon.js index 6f2da48..4fb09ac 100644 --- a/src/components/common/ActiveIcon.js +++ b/src/components/common/ActiveIcon.js @@ -3,7 +3,7 @@ import PropTypes from "prop-types"; import { CheckCircleOutlineRounded, RemoveRounded } from "@material-ui/icons"; import { LinearProgress, Grid } from "@material-ui/core"; -const ActiveIcon = ({ active, loading }) => { +const ActiveIcon = ({ active, loading, color }) => { if (loading && loading === true) { return ( @@ -16,8 +16,9 @@ const ActiveIcon = ({ active, loading }) => { ); } + const circleColor = color || "primary"; return active && active === true ? ( - + ) : ( ); @@ -25,7 +26,8 @@ const ActiveIcon = ({ active, loading }) => { ActiveIcon.propTypes = { active: PropTypes.bool, - loading: PropTypes.bool + loading: PropTypes.bool, + color: PropTypes.string }; export default ActiveIcon; diff --git a/src/features/server/components/ServerSummary.js b/src/features/server/components/ServerSummary.js index 6bcdf38..9d3b16c 100644 --- a/src/features/server/components/ServerSummary.js +++ b/src/features/server/components/ServerSummary.js @@ -1,9 +1,10 @@ import React from "react"; import PropTypes from "prop-types"; -import { Grid, Typography, Link } from "@material-ui/core"; +import { Grid, Typography, Link, Tooltip } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; import { useTranslation } from "react-i18next"; import styles from "../../../components/common/styles/gridStyles"; +import ActiveIcon from "../../../components/common/ActiveIcon"; const useStyles = makeStyles(styles); @@ -18,22 +19,27 @@ const ServerSummary = ({ return ( - - {`${t("Server.Domain")}: `} - {data.domain.name} - - - + {`${t("Server.HostName")}: `} {serverHost || ""} - - + {`${t("Server.SessionsCount")}: `} {data.sessionsCount} - - + + + + {`${t("Server.IsChainMember")}: `} + + + + + + {`${t("Server.Domain")}: `} + {data.domain.name} + + {`${t("Server.DDNSProvider")}: `}