feat: merge new features (#58) (#10)

* feat: merge new features * fix: rename verifiedWallets to verifiedAddresses and remove duplicate code * chore: update footer section name, ConsumerParameters validation & footer privacy link name * fix: privacy link & address resolution * chore: updated verifiedAddresses * chore: updated imprint link * feat: faucet disabled by default * chore: updated ecosystem & announcement --------- Co-authored-by: Moritz Kirstein <[email protected]>
deltaDAO · Nov 11, 2024 · cf8d776 · cf8d776
1 parent 37dce92
commit cf8d776
Show file tree

Hide file tree

Showing 67 changed files with 1,694 additions and 590 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,12 @@
-* @moritzkirstein @oceanByte
+# Base ownership of the codebase
+* @deltaDAO/frontend
+
+# The following content related files are additionaly owned by the qa team
+# File to manage portal whitelists and featured assets
+address.config.js @deltaDAO/qa @deltaDAO/frontend
+# File to manage address resolution
+pontusxAddresses.json @deltaDAO/qa @deltaDAO/frontend
+# Directory including .md and .json files to manage displayed content
+content/* @deltaDAO/qa @deltaDAO/frontend
+# Directory managing publicly hosted images
+public/images/* @deltaDAO/qa @deltaDAO/frontend
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "always"
+    "source.fixAll.eslint": "explicit"
   },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,

diff --git a/address.config.js b/address.config.js
diff --git a/app.config.js b/app.config.js
@@ -103,11 +103,12 @@ module.exports = {
     errorMargin: 10,
     // Map chainIds to their respective status endpoints
     statusEndpoints: {
-      100: 'https://status.genx.delta-dao.com/api/check-blocks'
+      32456: 'https://status.dev.pontus-x.eu/'
     }
   },
 
   faucet: {
+    enabled: process.env.NEXT_PUBLIC_FAUCET_ENABLED || 'false',
     baseUri: 'https://faucet.api.pontus-x.eu'
   }
 }
diff --git a/content/DDOtoServiceCredential/serviceCredentialForm.json b/content/DDOtoServiceCredential/serviceCredentialForm.json
@@ -0,0 +1,45 @@
+{
+  "metadata": {
+    "title": "Metadata",
+    "fields": [
+      {
+        "name": "didweb",
+        "label": "Service Provider DID:WEB ",
+        "placeholder": "did:web:yourdomain.eu",
+        "help": "The DID:WEB of the service provider / issuer publishing the Gaia-X Service Credential.",
+        "required": true
+      },
+      {
+        "name": "credentialHostingPath",
+        "label": "Service Credential Hosting Path ",
+        "placeholder": "https://yourdomain.eu/.well-known",
+        "help": "The base path to your public storage of Gaia-X Service Credentials.",
+        "required": true
+      },
+      {
+        "name": "pathToParticipantCredential",
+        "label": "Service Provider Participant Credential ",
+        "placeholder": "https://yourdomain.eu/.well-known/participant_vp.json",
+        "help": "URI of the service provider Gaia-X Participant Credential required to identity the responsible service provider.",
+        "required": true
+      },
+      {
+        "name": "knownDependencyCredentials",
+        "label": "Known Dependency Credentials",
+        "placeholder": "https://www.yourdomain.eu/.well-known/2210_gx_service_provider_1.json",
+        "help": "Contains resolvable links to the Gaia-X service credentials related to this service that can exist independently of it.",
+        "required": false
+      },
+      {
+        "name": "knownAggregatedServiceCredentials",
+        "label": "Known Aggregated Resource Credentials",
+        "placeholder": "https://www.yourdomain.eu/.well-known/2210_gx_resource_data_road_condition_7.json",
+        "help": "Contains resolveable links to Gaia-X Resource and Service Credentials related to this service that can exist independently of it.",
+        "required": false
+      }
+    ]
+  },
+  "submission": {
+    "title": "Submit"
+  }
+}
diff --git a/content/pages/faucet.json b/content/pages/faucet.json
@@ -1,9 +1,17 @@
 {
   "title": "Pontus-X Faucet",
-  "description": "Get 1000 EUROe fee and payment tokens for the Pontus-X network every 12 hours.",
-  "input": {
-    "label": "Your Pontus-X address",
-    "placeholder": "0x28080F654eED6CC00e8b16F4841E92CD0c2C0778",
-    "buttonLabel": "Get tokens"
+  "description": "Request tokens for the Pontus-X Networks",
+  "buttonLabel": "Get Tokens",
+  "card": {
+    "cardTitle": "Welcome to the Pontus-X Faucet",
+    "cardDescription": "A faucet is a service that provides free tokens for testing purposes. Known accounts can request 10 EUROe fee tokens and 1000 EUROe payment tokens to use on the Pontus-X network. These tokens are available every 12 hours.",
+    "cardExplainerTitle": "How to Request Tokens",
+    "cardExplainerFirstStep": "Ensure you have a web3 wallet (e.g. MetaMask) connected.",
+    "cardExplainerSecondStep": "Your wallet address will be automatically detected and displayed below.",
+    "cardExplainerThirdStep": "Click the button to request your free tokens.",
+    "cardExplainerFourthStep": "Wait for a few seconds while the request is processed.",
+    "cardExplainerFithStep": "You will receive a confirmation once the tokens are successfully sent to your address.",
+    "cardNetworkAddress": "Your Pontus-X address",
+    "cardNetwork": "Connected Network"
   }
 }
diff --git a/content/pages/privacy/en.md b/content/pages/privacy/en.md
@@ -108,11 +108,39 @@ Gaia-X AISBL retains your personal data for as long as needed to provide their s
 
 Automated decision making including profiling does not take place.
 
-## 6. Cookies and web storage
+## 6. Cookies and Analytics
 
-A cookie is a small file that stores Internet settings. Your web browser downloads it on the first visit to a website. The next time you open this website with the same device, the cookie and the information stored in it are either sent back to the website that created it (first-party cookie) or sent to another website it belongs to (third-party cookie). This enables the website to detect that you have opened it previously with this browser and, in some cases, to vary the displayed content. Web storage (local storage and session storage) has similar functionality to cookies.
+**6.1 Cookies**
 
-Our portal demonstrator does not use cookies or web storage for analytics or marketing purposes. We use your web storage to remember your page preferences, enable functionalities and to enhance your user experience. Your browser will remove the session storage once you close your browser. You have the option of disabling cookies and deleting cookies and web storage from your computer's hard disk at any time in your browser settings.
+A cookie is a small file that stores information in your browser. Your web browser downloads it on the first visit to a website. The next time you open this website with the same device, the cookie and the information stored in it are either sent back to the website that created it (first-party cookie) or sent to another website it belongs to (third-party cookie). This enables the website to detect that you have opened it previously with this browser and, in some cases, to vary the displayed content. Some cookies are necessary for making websites work, and others are used for enhancing your experience on the visited website. Cookies can also be used for marketing and analytics purposes. Web storage (local storage and session storage) has similar functionality to cookies.
+
+Our portal demonstrator uses cookies and your web storage to remember your page preferences, enable functionalities and to enhance your user experience. You have the option of disabling cookies and deleting cookies and web storage from your computer's hard disk at any time in your browser settings.
+
+**6.2 Analytics**
+
+deltaDAO uses [Plausible Analytics](https://plausible.io/), a privacy-friendly web analytics tool for tracking overall trends in our website traffic. We create aggregated statistics based on our legitimate interest to gain insights to improve existing and future features and services, and to evaluate user engagement. Plausible Analytics does not use cookies or similar technologies that require information to be stored on your device. Instead, the tool focuses on analyzing aggregated data without the need to access your end device or store information there.
+
+Plausible Analytics does not track individual visitors and does not create persistent identifiers. It does not use cross-platform or cross-device tracking and does not pass on data to third parties. Plausible Analytics primarily uses data that is recorded by default in server logs, such as requested URLs, access times, HTTP status codes and transferred data volumes. This information is used to analyze website traffic. Data processing at Plausible Analytics takes place in two steps:
+
+- Pseudonymization:
+
+  - When the data is received, it is pseudonymized using a hash function and a regularly changing key (“salt”). This process aims to change personal data in such a way that data subjects are no longer directly identifiable, but a distinction between sessions is made possible.
+
+  - hash(daily_salt + website_domain + ip_address + user_agent)
+
+  - Plausible Analytics never stores the raw data IP address and User-Agent in logs, databases or anywhere on disk at all.
+
+- Anonymization after 24 hours: Within 24 hours of pseudonymization, the data is completely anonymized by removing the “salt” so that it can no longer be traced back to the original user data. The remaining data does not allow any direct or indirect identification of data subjects.
+
+Plausible Analytics only uses EU-based service providers for hosting and additional services such as CDN and DDoS protection. The servers are located in Germany (operated by Hetzner) and additional services are provided by Bunny (based in Slovenia).
+
+deltaDAO signed a DPA with Plausible Analytics.
+
+- Here you can find Plausible Analytic’s current [DPA](https://plausible.io/dpa).
+
+- Here you can find Plausible Analytic’s [Privacy Policy](https://plausible.io/privacy).
+
+- Here you can find more information about Plausible Analytic’s [privacy practices](https://plausible.io/data-policy), [security practices](https://plausible.io/security) and a [legal assessment on GDPR compliance](https://plausible.io/blog/legal-assessment-gdpr-eprivacy).
 
 ## 7. External links
 

diff --git a/content/site.json b/content/site.json
@@ -21,7 +21,6 @@
       "name": "Faucet",
       "link": "/faucet"
     },
-
     {
       "name": "Log",
       "link": "https://explorer.pontus-x.eu/"
@@ -30,12 +29,8 @@
       "name": "Ecosystem",
       "subItems": [
         {
-          "name": "Pontus-X Portal",
-          "link": "https://portal.pontus-x.eu/",
-          "description": "The Pontus-X reference ecosystem portal.",
-          "image": "deltadao-logo.webp",
-          "category": "ecosystem",
-          "isLive": false
+          "name": "Pontus-X",
+          "link": "https://www.pontus-x.eu/"
         },
         {
           "name": "EuProGigant",
@@ -70,19 +65,11 @@
           "isLive": true
         },
         {
-          "name": "Car Repair 4.0",
-          "link": "https://portal.autowerkstatt40.org/",
-          "description": "Car Repair 4.0 develops a hub infrastructure that connects car workshops to Gaia-X ecosystems and enables AI-supported fault tracking.",
-          "image": "carrepair40.webp",
-          "category": "AI",
-          "isLive": true
-        },
-        {
-          "name": "Service-Meister",
-          "link": "https://servicemeister.pontus-x.eu/",
-          "description": "An AI-based Service Ecosystem for Technical Service in the Age of Industry 4.0.",
-          "image": "service-meister-logo.webp",
-          "category": "AI",
+          "name": "FIWARE",
+          "link": "https://fiware-marketplace-a4eqd.ondigitalocean.app/",
+          "description": "A curated framework of Open Source Platform components to accelerate the development of Smart Solutions.",
+          "image": "logo-fiware-full.webp",
+          "category": "smart city",
           "isLive": true
         },
         {
@@ -93,6 +80,14 @@
           "category": "language models",
           "isLive": true
         },
+        {
+          "name": "Car Repair 4.0",
+          "link": "https://portal.autowerkstatt40.org/",
+          "description": "Car Repair 4.0 develops a hub infrastructure that connects car workshops to Gaia-X ecosystems and enables AI-supported fault tracking.",
+          "image": "carrepair40.webp",
+          "category": "AI",
+          "isLive": true
+        },
         {
           "name": "Flex4Res",
           "link": "https://flex4res.pontus-x.eu/",
@@ -117,13 +112,29 @@
           "category": "agriculture",
           "isLive": true
         },
-       {
+        {
           "name": "Polish Agriculture Data Space",
           "link": "https://dataspaces.psnc.pl/",
           "description": "An open data space platform for sharing and marketing agri-related datasets guaranteeing data sovereignty.",
           "image": "PSNC.webp",
           "category": "agriculture",
           "isLive": true
+        },
+        {
+          "name": "Service-Meister",
+          "link": "https://servicemeister.pontus-x.eu/",
+          "description": "An AI-based Service Ecosystem for Technical Service in the Age of Industry 4.0.",
+          "image": "service-meister-logo.webp",
+          "category": "AI",
+          "isLive": true
+        },
+        {
+          "name": "deltaDAO AI marketplace",
+          "link": "https://market.delta-dao.com/",
+          "description": "With deltaDAO's AI Marketplace, you have the freedom to decide how your AI service is offered. By keeping your AI private, you retain full control and do not disclose your valuable IP.",
+          "image": "deltadao-logo.webp",
+          "category": "AI",
+          "isLive": false
         }
       ]
     },
@@ -153,7 +164,7 @@
   "footer": {
     "notice": "The ACCURATE project is funded by the European Union, under Grant Agreement number 101138269. Views and opinions expressed are however those of the author(s) only and do not necessarily reflect those of the European Union or the European Health and Digital Executive Agency. Neither the European Union nor the granting authority can be held responsible for them.\n\nStart: 01/12/2023\nFinish: 30/11/2026",
     "copyright": "Built by [deltaDAO](https://delta-dao.com)",
-    "privacyTitle": "Privacy",
+    "privacyTitle": "Legal",
     "content": [
       {
         "title": "External",

diff --git a/genxAddress.json b/genxAddress.json
diff --git a/networksMetadata.config.js b/networksMetadata.config.js
@@ -2,28 +2,6 @@
 // see: https://github.com/ethereum-lists/chains
 
 const networksMetadata = [
-  {
-    chainId: 100,
-    networkId: 100,
-    name: 'GEN-X Testnet',
-    chain: 'GEN-X',
-    rpc: ['https://rpc.genx.minimal-gaia-x.eu'],
-    faucets: [],
-    nativeCurrency: {
-      name: 'GX',
-      symbol: 'GX',
-      decimals: 18
-    },
-    infoURL: 'https://docs.genx.minimal-gaia-x.eu',
-    shortName: 'GEN-X',
-    explorers: [
-      {
-        name: 'GEN-X Testnet Explorer',
-        url: 'https://explorer.genx.pontus-x.eu',
-        standard: ''
-      }
-    ]
-  },
   {
     chainId: 32456,
     networkId: 32456,

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "type-check": "tsc --noEmit",
     "postinstall": "husky install && npm run copy:address",
     "copy:address": "node scripts/copy-addresses.js",
-    "codegen:apollo": "apollo client:codegen --endpoint=https://subgraph.dev.pontus-x.eu/subgraphs/name/oceanprotocol/ocean-subgraph --target typescript --tsFileExtension=d.ts --outputFlat src/@types/subgraph/",
+    "codegen:apollo": "apollo client:codegen --endpoint=https://subgraph.test.pontus-x.eu/subgraphs/name/oceanprotocol/ocean-subgraph --target typescript --tsFileExtension=d.ts --outputFlat src/@types/subgraph/",
     "storybook": "cross-env NODE_ENV=test start-storybook -p 6006 --quiet",
     "storybook:build": "cross-env NODE_ENV=test build-storybook"
   },