1
0
mirror of https://github.com/oceanprotocol/commons.git synced 2023-03-15 18:03:00 +01:00
Commit Graph

363 Commits

Author SHA1 Message Date
Jernej Pregelj
87b2fde0af
categories, show from category on homepage 2019-05-27 12:21:54 +02:00
Jernej Pregelj
4a7ddca9e8
retrieve category asets on home 2019-05-27 12:21:53 +02:00
Jernej Pregelj
988e03bcca
channel view, latest assets from aquarius 2019-05-27 12:21:53 +02:00
9540236ef0
merge fix 2019-05-27 12:21:53 +02:00
Jernej Pregelj
a94d7e1b6c
latest assets 2019-05-27 12:21:53 +02:00
8497f6f9a2
test tweaks 2019-05-27 12:21:53 +02:00
92721702a0
categories search link on asset details, test fix 2019-05-27 12:21:53 +02:00
7fc99699c7
category search fixes 2019-05-27 12:21:53 +02:00
1b1ac5c9ef
category search, make multiple layouts on one page possible 2019-05-27 12:21:52 +02:00
Jernej Pregelj
13c2c9b68a
categories, show from category on homepage 2019-05-27 12:21:52 +02:00
Jernej Pregelj
9795e6e642
retrieve category asets on home 2019-05-27 12:21:52 +02:00
Jernej Pregelj
36d61b3fc1
add category 2019-05-27 12:21:52 +02:00
2c280d79c5
remove AI For Good as category 2019-05-27 11:21:55 +02:00
f432ce4b2d
Merge pull request #110 from oceanprotocol/feature/events
Consume feedback mesages
2019-05-21 16:17:41 +02:00
056ec23925
more empathetic error message 2019-05-21 12:07:27 +02:00
081772ce37
add AI Commons logo 2019-05-20 14:40:50 +02:00
7a2608f4f3
merge fix 2019-05-20 13:36:07 +02:00
879f51170e
message output refactor, testing 2019-05-20 13:36:07 +02:00
0e12204a5a
message tweaks 2019-05-20 13:36:07 +02:00
b2ae8fcce5
fix missing initial message 2019-05-20 13:36:07 +02:00
7dca7f8e82
adapot to new order flow 2019-05-20 13:36:07 +02:00
10a86d389c
messaging 2019-05-20 13:36:07 +02:00
d713ef11e4
output more events 2019-05-20 13:36:07 +02:00
8856dca647
output step numbers 2019-05-20 13:36:07 +02:00
cbfc1bd1c7
prototype consume feedback mesages 2019-05-20 13:36:07 +02:00
fe39dec214
add AI Commons to stats footer 2019-05-20 13:34:36 +02:00
c859ac098e
Merge pull request #128 from oceanprotocol/feature/total-assets
Output total assets
2019-05-20 13:30:54 +02:00
sjvallon
eaf13b38a0
Update meta.json 2019-05-20 12:44:15 +02:00
21786a7d16
remove AI Commons line for now 2019-05-17 15:18:00 +02:00
d3e44be4e0
consistent AI For Good category naming 2019-05-17 14:53:16 +02:00
e6fc7a9085
styling, AI Commons link 2019-05-17 01:47:36 +02:00
22440827ca
output total assets in the marketplace, use new Market Provider for it 2019-05-17 01:47:36 +02:00
c7418a172c
Merge pull request #130 from oceanprotocol/fix/search-term
url encode & decode search term
2019-05-16 15:08:06 +02:00
c5a4a15a3a
url encode & decode search term 2019-05-16 13:27:41 +02:00
7d64ec2d55
fix react-ga initialization 2019-05-16 11:43:23 +02:00
46eba4e795
Merge pull request #126 from oceanprotocol/feature/aiforgood
AI for Good category
2019-05-15 13:41:19 +02:00
062759bb46
add AI for Good category 2019-05-14 17:26:28 +02:00
f49fa14b2a
less verbose error logging 2019-05-14 13:12:18 +02:00
6dcb7166ce
add Spree to network detection 2019-05-14 12:57:21 +02:00
42dcb8c584
Duero network name 2019-05-14 12:53:43 +02:00
807723be35
isCorrectNetwork -> isOceanNetwork 2019-05-14 12:52:41 +02:00
cbffc42bca
fix network name during network polling 2019-05-13 16:17:59 +02:00
f636170e3c
add duero to network detection 2019-05-13 15:58:01 +02:00
90c252c055
pass through all props to textarea 2019-05-10 12:30:31 +02:00
20299d9116
consume fix
* workaround for https://github.com/oceanprotocol/squid-js/pull/221
2019-05-06 15:26:47 +02:00
9bdfca4be4
more tests 2019-05-04 04:27:27 +02:00
9f0c324cb2
Merge pull request #115 from oceanprotocol/feature/avatar
add blockies for account display
2019-04-30 18:45:14 +02:00
a8969bb70c
hotfix for search input 2019-04-30 18:36:51 +02:00
da47751442
add blockies for account display 2019-04-29 21:04:33 +02:00
039c7b2fe5
sanitize search input 2019-04-29 18:26:20 +02:00
Sebastian Gerske
690dfc33df
Merge pull request #113 from oceanprotocol/update/telegram
update telegram link
2019-04-29 15:30:32 +02:00
Sebastian Gerske
e6806f467d update telegram link 2019-04-29 12:14:32 +02:00
fe08ccc8b2
fix search titles 2019-04-29 12:02:51 +02:00
17082c817f
hotfix for asset title user input 2019-04-25 11:58:14 +02:00
9860272924
fix datepicker styles 2019-04-24 13:03:56 +02:00
8a5fc36436
more typings for window.ethereum 2019-04-23 13:13:10 +02:00
ffb049b1c3
fixes 2019-04-23 13:02:47 +02:00
b03074ecee
fix test 2019-04-16 00:36:43 +02:00
e9b1f24094
mobile tweaks 2019-04-15 23:14:29 +02:00
dde4086827
cleanup 2019-04-15 22:46:49 +02:00
1a15a30435
add pagination UI render test 2019-04-15 22:33:58 +02:00
8a5d89e640
new pagination UI 2019-04-15 22:13:40 +02:00
ce8945a639
move config file 2019-04-15 21:09:05 +02:00
5f1cc2cb1d
fix rerender during consuming flow 2019-04-15 20:06:56 +02:00
745969f686
add tests, use react-testing-library 2019-04-15 19:21:08 +02:00
23556b1663
bring back unlock account action 2019-04-15 17:41:46 +02:00
4aaa92f66a
cleanup, refactor withTracker HOC 2019-04-15 17:41:46 +02:00
7203b88b5e
move requestFromFaucet function, typed response 2019-04-15 17:41:46 +02:00
6ed3cb7842
web3/ocean/account timing tweaks 2019-04-15 17:41:46 +02:00
adab473f4e
move web3/ocean detection out of App.jsx 2019-04-15 17:41:46 +02:00
3a8d6ea284
cleanup and more fine-grained bootstrap process
* new detection flow, one after the other: web3 -> network -> ocean -> accounts
* make account enabling part of bootstrap
* kick out dedicated startLogin action
* plan for modern, legacy, and non-dapp browsers
* consolidate fetchNetwork & fetchAccounts
2019-04-15 17:41:46 +02:00
fe695009ff
cancel AssetsUser component fetching when unmounted 2019-04-15 17:41:46 +02:00
ffd290ad3f
Ocean bootstrap tweaks 2019-04-15 17:41:45 +02:00
823281f967
faster perceived loading 2019-04-15 17:41:45 +02:00
5f2253a02f
refactor web3 & network detection 2019-04-15 17:41:45 +02:00
4a6053ec82
output transaction hash 2019-04-11 20:01:15 +02:00
07a7b41258
adapt to new faucet server response format, pass through success message 2019-04-11 18:39:39 +02:00
686ff8e8bd
more truncation with react-dotdotdot 2019-04-10 17:34:35 +02:00
fddb630908
improve text truncation 2019-04-10 16:17:55 +02:00
14b46e1425
add more open source licenses 2019-04-10 13:04:19 +02:00
6cfd29c56e
adapt to account & network changes 2019-04-09 21:51:22 +02:00
3d7560648c
Merge pull request #90 from oceanprotocol/feature/search-pages
Make page numbers part of URL
2019-04-09 14:48:43 +02:00
a77f01d595
add page to url 2019-04-09 13:51:00 +02:00
Troy McConaghy
740c5a9634 Fix: file URLs get decrypted, not files 2019-04-09 13:27:01 +02:00
efbfd91c65
switch to respective page if query string is present 2019-04-09 13:12:58 +02:00
fb64bcadbd
search updates for Aquarius 0.2.2 & pagination fixes 2019-04-09 11:59:29 +02:00
2b8bb68d39
popper placement 2019-04-09 10:49:36 +02:00
5340df0993
mobile tweaks for search results and main menu 2019-04-08 21:06:09 +02:00
4dcc6c831a
consume & faucet tweaks for Web3 cases 2019-04-08 20:21:29 +02:00
6ac4440897
withTracker HOC formatting 2019-04-08 19:54:18 +02:00
18267a1a18
simplify consume buttons logic 2019-04-08 19:46:53 +02:00
ba186b832a
strip HTML from meta page title 2019-04-08 16:23:14 +02:00
7a24f489b7
Merge pull request #76 from oceanprotocol/feature/markdown
render asset description with markdown
2019-04-08 16:16:14 +02:00
774f57a16f
render asset description with markdown 2019-04-08 15:59:02 +02:00
Troy McConaghy
af8480c389 Change sample data set/search to one w/ results 2019-04-08 15:57:16 +02:00
f032a36e47
hotfix for search title 2019-04-08 13:37:57 +02:00
26b663a09c
hotfix for returning actual first results page 2019-04-08 12:53:44 +02:00
Jernej Pregelj
f4a2ea56b3 Merge branch 'feature/analytics' of https://github.com/oceanprotocol/commons into feature/analytics 2019-04-08 12:08:17 +02:00
Jernej Pregelj
1725c3a8a0 tests 2019-04-08 12:07:09 +02:00
Jernej Pregelj
7e26d30fb2
Merge branch 'master' into feature/analytics 2019-04-08 11:44:02 +02:00
Jernej Pregelj
0bc47335e9 message fixes 2019-04-08 11:41:06 +02:00
Jernej Pregelj
f3db82b59d analytics 2019-04-08 11:35:10 +02:00
5a9f72ab3b
Merge pull request #73 from oceanprotocol/feature/about
add initial about copy
2019-04-08 11:30:07 +02:00
ca261e1025
add initial about copy 2019-04-08 11:19:13 +02:00
ae2911c689
Merge branch 'master' into feature/search-tweaks 2019-04-08 10:51:12 +02:00
a04b2553e5
web3message fixes, formatting fixes 2019-04-08 10:44:03 +02:00
Jernej Pregelj
00e69646ad web2 and web3 2019-04-06 17:55:24 +02:00
e81e2c866b
Merge branch 'master' into feature/search-tweaks 2019-04-05 17:16:06 +02:00
cfaa57f93d
Merge pull request #69 from oceanprotocol/feature/account-tweaks
Account popover tweaks
2019-04-05 17:15:50 +02:00
Jernej Pregelj
b810c7ab32
Merge branch 'master' into datepicker 2019-04-05 16:43:02 +02:00
Jernej Pregelj
51a821a51d date object change 2019-04-05 16:41:29 +02:00
9ba5f7c12f
handle wrong network use case 2019-04-05 16:28:34 +02:00
Jernej Pregelj
2dedbc19e0 datepicker 2019-04-05 16:14:26 +02:00
09281aa8e3
add isNile check 2019-04-05 16:07:46 +02:00
50cafa5c72
style tweaks 2019-04-05 15:46:46 +02:00
ec91010604
show message to non-Web3 users 2019-04-05 15:45:44 +02:00
1e1dac4f8f
refactor popover 2019-04-05 15:39:32 +02:00
27f02f3e03
ouput total results 2019-04-05 15:24:52 +02:00
410a49f1dc
25 items per page, prepare dynamic updating of offset 2019-04-05 15:20:38 +02:00
2b7be08d20
Merge branch 'master' into feature/search-tweaks 2019-04-05 15:03:01 +02:00
25f8c80370
Merge pull request #67 from oceanprotocol/feature/category-fixes
category fixes
2019-04-05 15:02:48 +02:00
4bd455c1ae
category fixes
* remove slugify from all select values
* so categories defined in form-publish.json are stored when publishing
* map categories to category images
* add jellyfish background as fallback image
2019-04-05 14:55:01 +02:00
Troy McConaghy
6de784c730 Change "i.e." to "e.g." in placeholders 2019-04-05 14:27:43 +02:00
ce502609ec
make pagination component work 2019-04-05 14:24:55 +02:00
cf60cd070f
formatting 2019-04-05 13:55:51 +02:00
21d6e6c277
Merge branch 'master' into feature/search-tweaks 2019-04-05 13:55:01 +02:00
Javier Cortejoso
b0a8c61f6c
Merge branch 'master' into feature/docker 2019-04-05 13:37:25 +02:00
830d3040b6
simplify grid layout for search results 2019-04-05 13:28:15 +02:00
d2cadbff13
fix asset file display 2019-04-05 13:27:32 +02:00
Javier Cortejoso
534da80ed2
Updated react env variable names 2019-04-05 13:10:50 +02:00
0985e8b4e6
add pagination component 2019-04-05 12:19:17 +02:00
Javier Cortejoso
6b5cb291aa
Removed main Dockerfile 2019-04-05 11:58:10 +02:00
Javier Cortejoso
56dcbbb6ff
Removed templates and use env variables directly 2019-04-05 11:53:02 +02:00
79e37e965f
adapt to new search response 2019-04-05 11:18:30 +02:00
Javier Cortejoso
a855bbea4a
Merge branch 'master' of github.com:oceanprotocol/commons into feature/docker 2019-04-05 11:07:59 +02:00
0c38b6caa3
Merge branch 'master' into feature/search-tweaks 2019-04-04 17:23:10 +02:00
a1ab653ffb
Merge pull request #59 from oceanprotocol/feature/style-tweaks
Style tweaks
2019-04-04 17:21:31 +02:00
7df93c89ad
switch to datePublished in asset history 2019-04-04 14:14:09 +02:00
67f6d3f508
kick out prototyping stuff
* closes #58
2019-04-04 14:08:13 +02:00
9b9cbfaff3
filter some menu items based on Web3 status 2019-04-04 14:07:16 +02:00
2abeb466a5
fix category search from asset detail page 2019-04-04 13:34:03 +02:00
Javier Cortejoso
b2be53183f
Merge branch 'master' of github.com:oceanprotocol/commons into feature/docker 2019-04-04 13:04:34 +02:00
Javier Cortejoso
a5d6245519
Service parameters as env variables 2019-04-04 12:41:03 +02:00
dbb779ef49
switch to queryMetadata 2019-04-04 12:36:49 +02:00
Jernej Pregelj
e062e87d24 Merge branch 'master' of https://github.com/oceanprotocol/commons into feature/dockerize 2019-04-04 11:34:50 +02:00
Jernej Pregelj
3d071161da docker-compose + dockerfiles 2019-04-04 11:30:31 +02:00
519c2a887f
refactor to use one download per file 2019-04-03 18:41:39 +02:00
3fb426413d
prepare outputting more status messages from network 2019-04-03 18:02:18 +02:00
de91b301f0
new asset file style 2019-04-03 16:51:54 +02:00
0d4d955194
success message styling 2019-04-03 16:39:13 +02:00
8970d1544b
Merge branch 'master' into feature/search-tweaks 2019-04-03 15:53:22 +02:00
cdc5a1daf9
change brizo address 2019-04-03 15:10:03 +02:00
45c3becd5d
Merge branch 'master' into feature/search-tweaks 2019-04-03 15:04:12 +02:00
c35db1b37a
rename to commons 2019-04-03 14:40:31 +02:00
0751ff2a6b
code style 2019-04-03 12:51:20 +02:00
dfe07d13b3
try filtering free assets only 2019-04-03 12:34:13 +02:00
82eba1750b
switch to queryMetadataByText 2019-04-03 12:22:33 +02:00
b23c0d128e
mobile fixes 2019-04-02 17:00:30 +02:00
69ecf6757a
history loading tweaks 2019-04-02 14:55:15 +02:00
7cb54cbd06
search results tweaks 2019-04-02 14:51:59 +02:00
78f4d3a12e
loading state for search 2019-04-02 14:25:16 +02:00
46d5540316
config & metadata fixes 2019-04-02 13:59:07 +02:00
717d67c619
Merge branch 'master' into feature/remote-config 2019-04-02 13:06:52 +02:00
0aabe940ca
file listing fixes, consume flow updates 2019-04-02 12:58:22 +02:00
9f7ddf1c31
pass through faucet server response, error feedback 2019-04-01 17:15:59 +02:00
2dba004f7a
add remote config for Nile 2019-04-01 16:05:24 +02:00
57e33d8407
dateCreated hotfix 2019-04-01 15:07:53 +02:00
2ad4937d05
metadata hotfixes 2019-04-01 13:49:25 +02:00
a9da3e33e0
metadata fixes 2019-04-01 13:04:25 +02:00
508628bfda
Merge branch 'master' into feature/datepicker 2019-04-01 12:55:58 +02:00
1e02037a18
Merge branch 'master' into feature/assets-styling 2019-04-01 12:41:39 +02:00
1a9c875c48
better types 2019-03-29 19:44:58 +01:00
213a9956b6
merge fix 2019-03-29 18:04:35 +01:00
9cc5fb3a79
make amount of recent history items configurable 2019-03-29 18:04:35 +01:00
6eda278f1b
fix search links 2019-03-29 18:04:34 +01:00
e01da4293c
category images prototype
* ref #30
2019-03-29 18:04:34 +01:00
5a9ac24df1
files consume flow workaround and UX improvements 2019-03-29 18:04:34 +01:00
a24a2b983e
fix consume flow 2019-03-29 18:04:34 +01:00
1585a4a2f9
prepare retrieving and displaying files metadata 2019-03-29 18:04:34 +01:00
2715acb2fb
fix user assets listing 2019-03-29 18:04:34 +01:00
4977b28f1b
Files styling 2019-03-29 18:04:34 +01:00
19c4d1c662
components reorganisation 2019-03-29 18:04:12 +01:00
d4c8d05477
make AssetsUser component more usable 2019-03-29 18:04:12 +01:00
17b955a815
Invoices -> History 2019-03-29 18:04:12 +01:00
5b67e11f94
new list style for asset listing 2019-03-29 18:04:11 +01:00
3fabfa7b35
Merge branch 'master' into feature/oep-8-files 2019-03-29 17:20:05 +01:00
dd9ccd92f0
change label 2019-03-29 15:57:12 +01:00
6d0c21c95f
push UTC ISO date string 2019-03-29 15:55:50 +01:00
9f77147d42
ask for date, populate dateCreated from it 2019-03-29 15:47:18 +01:00
78873ac4bf
style date picker 2019-03-29 15:26:46 +01:00
f45bebea8b
add date picker 2019-03-29 15:07:33 +01:00
ecd5742b22
compression tweaks 2019-03-28 16:00:09 +01:00
420e127190
switch to @oceanprotocol/typographies package 2019-03-28 15:25:46 +01:00
bfc0e6548a
update file metadata structure 2019-03-28 12:26:16 +01:00
Jernej Pregelj
1ce9d3ef72 category error fix 2019-03-26 17:42:24 +01:00
Jernej Pregelj
e6a3fe6ec1 consume flow working with brizo accounts 2019-03-26 16:10:07 +01:00
Jernej Pregelj
d134e025a4 fix publishing nested categories in array 2019-03-26 10:48:32 +01:00
Jernej Pregelj
8de81991df
Merge branch 'master' into feature/consume-flow 2019-03-25 16:23:34 +01:00
Jernej Pregelj
da361c98ff linting 2019-03-25 15:27:43 +01:00
Jernej Pregelj
c6f1e35c54
Merge branch 'master' into feature/consume-flow 2019-03-25 15:25:31 +01:00