Merge pull request #162 from metagov/index-old

index mainnetv0 graph
metagov · Oct 18, 2023 · 163f3bd · 163f3bd
2 parents 779804f + 596add0
commit 163f3bd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/daostar-website/package.json b/daostar-website/package.json
@@ -46,15 +46,15 @@
     "react-three-fiber": "^6.0.13",
     "three": "^0.148.0",
     "ts-jest": "^29.0.5",
-    "typescript": "^4.9.4",
+    "typescript": "^5.2.2",
     "typewriter-effect": "^2.19.0",
     "validator": "^13.7.0",
-    "wagmi": "^0.11.4",
+    "wagmi": "^1.1.1",
     "web-vitals": "^2.1.4",
     "web3": "^1.8.1"
   },
   "scripts": {
-    "start": "PORT=8000 REACT_APP_API_URL=https://api.daostar.org react-scripts start",
+    "start": "PORT=8000 REACT_APP_API_URL=http://localhost:8080/https://api.daostar.org react-scripts start",
     "build": "REACT_APP_API_URL=https://api.daostar.org react-scripts build",
     "predeploy": "REACT_APP_API_URL=https://api.daostar.org npm run build",
     "deploy": "REACT_APP_API_URL=https://api.daostar.org gh-pages -d build",

diff --git a/daostar-website/src/App.js b/daostar-website/src/App.js
@@ -33,6 +33,10 @@ function App() {
         context: { apiName: "mainnet" },
         variables: { id: "mainnet" },
     });
+    const mainnetv0Res = useQuery(queries.REGISTRATIONS, {
+        context: { apiName: "mainnetv0" },
+        variables: { id: "mainnet" },
+    });
     const goerliRes = useQuery(queries.REGISTRATIONS, {
         context: { apiName: "goerli" },
         variables: { id: "goerli" },
@@ -54,7 +58,11 @@ function App() {
         context: { apiName: "optimism" },
         variables: { id: "optimism" },
     });
-
+    const {
+        loading: mainnetv0Loading,
+        error: mainnetv0Error,
+        data: mainnetv0Data,
+    } = mainnetv0Res;
     const {
         loading: optimismLoading,
         error: optimismError,
@@ -90,19 +98,22 @@ function App() {
         error: gnosisError,
         data: gnosisData,
     } = gnosisRes;
-    console.log({ mainnetData, goerliData, gnosisData, optimismGoerliData, arbitrumGoerliData, chapelData });
+    console.log({ mainnetData, goerliData, gnosisData, optimismGoerliData, arbitrumGoerliData, chapelData, mainnetv0Data });
 
-    if (error || goerliError || optimismGoerliError || arbitrumGoerliError || chapelError || optimismError ) {
+    if (error || goerliError || optimismGoerliError || arbitrumGoerliError || chapelError || optimismError || mainnetv0Error ) {
         console.error("Mainnet Error "+ error);
+        console.error("Mainnet  v0 Error "+ mainnetv0Error);
         console.error("Goerli Error "+ goerliError);
         console.error("Optimism Goerli Error "+ optimismGoerliError);
         console.error("Arbitrum Goerli Error" + arbitrumGoerliError);
         console.error("Chapel Error" + chapelError);
         console.error("Optimism Error" + optimismError)
     };
-    if (loading || goerliLoading || gnosisLoading || optimismGoerliLoading || arbitrumGoerliLoading || chapelLoading || optimismLoading) return "loading...";
+    if (loading || mainnetv0Loading || goerliLoading || gnosisLoading || optimismGoerliLoading || arbitrumGoerliLoading || chapelLoading || optimismLoading) return "loading...";
     const mainnetRegistrations =
         mainnetData?.registrationNetwork?.registrations || [];
+    const mainnetv0Registrations =
+        mainnetv0Data?.registrationNetwork?.registrations || [];
     const goerliRegistrations =
         goerliData?.registrationNetwork?.registrations || [];
     const optimismGoerliRegistrations =
@@ -116,6 +127,7 @@ function App() {
     const chapelRegistrations =
         chapelData?.registrationNetwork?.registrations || [];
     const allRegistrationInstances = mainnetRegistrations.concat(
+        mainnetv0Registrations,
         goerliRegistrations,
         gnosisRegistrations,
         optimismGoerliRegistrations,

diff --git a/daostar-website/src/index.js b/daostar-website/src/index.js
@@ -34,7 +34,8 @@ const client = new ApolloClient({
                 gnosis: `https://api.thegraph.com/subgraphs/name/rashmi-278/daostar-gnosis`,
                 arbitrumGoerli: `https://api.thegraph.com/subgraphs/name/crazyyuan/daostar-arbitrum-goerli`,
                 chapel:`https://api.thegraph.com/subgraphs/name/crazyyuan/daostar-bnb-bruno`,
-                optimism: `https://api.thegraph.com/subgraphs/name/crazyyuan/daostar-optimism`
+                optimism: `https://api.thegraph.com/subgraphs/name/crazyyuan/daostar-optimism`,
+                mainnetv0: `https://api.thegraph.com/subgraphs/name/crazyyuan/daostar-ethereum-main-v0`
 
             },
             // defaultEndpoint: 'https://api.thegraph.com/subgraphs/name/ipatka/daostar',