Merge remote-tracking branch 'origin/master' into dev-updates

fairDataSociety · Mar 27, 2024 · f4aef56 · f4aef56
2 parents b6f0161 + eb31397
commit f4aef56
Show file tree

Hide file tree

Showing 34 changed files with 287 additions and 154 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/docs/CONTACT.md b/docs/CONTACT.md
@@ -1,11 +1,10 @@
-
 # Contact Us
 
 If you have any questions, concerns, or feedback about Fairdrive, we'd love to hear from you! Here's how you can reach us:
 
 ## Discussions
 
-You can join discussions on [GitHub](https://github.com/orgs/fairDataSociety/discussions) 
+You can join discussions on [GitHub](https://github.com/orgs/fairDataSociety/discussions)
 
 ## Social Media
 
@@ -15,11 +14,8 @@ You can also reach out to us on social media:
 - [GitHub](https://github.com/fairDataSociety)
 - [Discord](https://discord.com/invite/vw3PmWf2rE)
 
-
 ## Getting Help
 
-If you need help using Fairdrive, check out our [User Guide](USER-GUIDE.md) and [FAQ](FAQ.md). 
-Start [here](GETTING-STARTED.md) or see [Design](DESIGN.md), [Functionality](FUNCTIONALITY.md) or [Architecture](ARCHITECTURE.md). 
+If you need help using Fairdrive, check out our [User Guide](USER-GUIDE.md) and [FAQ](FAQ.md).
+Start [here](GETTING-STARTED.md) or see [Design](DESIGN.md), [Functionality](FUNCTIONALITY.md) or [Architecture](ARCHITECTURE.md).
 Developers can check [Development Instructions](DEVELOPMENT.md).
-
-If you can't find the answer to your question, feel free to [contact us](CONTACT.md).
diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md
@@ -15,13 +15,25 @@ Fairdrive is a web application, so there's no need to install anything on your c
 
 ## Creating an Account
 
-To use Fairdrive, you'll need to create an account. Here's how:
+To use Fairdrive, you'll need to create an account, or migrate through Metamask.
+
+Follow these steps to create an account:
 
 1. Go to the Fairdrive website.
 2. Click on the "Sign Up" button.
 3. Fill out the registration form with your details.
 4. Click "Submit" to create your account.
 
+Follow these steps to login with Metamask
+
+1. Install Metamask extension to Chrome.
+2. Go to the Fairdrive website.
+3. Click on the connect button in the right header corner.
+4. Select Metamask, if you are not logged in currently, please login.
+5. Provide a one-time-only password for athentication.
+6. Send the neccessary gas fee.
+7. When the funding is done, you are able to see the Fairdrive overview section. In this page you will see the migrate button above, to proceed with user credentials for interoperability.
+
 ## Logging In
 
 Once you've created your account, you can log in to Fairdrive:
@@ -41,8 +53,8 @@ Once you're logged in, you can start using Fairdrive to manage your pods, files,
 
 ## Getting Help
 
-If you need help using Fairdrive, check out our [User Guide](USER-GUIDE.md) and [FAQ](FAQ.md). 
-Start [here](GETTING-STARTED.md) or see [Design](DESIGN.md), [Functionality](FUNCTIONALITY.md) or [Architecture](ARCHITECTURE.md). 
+If you need help using Fairdrive, check out our [User Guide](USER-GUIDE.md) and [FAQ](FAQ.md).
+Start [here](GETTING-STARTED.md) or see [Design](DESIGN.md), [Functionality](FUNCTIONALITY.md) or [Architecture](ARCHITECTURE.md).
 Developers can check [Development Instructions](DEVELOPMENT.md).
 
 If you can't find the answer to your question, feel free to [contact us](CONTACT.md).

diff --git a/docs/USER-GUIDE.md b/docs/USER-GUIDE.md
@@ -34,13 +34,6 @@ To use Fairdrive, you'll need to create an account using any of below options. H
 4. When you finish procedure your FDP account will be ready
 5. Login into Fairdrive using your username/password
 
-#### 3. Using Bloosom extension
-
-1. Make sure you are logged in inside Blossom extension
-2. Click Connect
-3. Select Blossom
-4. Allow Fairdrive full access of your personal storage
-
 ## Logging In
 
 **Metamask** account:
@@ -49,7 +42,7 @@ To use Fairdrive, you'll need to create an account using any of below options. H
 2. Enter passphrase
 3. Sign message
 
-**FDP Portable account** to log in to Fairdrive:
+**FDP Portable account** (development only) to log in to Fairdrive:
 
 1. Go to the Fairdrive website.
 2. Click on the "Log In" button.

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
@@ -98,7 +98,7 @@ export default function MetamaskCreateAccount({
       await fdpClientRef.current.account.register(request);
       const wallet = new Wallet(fdpClientRef.current.account.wallet.privateKey);
       setWallet(wallet);
-      setFdpStorageType('native');
+      setFdpStorageType('native', undefined, 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/"