diff --git a/frontend/src/components/Blocks.js b/frontend/src/components/Blocks.js index dea9e15..6074ca9 100644 --- a/frontend/src/components/Blocks.js +++ b/frontend/src/components/Blocks.js @@ -1,4 +1,5 @@ import { useState, useEffect } from 'react'; +import DataContext from './Context'; import BlocksOne from './BlocksOne'; import BlocksTwo from './BlocksTwo'; // import FontsBlock from './FontsBlock'; @@ -18,24 +19,18 @@ const Blocks = () => { return ( <> {connectionData ? ( - <> +
- +
- +
- - + +
- +
) : (
Loading...
diff --git a/frontend/src/components/BlocksOne.js b/frontend/src/components/BlocksOne.js index 638098f..8725613 100644 --- a/frontend/src/components/BlocksOne.js +++ b/frontend/src/components/BlocksOne.js @@ -3,12 +3,12 @@ import IntlBlock from './IntlBlock'; import NavigatorBlock from './NavigatorBlock'; import FingerprintBlock from './FingerprintBlock'; -const BlocksOne = ({ workerData }) => ( +const BlocksOne = () => ( <> - - - - + + + + ); diff --git a/frontend/src/components/BlocksTwo.js b/frontend/src/components/BlocksTwo.js index abbe95b..602e380 100644 --- a/frontend/src/components/BlocksTwo.js +++ b/frontend/src/components/BlocksTwo.js @@ -3,12 +3,12 @@ import ScreenBlock from './ScreenBlock'; import LocationBlock from './LocationBlock'; import ConnectionBlock from './ConnectionBlock'; -const BlocksTwo = ({ workerData, connectionData }) => ( +const BlocksTwo = () => ( <> - - + + - + ); diff --git a/frontend/src/components/ConnectionBlock.js b/frontend/src/components/ConnectionBlock.js index c138cdc..89c99da 100644 --- a/frontend/src/components/ConnectionBlock.js +++ b/frontend/src/components/ConnectionBlock.js @@ -1,25 +1,30 @@ +import { useContext } from 'react'; +import DataContext from './Context'; import Block from './Block'; import Table from './Table'; import { getConnection } from '../utils/connection'; -const LocationBlock = ({ connectionData }) => ( - -

Connection

- -

- Explanation: Your IP address reveals information about your - connection.{' '} - - Read more - -

- -); +const LocationBlock = () => { + const { connectionData } = useContext(DataContext); + return ( + +

Connection

+
+

+ Explanation: Your IP address reveals information about your + connection.{' '} + + Read more + +

+ + ); +}; export default LocationBlock; diff --git a/frontend/src/components/Context.js b/frontend/src/components/Context.js new file mode 100644 index 0000000..4798c3f --- /dev/null +++ b/frontend/src/components/Context.js @@ -0,0 +1,5 @@ +import { createContext } from 'react'; + +const DataContext = createContext(); + +export default DataContext; diff --git a/frontend/src/components/FingerprintBlock.js b/frontend/src/components/FingerprintBlock.js index 3bfc09c..9ca6dc4 100644 --- a/frontend/src/components/FingerprintBlock.js +++ b/frontend/src/components/FingerprintBlock.js @@ -1,5 +1,6 @@ import './FingerprintBlock.css'; -import { useState, useEffect } from 'react'; +import { useState, useEffect, useContext } from 'react'; +import DataContext from './Context'; import Block from './Block'; import Table from './Table'; import { @@ -9,9 +10,10 @@ import { getFingerprint, } from '../utils/fingerprint'; -const FingerprintBlock = ({ workerData }) => { +const FingerprintBlock = () => { const [signature, setSignature] = useState(); const [load, setload] = useState(false); + const { workerData } = useContext(DataContext); const hash = getHash(workerData); useEffect(() => { diff --git a/frontend/src/components/IntlBlock.js b/frontend/src/components/IntlBlock.js index 062c5df..2d707f0 100644 --- a/frontend/src/components/IntlBlock.js +++ b/frontend/src/components/IntlBlock.js @@ -1,24 +1,29 @@ +import { useContext } from 'react'; +import DataContext from './Context'; import Block from './Block'; import Table from './Table'; import getIntl from '../utils/intl'; -const IntlBlock = ({ workerData }) => ( - -

Intl

-
-

- Explanation: The Intl object exposes info about your computer.{' '} - - Read more - -

- -); +const IntlBlock = () => { + const { workerData } = useContext(DataContext); + return ( + +

Intl

+
+

+ Explanation: The Intl object exposes info about your computer.{' '} + + Read more + +

+ + ); +}; export default IntlBlock; diff --git a/frontend/src/components/LocationBlock.js b/frontend/src/components/LocationBlock.js index 6e7ef87..320fa04 100644 --- a/frontend/src/components/LocationBlock.js +++ b/frontend/src/components/LocationBlock.js @@ -1,26 +1,31 @@ +import { useContext } from 'react'; +import DataContext from './Context'; import Block from './Block'; import Table from './Table'; import { getMap, getLocation } from '../utils/connection'; -const LocationBlock = ({ connectionData, workerData }) => ( - -

Location

- Map of current location -
-

- Explanation: Your IP address can be used to determine your - location.{' '} - - Read more - -

- -); +const LocationBlock = () => { + const { workerData, connectionData } = useContext(DataContext); + return ( + +

Location

+ Map of current location +
+

+ Explanation: Your IP address can be used to determine your + location.{' '} + + Read more + +

+ + ); +}; export default LocationBlock; diff --git a/frontend/src/components/NavigatorBlock.js b/frontend/src/components/NavigatorBlock.js index 5a0841c..395c42d 100644 --- a/frontend/src/components/NavigatorBlock.js +++ b/frontend/src/components/NavigatorBlock.js @@ -1,25 +1,30 @@ +import { useContext } from 'react'; +import DataContext from './Context'; import Block from './Block'; import Table from './Table'; import getNavigator from '../utils/navigator'; -const NavigatorBlock = ({ workerData }) => ( - -

Navigator

-
-

- Explanation: The Navigator interface exposes info about your - computer.{' '} - - Read more - -

- -); +const NavigatorBlock = () => { + const { workerData } = useContext(DataContext); + return ( + +

Navigator

+
+

+ Explanation: The Navigator interface exposes info about your + computer.{' '} + + Read more + +

+ + ); +}; export default NavigatorBlock; diff --git a/frontend/src/components/OtherBlock.js b/frontend/src/components/OtherBlock.js index 3f269f3..5782e72 100644 --- a/frontend/src/components/OtherBlock.js +++ b/frontend/src/components/OtherBlock.js @@ -1,12 +1,13 @@ -import { useState, useEffect } from 'react'; - +import { useState, useEffect, useContext } from 'react'; +import DataContext from './Context'; import Block from './Block'; import Table from './Table'; import getOther from '../utils/other'; -const OtherBlock = ({ workerData }) => { +const OtherBlock = () => { const [adBlock, setAdBlock] = useState(); const [battery, setBattery] = useState(); + const { workerData } = useContext(DataContext); useEffect(() => { fetch('https://www3.doubleclick.net', { diff --git a/frontend/src/components/UserAgentBlock.js b/frontend/src/components/UserAgentBlock.js index 7437262..ac38b4b 100644 --- a/frontend/src/components/UserAgentBlock.js +++ b/frontend/src/components/UserAgentBlock.js @@ -1,25 +1,30 @@ +import { useContext } from 'react'; +import DataContext from './Context'; import Block from './Block'; import Table from './Table'; import getUserAgent from '../utils/userAgent'; -const UserAgentBlock = ({ workerAgent }) => ( - -

User Agent

-
-

- Explanation: Your user agent can be parsed to determine information - about your browser or operating system.{' '} - - Read more - -

- -); +const UserAgentBlock = () => { + const { workerData } = useContext(DataContext); + return ( + +

User Agent

+
+

+ Explanation: Your user agent can be parsed to determine + information about your browser or operating system.{' '} + + Read more + +

+ + ); +}; export default UserAgentBlock;