grid working

your-digital-rights · Sep 17, 2024 · 6729827 · 6729827
1 parent 1109672
commit 6729827
Show file tree

Hide file tree

Showing 7 changed files with 379 additions and 416 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -24,11 +24,11 @@
     "@fortawesome/free-brands-svg-icons": "^5.9.0",
     "@fortawesome/free-solid-svg-icons": "^5.9.0",
     "@fortawesome/react-fontawesome": "^0.1.4",
-    "@material-ui/core": "^4.11.3",
-    "@material-ui/icons": "^4.11.2",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
     "accepts": "^1.3.5",
-    "ag-grid-community": "^32.0.0",
-    "ag-grid-react": "^32.0.0",
+    "ag-grid-community": "^27.0.0",
+    "ag-grid-react": "^27.0.0",
     "cookie-cutter": "^0.2.0",
     "downshift": "^9.0.6",
     "isomorphic-fetch": "^3.0.0",
@@ -38,8 +38,8 @@
     "leaflet.markercluster": "^1.5.3",
     "mailgo": "^0.12.2",
     "mailto-link": "^2.0.0",
-    "next": "^14.1.1",
-    "next-seo": "^6.4.0",
+    "next": "^14.2.11",
+    "next-seo": "^6.6.0",
     "node-gyp": "^6.1.0",
     "prop-types": "^15.7.2",
     "react": "^18.2.0",

diff --git a/frontend/src/components/DataBrokersList/index.js b/frontend/src/components/DataBrokersList/index.js
@@ -38,8 +38,8 @@ const DataBrokersDB = ({ classes, dataBrokers }) => {
       <>
       <Image 
         className={classes.orgLogo} 
-        width='20px' 
-        height='20px' 
+        width='20' 
+        height='20' 
         src={src} 
         placeholder="blur"
         blurDataURL="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFUlEQVR42mMU3NlZz0AEYBxVSF+FAOEUEj9NKjNZAAAAAElFTkSuQmCC"
@@ -143,17 +143,17 @@ const DataBrokersDB = ({ classes, dataBrokers }) => {
     setSelectedDataBroker(e.data); 
   };
 
-  const Map = dynamic(
-    () => import("../MainMap"), 
+  const Map = React.useMemo(() => dynamic(
+    () => import('../MainMap'), // replace '@components/map' with your component's location
     { 
-      ssr: false 
-    } // This line is important. It's what prevents server-side render
-  );
+      ssr: false // This line is important. It's what prevents server-side render
+    }
+  ), [selectedDataBroker])
 
   return (
     <div className={classes.container}>
       <Paper className={classes.inner}>
-        <Map dataBrokers={dataBrokers} selectedDataBroker={selectedDataBroker} />
+
         <div className={classes.database}>
           <Paper className={classes.searchRoot} id="grid-wrapper" elevation={1}>
             <SearchIcon />

diff --git a/frontend/src/components/Footer/index.js b/frontend/src/components/Footer/index.js
@@ -113,7 +113,7 @@ const Footer = ({ classes }) => {
               id="footer.privacyPolicy"
               defaultMessage="<a>Privacy Policy</a>"
               values={{
-                a: txt=> (<Link href="/privacy" ><a className={classes.DisclaimerLink}>{txt}</a></Link>)
+                a: txt=> (<Link legacyBehavior href="/privacy" ><a className={classes.DisclaimerLink}>{txt}</a></Link>)
               }}
             />
           </Typography>
@@ -122,7 +122,7 @@ const Footer = ({ classes }) => {
               id="footer.mission"
               defaultMessage="<a>Mission</a>"
               values={{
-                a: txt=> (<Link href="/about" ><a className={classes.DisclaimerLink}>{txt}</a></Link>)
+                a: txt=> (<Link legacyBehavior href="/about" ><a className={classes.DisclaimerLink}>{txt}</a></Link>)
               }}
             />
           </Typography> 

diff --git a/frontend/src/components/MainMap/index.js b/frontend/src/components/MainMap/index.js
@@ -34,10 +34,8 @@ const Map = (props) => {
 };
 
 const DataBrokersGroup = ({dataBrokers, classes, selectedDataBroker}) => {
-	const map = useMap();
 	const groupRef = React.useRef(null);
 	const dataBrokersWithLocation = dataBrokers.filter((dataBroker) => dataBroker.latlng && dataBroker.latlng.length > 0);
-
 	const [markers, setMarkers] = React.useState({})
 
 	const markersRef = React.useCallback((dataBroker, marker) => {

diff --git a/frontend/src/components/Nav/index.js b/frontend/src/components/Nav/index.js
@@ -22,7 +22,7 @@ const NavItem = ({
 }) => {
   return (
     <li className={classes.item} onClick={onClickHandler}>
-      <Link href={href} className={classes.link} passHref>
+      <Link legacyBehavior href={href} className={classes.link} passHref>
         <Typography
           component="a"
           target={target}

diff --git a/frontend/src/pages/top-ten.js b/frontend/src/pages/top-ten.js
@@ -131,7 +131,7 @@ const Brokers = ({ classes, router }) => {
                 {dataBrokers.map((company) => (
                   <Grid key={company.domain} item>
                     <Paper className={classes.paper} elevation={2} >
-                      <Link href={"https://yourdigitalrights.org/d/" + company.domain} passHref> 
+                      <Link legacyBehavior href={"https://yourdigitalrights.org/d/" + company.domain} passHref> 
                         <GridListTile
                           component="a"
                           target="_blank"