Skip to content

Commit

Permalink
Development (#2)
Browse files Browse the repository at this point in the history
* update font

* update logo

* update site title and favicon

* update footer

* update home header

* update cookie banner

* update primary button

* update menu wrap break point

* update ecosystem button style

* update actions menu

* update onboarding module

* update top sales card

* update content section and key data

* update partners

* update built by section

* fix home titles size

* fix search bar styling on homepage header

* update page header

* update bookmarks page

* update table header

* update ghost button style

* onboarding module fixes

* update nft colors

* update publish metadata page

* update publish page

* update asset content page

* update package.json project info

* increase form input errors font size

* update title

* update menu

* update chains config

* add faucet

* feat: auto wallet for publish and edit functionality

* update nft name and tooltip

* move networks list to separate button

* fix imports

* add new "policies" publish step

* add 1 hour option to timeout

* remove ocean token from pricing options

* update fixed price label

* update add tokens section

* Update pricing page

* update supported networks list

* fix import

* add saas type to publish flow

* fix publish

* update metadata edit

* fix type

* update home header alignment

* fix lint error

* feat: add euroe on devnet

* refactor: reorder partners

* refactor: update publish form content

* chore: update default networks

* chore: update address whitelist

* chore: update ecosystem

* fix: typo

* fix: include saas object in additional metadata only for saas assets

---------

Co-authored-by: deltaDAO Dev <[email protected]>
  • Loading branch information
moritzkirstein and deltaDAO-Dev authored Sep 23, 2024
1 parent 32e29c5 commit f432448
Show file tree
Hide file tree
Showing 184 changed files with 1,846 additions and 820 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "always"
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
Expand Down
8 changes: 1 addition & 7 deletions address.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
module.exports = {
whitelists: {
'nft.owner': [
'0x4A806a4851472F7cFd579d3FF5465F03c3c2B5d4',
'0x21CF19e1FaF3A62f82B432f82152e8c5C0FdBdaF',
'0x9dfbda23b65efB1c836828D74a96eB8528A60f3C',
'0xb2AF8b92bFaC5299Cb6EDEf16150BFD1d4d26a93',
'0x3dB4E0b1fC6072271BF51e9a0CC17E3c7C4C99f5'
],
'nft.owner': [],
'datatokens.address': []
},
featured: [
Expand Down
20 changes: 17 additions & 3 deletions app.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ module.exports = {
// const { appConfig } = useMarketMetadata()
// return appConfig.metadataCacheUri
metadataCacheUri:
process.env.NEXT_PUBLIC_METADATACACHE_URI ||
'https://aquarius510.v4.delta-dao.com',
process.env.NEXT_PUBLIC_METADATACACHE_URI || 'https://aquarius.pontus-x.eu',

complianceUri:
process.env.NEXT_PUBLIC_COMPLIANCE_URI ||
Expand Down Expand Up @@ -95,5 +94,20 @@ module.exports = {
},

// Display alert banner for the developer preview deployment
showPreviewAlert: process.env.NEXT_PUBLIC_SHOW_PREVIEW_ALERT || 'false'
showPreviewAlert: process.env.NEXT_PUBLIC_SHOW_PREVIEW_ALERT || 'false',

networkAlertConfig: {
// Refresh interval for network status - 30 sec
refreshInterval: 30000,
// Margin of error for block count (how much difference between min / max block numbers before showing an alert)
errorMargin: 10,
// Map chainIds to their respective status endpoints
statusEndpoints: {
100: 'https://status.genx.delta-dao.com/api/check-blocks'
}
},

faucet: {
baseUri: 'https://faucet.api.pontus-x.eu'
}
}
74 changes: 29 additions & 45 deletions chains.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,66 +3,50 @@

const chains = [
{
chainId: 100,
chainId: 32456,
isDefault: true,
isCustom: true,
network: 'genx',
metadataCacheUri: 'https://aquarius510.v4.delta-dao.com',
nodeUri: 'https://rpc.genx.minimal-gaia-x.eu',
providerUri: 'https://provider.v4.genx.delta-dao.com',
subgraphUri: 'https://subgraph.v4.genx.minimal-gaia-x.eu',
explorerUri: 'https://explorer.pontus-x.eu',
oceanTokenAddress: '0x0995527d3473b3a98c471f1ed8787acd77fbf009',
network: 'pontusx-devnet',
oceanTokenSymbol: 'OCEAN',
fixedRateExchangeAddress: '0xAD8E7d2aFf5F5ae7c2645a52110851914eE6664b',
dispenserAddress: '0x94cb8FC8719Ed09bE3D9c696d2037EA95ef68d3e',
startBlock: 3665369,
oceanTokenAddress: '0xdF171F74a8d3f4e2A789A566Dce9Fa4945196112',
nftFactoryAddress: '0xFdC4a5DEaCDfc6D82F66e894539461a269900E13',
fixedRateExchangeAddress: '0x8372715D834d286c9aECE1AcD51Da5755B32D505',
dispenserAddress: '0x5461b629E01f72E0A468931A36e039Eea394f9eA',
opfCommunityFeeCollector: '0x1f84fB438292269219f9396D57431eA9257C23d4',
startBlock: 57428,
transactionBlockTimeout: 50,
transactionConfirmationBlocks: 1,
transactionPollingTimeout: 750,
gasFeeMultiplier: 1.1,
nftFactoryAddress: '0x6cb85858183B82154921f68b434299EC4281da53',
opfCommunityFeeCollector: '0x2e0C9e15A45c9884F7768BB852E7399B9153525d',
veAllocate: '0x3fa1d5AC45ab1Ff9CFAe227c5583Ec0484b54Ef9',
veOCEAN: '0x061955B6980A34fce74b235f90DBe20d76f087b1',
veDelegation: '0x96E3aE4247a01C3d40a261df1F8ead70E32E7C0c',
veFeeDistributor: '0x35F1e6765750E874EB9d0675393A1A394A4749b4',
veDelegationProxy: '0x51B1b14b8bfb43a2fB0b49843787Ca440200F6b7',
DFRewards: '0x4259c164eedA7483dda2b4b622D761A88674D31f',
DFStrategyV1: '0x1be9C72500B41c286C797D4FE727747Ae9C4E195',
veFeeEstimate: '0xCFeF55c6ae4d250586e293f29832967a04A9087d',
providerAddress: '0x68C24FA5b2319C81b34f248d1f928601D2E5246B'
providerUri: 'https://provider.dev.pontus-x.eu',
providerAddress: '0x68C24FA5b2319C81b34f248d1f928601D2E5246B',
metadataCacheUri: 'https://aquarius.pontus-x.eu',
nodeUri: 'https://rpc.dev.pontus-x.eu',
subgraphUri: 'https://subgraph.dev.pontus-x.eu',
explorerUri: 'https://explorer.pontus-x.eu/devnet/pontusx'
},
{
chainId: 32456,
isDefault: false,
chainId: 32457,
isDefault: true,
isCustom: true,
network: 'pontusx',
metadataCacheUri: 'https://aquarius.dev.pontus-x.eu',
nodeUri: 'https://rpc.dev.pontus-x.eu',
providerUri: 'https://provider.dev.pontus-x.eu',
subgraphUri: 'https://subgraph.dev.pontus-x.eu',
explorerUri: 'https://explorer.pontus-x.eu',
oceanTokenAddress: '0xdF171F74a8d3f4e2A789A566Dce9Fa4945196112',
network: 'pontusx-testnet',
oceanTokenSymbol: 'OCEAN',
fixedRateExchangeAddress: '0x8372715D834d286c9aECE1AcD51Da5755B32D505',
dispenserAddress: '0x5461b629E01f72E0A468931A36e039Eea394f9eA',
startBlock: 57428,
oceanTokenAddress: '0x5B190F9E2E721f8c811E4d584383E3d57b865C69',
nftFactoryAddress: '0x2C4d542ff791890D9290Eec89C9348A4891A6Fd2',
fixedRateExchangeAddress: '0xcE0F39abB6DA2aE4d072DA78FA0A711cBB62764E',
dispenserAddress: '0xaB5B68F88Bc881CAA427007559E9bbF8818026dE',
opfCommunityFeeCollector: '0xACC8d1B2a0007951fb4ed622ACB1C4fcCAbe778D',
startBlock: 82191,
transactionBlockTimeout: 50,
transactionConfirmationBlocks: 1,
transactionPollingTimeout: 750,
gasFeeMultiplier: 1.1,
nftFactoryAddress: '0xFdC4a5DEaCDfc6D82F66e894539461a269900E13',
opfCommunityFeeCollector: '0x1f84fB438292269219f9396D57431eA9257C23d4',
veAllocate: '0x3fa1d5AC45ab1Ff9CFAe227c5583Ec0484b54Ef9',
veOCEAN: '0x061955B6980A34fce74b235f90DBe20d76f087b1',
veDelegation: '0x96E3aE4247a01C3d40a261df1F8ead70E32E7C0c',
veFeeDistributor: '0x35F1e6765750E874EB9d0675393A1A394A4749b4',
veDelegationProxy: '0x51B1b14b8bfb43a2fB0b49843787Ca440200F6b7',
DFRewards: '0x6BB265D6c08b7E7432dF9B3D3499beEAA9856232',
DFStrategyV1: '0x98FBBB6523441b960E4D1d9A98601332092F4aB6',
veFeeEstimate: '0xCFeF55c6ae4d250586e293f29832967a04A9087d',
providerAddress: '0x68C24FA5b2319C81b34f248d1f928601D2E5246B'
providerUri: 'https://provider.test.pontus-x.eu',
providerAddress: '0x9546d39CE3E48BC942f0be4AA9652cBe0Aff3592',
metadataCacheUri: 'https://aquarius.pontus-x.eu',
nodeUri: 'https://rpc.test.pontus-x.eu',
subgraphUri: 'https://subgraph.test.pontus-x.eu',
explorerUri: 'https://explorer.pontus-x.eu/testnet/pontusx'
}
]

Expand Down
5 changes: 5 additions & 0 deletions content/onboarding/steps/faucet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"title": "Request test tokens",
"subtitle": "You can claim some test tokens for your address once every 12 hours.",
"body": "Click on the button below to request EUROe test payment tokens. You will receive both, the EUROe labelled network token as well as the payment token."
}
2 changes: 1 addition & 1 deletion content/onboarding/steps/importCustomTokens.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "Import custom tokens",
"subtitle": "Before you can claim some test tokens you need to import the token's contract address to MetaMask",
"body": "Click on the button below to import the OCEAN and EUROe custom test tokens.",
"body": "Click on the button below to import the EUROe test payment token. Please be aware, that Pontus-X is also using a EUROe labelled network token to facilitate fee payments.",
"image": "/images/onboarding/import_ocean_token.png"
}
77 changes: 55 additions & 22 deletions content/pages/editMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
"form": {
"success": "🎉 Successfully updated. 🎉\n\nUpdates might not show up right away on your asset. In this case, wait some seconds and reload your asset details page in your browser.",
"error": "Updating DDO failed.",
"stateError": "Updating asset state failed.",
"data": [
{
"name": "name",
"label": "New Title",
"placeholder": "e.g. Shapes of Desert Plants",
"placeholder": "e.g. Production data of a manufacturing process",
"help": "Enter a concise title.",
"required": true
},
Expand Down Expand Up @@ -34,37 +35,28 @@
"type": "tabs",
"fields": [
{
"value": "ipfs",
"title": "IPFS",
"label": "CID",
"placeholder": "e.g. bafkreidgvpkjawlxz6sffxzwgooowe5yt7i6wsyg236mfoks77nywkptdq",
"help": "This CID will be stored encrypted after publishing.",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
},
{
"value": "arweave",
"title": "Arweave",
"label": "Transaction ID",
"placeholder": "e.g. DBRCL94j3QqdPaUtt4VWRen8rZfJZBb7Ey40iMpXfhtd",
"help": "This Transaction ID will be stored encrypted after publishing.",
"value": "url",
"title": "URL",
"label": "File",
"placeholder": "e.g. https://file.com/file.json",
"help": "This URL will be stored encrypted after publishing. **Please make sure that the endpoint is accessible over the internet and is not protected by a firewall or by credentials.**",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
"required": true,
"methods": false
},
{
"value": "url",
"title": "URL",
"title": "API",
"label": "File",
"placeholder": "e.g. https://file.com/file.json",
"help": "This URL will be stored encrypted after publishing. **Please make sure that the endpoint is accessible over the internet and is not protected by a firewall or by credentials.**",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true,
"methods": true,
"innerFields": [
{
"value": "headers",
Expand All @@ -73,6 +65,30 @@
"placeholder_value": "Authorization",
"help": "This HEADERS will be stored encrypted after publishing.",
"type": "headers",
"required": false
}
]
},
{
"value": "saas",
"title": "SaaS",
"label": "Redirect URL",
"placeholder": "e.g. https://delta-dao/the-future-is-now",
"help": "The url the user will be redirected to after buying access to the SaaS.",
"prominentHelp": true,
"type": "saas",
"fieldFormPrefix": "saas",
"required": true,
"methods": false,
"innerFields": [
{
"value": "paymentMode",
"title": "PaymentMode",
"label": "PaymentMode",
"help": "Choose how the payment mode for your Saas.",
"type": "select",
"selected": "",
"options": ["Subscription", "Pay per use"],
"required": true
}
]
Expand All @@ -87,7 +103,6 @@
"prominentHelp": true,
"type": "files",
"required": true,
"headers": true,
"innerFields": [
{
"value": "headers",
Expand All @@ -96,7 +111,7 @@
"placeholder_value": "Authorization",
"help": "This HEADERS will be stored encrypted after publishing.",
"type": "headers",
"required": true
"required": false
},
{
"value": "query",
Expand All @@ -108,6 +123,17 @@
"required": true
}
]
},
{
"value": "ipfs",
"title": "IPFS",
"label": "CID",
"placeholder": "e.g. bafkreidgvpkjawlxz6sffxzwgooowe5yt7i6wsyg236mfoks77nywkptdq",
"help": "This CID will be stored encrypted after publishing.",
"computeHelp": "For a compute dataset, your file should match the file type required by the algorithm, and should not exceed 1 GB in file size. ",
"prominentHelp": true,
"type": "files",
"required": true
}
],
"sortOptions": false,
Expand Down Expand Up @@ -139,7 +165,14 @@
"label": "Timeout",
"help": "Define how long buyers should be able to download the dataset again after the initial purchase.",
"type": "select",
"options": ["Forever", "1 day", "1 week", "1 month", "1 year"],
"options": [
"Forever",
"1 hour",
"1 day",
"1 week",
"1 month",
"1 year"
],
"sortOptions": false,
"required": true
},
Expand Down
9 changes: 9 additions & 0 deletions content/pages/faucet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"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"
}
}
27 changes: 14 additions & 13 deletions content/pages/home/content.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,32 @@
},
"paragraphs": [
{
"title": "The Manufacturing Ecosystem",
"body": "In the rapidly evolving digital landscape, challenges like the COVID-19 pandemic have forced manufacturers to rethink not only their supply chains but also the adaptability of their production facilities. Achieving resilient manufacturing is crucial to maintain high-quality production at efficient rates while reducing non-value-adding activities.",
"title": "Our Vision: Transforming Manufacturing into a Service (MAAS)",
"body": "ACCURATE envisions resilient Manufacturing as a Service (MAAS) value chains designed to withstand both prolonged and immediate disruptions. Our goal is to redefine the industry, ensuring that MAAS not only achieves technical viability but also establishes economic sustainability, profitability, and environmental friendliness.",
"cta": "Learn More",
"ctaTo": "https://flex4res.eu"
"ctaTo": "https://accurateproject.eu",
"image": "/images/accurate-home-graphic.webp"
},
{
"title": "Flex4Res Concept",
"body": "The European research project Flex4Res, which stands for Data spaces for FLEXible production lines and supply chains FOR RESilient manufacturing, concentrates on making supply chains more resilient. To achieve this, Flex4Res develops an open platform for secure and sovereign data exchange along the supply chain that supports the reconfiguration of production networks. It also develops two toolboxes: one for resilience assessment and one for reconfiguration planning. These toolboxes allow different players in the supply chain to effectively and rapidly adjust to various disruptions, both in their supply chains and production processes.",
"title": "Our Mission",
"body": "We're dedicated to delivering a federated MAAS framework, data space, and ecosystem. Fueled by intricate multi-level digital twin models of MAAS value chains, our mission is to forge a collaborative Decision-Support System. This empowers robust planning, resilient operation, and swift recovery for value networks and industrial systems.",
"cta": "Learn More",
"ctaTo": "https://flex4res.eu",
"image": "/images/flex4res-concept.webp"
"ctaTo": "https://accurateproject.eu",
"image": "/images/accurate-our-mission.webp"
}
],
"stats": [
{
"label": "Million Euro funding amount",
"value": 8
"label": "EU Countries",
"value": 6
},
{
"label": "project partner",
"value": 17
"label": "EU Key Players",
"value": 11
},
{
"label": "use cases",
"value": 4
"label": "Pilots",
"value": 3
}
]
}
7 changes: 4 additions & 3 deletions content/price.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"create": {
"fixed": {
"title": "Fixed",
"title": "Priced",
"info": "Set your price for accessing this dataset. The datatoken for this dataset will be worth the entered amount of the selected base token.",
"tooltips": {
"communityFee": "Goes to Ocean DAO for teams to improve the tools, build apps, do outreach, and more. A small fraction is used to burn OCEAN. This fee is collected when downloading or using an asset in a compute job.",
"marketplaceFee": "Goes to the marketplace owner that is hosting and providing the marketplace and is collected when downloading or using an asset in a compute job. In Ocean Market, it is treated as network revenue that goes to the Ocean community."
"communityFee": "Goes to the Pontus-X Ecosystem participants to improve the tools, build apps, do outreach, and more. This fee is collected when downloading or using an asset in a compute job.",
"marketplaceFee": "Goes to the marketplace owner that is hosting and providing the marketplace and is collected when downloading or using an asset in a compute job.",
"earningsAfterFees": "The amount of tokens you will receive after the fees are collected."
}
},
"free": {
Expand Down
Loading

0 comments on commit f432448

Please sign in to comment.