Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: general enhancements #456

Merged
merged 41 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
f2577da
Update en.md
MeikeMolitor Oct 9, 2023
6ebcb4c
Update policies.json
MeikeMolitor Oct 9, 2023
caed3f3
Update en.md
MeikeMolitor Oct 9, 2023
849c779
Merge pull request #431 from deltaDAO/MeikeMolitor-patch-1
moritzkirstein Oct 10, 2023
78b7380
error handling updates
bogdanfazakas Oct 11, 2023
e8d96c1
Revert "error handling updates"
bogdanfazakas Oct 11, 2023
ed6322a
Merge pull request #435 from deltaDAO/development
moritzkirstein Oct 12, 2023
031f6eb
fix: free assets not displayed in c2d (#1974)
LucaMilanese90 Oct 12, 2023
1514e78
Fix footer market stats (#1976)
bogdanfazakas Oct 13, 2023
ba17184
Fix/Fallback to subgraph price (#1959)
bogdanfazakas Oct 18, 2023
0c5a29d
Fix custom docker image fields (#1978)
bogdanfazakas Oct 18, 2023
d613f19
Fix infinite loading on file info (#1977)
bogdanfazakas Oct 18, 2023
b9743be
Merge pull request #446 from deltaDAO/development
moritzkirstein Oct 19, 2023
8a0ce74
Merge pull request #449 from deltaDAO/development
moritzkirstein Oct 20, 2023
cee80af
Update Showreel
kaimeinke Oct 22, 2023
07d15fb
Merge pull request #451 from deltaDAO/kaimeinke-patch-1
LucaMilanese90 Oct 22, 2023
e427db9
Bump remark-gfm from 3.0.1 to 4.0.0 (#1973)
dependabot[bot] Oct 23, 2023
538d986
Bump @types/remove-markdown from 0.3.1 to 0.3.2 (#1971)
dependabot[bot] Oct 23, 2023
c7d1bd6
Bump react-devtools-core from 4.27.6 to 4.28.4 (#1983)
dependabot[bot] Oct 23, 2023
10bc16c
Merge pull request #453 from deltaDAO/development
moritzkirstein Oct 23, 2023
df4349f
Bump @types/react-modal from 3.13.1 to 3.16.2 (#1984)
dependabot[bot] Oct 23, 2023
8d28e38
Merge remote-tracking branch 'ocean/main' into feat/general-enhancements
LucaMilanese90 Oct 23, 2023
0a39e22
feat: support credentials for automation wallet
LucaMilanese90 Oct 23, 2023
94c3334
feat: disable ctd terms checkbox during form load
LucaMilanese90 Oct 23, 2023
58de24e
feat: update price output for free ctd
LucaMilanese90 Oct 23, 2023
0dbbb70
feat: hide file info if accountId is not allowed
LucaMilanese90 Oct 23, 2023
8fbc4c4
feat: update tag autocomplete background color
LucaMilanese90 Oct 23, 2023
75ea60c
feat: display name for verified wallets in top sellers section
LucaMilanese90 Oct 23, 2023
59c916a
feat: add feedback after buying a consume asset
LucaMilanese90 Oct 23, 2023
586d435
fix: edit asset metadata license field
LucaMilanese90 Oct 24, 2023
4d79084
fix: edit asset ddo preview
LucaMilanese90 Oct 24, 2023
815c3a5
feat: pre-select ctd env and algo
LucaMilanese90 Oct 24, 2023
6bff1b0
feat: use computeEnv desc field as name
LucaMilanese90 Oct 24, 2023
b06d32b
feat: add collapsible service credentials section
LucaMilanese90 Oct 24, 2023
1f3eaf3
fix: default expand credentials at verify page
LucaMilanese90 Oct 24, 2023
5c99d47
fix: storybook build
LucaMilanese90 Oct 24, 2023
6a0903d
fix: types
LucaMilanese90 Oct 24, 2023
654b23f
fix: test
LucaMilanese90 Oct 24, 2023
86a579e
feat: update eslint package and config
LucaMilanese90 Oct 24, 2023
16d7367
fix: CPs formik error handling
LucaMilanese90 Oct 26, 2023
c2bd946
Update src/components/Asset/AssetActions/Compute/AlgorithmDatasetsLis…
LucaMilanese90 Oct 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
"@typescript-eslint/explicit-function-return-type": "off",
"no-use-before-define": "off",
"@typescript-eslint/no-use-before-define": "error",
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": ["warn"],
"no-explicit-any": "off",
"@typescript-eslint/no-explicit-any": ["warn"],
"prefer-destructuring": [
"error",
{
Expand Down
25 changes: 19 additions & 6 deletions address.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ module.exports = {
'did:op:99fda160c29d15c4c9d2216033da9594f9932176229f77cfadf53dbf12cc4dc8', // moveID Wolfsburg Smart Parking and Charging Garage Status
'did:op:b4be1f60c197890bfebc041e66731a2c6f98f520169a9f38173c19e29353b4d0', // Road Damage Detection (FREE)
'did:op:2e148b5c1ff12590c13bc018100743f0253f22f49cbaf7876612b2417f961789', // 01 - Vehicle Data Collection (EUR)
'did:op:52a1c78e5569e09514e293602cd38c10b7d011758ce269c7f07b6ddf46f2c8cb', // SAVe Marktkauf Kreuzung
'did:op:025422379b72f683deb0facd08be6f87b845641116bf7f9f2cfbb0bc9efc82b6', // CARISSMA Indoor Track (Road5)
'did:op:8e3f2acad2b9d856038f23c86190c7052ba9f7472675e302bd44867d6bb974e0', // Lidar Sensor Model
'did:op:87b0133e6979419919d8526e3bac2604bd8b04d0fca43e21fb3fde67497a7860', // Traffic Object Annotation for Highway Image Data
'did:op:f3e162d564b5a925edaf2ce9d8cb3f52347f63376f337b4c6b910d22d93f02bc', // Morning Rush Intensities / INWEVA Spitsen 2020 (RWS)
'did:op:8c2cc9d84e76c14fdf3c833f5dd8fbeec7748ec7ec21511434fc52f30153101a' // Traffic Data for Object Annotation (RWS)
Expand All @@ -23,15 +20,20 @@ module.exports = {
{
title: 'Manufacturing, Industry 4.0',
assets: [
'did:op:6fe6ae5f546adf88606a0da158389f44a0801c3fe87ddb6e1f63e9120e07989c', // The Digital Project Management Office (DigitalPMO)
'did:op:739b2e3158ccd6db1b47ca5d84a63ba258732c70dcdcc7ae519ac57bb1c37e6d', // Import Semantic Collaboration Service
'did:op:540200ff34165c3d8e8abfb0e388575e44a9e9509a5912a353e7eb2a672e6f42', // Semantic Collaboration 1
'did:op:ac74139fa102d32f326ccdab3727a95299f1c2b6add9158385439e5b06810833', // AutoTiM Machine Learning Application
'did:op:271ebac61d2881e83116c285173abbdb99bfd8abe6cb0661f7bf070eea0c25c9', // AutoTiM - Basic Motion
'did:op:dd456754dc659ef111cc5fa87662cda1a67ca390c3f86fee4d5592ecb3bbffd5', // Supplier No. 1 - Component Data for Part Matching
'did:op:bd2d41775c5041361d899f30734920af6383c3ca5838d06fa4649cba9c94192e', // Supplier No. 2 - Component Data for Part Matching
'did:op:adb67df12b41a4089e0d3f4933bab5254bb905657b92b35bcd1cbcefc836fee5', // Component Matching Aggregation Algorithm
'did:op:df64a2b05a8de027a94c0f4a99af63650667d2e5e723bebc9229a368ac452447', // Data Part No. 598
'did:op:1ec479af4e54ca036b1a99d95a0caa4ac95dccc1f6d4d46290f5e1c8b9e24097', // Data Part No. 818
'did:op:bd74d6a281ba414de2b4d8ee4087277575f95676bd74e20ee9e2960c9c38d7c5', // ToolCondition-Algorithm - EuProGigant
'did:op:a3da777fd3711da36d5e1e5904a8c074b6e8df51549db2b6c8a5bc7ec3ab60cf', // CO2-Estimate Algorithm - EuProGigant
'did:op:104f5b221177ced601fb501e992fac93b762946e3636e6b897af2e08803dd0e6', // Quality Data of IFT TU Wien Material Number 00.954669 Serial Number 1
'did:op:bb31dedd26cbf37c83f71cc427f5a27dbf0f8190bcb5724b7fbe8c7895f39e21', // Quality Data of PTW TUDa Material Number 00.954668 Serial Number 1
'did:op:14a708141e6cee588b8ee31aab3bee5b54e0cb12689ccee183d031e36b5f474d' // Data Part No. 593
'did:op:bacaa9a4f1d85ca0d597e8b2454280ed137b77c81a24ff1bcaf367172d44a2b2' // Data Part No. 819
]
},
{
Expand Down Expand Up @@ -59,5 +61,16 @@ module.exports = {
'did:op:78e88197730d01625963e3461f18dc89bfc6f8fdf2d146df9a076bb1d2f8d4a8' // GraphQL Demo - Compute (OCEAN)
]
}
]
],
verifiedWallets: {
'0x4C84a36fCDb7Bc750294A7f3B5ad5CA8F74C4A52': 'deltaDAO AG',
'0x3dB4E0b1fC6072271BF51e9a0CC17E3c7C4C99f5': 'deltaDAO AG',
'0x4A806a4851472F7cFd579d3FF5465F03c3c2B5d4': 'PTW - TU Darmstadt',
'0x4DdaE8989871DB4fAB65d62775e20c577340F8bE': 'inovex GmbH',
'0xa98A6eefbAE870b88a9C7A43f4b50066A01c93b6': 'RWS',
'0x9dfbda23b65efB1c836828D74a96eB8528A60f3C': 'Craftworks',
'0xb2AF8b92bFaC5299Cb6EDEf16150BFD1d4d26a93': 'Concircle Österreich GmbH',
'0x81c337F4a5113E30919F588F178a361ade1D1Be2': 'ZARM Technik AG',
'0xF20113edd04d98A64AD2A003B836677E1c9aACAD': 'State Library of Berlin'
}
}
9 changes: 7 additions & 2 deletions content/pages/privacy/en.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,21 @@ For detailed information about the processing operations, lawfulness, purposes,
## 3. Recipients and cross-border data transfer

**Visiting our portal demonstrator**
When visiting our portal demonstrator, your IP address is processed by Vercel Inc., 340 S Lemon Ave #4133, Walnut, CA 91789, USA. Vercel is a service provider that hosts our portal demonstrator. Our portal demonstrator is served by Vercel using a Content Delivery Network, a geographically distributed network, with servers within and outside of the European Economic Area (EEA). This means, if you are located within the EEA, your IP address will most likely be processed on a Vercel server within the EEA. We signed a Data Processing Agreement (DPA) including Standard Contractual Clauses (SCC) with Vercel to ensure a data protection compliant processing of your personal data. You have the right to receive a copy of these SCC. To exercise your right, please contact us at <[email protected]>.
When visiting our portal demonstrator, your IP address is processed by Vercel Inc., 340 S Lemon Ave #4133, Walnut, CA 91789, USA. Vercel is a service provider that hosts our portal demonstrator. Our portal demonstrator is served by Vercel using a Content Delivery Network, a geographically distributed network, with servers within and outside of the European Economic Area (EEA). This means, if you are located within the EEA, your IP address will most likely (but not guaranteed) be processed on a Vercel server within the EEA.

There is no adequacy decision for the USA from the European Commission. Our cooperation with Vercel is based on a Data Processing Agreement (DPA) including Standard Contractual Clauses (SCC). You have the right to receive a copy of these SCC. To exercise your right, please contact us at <[email protected]>.

- Here you can find Vercel&#39;s current [**DPA including SCC** &#8599;](https://vercel.com/legal/dpa).
- Here you can find Vercel&#39;s [**privacy policy** &#8599;](https://vercel.com/legal/privacy-policy).

**Contact via e-mail**
When you contact us via e-mail, our (mail) service provider Microsoft (located at One Microsoft Way Redmond, WA 98052-6399, USA) supports us in processing your personal data so we can communicate with you. We have restricted storage on the EEA and signed SCC with our provider. You have the right to receive a copy of these SCC. To exercise your right, please contact us at <[email protected]>.
When you contact us via e-mail, our (mail) service provider Microsoft Corporation (located at 1 Microsoft Way, Redmond, Washington 98052-8300, USA) supports us in processing your personal data so we can communicate with you.

There is no adequacy decision for the USA from the European Commission. However, Microsoft is EU-US DPF (EU‐US Data Privacy Framework) certified. The EU‐US DPF is an adequacy decision of the European Commission, limited to certified entities. Moreover, we have restricted storage on the EEA and signed SCC with our provider. You have the right to receive a copy of these SCC. To exercise your right, please contact us at <[email protected]>.

- Here you can find Microsoft&#39;s current [**DPA including SCC** &#8599;](https://www.microsoft.com/licensing/docs/view/Microsoft-Products-and-Services-Data-Protection-Addendum-DPA).
- Here you can find Microsoft&#39;s [**privacy policy** &#8599;](https://privacy.microsoft.com/de-de/privacystatement).
- Here you can find Microsoft&#39;s [**Data Privacy Framework List entry** &#8599;](https://www.dataprivacyframework.gov/s/participant-search/participant-detail?id=a2zt0000000KzNaAAK&status=Active).

**Self-Description verification functionality**
When you are verifying a Self-Description, your IP address is processed by Gaia-X AISBL (Gaia-X European Association for Data and Cloud AISBL, Avenue des Arts 6-9, 1210 Brussels, Belgium) to resolve your request (see also chapter 4.3).
Expand Down
2 changes: 1 addition & 1 deletion content/pages/privacy/policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"policy": "en",
"language": "English",
"date": "2023-08-04",
"date": "2023-10-09",
"params": {
"languageLabel": "Language",
"languageHelp": "Language of the privacy policy",
Expand Down
Loading
Loading