diff --git a/Plan/src/main/resources/assets/plan/plan/bungeeconfig.yml b/Plan/src/main/resources/assets/plan/plan/bungeeconfig.yml
index a5c58af88..289a17216 100644
--- a/Plan/src/main/resources/assets/plan/plan/bungeeconfig.yml
+++ b/Plan/src/main/resources/assets/plan/plan/bungeeconfig.yml
@@ -20,7 +20,6 @@ Plugin:
# Display update notification on the website
Check_for_updates: true
Notify_about_DEV_releases: false
- Frontend_BETA: false
Use_Legacy_Frontend: false
# -----------------------------------------------------
# Supported databases: MySQL
@@ -35,6 +34,9 @@ Database:
# Launch options to append after mysql driver address
Launch_options: "?rewriteBatchedStatements=true&useSSL=false&serverTimezone=UTC"
Max_connections: 8
+ Max_Lifetime:
+ Time: 25
+ Unit: MINUTES
# -----------------------------------------------------
# More information about SSL Certificate Settings:
# https://github.com/plan-player-analytics/Plan/wiki/SSL-Certificate-%28HTTPS%29-Set-Up
@@ -72,6 +74,11 @@ Webserver:
Remove_logs_after_days: 30
IP_whitelist:
Enabled: false
+ # Supported formats:
+ # IPv4 exact: "192.168.0.1", wildcard: "192.168.*.*", cidr: "192.168.0.0/16"
+ # IPv6 exact: "0:0:0:0:0:0:0:1", compressed: "1::1", cidr: "1234:db8:1234:1a:20::/64"
+ # More: https://seancfoley.github.io/IPAddress/ipaddress.html#supported-ip-address-parsing-formats
+ # Dynamic DNS hostname: "dns:intranet.example.com", updated once per minute
Whitelist:
- "192.168.0.0"
- "0:0:0:0:0:0:0:1"
diff --git a/Plan/src/main/resources/assets/plan/plan/config.yml b/Plan/src/main/resources/assets/plan/plan/config.yml
index 4d78ba698..617804487 100644
--- a/Plan/src/main/resources/assets/plan/plan/config.yml
+++ b/Plan/src/main/resources/assets/plan/plan/config.yml
@@ -20,7 +20,6 @@ Plugin:
Notify_about_DEV_releases: false
Configuration:
Allow_proxy_to_manage_settings: true
- Frontend_BETA: false
Use_Legacy_Frontend: false
# -----------------------------------------------------
# Supported databases: SQLite, MySQL
@@ -36,6 +35,9 @@ Database:
# Launch options to append after mysql driver address
Launch_options: "?rewriteBatchedStatements=true&useSSL=false&serverTimezone=UTC"
Max_connections: 8
+ Max_Lifetime:
+ Time: 25
+ Unit: MINUTES
# -----------------------------------------------------
# More information about SSL Certificate Settings:
# https://github.com/plan-player-analytics/Plan/wiki/SSL-Certificate-%28HTTPS%29-Set-Up
@@ -73,6 +75,11 @@ Webserver:
Remove_logs_after_days: 30
IP_whitelist:
Enabled: false
+ # Supported formats:
+ # IPv4 exact: "192.168.0.1", wildcard: "192.168.*.*", cidr: "192.168.0.0/16"
+ # IPv6 exact: "0:0:0:0:0:0:0:1", compressed: "1::1", cidr: "1234:db8:1234:1a:20::/64"
+ # More: https://seancfoley.github.io/IPAddress/ipaddress.html#supported-ip-address-parsing-formats
+ # Dynamic DNS hostname: "dns:intranet.example.com", updated once per minute
Whitelist:
- "192.168.0.0"
- "0:0:0:0:0:0:0:1"
diff --git a/react/dashboard/dashboard/package.json b/react/dashboard/dashboard/package.json
index f256627b2..3e5b129cc 100644
--- a/react/dashboard/dashboard/package.json
+++ b/react/dashboard/dashboard/package.json
@@ -11,35 +11,35 @@
"@fortawesome/free-regular-svg-icons": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "^0.2.0",
- "@fullcalendar/bootstrap": "^5.11.4",
- "@fullcalendar/daygrid": "^5.11.4",
- "@fullcalendar/react": "^5.11.4",
+ "@fullcalendar/bootstrap": "^5.11.5",
+ "@fullcalendar/daygrid": "^5.11.5",
+ "@fullcalendar/react": "^5.11.5",
"@highcharts/map-collection": "^2.0.1",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
- "axios": "^1.3.5",
+ "axios": "^1.4.0",
"bootstrap": "^5.2.3",
"datatables.net": "^1.13.4",
"datatables.net-bs5": "^1.13.4",
"datatables.net-responsive-bs5": "^2.4.1",
"highcharts": "^10.3.3",
- "i18next": "^22.4.14",
+ "i18next": "^22.4.15",
"i18next-chained-backend": "^4.2.0",
"i18next-http-backend": "^2.2.0",
- "i18next-localstorage-backend": "^4.1.0",
+ "i18next-localstorage-backend": "^4.1.1",
"masonry-layout": "^4.2.2",
"react": "^18.2.0",
- "react-bootstrap": "^2.7.2",
+ "react-bootstrap": "^2.7.4",
"react-bootstrap-range-slider": "^3.0.8",
"react-dom": "^18.2.0",
- "react-i18next": "^12.2.0",
+ "react-i18next": "^12.2.2",
"react-mcjsonchat": "^1.0.0",
"react-router-dom": "6",
"react-scripts": "5.0.1",
- "sass": "^1.61.0",
+ "sass": "^1.62.1",
"source-map-explorer": "^2.5.2",
- "swagger-ui": "^4.18.2",
+ "swagger-ui": "^4.18.3",
"web-vitals": "^3.0.2"
},
"scripts": {
diff --git a/react/dashboard/dashboard/src/components/cards/server/graphs/NetworkOnlineActivityGraphsCard.js b/react/dashboard/dashboard/src/components/cards/server/graphs/NetworkOnlineActivityGraphsCard.js
index 561b7f958..713c644a0 100644
--- a/react/dashboard/dashboard/src/components/cards/server/graphs/NetworkOnlineActivityGraphsCard.js
+++ b/react/dashboard/dashboard/src/components/cards/server/graphs/NetworkOnlineActivityGraphsCard.js
@@ -33,6 +33,8 @@ const MultiProxyPlayersOnlineGraph = () => {
const PlayersOnlineTab = () => {
const {serverUUID, networkMetadata} = useMetadata();
+ if (!networkMetadata) return
+
if (networkMetadata.usingRedisBungee || networkMetadata.servers.filter(server => server.proxy).length === 1) {
return
} else {
diff --git a/react/dashboard/dashboard/src/components/extensions/ExtensionCard.js b/react/dashboard/dashboard/src/components/extensions/ExtensionCard.js
index ff44714ea..7c801e71b 100644
--- a/react/dashboard/dashboard/src/components/extensions/ExtensionCard.js
+++ b/react/dashboard/dashboard/src/components/extensions/ExtensionCard.js
@@ -4,6 +4,9 @@ import ExtensionIcon from "./ExtensionIcon";
import Datapoint from "../Datapoint";
import Masonry from 'masonry-layout'
import ExtensionTable from "./ExtensionTable";
+import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome";
+import End from "../layout/End";
+import {MinecraftChat} from "react-mcjsonchat";
export const ExtensionCardWrapper = ({extension, children}) => {
const [windowWidth, setWindowWidth] = useState(window.innerWidth);
@@ -43,12 +46,31 @@ const ExtensionTab = ({tab}) => {
}
const ExtensionValue = ({data}) => {
- return ();
+ const color = data.description.icon.colorClass;
+ const colorClass = color && color.startsWith("col-") ? color : "col-" + color;
+ const icon = [data.description.icon.familyClass, data.description.icon.iconName];
+ const name = data.description.text;
+ const title = data.description.description;
+ if (data.type === 'HTML') {
+ return (
+
+ {icon && } {name}
+ {}
+
+ );
+ } else if (data.type === 'COMPONENT') {
+ return (
+ {icon && } {name}
+ {}
+
)
+ } else {
+ return ();
+ }
}
const ExtensionValues = ({tab}) => {
diff --git a/react/dashboard/dashboard/src/components/navigation/Header.js b/react/dashboard/dashboard/src/components/navigation/Header.js
index 0d7c5ea38..d7abfc50f 100644
--- a/react/dashboard/dashboard/src/components/navigation/Header.js
+++ b/react/dashboard/dashboard/src/components/navigation/Header.js
@@ -36,7 +36,7 @@ const Header = ({page, tab, hideUpdater}) => {
const {requestUpdate, lastUpdate, updating, toggleSidebar} = useNavigation();
const {getPlayerHeadImageUrl} = useMetadata();
- const headImageUrl = user ? getPlayerHeadImageUrl(user.playerName, user.linkedToUuid) : undefined
+ const headImageUrl = user ? getPlayerHeadImageUrl(user.playerName, user.playerUUID) : undefined
// TODO Remove .replace('<', '') after locale replacement
return (