1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-30 13:51:42 +02:00
Commit Graph

111 Commits

Author SHA1 Message Date
Jamie Hewitt
58781ff95f
Improve search queries (#755)
* refactoring search fields

* Searching without spaces

* Adapting nospace term to a prefix query

* Fixing algorithm/dataset filter

* filtering using match

* Removing addTypeFilterToQuery()

* Removing console log messages
2021-08-02 16:04:11 +02: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
Norbi
14f2f2a747 Merge branch 'main' into feature/multinetwork 2021-07-01 14:44:21 +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
30174e1a84
Merge branch 'main' into feature/multinetwork 2021-06-14 15:17:33 +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
b8930cc738
Merge branch 'main' into feature/multinetwork 2021-06-11 11:14:43 +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
f0b040c5cb
Merge branch 'main' into feature/multinetwork 2021-06-08 10:48:10 +02: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
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
ece07927f6
more package updates 2021-06-04 11:51:13 +02:00
b516e95879
prettier formatting updates 2021-06-04 11:43:47 +02:00
claudiaHash
5428a8e5b4
searching by full token symbol (#564)
* searching by full token symbol


regular expression used

* search by full names


match partial data


useless comments deleted


log deleted

* make search text uppercase

* data author and description added in query fields

* working search combined with sorting and filtering

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-25 11:23:48 +03:00
claudiaHash
f7cf804ba5
Filter buttons bugs fix (#614)
* buttons selection and deselection fix

* style fixes

* hide button fix

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-20 11:50:52 +03:00
Norbi
56169b9887
show page details after receiving the title (#612)
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-20 11:00:50 +03:00
Norbi
65194696d3
Handle asset price in teaser (#596)
* used price from subgraph for asset teasers

* moved loading component inside AssetList

* replaced any with proper types inside subgraph utils

* fixed loading component displayed when empty assets or prices list

* show loading component when refetching data on sort and filter

* get each asset price before displaying the component, loading changes

* refactoring functions for getting asset prices

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-17 17:08:15 +03:00
claudiaHash
82acbba5ce
Remove price from queries (#600)
* subgraph query added

* return ddo list

* price queries removed from sorting and filtering

* subgraph query added


return ddo list


price queries removed from sorting and filtering

* subgraph query removed

* removed unused subgraph query

* undo subgraph fetchData change

* linting errors fixed

* files renamed, priceType removed

* removed unused imports and vars

* removed all price filter variables

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-05-17 16:14:40 +03:00
Bogdan Fazakas
18f2c99e78
Start compute job (#439)
* Wip start compute job

* Wip select algorithm design

* Asset selection form component, for start compute job (#442)

* prototype AssetSelection

* assetselection styling

* typing "fix"

* put back file info icon

* AssetSelection styling in context

* update start job method, fixed algo select, and fixed option typing

* compute logic update

* add has previous orders for algo asset

* fixed search algorithm assets in start compute form

* fixed lint errors

* updated previous order for algo logic and compute flow

* update use price hook and added buy DT for algo

* display only alg of type exchange and sort by value

* display only trusted algo for asset if field is set

* added logic for allow all published algorithms or no algorithms allowed

* asset selection style & spacing tweaks

* refactor get algorithms for compute and edit compute

* fixed form options and more refactoring

* new ButtonBuy component

* shared component between consume/compute
* dealing with various states: loading, previous orders, help text output

* effect dependencies

* move error output into toast

* formik data flow refactor

* ditch custom field change handler
* fix initialValues
* typed form data & validation
* fixes multiple form validation issues along the way

* isInitialValid → validateOnMount

* metadata display tweaks

* error feedback tweaks

* oler assets checks, confeti on succes job, market fee on order, removed algo compute logic

* more startJob logging

* feedback & messaging changes

* metadata display

* return all algos, fixed & dynamic priced ones

* fix DOM nesting

* messaging updates

* copy tweaks

* check algorithm previous history for both acces and compute sercive types

* handle start compute error

* extra checks on start compute response

* styling tweaks, fix toast UI errors

* AssetSelection: empty screen, tweak min/max height

* fix FRE issues on start compute

* check is ordarable before start compute job

* logging tweaks

* disable eslint no-unused-vars rule for some Apollo code blocks

* fix metadata editing for compute assets

* consider dataset timeout for compute too

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-01 17:21:08 +02:00
Bogdan Fazakas
2e9db9d170 Merge branch 'main' into feature/compute 2021-03-18 13:42:31 +02: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
df587bb5b5
Merge branch 'main' into feature/compute 2021-03-17 12:58:13 +01:00
bdccb0966f
Web3/Ocean splitup + full Polygon/Matic support (#433) 2021-03-17 11:44:26 +01:00
Bogdan Fazakas
32ff7af3ce
Merge branch 'feature/compute' into publish-algo 2021-03-03 16:13:03 +02:00
claudia.holhos
c35fb820c3 clear button display changed 2021-03-02 15:41:43 +02:00
claudia.holhos
3b604085ab clear button styling 2021-03-02 11:29:57 +02:00
claudia.holhos
f1d47bbec9 typo fixed 2021-03-01 19:09:43 +02:00
claudia.holhos
8cce1898fd clear filters button added 2021-03-01 19:08:18 +02:00
claudia.holhos
59b8b8b48a Merge remote-tracking branch 'origin/feature/issue392' into feature/issue392 2021-03-01 17:38:37 +02:00
claudia.holhos
8d07414db1 sort fix 2021-03-01 17:38:02 +02:00
d71bf5dfaa
style fix 2021-03-01 15:10:52 +01:00
9f9113c291
Merge branch 'feature/compute' into feature/issue392 2021-03-01 15:07:34 +01:00
07e8ac6f13
styling & spacing 2021-03-01 15:04:41 +01:00
Bogdan Fazakas
f2e906e790
Fix/ Search query with price filter and no text (#408)
* fixed querry with price filter and no text entered

* retrigger checks
2021-03-01 15:35:29 +02:00
claudia.holhos
6eaf2efd95 eliminate no price elements on both price filters set 2021-02-25 17:10:19 +02:00
e5b71046db
small global color tweaks 2021-02-25 13:16:32 +01:00
claudia.holhos
2283148e6d code refactoring 2021-02-25 14:14:21 +02:00
claudia.holhos
99e0cb78e2 select multiple options 2021-02-24 20:32:18 +02:00
claudia.holhos
2938a09454 select and deselect filter button
price and service filters combined


unselect filter on button
2021-02-23 23:51:02 +02:00
70d3e26bab
Merge branch 'feature/compute' into publish-algo 2021-02-23 11:43:49 +01:00
claudiaHash
ce81777030
view algorithms on homepage (#388)
* view algorithms on homepage

* linting error fixed

* view algos on rinkeby/mainnet, added algos on search

* global color system tweak, apply on asset teaser system

* create subtle hierarchical distinction between background & content
* output asset type
* add asset type as css class
* bonus side effect: a nicer dark mode theme on OLED screens

* add icon assets

* compute/download icons added to asset teaser

* tooltip content fix

* tooltip content width fix


tooltip message shortened

* max-width added

* links renamed, all algos section removed

* datatoken tooltip removed

* spacing tweaks

* visual separation of asset & access type, flip order
* spacing/font size tweaks, aligning things

* fix search

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

* light mode color tweak

* change dataset display name

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

* data set label fixed

* query updated for data sets and algos

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-02-22 16:25:27 +02:00
Norby
1f72fd3951
Feature/asset list isolated pagination (#356)
* isolated pagination using query

* made pagination hrefBuilder prop optional

* mad query prop optional, fixed TransactionHistoryPool import error

* removed pagination and url logic outsite AssetQueryList

* renamed AssetQueryList to AssetList, changed props

* used navigate from gatsby
2021-02-05 14:00:30 +01:00
Bogdan Fazakas
83dca873f8
add sort filter features to search (#322)
* sort and filter working added ui element for filter

* added UI for filter and sort

* made sort and filter work with the new UI

* filter and sort inline style

* updated styling and linters

* added sort direction

* apply sort and filter when starting a new search and sort order style update

* fixed sort by price

* change sort order selector
change direction when click on a sort option instead of clicking on the arrow that shows actual sort direction

* added default sort to owner and tag search

* refactor getSearchQuery method

* refactor sort methods

* fixed lint errors

* updated styling for sort and filter components

* fixed lint

* apply dynamic filter when sorting by liquidity

* interaction & alignment styling

* style tweaks, legacy search layout styles removal

* refactor sort component and fixed browsing all datasets
also aded default sort params when browsing all data sets

* fixed lint issues

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-01-21 10:42:05 +01:00
Norby
b5f6f9c9c1
displayed search results count (#312)
* displayed search results count

* updated unit test for Search component

* account for singular & plural, display message if there's no result
2021-01-13 10:15:50 +01:00
960c5b3234
Update metadata, the proper way (#292)
* prototype view switching

* refactor, more UI

* formik form setup & data flow

* debug output, fixes, refactor

* description preview refactor

* publish/update date changes

* output created & updated date at top of asset
* use ddo.created & ddo.updated everywhere
* stop pushing metadata.main.datePublished

* owner check for edit link

* all the feedback states and switching between them: loading, error, success

* refactor feedback, one component for publish & edit

* action & date output fixes

* move all content, iterate form fields from it

* UI updates

* styling tweaks

* ddo dataflow refactor, more useAsset usage

* more useAsset usage

* form actions styling

* prepare edit history component

* metadata output tweaks

* copy

* safeguard against profile urls without protocol defined

* refetch ddo after edit

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

* switch author for dataTokenOptions in metadata preview

* refactor

* copy

* showPricing fix

* validation: minimum characters for title & description

* disable submit button when validation fails

* form validation fixes

* manually trigger onChange validation in publish & edit forms

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2020-12-10 14:30:40 +01:00
5824d35ef7
move purgatory asset warning and hide most metadata (#287)
* move purgatory asset warning, hide most metadata

* move copy, less metadata

* refactor

* move copy

* delay fix
2020-12-02 14:37:01 +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
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