1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Commit Graph

211 Commits

Author SHA1 Message Date
0227b4f084
Fix WalletConnect connection (#764)
* bump @walletconnect/web3-provider to v1.5.2

* bump web3 to v1.5.0
2021-08-02 11:49:12 +02:00
af3bb86073
publish form fixes (#768)
* fix publish form submit button

* directly use generateDatatokenName from ocean.js

* bump ocean.js to v0.17.0

* fix all the publish things

* wrap OceanProvider around publish page
* initiate Ocean from usePublish hook
2021-07-30 15:52:12 +02:00
ac1c1fd31a
Merge branch 'main' into feature/multinetwork 2021-07-26 15:45:53 +02:00
1c60322c53
bump ocean.js to v0.16.6 (#750) 2021-07-22 16:04:23 +02:00
37ea73d421
Merge branch 'main' into feature/multinetwork 2021-07-22 15:17:18 +02:00
4ec23c882f
WalletConnect updates (#749)
* bump @walletconnect/web3-provider to v1.5.0-rc.7

* bump web3 to v1.4.0

* proper wallet logout

* listen to chainChanged instead of networkChanged

* restores network switching for WalletConnect

* fix wallet switching

* get and set initial chainId

* walletconnect modal visual fixes
2021-07-22 15:16:15 +02:00
08ee32f105
Merge branch 'main' into feature/multinetwork 2021-07-14 11:28:50 +02:00
cdedfafca2
bump ocean.js to v0.16.5 (#734)
* bump ocean.js to v0.16.5

* manual package-lock fix
2021-07-14 10:58:23 +02:00
333cf7d24d
npm ci fix 2021-07-12 15:37:14 +02:00
Bogdan Fazakas
11b7146812 added back apollo typings until we can get all of them using graphql codegen 2021-07-09 11:36:43 +03:00
Bogdan Fazakas
d250da3eab update oceanJS to 0.16.4 replaced ddo type from any to DDO 2021-07-08 10:57:40 +03:00
Bogdan Fazakas
4fbac1e2e0 merged multinetwork into poc-urql 2021-07-07 11:08:39 +03:00
Kris Liew
675da0836f
bump ocean.js v0.16.2, ocean.assets.isConsumable implementation to disable buy button and display relevant message (#463)
* Implement ocean.assets.isConsumable

* Fix accountId from useWeb3() returning lower case on switching metamask account (allow/deny list)

* Update Ocean.js version v0.16.2 and package-lock.json

* Fix datePublished error on validate-remote

Co-authored-by: KIANLAU <kian_yee.lau@daimler.com>
Co-authored-by: Kris (SJ) <39853992+soonjing@users.noreply.github.com>
2021-07-06 14:51:37 +08:00
Bogdan Fazakas
3fe133e55f remove not used scripts 2021-07-06 01:21:35 +03:00
Bogdan Fazakas
04b89ddd35 replaced introspection generation with graphql codegen 2021-07-06 01:09:51 +03:00
Bogdan Fazakas
8d50eb92c0 merged multinetwork into poc-urql 2021-07-05 14:27:43 +03:00
Bogdan Fazakas
5de2a6e330 remove apollo typings and generate schema using urql 2021-07-02 09:44:24 +03:00
da23e9f3a0
bump ocean.js, support more networks (#701)
* bump ocean.js

* fix frontpage empty views

* package-lock fix

* hook dependencies are fun

* bump ocean.js

* network tweaks

* add more chains to user preferences
2021-06-30 10:32:09 +03:00
6f1abcbb1e
output MarketStats again 2021-06-25 10:48:48 +02:00
Bogdan Fazakas
5e45fff361 wip replace apollo with urql 2021-06-22 08:52:49 +03:00
claudiaHash
eb8c6afb62
Search issues fix (#641)
* search by addresses

* search by asset id

* logs deleted

* search query updated

* search query updated

* search terms differentiated

* asset id hack

* id search hack removed

* restore lock file

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove SearchQuery return type

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* refine query, add relevance sort

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove old comments

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove white spaces from search term endings

* fix filter by type

* wip on filter with empty search text

* sort by relevance fix

* linting errors fix

* lint fixes

* comment sort by relevance

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* lint

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* search by owner and tags fix

* lint  err fix

* fix search

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-15 16:46:49 +03:00
Norbi
3a4851132d
Show the list of data sets an algorithm is allowed to run on (#579)
* WIP

* UI changes

* get and display datasets on both compute and consume

* new component for datasets that algorithm can run compute job on

* AssetSelection className refactor

* added internal link to AssetSelection

* show loading page when changing asset

* Component and asset title UI update

* created new component for dataset list

* removed unnecessary changes

* updated link margin

* prettier fix

* merge fix

* another fix

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-06-14 14:37:03 +02:00
Bogdan Fazakas
e8033687fb
Put back in place removed docker hub image check (#642)
* Put back removed docker hub image check using proxy

* fixed lint errors

* update scroll so  in case of docker image validation error the input fields are in viewport
2021-06-14 14:10:12 +02:00
Jamie Hewitt
e26ed0e81a
Issue 582 market rbac integration (#597)
* adding env for RBAC server url to app.config.js

* creating util function for requesting auth from the rbac server

* fixing typing error

* testing rbac request on homepage

* removing console logs

* importing RBAC url from config file

* creating develpment .env file

* return true if no rbac url env is set

* creating permissions parent component

* wrapping homepage content in permission element

* wrapping publish in permissions wrapper

* wrapping search results in permissions wrapper

* wrapping asset actions in permissions element

* creating an error alert for permission denied

* updating react hook dependency

* passing address to rbac component

* sedning address to RBAC server

* wrapping asset in permission component

* removing unused import of Permission component

* sending request based on address

* chaning default permission case to restrict access

* updating eventType as consume

* Adding loader icon while waiting form permission response

* only sending request to RBAC if address is defined

* adding wallet connection info message

* changing the env name and checking for undefined

* updating .env.development

* Check for undefined RBAC_URL in permissions component

* removing .env.development and updating .env.example

* updating .env.example comment

* switching alert messages and reducing return statements

* removing console.log message

* fixing linting issue

* Revert "fixing linting issue"

This reverts commit 8bcb80be3d.

* Fixing linting errors

* pull from origin main

* Revert "pull from origin main"

This reverts commit 9535e41a5f.
2021-06-10 12:06:26 +03:00
mihaisc
1560c69239
Revert "Fix assets in purgatory not displayed" (#647)
* Revert "Fix assets in purgatory not displayed (#646)"

This reverts commit f759757a1d.

* fix asset purgatory

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-07 14:24:51 +03:00
Norbi
f759757a1d
Fix assets in purgatory not displayed (#646)
* don't show loading component if pageTitle is an empty string

* fix lint errors

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-07 12:36:44 +03:00
mihaisc
e0f8104d07
add web3 in package-lock
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-06-04 14:19:51 +03:00
ece07927f6
more package updates 2021-06-04 11:51:13 +02:00
4dd11fd0f0
ethereumjs-abi lockfile fix 2021-06-04 11:43:51 +02:00
b5d58267c0
ethereum-blockies lockfile fix 2021-06-04 11:43:51 +02:00
508564ec03
more package updates, lock graphql, fresh package-lock 2021-06-04 11:43:51 +02:00
de2e4e8fae
package cleanup and updates 2021-06-04 11:42:33 +02:00
Bogdan Fazakas
ff1d987b5d Merge branch 'main' into fix/issue497-fetch-price-subgraph, fixed merge conflicts 2021-05-10 16:27:32 +03:00
Dimo Dzhurenov
49cd032274
using BigNumber instead of Number (#570)
* using BigNumber instead of Number

* remove wrong calculation of ocean ammount

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove calculateAmountOfOceansRemoved

* using decimal.js for remove

* bump to ocean.js v0.14.8

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-04 14:56:47 +02:00
Jamie Hewitt
0a739cbe93
Support for Moonbase Alpha (#552)
* upgrading to ocean.js 0.14.6

* proper ocean.js update

* make all explorer links work

* handle new moonbeamalpha config

* add moonbase alpha to chain user preferences

* more ocean.js v0.14 updates

* switch to grid

* upgrading ocean.js to 0.14.7

* lock to @oceanprotocol/contracts v0.5.16

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-29 14:48:57 +02:00
Bogdan Fazakas
0cef2cccd5 update price value for pool assets using consumePrice and added isConsumable logic 2021-04-22 14:03:58 +03:00
14e4cc3f68
Merge branch 'main' into feature/compute 2021-04-22 13:03:08 +02:00
Bogdan Fazakas
fa6554a23f
fix for terms state (#545) 2021-04-22 12:37:43 +02:00
9f38bba69a
bump to ocean.js v0.14.4 2021-04-19 16:07:52 +02:00
mihaisc
545be24429
fix compute history duplication (#530)
* check provider compute address

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove console

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* lock file

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* lib update, lock file fix

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-16 15:23:09 +03:00
afca6cfdd3
npm audit fix 2021-04-16 11:32:46 +02:00
26a410a479
lock to ocean.js v0.14.1 2021-04-16 11:31:44 +02:00
mihaisc
c40ca5dae7
fix package-lock (#520)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-15 12:26:53 +03:00
79497adbab
package fix 2021-04-15 11:24:00 +02:00
a78988be67
Merge branch 'main' into feature/compute 2021-04-15 11:21:46 +02:00
Jamie Hewitt
2826df8287
Allowing urls without proceeding http or https (#493)
* allowing urls without proceeding http or https

* Installing package: valid-url-utf8

* removing pre-submit URL validation

* removing new package

* updating package-lock.json
2021-04-15 11:18:48 +03:00
Bogdan Fazakas
d52d644850 merged compute into subgraph-util-methods 2021-04-14 12:08:30 +03:00
claudiaHash
fc6b029118
Compute job history (#462)
* get compute orders query

* wip on getting compute jobs

* wip refcatoring

* get compute history refactored

* small refactor

* loop fixes

* display jobs refactor changes

* display jobs fix

* early output of assets

* query tweak

* quick fix

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* live update for testing

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix load time

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* temp refactor

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* cleanup

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* lib bump

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix status args

* remove metadata json

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix item duplication

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* check if wallet connected

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* debug logs

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* lib bump

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix service grouping

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* added sorting

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-14 12:01:37 +03:00
Bogdan Fazakas
b87d50aa09
Refactor compute methods calls (#502)
* prepare compute for oceanJs method refactor

* bump oceanjs to 0.14.0
2021-04-14 10:21:59 +03:00
Bogdan Fazakas
56554028b8 merged compute into subgraph-util-methods 2021-04-13 19:21:05 +03:00