diff --git a/Plan/react/dashboard/package.json b/Plan/react/dashboard/package.json index 76fc46dd9..620181596 100644 --- a/Plan/react/dashboard/package.json +++ b/Plan/react/dashboard/package.json @@ -29,9 +29,9 @@ "i18next-http-backend": "^2.1.1", "i18next-localstorage-backend": "^4.1.0", "masonry-layout": "^4.2.2", - "react": "^17.0.2", - "react-bootstrap-v5": "^1.4.0", - "react-dom": "^17.0.2", + "react": "^18.2.0", + "react-bootstrap": "^2.7.0", + "react-dom": "^18.2.0", "react-i18next": "^12.1.5", "react-mcjsonchat": "^1.0.0", "react-router-dom": "6", diff --git a/Plan/react/dashboard/src/components/accordion/ServerAccordion.js b/Plan/react/dashboard/src/components/accordion/ServerAccordion.js index 05fd89d57..b19a86558 100644 --- a/Plan/react/dashboard/src/components/accordion/ServerAccordion.js +++ b/Plan/react/dashboard/src/components/accordion/ServerAccordion.js @@ -3,7 +3,7 @@ import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import {faCrosshairs, faGavel, faLocationArrow, faServer, faSkull} from "@fortawesome/free-solid-svg-icons"; import {faCalendarCheck, faCalendarPlus, faClock} from "@fortawesome/free-regular-svg-icons"; import Datapoint from "../Datapoint"; -import {Col, Row} from "react-bootstrap-v5"; +import {Col, Row} from "react-bootstrap"; import WorldPie from "../graphs/WorldPie"; import Accordion from "./Accordion"; import {faSuperpowers} from "@fortawesome/free-brands-svg-icons"; diff --git a/Plan/react/dashboard/src/components/accordion/SessionAccordion.js b/Plan/react/dashboard/src/components/accordion/SessionAccordion.js index a17ecf39d..81f76b9d1 100644 --- a/Plan/react/dashboard/src/components/accordion/SessionAccordion.js +++ b/Plan/react/dashboard/src/components/accordion/SessionAccordion.js @@ -3,7 +3,7 @@ import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import {faCrosshairs, faServer, faSignal, faSkull, faUser} from "@fortawesome/free-solid-svg-icons"; import {faCalendarPlus, faClock, faMap} from "@fortawesome/free-regular-svg-icons"; import Datapoint from "../Datapoint"; -import {Col, Row} from "react-bootstrap-v5"; +import {Col, Row} from "react-bootstrap"; import WorldPie from "../graphs/WorldPie"; import KillsTable from "../table/KillsTable"; import Accordion from "./Accordion"; diff --git a/Plan/react/dashboard/src/components/cards/CardHeader.js b/Plan/react/dashboard/src/components/cards/CardHeader.js index 3eeedaefb..2454173aa 100644 --- a/Plan/react/dashboard/src/components/cards/CardHeader.js +++ b/Plan/react/dashboard/src/components/cards/CardHeader.js @@ -1,6 +1,6 @@ import React from 'react'; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {useTranslation} from "react-i18next"; const CardHeader = ({icon, color, label}) => { diff --git a/Plan/react/dashboard/src/components/cards/common/GeolocationsCard.js b/Plan/react/dashboard/src/components/cards/common/GeolocationsCard.js index ebca1fecb..a8d4ca020 100644 --- a/Plan/react/dashboard/src/components/cards/common/GeolocationsCard.js +++ b/Plan/react/dashboard/src/components/cards/common/GeolocationsCard.js @@ -1,14 +1,11 @@ import {useTranslation} from "react-i18next"; -import {Card, Col, Dropdown, Row} from "react-bootstrap-v5"; +import {Card, Col, Dropdown, Row} from "react-bootstrap"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import React, {useState} from "react"; import {faExclamationTriangle, faGlobe, faLayerGroup} from "@fortawesome/free-solid-svg-icons"; import GeolocationBarGraph from "../../graphs/GeolocationBarGraph"; import GeolocationWorldMap, {ProjectionOptions} from "../../graphs/GeolocationWorldMap"; import {CardLoader} from "../../navigation/Loader"; -import DropdownToggle from "react-bootstrap-v5/lib/esm/DropdownToggle"; -import DropdownMenu from "react-bootstrap-v5/lib/esm/DropdownMenu"; -import DropdownItem from "react-bootstrap-v5/lib/esm/DropdownItem"; const ProjectionDropDown = ({projection, setProjection}) => { const {t} = useTranslation(); @@ -18,18 +15,18 @@ const ProjectionDropDown = ({projection, setProjection}) => { return ( - + {t(projection)} - + - +
{t('html.label.geoProjection.dropdown')}
{projectionOptions.map((option, i) => ( - setProjection(option)}> + setProjection(option)}> {t(option)} - + ))} - + ) } diff --git a/Plan/react/dashboard/src/components/cards/common/InsightsFor30DaysCard.js b/Plan/react/dashboard/src/components/cards/common/InsightsFor30DaysCard.js index 5df2778c8..7a0418143 100644 --- a/Plan/react/dashboard/src/components/cards/common/InsightsFor30DaysCard.js +++ b/Plan/react/dashboard/src/components/cards/common/InsightsFor30DaysCard.js @@ -1,5 +1,5 @@ import {useTranslation} from "react-i18next"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import React from "react"; import {faLifeRing} from "@fortawesome/free-regular-svg-icons"; diff --git a/Plan/react/dashboard/src/components/cards/common/PingTableCard.js b/Plan/react/dashboard/src/components/cards/common/PingTableCard.js index e9b3c2552..29305e39d 100644 --- a/Plan/react/dashboard/src/components/cards/common/PingTableCard.js +++ b/Plan/react/dashboard/src/components/cards/common/PingTableCard.js @@ -1,5 +1,5 @@ import React from 'react'; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import CardHeader from "../CardHeader"; import {faWifi} from "@fortawesome/free-solid-svg-icons"; import PingTable from "../../table/PingTable"; diff --git a/Plan/react/dashboard/src/components/cards/common/PlayerListCard.js b/Plan/react/dashboard/src/components/cards/common/PlayerListCard.js index 9fc9b671e..c850ea8e8 100644 --- a/Plan/react/dashboard/src/components/cards/common/PlayerListCard.js +++ b/Plan/react/dashboard/src/components/cards/common/PlayerListCard.js @@ -1,5 +1,5 @@ import {useTranslation} from "react-i18next"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import React, {useEffect, useState} from "react"; import {faUsers} from "@fortawesome/free-solid-svg-icons"; diff --git a/Plan/react/dashboard/src/components/cards/common/PvpKillsTableCard.js b/Plan/react/dashboard/src/components/cards/common/PvpKillsTableCard.js index 62af23328..1dd2eb2f7 100644 --- a/Plan/react/dashboard/src/components/cards/common/PvpKillsTableCard.js +++ b/Plan/react/dashboard/src/components/cards/common/PvpKillsTableCard.js @@ -1,5 +1,5 @@ import {useTranslation} from "react-i18next"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import {faCrosshairs} from "@fortawesome/free-solid-svg-icons"; import KillsTable from "../../table/KillsTable"; diff --git a/Plan/react/dashboard/src/components/cards/common/RecentSessionsCard.js b/Plan/react/dashboard/src/components/cards/common/RecentSessionsCard.js index 4c6042cd2..eced43025 100644 --- a/Plan/react/dashboard/src/components/cards/common/RecentSessionsCard.js +++ b/Plan/react/dashboard/src/components/cards/common/RecentSessionsCard.js @@ -1,5 +1,5 @@ import {useTranslation} from "react-i18next"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import {faCalendar, faHandPointer} from "@fortawesome/free-regular-svg-icons"; import Scrollable from "../../Scrollable"; diff --git a/Plan/react/dashboard/src/components/cards/common/ServerPieCard.js b/Plan/react/dashboard/src/components/cards/common/ServerPieCard.js index 250fcc9a8..8a5138c2d 100644 --- a/Plan/react/dashboard/src/components/cards/common/ServerPieCard.js +++ b/Plan/react/dashboard/src/components/cards/common/ServerPieCard.js @@ -1,4 +1,4 @@ -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import React from "react"; import {CardLoader} from "../../navigation/Loader"; import ServerPie from "../../graphs/ServerPie"; diff --git a/Plan/react/dashboard/src/components/cards/common/TrendCard.js b/Plan/react/dashboard/src/components/cards/common/TrendCard.js index a39916ea3..a54c16f58 100644 --- a/Plan/react/dashboard/src/components/cards/common/TrendCard.js +++ b/Plan/react/dashboard/src/components/cards/common/TrendCard.js @@ -1,4 +1,4 @@ -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import Datapoint from "../../Datapoint"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import {faLongArrowAltRight} from "@fortawesome/free-solid-svg-icons"; diff --git a/Plan/react/dashboard/src/components/cards/common/WorldPieCard.js b/Plan/react/dashboard/src/components/cards/common/WorldPieCard.js index 006e8e860..65246fdd3 100644 --- a/Plan/react/dashboard/src/components/cards/common/WorldPieCard.js +++ b/Plan/react/dashboard/src/components/cards/common/WorldPieCard.js @@ -1,5 +1,5 @@ import {useTranslation} from "react-i18next"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import {faClock} from "@fortawesome/free-regular-svg-icons"; import WorldPie from "../../graphs/WorldPie"; diff --git a/Plan/react/dashboard/src/components/cards/network/PerformanceGraphsCard.js b/Plan/react/dashboard/src/components/cards/network/PerformanceGraphsCard.js index e28774a0b..aae71ce8e 100644 --- a/Plan/react/dashboard/src/components/cards/network/PerformanceGraphsCard.js +++ b/Plan/react/dashboard/src/components/cards/network/PerformanceGraphsCard.js @@ -9,7 +9,7 @@ import { faTachometerAlt, faUser } from "@fortawesome/free-solid-svg-icons"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {useDataRequest} from "../../../hooks/dataFetchHook"; import {fetchPingGraph} from "../../../service/serverService"; import {tooltip, yAxisConfigurations} from "../../../util/graphs"; diff --git a/Plan/react/dashboard/src/components/cards/network/QuickViewDataCard.js b/Plan/react/dashboard/src/components/cards/network/QuickViewDataCard.js index 3aad6395f..a25e023d0 100644 --- a/Plan/react/dashboard/src/components/cards/network/QuickViewDataCard.js +++ b/Plan/react/dashboard/src/components/cards/network/QuickViewDataCard.js @@ -1,5 +1,5 @@ import React from 'react'; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import CardHeader from "../CardHeader"; import { faBookOpen, diff --git a/Plan/react/dashboard/src/components/cards/network/QuickViewGraphCard.js b/Plan/react/dashboard/src/components/cards/network/QuickViewGraphCard.js index 7706c5cda..e1c2c3bd2 100644 --- a/Plan/react/dashboard/src/components/cards/network/QuickViewGraphCard.js +++ b/Plan/react/dashboard/src/components/cards/network/QuickViewGraphCard.js @@ -1,6 +1,6 @@ import React from 'react'; import CardHeader from "../CardHeader"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import PlayersOnlineGraph from "../../graphs/PlayersOnlineGraph"; import {faChartArea} from "@fortawesome/free-solid-svg-icons"; import {useTranslation} from "react-i18next"; diff --git a/Plan/react/dashboard/src/components/cards/network/ServersTableCard.js b/Plan/react/dashboard/src/components/cards/network/ServersTableCard.js index 1f0807827..19be26ba8 100644 --- a/Plan/react/dashboard/src/components/cards/network/ServersTableCard.js +++ b/Plan/react/dashboard/src/components/cards/network/ServersTableCard.js @@ -1,12 +1,9 @@ import React, {useCallback, useState} from 'react'; -import {Card, Dropdown} from "react-bootstrap-v5"; +import {Card, Dropdown} from "react-bootstrap"; import ServersTable, {ServerSortOption} from "../../table/ServersTable"; import {faNetworkWired} from "@fortawesome/free-solid-svg-icons"; import {useTranslation} from "react-i18next"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; -import DropdownToggle from "react-bootstrap-v5/lib/esm/DropdownToggle"; -import DropdownMenu from "react-bootstrap-v5/lib/esm/DropdownMenu"; -import DropdownItem from "react-bootstrap-v5/lib/esm/DropdownItem"; import {CardLoader} from "../../navigation/Loader"; const SortDropDown = ({sortBy, sortReversed, setSortBy}) => { @@ -20,18 +17,18 @@ const SortDropDown = ({sortBy, sortReversed, setSortBy}) => { return ( - + {t(sortBy.label)} - + - +
{t('html.label.sortBy')}
{sortOptions.map((option, i) => ( - setSortBy(option)}> + setSortBy(option)}> {t(option.label)} - + ))} - + ) } diff --git a/Plan/react/dashboard/src/components/cards/player/NicknamesCard.js b/Plan/react/dashboard/src/components/cards/player/NicknamesCard.js index e5c4fe0f0..c53be82f6 100644 --- a/Plan/react/dashboard/src/components/cards/player/NicknamesCard.js +++ b/Plan/react/dashboard/src/components/cards/player/NicknamesCard.js @@ -1,6 +1,6 @@ import {useTranslation} from "react-i18next"; import {useTheme} from "../../../hooks/themeHook"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import {faServer, faSignature} from "@fortawesome/free-solid-svg-icons"; import Scrollable from "../../Scrollable"; diff --git a/Plan/react/dashboard/src/components/cards/player/PvpPveAsNumbersCard.js b/Plan/react/dashboard/src/components/cards/player/PvpPveAsNumbersCard.js index d6916bd06..7ef8a2bbe 100644 --- a/Plan/react/dashboard/src/components/cards/player/PvpPveAsNumbersCard.js +++ b/Plan/react/dashboard/src/components/cards/player/PvpPveAsNumbersCard.js @@ -1,5 +1,5 @@ import {useTranslation} from "react-i18next"; -import {Card} from "react-bootstrap-v5"; +import {Card} from "react-bootstrap"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; import {faCampground} from "@fortawesome/free-solid-svg-icons"; import React from "react"; diff --git a/Plan/react/dashboard/src/components/cards/query/FilterDropdown.js b/Plan/react/dashboard/src/components/cards/query/FilterDropdown.js index e15fb2006..4fc99c205 100644 --- a/Plan/react/dashboard/src/components/cards/query/FilterDropdown.js +++ b/Plan/react/dashboard/src/components/cards/query/FilterDropdown.js @@ -1,9 +1,6 @@ import React from 'react'; -import DropdownToggle from "react-bootstrap-v5/lib/esm/DropdownToggle"; import {FontAwesomeIcon as Fa} from "@fortawesome/react-fontawesome"; -import DropdownMenu from "react-bootstrap-v5/lib/esm/DropdownMenu"; -import DropdownItem from "react-bootstrap-v5/lib/esm/DropdownItem"; -import {Dropdown} from "react-bootstrap-v5"; +import {Dropdown} from "react-bootstrap"; import {faPlus} from "@fortawesome/free-solid-svg-icons"; import {useTranslation} from "react-i18next"; import Scrollable from "../../Scrollable"; @@ -47,20 +44,20 @@ const FilterDropdown = ({filterOptions, filters, setFilters}) => { return ( - + {t('html.query.filters.add')} - + - +
{t('html.query.filters.add')}
{filterOptions.map((option, i) => ( - addFilter(option)}> + addFilter(option)}> {getReadableFilterName(option)} - + ))} - + ) }; diff --git a/Plan/react/dashboard/src/components/cards/query/FilterList.js b/Plan/react/dashboard/src/components/cards/query/FilterList.js index 6314276e4..bc06bb197 100644 --- a/Plan/react/dashboard/src/components/cards/query/FilterList.js +++ b/Plan/react/dashboard/src/components/cards/query/FilterList.js @@ -29,8 +29,8 @@ const FilterList = ({filters, setFilters, setAsInvalid, setAsValid}) => { return (