1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-28 16:47:52 +02:00
Commit Graph

339 Commits

Author SHA1 Message Date
Jamie Hewitt
0a3ec01248
hiding error message (#757) 2021-07-30 15:54:32 +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
3cecfb44a0
pool transactions component splitup 2021-07-26 17:09:32 +02:00
605f77e055
get the providerUri for file validation based on user network
* closes #756
2021-07-26 16:49:45 +02:00
3a130c364b
cleanup 2021-07-26 15:53:21 +02:00
a7998abb99
Multinetwork UI additions (#729)
* add BSC to default chains

* searchbar visual tweaks

* race condition fix

* network name tweaks

* beta → v3

* use publish form titles to inform about network

* form actions refactor

* simplify network name on asset details

* visual indicator for selected chains on button

* lint fix

* more layout flow tinkering, collapsed search by default

* search field layout tweaks

* unknown network/gaia-x name fixes

* put back search cancel button in webkit

* space fixes

* cross browser visual fixes
2021-07-26 15:48:24 +02:00
claudiaHash
92e6ec633f
Adapt history data fetching for multi network (#686)
* multiple graphs queried

* multiple graphs queried


WIP

* fixes

* urql provider added

* urql used in downloads tab

* wip on downloads, pool shares and compute orders

* OperationContext added

* urql client query used

* added method for query multiple subgraphs

* get multiple subgraphs data

* aqua changes integrated

* published and poolTransaction tabs data correctly fetched

* poolTransaction symbol taken from Subgraph

* Downloads loading fixed, logs deleted

* compute history partial fix

* fetch data after deselecting network fix, logs deleted

* changes after Multinetwork branch merge

* ddo usage and config removed

* get out symbol fix, unused imports deleted

* loading data fix

* console log removed

* loading data with no wallet connected fix

* no wallet connected and empty result message updated

* NetworkName added on table

* explorer link fix for pool transactions

* NetworkName added in PoolTransactions table

* transactions and downloads sorted by timestamp

* pool shares and compute jobs sorted by timestamp

* use transaction network id for explorer link

* pool transactions refetch

* pool shares refetch

* stop re-displaying table data if no changes on refetch

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Norbert <katunanorbert@gmail.com>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2021-07-23 15:46:25 +03: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
Norbi
7368c9cc68
Statistics footer (#746)
* display multiple chains statistics

* fetching stats data from multiple subgraphs

* design changes

* display one combined stat for all main networks

* tooltip updates

* added Loader component

* refactoring

* refactor for better fallback, remove loader

* tooltip styling and refactor

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-07-22 13:07:52 +02:00
mihaisc
22da62b231
Check graph sync status (#745)
* fix balance check after network switch

* error location

* remove console

* fix messages

* fixed sync status

* remove comment
2021-07-22 02:40:44 -07:00
Norbi
565c0324f9
Create wallet network switcher (#676)
* created component for wallet network switching

* component styling

* display network names

* created networks config

* fix get network config function

* wip

* moved switcher component inside consume

* use isAssetNetwork to show Switcher component, added to publish

* get network properties using networkList and oceanConfig

* error fix

* hide wallet network switcher if no provider

* use chainId from useAsset ddo

* added switcher component to Compute

* added component to edit metadata and compute settings

* added component to advance settings form

* fixed lint errors

* included component inside Web3Feedback

* updated text and icon design

* button design update, and Web3Feedback position on edit asset

* fixed lint error

* message update

* tag error fixes

* disabled pool and trade buttons if not asset network

* mainnet aquarius fallback url

* filename typo fix

* replace NetworkName component with getNetworkDisplayName function

* added method to switch to EthereumChain networks, removed logs

* fixed lint error

* style tweaks

* markup and styles simplification

* restrict add datatoken

Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-07-15 17:03:03 +02:00
483ce88d42
another merge fix 2021-07-14 11:44:40 +02:00
fa278899ef
merge fix 2021-07-14 11:33:11 +02:00
08ee32f105
Merge branch 'main' into feature/multinetwork 2021-07-14 11:28:50 +02:00
7d4cb0e87c
fixes for unknown networks (#725)
* fixes for unknown networks

* hack in native token symbol
2021-07-13 16:22:19 +03:00
Bogdan Fazakas
1da3214599 fixed bookmark prices 2021-07-12 11:35:12 +03: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
Norbert
fa4c3a10ee Merge branch 'main' into feature/multinetwork 2021-07-07 10:09:28 +03:00
Norbi
4e0bc09f8c
Adapt Aquarius queries to chainId (#667)
* wip

* get latest assets from multiple networks

* updated queryMetadata function in components

* added new multinetwork aquarius api

* Use ddo chainId for AssetType inside teaser

* added chainId filter to queries from home page

* put chainId query string in parenthesis

* search filter by chainIds

* updated getDoo and getAssetName functions

* removed logs and fixed lint errors

* updated get published assets query

* adapted bookmarks aquarius call to multinetwork

* removed temporary ddo

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-07-07 09:45:20 +03:00
mihaisc
3798d80a4d
Global search bar (#690)
* move search bar

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

* update search bar

Signed-off-by: mihaisc <mihai@oceanprotocol.com>

* add enter event

Signed-off-by: mihaisc <mihai@oceanprotocol.com>

* fix lint

* small button fixes

* add padding, change media width to rem

* remove comments
2021-07-06 04:55:10 -07: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
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
Norbi
14f2f2a747 Merge branch 'main' into feature/multinetwork 2021-07-01 14:44:21 +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
Bogdan Fazakas
5e45fff361 wip replace apollo with urql 2021-06-22 08:52:49 +03:00
Kris Liew
e02babf2c2
[EPIC] Free Pricing (#681)
* Free Pricing Option at create Pricing (#621)

* Free Pricing Option + env var toggle

* Create Pricing step msg

* Default 'allowFreePricing' to true temp for review

* Fix price 0 on free tab

* Attempt fix useSiteMetadata

* Fix linting

* Feature/free price support consume compute (#654)

* Update fetch free price

* Feedback change UI remove 0's

* update button msg && fix

* compute algorithm list show 'Free' instead of '0'

* updateMetadata() v3 workaround solution for free pricing (#677)

* compute algorithm list show 'Free' instead of '0'

* workaround editMetaData free price

* utils function for compute & download

* `allowFreePricing` default to false
2021-06-16 09:32:11 +08: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
a017ad219d
move network metadata into a hook 2021-06-14 20:04:44 +02:00
30174e1a84
Merge branch 'main' into feature/multinetwork 2021-06-14 15:17:33 +02:00
2f4f53ae2a
Menu refactor (#672)
* layout flow and space saving tinkering

* different tactic

* different minimal network name

* next layout flow iteration

* move chains preference into its own action

* mobile view tweaks

* more network icons

* fix and clean up ocean token metadata

* refactor and clean up Chains component

* naming cleanup
2021-06-14 15:05:16 +02: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
Kris Liew
4fc5862654
Edit Advance Settings form for Edit Credentials & edit isOrderDisabled Flag (#655)
* #638 Initial design

* #638 fix import and get value from env file

* #638 Fix UI

* #638 Improved UI

* #638 Add deny credential and isOrderDisabled

* UI update

* Fix lint

* Attempt fix issue

* Revert "Attempt fix issue"

This reverts commit e3d916fe61.

* Extract default credential type

* Fix complexity issue

* Fix complexity issue

* Fix typo error

* Enhance UI

* Enhance Credentials Component UI

* Reduce duplication

* Revert "Reduce duplication"

This reverts commit e3bf6b4a2a.

Co-authored-by: KY Lau <kian_yee.lau@daimler.com>
2021-06-14 15:47:31 +08:00
Norbi
064bb2fd69
Change bookmarks and migration (#675)
* changed bookmark structure to list of dids

* fixed add, remove bookmark

* wip

* fixed type error and migration

* remove logs

* fix lint error

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-11 16:01:44 +03:00
4df84b8b14
split up network list into main & test networks 2021-06-09 19:41:12 +02:00
9943dae93c
full width menu bar 2021-06-09 19:40:43 +02:00
ef218a9d9e
chainId switching mechanism 2021-06-09 11:45:36 +02:00
796fc6be81
get all screens to render again 2021-06-04 15:53:34 +02:00
21792e9d4f
move OceanProvider to asset route 2021-06-04 15:13:47 +02:00
3332249928
refactor and tinkering 2021-06-04 15:06:24 +02:00
6bc37b9b7b
remove NetworkBanner 2021-06-04 15:01:25 +02:00
9d7486d626
prototype network feedback based on asset network checks 2021-06-04 15:01:22 +02:00
fa682dad1e
show network at all times in wallet component 2021-06-04 15:00:33 +02:00
10b29c6e37
unify network names, more icons 2021-06-04 15:00:33 +02:00
476147f65a
add network icon components 2021-06-04 15:00:32 +02:00
b516e95879
prettier formatting updates 2021-06-04 11:43:47 +02:00
Jamie Hewitt
d887675f82
Add datatoken to wallet for metamask users (#574)
* upgrading to ocean.js 0.14.6

* saving initial changes

* creating seperate component for adding tokens

* showing datatoken name

* adding button for metamask users

* using substring as datatoken symbol

* removing duplicated code

* removing empty div element

* removing unneccessary div element

* no longer sending the whole DDO

* refactoring add token functions

* updating function name

* no longer sending the whole ddo to the addDataToken component

* removing DDO import

* small refactor, get web3 provider info in useWeb3

* general AddToken component

* cleanup

* cleanup, remove symbol shortening

* copy, layout tweaks

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-17 16:12:22 +02:00