Merge branch 'master' into feat/571-invite-status-text

fairDataSociety · Dec 15, 2023 · 298c9fb · 298c9fb
2 parents a458c3a + 91f4316
commit 298c9fb
Show file tree

Hide file tree

Showing 33 changed files with 276 additions and 147 deletions.
diff --git a/.github/workflows/swarm.yml b/.github/workflows/swarm.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-      - development
-      - staging
 
 jobs:
   build:
@@ -15,15 +13,20 @@ jobs:
         working-directory: .
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [16.x]
     steps:
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+
       - name: checkout
         uses: actions/checkout@v3
 
       - name: Set environment specific variables
         uses: jnus/[email protected]
         with:
-          scope: ${{ github.ref_name }}
+          scope: "swarm"
           configFile: '.github/workflows/variables.json'
           secrets: '${{ toJson(secrets.github_token) }}'
 
@@ -62,6 +65,7 @@ jobs:
           bee-url: ${{ env.SWARM_URL }}
           dir: ./out
           index-document: index.html
+          pin: true
           timeout: 200000
       - name: update feed
         id: swarm-feed
@@ -71,7 +75,7 @@ jobs:
         with:
           bee-url: ${{ env.SWARM_URL }}
           reference: ${{ steps.swarm-upload.outputs.reference }}
-          topic: consents
+          topic: theapp
           signer: ${{ secrets[env.SIGNER] }}
       - name: get CID
         id: swarm-cid
@@ -88,4 +92,4 @@ jobs:
         env:
           TOKEN: '${{ secrets.purge_token }}'
         run: |
-          curl -s ${{ env.PURGE_URL }}/deploy/purge?token=${{ secrets.purge_token }} -H "site: app.fairdrive${{ env.DEPLOYMENT }}fairdatasociety.org" -H "uri: "
+          curl -s ${{ env.PURGE_URL }}/deploy/purge?token=${{ secrets.purge_token }} -H "site: app.fairdrive${{ env.DEPLOYMENT }}io" -H "uri: /"
diff --git a/.github/workflows/variables.json b/.github/workflows/variables.json
@@ -6,7 +6,8 @@
       "Scope": {
         "Environment": [
           "master",
-    "main"
+          "main",
+          "swarm"
         ]
       }
     },
@@ -74,6 +75,15 @@
         ]
       }
     },
+    {
+      "Name": "NEXT_PUBLIC_FAIRDRIVEHOST",
+      "Value": "https://app.fairdrive.io",
+      "Scope": {
+        "Environment": [
+          "swarm"
+        ]
+      }
+    },
     {
       "Name": "NEXT_PUBLIC_FAIRDRIVEHOST",
       "Value": "https://fairdrive#{DEPLOYMENT}fairdatasociety.org",
@@ -91,7 +101,8 @@
           "main",
           "master",
           "staging",
-          "development"
+          "development",
+	  "swarm"
         ]
       }
     },
@@ -103,17 +114,65 @@
     {
       "Name": "NEXT_PUBLIC_CREATE_ACCOUNT_REDIRECT",
       "Value": "https://create#{DEPLOYMENT}fairdatasociety.org",
-      "Scope": {}
+      "Scope": {
+        "Environment": [
+          "main",
+          "master",
+          "staging",
+          "development"
+        ]
+      }
+    },
+    {
+      "Name": "NEXT_PUBLIC_CREATE_ACCOUNT_REDIRECT",
+      "Value": "https://create.fairdrive.io",
+      "Scope": {
+        "Environment": [
+          "swarm"
+        ]
+      }
     },
     {
       "Name": "NEXT_PUBLIC_NFT_GENERATOR_URL",
       "Value": "https://nft#{DEPLOYMENT}fairdatasociety.org",
-      "Scope": {}
+      "Scope": {
+        "Environment": [
+          "main",
+          "master",
+          "staging",
+          "development"
+        ]
+      }
+    },
+    {
+      "Name": "NEXT_PUBLIC_NFT_GENERATOR_URL",
+      "Value": "https://nft.fairdrive.io",
+      "Scope": {
+        "Environment": [
+          "swarm"
+        ]
+      }
     },
     {
       "Name": "NEXT_PUBLIC_CONSENT_VIEWER",
       "Value": "https://app.crviewer#{DEPLOYMENT}fairdatasociety.org",
-      "Scope": {}
+      "Scope": {
+        "Environment": [
+          "main",
+          "master",
+          "staging",
+          "development"
+        ]
+      }
+    },
+    {
+      "Name": "NEXT_PUBLIC_CONSENT_VIEWER",
+      "Value": "https://crviewer.fairdrive.org",
+      "Scope": {
+        "Environment": [
+          "swarm"
+        ]
+      }
     },
     {
       "Name": "NEXT_PUBLIC_BLOCKCHAIN_INFO",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
     "@fairdatasociety/blossom": "^0.5.0",
-    "@fairdatasociety/fdp-storage": "^0.13.0",
+    "@fairdatasociety/fdp-storage": "^0.16.0",
     "@headlessui/react": "^1.7.14",
     "@metamask/sdk": "^0.5.6",
     "@types/react-blockies": "^1.4.1",

diff --git a/src/components/Connect/Metamask/MetamaskConnect.tsx b/src/components/Connect/Metamask/MetamaskConnect.tsx
@@ -74,7 +74,7 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
       setAddress(wallet.address);
       setMnemonic(mnemonic);
 
-      router.push('/overview');
+      router.push('/drive');
     } catch (error) {
       console.error(error);
       setErrorMessage(String(error.message || error));

diff --git a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskCreateAccount.tsx
@@ -97,7 +97,7 @@ export default function MetamaskCreateAccount({
 
       await fdpClientRef.current.account.register(request);
       setWallet(fdpClientRef.current.account.wallet);
-      setFdpStorageType('native');
+      setFdpStorageType('native', undefined, false);
       setIsLoggedIn(true);
       setLoginType('username');
       setUser(username);

diff --git a/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx b/src/components/Dialogs/MetamaskMigrationDialog/MetamaskMigrationDialog.tsx
@@ -55,7 +55,9 @@ const MetamaskMigrationDialog = ({
     if (clickOutside) {
       return;
     }
-    setMetamaskMigrationNotification('closed');
+    setMetamaskMigrationNotification(
+      step === Step.COMPLETE ? 'completed' : 'closed'
+    );
     onClose();
   };
 

diff --git a/src/components/Footers/MainFooter/MainFooter.tsx b/src/components/Footers/MainFooter/MainFooter.tsx
@@ -27,7 +27,7 @@ const MainFooter: FC = () => {
   const { intl } = useLocales();
 
   return (
-    <div className="hidden md:flex justify-between items-center w-full h-32 px-8 bg-white shadow-top">
+    <div className="hidden md:flex justify-between items-center w-full py-2 px-8 bg-white shadow-top">
       <div className="flex items-center flex-wrap mr-4">
         <a
           href="https://fairdatasociety.org/"