Merge branch 'feature/articles' into feature/#219-transform-valid-mar…

…kdown-to-nodes
fxhash · Sep 24, 2022 · d02d2be · d02d2be
2 parents c19b3f0 + d0070bc
commit d02d2be
Show file tree

Hide file tree

Showing 245 changed files with 6,744 additions and 1,544 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,7 @@
 NEXT_PUBLIC_API_ROOT = https://api.fxhash.xyz/graphql
 NEXT_PUBLIC_API_FILE_ROOT = https://file-api.fxhash.xyz
 NEXT_PUBLIC_API_EXTRACT = https://extract.fxhash.xyz
+NEXT_PUBLIC_API_EVENTS_ROOT = https://events.fxhash.xyz
 NEXT_PUBLIC_IPFS_GATEWAY = https://gateway.fxhash.xyz
 NEXT_PUBLIC_IPFS_GATEWAY_SAFE = https://gateway.fxhash2.xyz
 NEXT_PUBLIC_TZKT_API = https://api.tzkt.io/v1/
@@ -19,13 +20,16 @@ NEXT_PUBLIC_TZ_CT_ADDRESS_ISSUER = KT1BJC12dG17CVvPKJ1VYaNnaT5mzfnUTwXv
 NEXT_PUBLIC_TZ_CT_ADDRESS_USERREGISTER = KT1Ezht4PDKZri7aVppVGT4Jkw39sesaFnww
 NEXT_PUBLIC_TZ_CT_ADDRESS_TOK_MODERATION = KT18tPu7uXy9PJ97i3qCLsr7an4X6sQ5qxU7
 NEXT_PUBLIC_TZ_CT_ADDRESS_USER_MODERATION = KT1Wn2kkKmdbyLWBiLXWCkE7fKj1LsLKar2A
+NEXT_PUBLIC_TZ_CT_ADDRESS_ARTICLE_MODERATION = KT1A36z7nG4zPDbhjyrzhYf9SCn5ipPZeRMQ
 NEXT_PUBLIC_TZ_CT_ADDRESS_TEAM_MODERATION = KT1FvGQcPxzuJkJsdWFQiGkueSNT5mqpFDrf
 NEXT_PUBLIC_TZ_CT_ADDRESS_CYCLES = KT1BgD9SPfysnMz3vkfm6ZEaGFKCVcE5ay91
 
 NEXT_PUBLIC_TZ_CT_ADDRESS_GENTK_V1 = KT1KEa8z6vWXDJrVqtMrAeDVzsvxat3kHaCE
 NEXT_PUBLIC_TZ_CT_ADDRESS_GENTK_V2 = KT1U6EHmNxJTkvaWJ4ThczG4FSDaHC21ssvi
+NEXT_PUBLIC_TZ_CT_ADDRESS_ARTICLES = KT1GtbuswcNMGhHF2TSuH1Yfaqn16do8Qtva
 NEXT_PUBLIC_TZ_CT_ADDRESS_MARKETPLACE_V1 = KT1Xo5B7PNBAeynZPmca4bRh6LQow4og1Zb9
 NEXT_PUBLIC_TZ_CT_ADDRESS_MARKETPLACE_V2 = KT1GbyoDi7H1sfXmimXpptZJuCdHMh66WS9u
+NEXT_PUBLIC_TZ_CT_ADDRESS_MARKETPLACE_V3 = KT1M1NyU9X4usEimt2f3kDaijZnDMNBu42Ja
 NEXT_PUBLIC_TZ_CT_ADDRESS_COLLAB_FACTORY = KT1JrUPSCt1r2MB2J7Lk2KwiWSYr3Mr414ck
 
 NEXT_PUBLIC_TZ_CT_ADDRESS_ALLOWED_MINT_ISSUER = KT1Djz5ix2yEGmV7PMq3GYq17TvMMkd1anT2

diff --git a/next.config.js b/next.config.js
@@ -9,6 +9,24 @@ if (!process.env.NEXT_PUBLIC_IPFS_GATEWAY || !process.env.NEXT_PUBLIC_IPFS_GATEW
 const urlGateway = new URL(process.env.NEXT_PUBLIC_IPFS_GATEWAY);
 const urlGatewaySafe = new URL(process.env.NEXT_PUBLIC_IPFS_GATEWAY_SAFE);
 
+// the main common security headers
+const baseSecurityHeaders = [
+  {
+    key: "X-Frame-Options",
+    value: "SAMEORIGIN"
+  },
+  // Isolates the browsing context exclusively to same-origin documents. 
+  // Cross-origin documents are not loaded in the same browsing context.
+  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Opener-Policy
+  {
+    key: 'Cross-Origin-Opener-Policy',
+    value: 'same-origin'
+  },
+]
+
+const articlesAllowedDomains = "https://*.spotify.com/ https://spotify.com https://*.youtube.com/ https://youtube.com https://*.twitter.com/ https://twitter.com"
+
+
 /** @type {import('next').NextConfig} */
 module.exports = withBundleAnalyzer({
   reactStrictMode: true,
@@ -19,6 +37,16 @@ module.exports = withBundleAnalyzer({
 
   async headers() {
     return [
+      {
+        source: "/:path*",
+        headers: [
+          {
+            key: "Content-Security-Policy",
+            value: `frame-ancestors 'self'; frame-src ${process.env.NEXT_PUBLIC_IPFS_GATEWAY_SAFE} ${articlesAllowedDomains} 'self';`
+          },
+          ...baseSecurityHeaders,
+        ]
+      },
       {
         source: "/sandbox/worker.js",
         headers: [
@@ -27,6 +55,19 @@ module.exports = withBundleAnalyzer({
             value: "/"
           }
         ]
+      },
+      {
+        source: "/sandbox/preview.html",
+        headers: [
+          {
+            key: "Content-Security-Policy",
+            value: ""
+          },
+          {
+            key: "Cross-Origin-Embedder-Policy",
+            value: "require-corp"
+          },
+        ]
       }
     ]
   },

diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "react-router-dom": "^5.3.0",
     "react-simple-code-editor": "^0.11.2",
     "react-textarea-autosize": "^8.3.4",
-    "rehype-format": "^4.0.0",
+    "rehype-format": "^4.0.1",
     "rehype-highlight": "^5.0.0",
     "rehype-katex": "^6.0.2",
     "rehype-prism": "^2.1.3",

diff --git a/public/images/logos/fxhash-black.svg b/public/images/logos/fxhash-black.svg
diff --git a/src/components/Activity/Action.module.scss b/src/components/Activity/Action.module.scss
@@ -102,6 +102,12 @@
   z-index: 1;
 }
 
+.link {
+  position: relative;
+  z-index: 1;
+  color: currentColor;
+}
+
 .align {
   display: flex;
   align-items: center;
@@ -116,4 +122,4 @@
   right: 0;
   display: block;
   z-index: 1;
-}
+}