merge

JustaLiang · Oct 22, 2021 · c1fd7e6 · c1fd7e6
2 parents a95731d + 8477609
commit c1fd7e6
Show file tree

Hide file tree

Showing 52 changed files with 23,863 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@ node_modules/
 # hardhat files
 cache/
 artifacts/
-frontend/src/hardhat/
+# frontend/src/hardhat/
 coverage/
 coverage.json
 

diff --git a/control/DeployEnable.ts b/control/DeployEnable.ts
@@ -1,5 +1,5 @@
 export const deployEnable: boolean[] = [
-    /* Ticket   */  true,
+    /* Ticket   */  false,
     /* Blindbox */  true,
-    /* Gallery  */  true,
+    /* Gallery  */  false,
 ];
diff --git a/frontend/src/components/NFTTemplateCard.tsx b/frontend/src/components/NFTTemplateCard.tsx
@@ -6,6 +6,17 @@ import { ProviderContext, SignerContext } from "../hardhat/SymfoniContext";
 import { NoobFriendlyTokenTemplate__factory } from "../hardhat/typechain/factories/NoobFriendlyTokenTemplate__factory";
 import { NoobFriendlyTokenTemplate } from "../hardhat/typechain/NoobFriendlyTokenTemplate";
 import { NFTTypeArray } from "./NFTTypeArray";
+
+const GATEWAY = new URL('https://dweb.link/')
+
+const toGatewayURL = (url: any, options: any = {}) => {
+    const gateway = options.gateway || GATEWAY
+    url = new URL(String(url))
+    return url.protocol === 'ipfs:'
+      ? new URL(`/ipfs/${url.href.slice('ipfs://'.length)}`, gateway)
+      : url
+}
+
 const useStyles = makeStyles((theme) => ({
     media: {
         objectFit: 'contain',
@@ -69,13 +80,13 @@ export const NFTTemplateCard: React.FC<Props> = (props) => {
         const updateImageURI = async () => {
             const baseURI = await template?.baseURI();
             if (baseURI) {
-                fetch(`https://ipfs.io/ipfs/${baseURI?.slice(7)}0`)
+                fetch(toGatewayURL(baseURI).toString()+'0')
                     .then((res) => {
                         if (res.status === 404) throw Error("URI error: 404");
                         return res.json();
                     })
                     .then((metadata) => {
-                        const imgURI = "https://ipfs.io/ipfs/" + metadata.image.slice(7);
+                        const imgURI = toGatewayURL(metadata.image).toString();
                         setImageURI(imgURI);
                     })
                     .catch((err) => {

diff --git a/frontend/src/hardhat/SymfoniContext.tsx b/frontend/src/hardhat/SymfoniContext.tsx
diff --git a/frontend/src/hardhat/deployments/rinkeby/.chainId b/frontend/src/hardhat/deployments/rinkeby/.chainId
@@ -0,0 +1 @@
+4
diff --git a/frontend/src/hardhat/deployments/rinkeby/NFTBlindboxGenerator.json b/frontend/src/hardhat/deployments/rinkeby/NFTBlindboxGenerator.json