1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-11-14 17:24:51 +01:00
Commit Graph

188 Commits

Author SHA1 Message Date
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
Jamie Hewitt
7672d78aee
Refactoring Market for new Ocean.js build (#481)
* removing imports from utils folder

* lib bump

* update status args

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-13 15:13:55 +02:00
mihaisc
4e4bbc1120
limit price precision to 18 (#492)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-09 16:59:20 +03:00
a5706d22eb
bump to ocean.js v0.12.1 (#455) 2021-03-25 08:48:13 +01:00
mihaisc
1599d74cfe
Update search and publish (#444)
* fix querys

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

* lib bump, publish update

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

* package-lock

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

* fix searchquery

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-03-18 13:27:58 +02:00
bdccb0966f
Web3/Ocean splitup + full Polygon/Matic support (#433) 2021-03-17 11:44:26 +01:00
Bogdan Fazakas
a4f4de84fd
add sample file to edit metadata form (#419)
* add sample file to edit metada form

* bump oceanjs to 0.11.2

* retrigger checks

* added updated package-lock.json

* bump react hooks to 0.5.4

* bump ocean.js to 0.11.4 and react hooks to 0.5.5
2021-03-09 17:52:40 +01:00
a760935564
Add Portis wallet connection (#291)
* add portis

* library loading tinkering

* bump packages

* typings fix

* pip as addon

* remove setuptools

* revert typings fix

* modal styling

* show portis button

* provider name workaround

* for faulty getInjectedProviderName()
* fixes https://github.com/oceanprotocol/market/issues/332

* more usage of provider info object

* output respective wallet logos

* add network switcher for Portis

* add functionality

* prototype for portis network switching

* improve user experience when reconnecting to cached provider

* support mainnet only, leave networking switching code commented out
2021-01-29 13:40:54 +01:00
ad864cc249
Dev experience tweaks (#354)
* add VS Code workspace settings

* add everything required for auto-formatting on filesave
* add list of suggested extensions

* add pre-commit hook for `npm run format`

* update code style docs

* make pre-commit work

* update docs

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-01-28 17:28:32 +01:00
mihaisc
05035d3cdc
remove ga (#345)
* remove ga

* remove from package
2021-01-28 14:11:08 +02:00
7b854e09dd
bump ocean libraries, vulnerability bumps (#329) 2021-01-21 17:04:49 +01:00
mihaisc
273769388c
Pool statistics from the graph (#288)
* graphql

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

* ignore generated

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

* delete generated

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

* fix travis

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

* fix travis

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

* fix fetch

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

* fix travis

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

* fix fetch

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

* update readme

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

* pool creator liquidit& statistics

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

* graph with the graph

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

* cleanup

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

* fix query

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

* update poll interval

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

* update graph url

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

* ocean bump

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

* run apollo codegen before starting gatsby

* put back graph loading state

* typing fix

* graph tweak, add error state

* readme update

* remove unused functions, move graph provider

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

* fix package-lock

* fix graph when switching tabs

* generate apollo files into one folder

* fix loading

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

* fix codegen camelcase

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

* bump apollo packages

* document subgraph usage, add example

* rewrite into Data Sources, add quick examples

* more data sources docs

* docs updates, typos

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-01-21 16:02:48 +01:00
b3b2ea9777
bump ocean.js & react hooks (#327)
* bump ocean.js

* adapt changes

* bump @oceanprotocol/react

* edit metadata tweaks
2021-01-19 14:34:52 +01:00
07f30108a7
package updates (#319)
* package updates

* bump lib & react

* 'fix' typing error

* seems Yup.SchemaOf does nos correctly handle Partial<Type>
2021-01-13 18:43:59 +02:00
de1bc11efe
add ropsten to network detection utilities (#294)
* add ropsten to network detection utilities

* mention ropsten in publish warning

* bump @oceanprotocol/lib
2020-12-11 18:30:51 +01:00
b2f1af6e87
package updates and fixes (#296)
* package updates and fixes

* yup update for edit form
2020-12-10 15:28:46 +01:00
c57731cd0b
restore WalletConnect (#290)
* restore WalletConnect

* bump @oceanprotocol/react

* visual fixes for walletconnect modal
2020-12-03 14:54:14 +01:00
mihaisc
dac47bf524
3Box publisher profiles (#264)
* install 3box

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

* tinkering

* check tweak

* load library on init only

* add profile

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

* get 3box profile

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

* fix return type

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

* remove console.log

* fix travis

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

* fix eslit

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

* fix travis

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

* 3box data structure tweaks, prepare output in byline

* refactor

* new Publisher component

* tweaks

* remove data partners

* link/profile splitup

* profile tweaks

* component splitup

* lots of styling, add image

* affordance for publisher, refactor, server response tinkering

* use 3Box proxy

* open all 3box links in new tab/window

* mobile fixes

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2020-11-27 12:04:35 +01:00
mihaisc
35d9b6faec
price optimizations and bug fixes (#274)
* price optimizations and bug fixes

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

* travis fix

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

* remove console.log

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

* rephrasing

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

* bump react hooks, show price while checking if consumable

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

* remove console.log

* fix travis
2020-11-26 16:02:42 +01:00
mihaisc
b5a11d6d0f
Handle price fetching better (#265)
* fix price refresh, add AssetProvider

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

* price comment

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

* fix trade

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

* fix trade

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

* fix pool liquidity

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

* fix AssetProvider

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

* fix

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

* fix import

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

* remove console.log

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

* pool refresh fix

* simplify, logging

* handle errors

* cleanup

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2020-11-20 14:31:28 +01:00
97ec21d2e0
404 page (#268) 2020-11-19 21:55:16 +01:00
bdd9f92d07
bump @oceanprotocol/lib 2020-11-16 18:12:49 +01:00
mihaisc
bb80c4df78
Swap tokens (#204)
* swap

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

* validation and calculation

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

* refactor

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

* remove unused effect

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

* fix interval

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

* increase refresh timer, remove optional params

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

* make inputs show up without wallet

* style fixes

* restyling

* styling

* more styling

* fix refresh price

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

* remove test effect

* fixes, get data as early as possible from DDO and initial state

* refactor

* refactor

* refactor

* label tweaks

* copy

* typo

* prototype output

* remove price header

* ouput swap fee

* fix

* spacing

* copy

* refactor pool transaction titles

* copy

* update math

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

* use messaging tweaks

* tab tweaks, output refactor

* fix dark mode selection style

* prototype output

* method tweaks

* slippage to 1%, added warnig banner

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

* form tweaks

* error fix

* empty inputs by default

* longer intervals

* maxOcean validation fix

* slippage tolerance UI

* modified slippage UI

* refactor, refresh ocean user balance

* move typings/models around

* typing fix

* fixed output values

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

* bump oceanlib

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

* remove console.log

* remove placeholder

* tweak

* non-web3 browser tweak

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2020-11-16 16:21:15 +01:00
461fcaf8ae
Liquidity & price history graph (#248)
* graph prototype

* switch items

* liquidity history graph prototype

* more graph styling

* epoch times conversion

* get data in root component

* redraw fix

* more graph styling

* loading fix

* re-render fixes

* re-render fixes

* new Aquarius responses

* price graph and switch buttons

* spacing tweaks
2020-11-16 15:10:33 +01:00