.env

@@ -2,7 +2,6 @@ NEXT_PUBLIC_VERSION=0.4
 
 NEXT_PUBLIC_INFURA_NETWORK=maticmum
 NEXT_PUBLIC_INFURA_KEY=83c4dbbe3bf9485aa4212ee63ee419b3
-NEXT_PUBLIC_INFURA_IPFS_API=https://ipfs.infura.io:5001/api/v0
 NEXT_PUBLIC_THE_GRAPH_IPFS_API=https://api.thegraph.com/ipfs/api/v0
 
 NEXT_PUBLIC_NETWORK_NAME=Mumbai Polygon Testnet

classes/Jurisdiction.js

@@ -1,3 +1,5 @@
+import { resolveLink } from 'utils/ipfs';
+
 /**
  * Class for the jurisdiction.
  */
@@ -7,6 +9,7 @@ export default class Jurisdiction {
     this.name = name;
     this.uri = uri;
     this.uriData = uriData;
+    this.uriData.image = resolveLink(uriData.image);
     this.roles = roles;
     this.rules = rules;
     this.rulesCount = rulesCount;

classes/Profile.js

@@ -1,3 +1,5 @@
+import { resolveLink } from 'utils/ipfs';
+
 /**
  * Class for the profile.
  */
@@ -20,7 +22,8 @@ export default class Profile {
     this.owner = owner;
     this.uri = uri;
     this.uriData = uriData;
-    this.uriImage = uriImage;
+    this.uriData.image = resolveLink(uriData.image);
+    this.uriImage = resolveLink(uriImage);
     this.uriFirstName = uriFirstName;
     this.uriLastName = uriLastName;
     this.reputations = reputations;

classes/metadata/AvatarNftMetadata.js

@@ -1,9 +1,11 @@
+import { resolveLink } from 'utils/ipfs';
+
 /**
  * Class for metadata of avatar nft.
  */
 export default class AvatarNftMetadata {
   constructor(image, attributes) {
-    this.image = image;
+    this.image = resolveLink(image);
     this.attributes = attributes;
   }
 }

classes/metadata/JurisdictionMetadata.js

@@ -1,9 +1,11 @@
+import { resolveLink } from 'utils/ipfs';
+
 /**
  * Class for metadata of jurisdiction.
  */
 export default class JurisdictionMetadata {
   constructor(image, description) {
-    this.image = image;
+    this.image = resolveLink(image);
     this.description = description;
   }
 }

components/form/widget/ProfileSelect.js

@@ -8,11 +8,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { formatAddress, formatProfileFirstLastName } from 'utils/formatters';
 
 /**
-<<<<<<< HEAD
  * A widget to select profile (profile id).
-=======
- * A widget to select profile (account).
->>>>>>> dev
  */
 export default function ProfileSelect(props) {
   const propsHeader = props.options?.header;

components/jurisdiction/JurisdictionManageDialog.js

@@ -21,6 +21,7 @@ import {
   handleMakeJurisdiction,
   handleSetJurisdictionUri,
 } from 'utils/analytics';
+import { resolveLink } from 'utils/ipfs';
 
 /**
  * A dialog for adding a jurisdiction or updating a specified jurisdiction.
@@ -40,7 +41,7 @@ export default function JurisdictionManageDialog({
   const [isOpen, setIsOpen] = useState(!isClose);
   const [formData, setFormData] = useState({
     ...(jurisdiction && {
-      image: jurisdiction.uriData?.image,
+      image: resolveLink(jurisdiction.uriData?.image),
       name: jurisdiction.name,
       description: jurisdiction.uriData?.description,
     }),

hooks/useIpfs.js

@@ -1,27 +1,23 @@
 import axios from 'axios';
 import { create } from 'ipfs-http-client';
 
-const infuraClient = create(process.env.NEXT_PUBLIC_INFURA_IPFS_API);
 const theGraphClient = create(process.env.NEXT_PUBLIC_THE_GRAPH_IPFS_API);
 
 export default function useIpfs() {
   let uploadFileToIPFS = async function (file) {
-    const created = await infuraClient.add({
+    const created = await theGraphClient.add({
       path: '',
       content: file,
     });
     const cid = created.path;
-    const url = `https://ipfs.infura.io/ipfs/${cid}`;
+    const url = `https://gateway.ipfs.io/ipfs/${cid}`;
     return { cid, url };
   };
 
   let uploadJsonToIPFS = async function (json) {
-    // Upload to the graph for usage in graph queries
-    await theGraphClient.add(JSON.stringify(json));
-    // Upload to infura
-    const created = await infuraClient.add(JSON.stringify(json));
+    const created = await theGraphClient.add(JSON.stringify(json));
     const cid = created.path;
-    const url = `https://ipfs.infura.io/ipfs/${cid}`;
+    const url = `https://gateway.ipfs.io/ipfs/${cid}`;
     return { cid, url };
   };