diff --git a/nest_frontend/components/interactive/BoxConditionDatetime.js b/nest_frontend/components/interactive/BoxConditionDatetime.js index 070c546..c625905 100644 --- a/nest_frontend/components/interactive/BoxConditionDatetime.js +++ b/nest_frontend/components/interactive/BoxConditionDatetime.js @@ -1,11 +1,11 @@ -import React, { useCallback, useContext } from "react" +import React, { useCallback } from "react" import BoxFull from "../base/BoxFull" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import { faClock } from "@fortawesome/free-solid-svg-icons" import useRepositoryEditor from "../../hooks/useRepositoryEditor" -import ContextLanguage from "../../contexts/ContextLanguage" import FormInlineTimeRay from "./FormInlineTimeRay" import { ConditionTime } from "../../objects/Condition" +import useStrings from "../../hooks/useStrings" /** @@ -18,7 +18,7 @@ import { ConditionTime } from "../../objects/Condition" */ export default function BoxConditionDatetime({ ...props }) { const { addCondition } = useRepositoryEditor() - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const submit = useCallback( timeRay => addCondition(new ConditionTime(timeRay)), diff --git a/nest_frontend/components/interactive/BoxConditionHashtag.js b/nest_frontend/components/interactive/BoxConditionHashtag.js index 0cbd18a..25c7cc8 100644 --- a/nest_frontend/components/interactive/BoxConditionHashtag.js +++ b/nest_frontend/components/interactive/BoxConditionHashtag.js @@ -1,11 +1,11 @@ -import React, { useCallback, useContext } from "react" +import React, { useCallback } from "react" import BoxFull from "../base/BoxFull" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import { faHashtag } from "@fortawesome/free-solid-svg-icons" import useRepositoryEditor from "../../hooks/useRepositoryEditor" -import ContextLanguage from "../../contexts/ContextLanguage" import FormInlineHashtag from "./FormInlineHashtag" import { ConditionHashtag } from "../../objects/Condition" +import useStrings from "../../hooks/useStrings" /** @@ -18,7 +18,7 @@ import { ConditionHashtag } from "../../objects/Condition" */ export default function BoxConditionHashtag({ ...props }) { const { addCondition } = useRepositoryEditor() - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const submit = useCallback( value => addCondition(new ConditionHashtag(value)), diff --git a/nest_frontend/components/interactive/BoxConditionLocation.js b/nest_frontend/components/interactive/BoxConditionLocation.js index c4443d6..d5302ef 100644 --- a/nest_frontend/components/interactive/BoxConditionLocation.js +++ b/nest_frontend/components/interactive/BoxConditionLocation.js @@ -1,12 +1,12 @@ -import React, { useCallback, useContext } from "react" +import React, { useCallback } from "react" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import { faLocationArrow, faPlus } from "@fortawesome/free-solid-svg-icons" import ButtonIconOnly from "../base/ButtonIconOnly" import useRepositoryEditor from "../../hooks/useRepositoryEditor" -import ContextLanguage from "../../contexts/ContextLanguage" import BoxMap from "../base/BoxMap" import useMapAreaState from "../../hooks/useMapAreaState" import { ConditionLocation } from "../../objects/Condition" +import useStrings from "../../hooks/useStrings" /** @@ -20,7 +20,7 @@ import { ConditionLocation } from "../../objects/Condition" export default function BoxConditionLocation({ ...props }) { const mapViewHook = useMapAreaState() const { addCondition } = useRepositoryEditor() - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const onButtonClick = useCallback( () => addCondition(new ConditionLocation(mapViewHook.mapArea)), diff --git a/nest_frontend/components/interactive/BoxConditionUser.js b/nest_frontend/components/interactive/BoxConditionUser.js index 3e1483c..00351b7 100644 --- a/nest_frontend/components/interactive/BoxConditionUser.js +++ b/nest_frontend/components/interactive/BoxConditionUser.js @@ -1,11 +1,11 @@ -import React, { useCallback, useContext } from "react" +import React, { useCallback } from "react" import BoxFull from "../base/BoxFull" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import { faAt } from "@fortawesome/free-solid-svg-icons" import useRepositoryEditor from "../../hooks/useRepositoryEditor" -import ContextLanguage from "../../contexts/ContextLanguage" import FormInlineUser from "./FormInlineUser" import { ConditionUser } from "../../objects/Condition" +import useStrings from "../../hooks/useStrings" /** @@ -18,7 +18,7 @@ import { ConditionUser } from "../../objects/Condition" */ export default function BoxConditionUser({ ...props }) { const { addCondition } = useRepositoryEditor() - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const submit = useCallback( value => addCondition(new ConditionUser(value)), diff --git a/nest_frontend/components/interactive/BoxConditions.js b/nest_frontend/components/interactive/BoxConditions.js index 896b097..2bdac78 100644 --- a/nest_frontend/components/interactive/BoxConditions.js +++ b/nest_frontend/components/interactive/BoxConditions.js @@ -1,8 +1,8 @@ -import React, { useContext } from "react" +import React from "react" import BoxFull from "../base/BoxFull" import BadgeCondition from "./BadgeCondition" import useRepositoryEditor from "../../hooks/useRepositoryEditor" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -14,7 +14,7 @@ import ContextLanguage from "../../contexts/ContextLanguage" */ export default function BoxConditions({ ...props }) { const { conditions } = useRepositoryEditor() - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const badges = conditions.map((cond, pos) => ) diff --git a/nest_frontend/components/interactive/BoxFilters.js b/nest_frontend/components/interactive/BoxFilters.js index fc942c8..3118e41 100644 --- a/nest_frontend/components/interactive/BoxFilters.js +++ b/nest_frontend/components/interactive/BoxFilters.js @@ -1,8 +1,8 @@ import React, { useContext } from "react" import BoxFull from "../base/BoxFull" -import ContextLanguage from "../../contexts/ContextLanguage" import ContextRepositoryViewer from "../../contexts/ContextRepositoryViewer" import BadgeFilter from "./BadgeFilter" +import useStrings from "../../hooks/useStrings" /** @@ -13,7 +13,7 @@ import BadgeFilter from "./BadgeFilter" * @constructor */ export default function BoxFilters({ ...props }) { - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const { filters } = useContext(ContextRepositoryViewer) const badges = filters.map((filter, pos) => ) diff --git a/nest_frontend/components/interactive/BoxLoggedIn.js b/nest_frontend/components/interactive/BoxLoggedIn.js index dba6e51..0942dd7 100644 --- a/nest_frontend/components/interactive/BoxLoggedIn.js +++ b/nest_frontend/components/interactive/BoxLoggedIn.js @@ -7,7 +7,7 @@ import ContextUser from "../../contexts/ContextUser" import { useHistory } from "react-router" import Style from "./BoxLoggedIn.module.css" import CurrentServer from "./CurrentServer" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -20,7 +20,7 @@ import ContextLanguage from "../../contexts/ContextLanguage" export default function BoxLoggedIn({ ...props }) { const { logout } = useContext(ContextUser) const history = useHistory() - const { strings } = useContext(ContextLanguage) + const strings = useStrings() return ( diff --git a/nest_frontend/components/interactive/BoxLogin.js b/nest_frontend/components/interactive/BoxLogin.js index 7f2c354..efba462 100644 --- a/nest_frontend/components/interactive/BoxLogin.js +++ b/nest_frontend/components/interactive/BoxLogin.js @@ -8,7 +8,7 @@ import FormButton from "../base/formparts/FormButton" import ContextUser from "../../contexts/ContextUser" import { useHistory } from "react-router" import FormAlert from "../base/formparts/FormAlert" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -25,7 +25,7 @@ export default function BoxLogin({ ...props }) { const [error, setError] = useState(null) const { login } = useContext(ContextUser) const history = useHistory() - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const doLogin = async () => { if(working) { diff --git a/nest_frontend/components/interactive/BoxRepositoryCreate.js b/nest_frontend/components/interactive/BoxRepositoryCreate.js index 613c574..40182a3 100644 --- a/nest_frontend/components/interactive/BoxRepositoryCreate.js +++ b/nest_frontend/components/interactive/BoxRepositoryCreate.js @@ -1,4 +1,4 @@ -import React, { useContext } from "react" +import React from "react" import BoxFull from "../base/BoxFull" import FormLabelled from "../base/FormLabelled" import FormLabel from "../base/formparts/FormLabel" @@ -8,9 +8,8 @@ import Radio from "../base/Radio" import Button from "../base/Button" import useRepositoryEditor from "../../hooks/useRepositoryEditor" import FormAlert from "../base/formparts/FormAlert" -import goToOnSuccess from "../../utils/goToOnSuccess" import { useHistory } from "react-router" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -34,7 +33,7 @@ export default function BoxRepositoryCreate({ running, ...props }) { } = useRepositoryEditor() const history = useHistory() - const { strings } = useContext(ContextLanguage) + const strings = useStrings() return ( diff --git a/nest_frontend/components/interactive/BoxSetServer.js b/nest_frontend/components/interactive/BoxSetServer.js index 91965b9..243644e 100644 --- a/nest_frontend/components/interactive/BoxSetServer.js +++ b/nest_frontend/components/interactive/BoxSetServer.js @@ -5,7 +5,7 @@ import FormLabel from "../base/formparts/FormLabel" import InputWithIcon from "../base/InputWithIcon" import { faGlobe } from "@fortawesome/free-solid-svg-icons" import ContextServer from "../../contexts/ContextServer" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -17,7 +17,7 @@ import ContextLanguage from "../../contexts/ContextLanguage" */ export default function BoxSetServer({ ...props }) { const { server, setServer } = useContext(ContextServer) - const { strings } = useContext(ContextLanguage) + const strings = useStrings() return ( diff --git a/nest_frontend/components/interactive/BoxUserCreate.js b/nest_frontend/components/interactive/BoxUserCreate.js index 8280460..7730ed8 100644 --- a/nest_frontend/components/interactive/BoxUserCreate.js +++ b/nest_frontend/components/interactive/BoxUserCreate.js @@ -1,4 +1,4 @@ -import React, { useCallback, useContext, useState } from "react" +import React, { useCallback, useState } from "react" import FormLabelled from "../base/FormLabelled" import FormLabel from "../base/formparts/FormLabel" import InputWithIcon from "../base/InputWithIcon" @@ -6,7 +6,7 @@ import { faEnvelope, faKey, faPlus, faUser } from "@fortawesome/free-solid-svg-i import FormButton from "../base/formparts/FormButton" import BoxFull from "../base/BoxFull" import FormAlert from "../base/formparts/FormAlert" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -23,7 +23,7 @@ export default function BoxUserCreate({ createUser, running, ...props }) { const [email, setEmail] = useState("") const [password, setPassword] = useState("") const [error, setError] = useState(undefined) - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const onButtonClick = useCallback( async () => { diff --git a/nest_frontend/components/interactive/BoxVisualizationChart.js b/nest_frontend/components/interactive/BoxVisualizationChart.js index 213369c..5298703 100644 --- a/nest_frontend/components/interactive/BoxVisualizationChart.js +++ b/nest_frontend/components/interactive/BoxVisualizationChart.js @@ -2,12 +2,12 @@ import React, { useContext, useMemo } from "react" import BoxFull from "../base/BoxFull" import BoxChart from "../base/BoxChart" import Empty from "./Empty" -import ContextLanguage from "../../contexts/ContextLanguage" import ContextRepositoryViewer from "../../contexts/ContextRepositoryViewer" +import useStrings from "../../hooks/useStrings" export default function BoxVisualizationChart({ ...props }) { - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const { tweets } = useContext(ContextRepositoryViewer) const chartProps = useMemo( diff --git a/nest_frontend/components/interactive/BoxVisualizationMap.js b/nest_frontend/components/interactive/BoxVisualizationMap.js index 24e461a..76f0642 100644 --- a/nest_frontend/components/interactive/BoxVisualizationMap.js +++ b/nest_frontend/components/interactive/BoxVisualizationMap.js @@ -1,9 +1,9 @@ import React, { useContext, useMemo } from "react" import BoxMap from "../base/BoxMap" -import ContextLanguage from "../../contexts/ContextLanguage" import { Marker, Popup } from "react-leaflet" import Coordinates from "../../objects/Coordinates" import ContextRepositoryViewer from "../../contexts/ContextRepositoryViewer" +import useStrings from "../../hooks/useStrings" /** @@ -14,7 +14,7 @@ import ContextRepositoryViewer from "../../contexts/ContextRepositoryViewer" * @constructor */ export default function BoxVisualizationMap({ ...props }) { - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const { tweets, mapViewHook } = useContext(ContextRepositoryViewer) const markers = useMemo( diff --git a/nest_frontend/components/interactive/BoxVisualizationStats.js b/nest_frontend/components/interactive/BoxVisualizationStats.js index 4b9c721..8b67997 100644 --- a/nest_frontend/components/interactive/BoxVisualizationStats.js +++ b/nest_frontend/components/interactive/BoxVisualizationStats.js @@ -1,13 +1,13 @@ import React, { useContext, useMemo } from "react" import FormLabelled from "../base/FormLabelled" import FormLabel from "../base/formparts/FormLabel" -import ContextLanguage from "../../contexts/ContextLanguage" import BoxFullScrollable from "../base/BoxFullScrollable" import ContextRepositoryViewer from "../../contexts/ContextRepositoryViewer" +import useStrings from "../../hooks/useStrings" export default function BoxVisualizationStats({ ...props }) { - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const { tweets, words, rawTweets } = useContext(ContextRepositoryViewer) const tweetCount = useMemo( diff --git a/nest_frontend/components/interactive/BoxVisualizationWordcloud.js b/nest_frontend/components/interactive/BoxVisualizationWordcloud.js index 31be76b..a0499c8 100644 --- a/nest_frontend/components/interactive/BoxVisualizationWordcloud.js +++ b/nest_frontend/components/interactive/BoxVisualizationWordcloud.js @@ -1,14 +1,14 @@ import React, { useCallback, useContext } from "react" import BoxWordcloud from "../base/BoxWordcloud" -import ContextLanguage from "../../contexts/ContextLanguage" import BoxFull from "../base/BoxFull" import Empty from "./Empty" import ContextRepositoryViewer from "../../contexts/ContextRepositoryViewer" import { FilterContains } from "../../objects/Filter" +import useStrings from "../../hooks/useStrings" export default function BoxVisualizationWordcloud({ ...props }) { - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const { words, appendFilter } = useContext(ContextRepositoryViewer) if(words.length === 0) { diff --git a/nest_frontend/components/interactive/ButtonToggleBeforeAfter.js b/nest_frontend/components/interactive/ButtonToggleBeforeAfter.js index 35afd68..0e89966 100644 --- a/nest_frontend/components/interactive/ButtonToggleBeforeAfter.js +++ b/nest_frontend/components/interactive/ButtonToggleBeforeAfter.js @@ -1,8 +1,8 @@ -import React, { useContext } from "react" +import React from "react" import Style from "./ButtonToggleBeforeAfter.module.css" import classNames from "classnames" import Button from "../base/Button" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -16,7 +16,7 @@ import ContextLanguage from "../../contexts/ContextLanguage" * @constructor */ export default function ButtonToggleBeforeAfter({ isBefore, setBefore, className, ...props }) { - const { strings } = useContext(ContextLanguage) + const strings = useStrings() const onButtonClick = () => { setBefore(a => !a) diff --git a/nest_frontend/components/interactive/Empty.js b/nest_frontend/components/interactive/Empty.js index 18bbcc1..45507ae 100644 --- a/nest_frontend/components/interactive/Empty.js +++ b/nest_frontend/components/interactive/Empty.js @@ -1,7 +1,7 @@ -import React, { useContext } from "react" +import React from "react" import Style from "./Empty.module.css" import classNames from "classnames" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -13,7 +13,7 @@ import ContextLanguage from "../../contexts/ContextLanguage" * @constructor */ export default function Empty({ className, ...props }) { - const { strings } = useContext(ContextLanguage) + const strings = useStrings() return ( diff --git a/nest_frontend/components/interactive/LoggedInUser.js b/nest_frontend/components/interactive/LoggedInUser.js index e611408..bc09f28 100644 --- a/nest_frontend/components/interactive/LoggedInUser.js +++ b/nest_frontend/components/interactive/LoggedInUser.js @@ -2,7 +2,7 @@ import React, { useContext } from "react" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import { faUser } from "@fortawesome/free-solid-svg-icons" import ContextUser from "../../contexts/ContextUser" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -14,7 +14,7 @@ import ContextLanguage from "../../contexts/ContextLanguage" */ export default function LoggedInUser({ ...props }) { const { user } = useContext(ContextUser) - const { strings } = useContext(ContextLanguage) + const strings = useStrings() if(!user) { return ( diff --git a/nest_frontend/components/interactive/Logo.js b/nest_frontend/components/interactive/Logo.js index 956c541..00b0853 100644 --- a/nest_frontend/components/interactive/Logo.js +++ b/nest_frontend/components/interactive/Logo.js @@ -4,7 +4,7 @@ import LogoDark from "../../media/LogoDark.png" import LogoLight from "../../media/LogoLight.png" import ContextTheme from "../../contexts/ContextTheme" import classNames from "classnames" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -19,7 +19,7 @@ import ContextLanguage from "../../contexts/ContextLanguage" */ export default function Logo({ className, ...props }) { const { theme } = useContext(ContextTheme) - const { strings } = useContext(ContextLanguage) + const strings = useStrings() let logo if(theme === "ThemeDark") { diff --git a/nest_frontend/components/interactive/SelectTheme.js b/nest_frontend/components/interactive/SelectTheme.js index 9da2e50..395ab1f 100644 --- a/nest_frontend/components/interactive/SelectTheme.js +++ b/nest_frontend/components/interactive/SelectTheme.js @@ -1,7 +1,7 @@ import React, { useContext } from "react" import Select from "../base/Select" import ContextTheme from "../../contexts/ContextTheme" -import ContextLanguage from "../../contexts/ContextLanguage" +import useStrings from "../../hooks/useStrings" /** @@ -14,7 +14,7 @@ import ContextLanguage from "../../contexts/ContextLanguage" */ export default function SelectTheme({ ...props }) { const { theme, setTheme } = useContext(ContextTheme) - const { strings } = useContext(ContextLanguage) + const strings = useStrings() return (