From 83d864df32a824b3fc17d93ab107bab8f2252341 Mon Sep 17 00:00:00 2001
From: z0ccc <z0cccccccc@gmail.com>
Date: Sat, 24 Jul 2021 00:34:25 -0400
Subject: [PATCH] added adblock error for connection

---
 frontend/src/components/ConnectBlock.js | 24 +++++++++++++++---------
 frontend/src/components/ScanBlocks.js   |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/ConnectBlock.js b/frontend/src/components/ConnectBlock.js
index e824bcb..4e532e1 100644
--- a/frontend/src/components/ConnectBlock.js
+++ b/frontend/src/components/ConnectBlock.js
@@ -4,14 +4,17 @@ import Table from './Table';
 
 const ConnectBlock = () => {
   const [connectData, setConnectData] = useState('');
-  const [display, setDisplay] = useState('none');
+  const [display, setDisplay] = useState('');
 
   useEffect(() => {
     fetch('http://ip-api.com/json')
       .then((response) => response.json())
       .then((data) => {
         setConnectData(data);
-        setDisplay('block');
+        setDisplay(1);
+      })
+      .catch(() => {
+        setDisplay(0);
       });
   }, []);
 
@@ -32,22 +35,22 @@ const ConnectBlock = () => {
     {
       key: 'ipAddress',
       title: 'IP address',
-      value: connectData.query || 'N/A',
+      value: connectData.query,
     },
     {
       key: 'isp',
       title: 'ISP',
-      value: connectData.isp || 'N/A',
+      value: connectData.isp,
     },
     {
       key: 'org',
       title: 'Organization',
-      value: connectData.org || 'N/A',
+      value: connectData.org,
     },
     {
       key: 'asn',
       title: 'ASN',
-      value: connectData.as || 'N/A',
+      value: connectData.as,
     },
     {
       key: 'tor',
@@ -59,9 +62,12 @@ const ConnectBlock = () => {
   return (
     <ScanBlock>
       <h1>Connection</h1>
-      <div style={{ display }}>
-        <Table data={data} />
-      </div>
+      {display === 1 && <Table data={data} />}
+      {display === 0 && (
+        <div className="boxWrap">
+          Unable to load data. Adblock or content filter may have blocked data from loading.
+        </div>
+      )}
       <p>
         <b>Explanation:</b> Your IP address reveals information about your
         connection. Using a VPN or Tor will hide your connection info.
diff --git a/frontend/src/components/ScanBlocks.js b/frontend/src/components/ScanBlocks.js
index c3579ff..0c2d68b 100644
--- a/frontend/src/components/ScanBlocks.js
+++ b/frontend/src/components/ScanBlocks.js
@@ -8,10 +8,10 @@ import FiltersBlock from './FiltersBlock';
 
 const ScanBlocks = () => (
   <div>
+    <ConnectBlock />
     <FingerprintBlock />
     <FiltersBlock />
     <LocationBlock />
-    <ConnectBlock />
     <SoftwareBlock />
     <HardwareBlock />
     {/* <FontsBlock /> */}