Skip to content

Commit a11fbde

Browse files
ihormlgades
authored andcommitted
bitshares#3580 Replace steemit news by hive and use bitshares tag
1 parent fc5414e commit a11fbde

File tree

4 files changed

+89
-53
lines changed

4 files changed

+89
-53
lines changed

app/branding.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ export function getConfigurationAsset() {
257257
};
258258
}
259259

260-
export function getSteemNewsTag() {
261-
return null;
260+
export function getHiveNewsTag() {
261+
return 'bitshares';
262262
}
263+

app/components/News.jsx

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from "react";
22
import counterpart from "counterpart";
3-
import {api} from "steem-js-api";
3+
import {api} from "@hiveio/hive-js";
44
import Translate from "react-translate-component";
55
import LoadingIndicator from "./LoadingIndicator";
66
import utils from "common/utils";
7-
import {getSteemNewsTag} from "../branding";
7+
import {getHiveNewsTag} from "../branding";
88

9-
const query = {tag: getSteemNewsTag(), limit: 20};
9+
const query = {tag: getHiveNewsTag(), limit: 20};
1010

1111
const alignRight = {textAlign: "right"};
1212
const alignLeft = {textAlign: "left"};
@@ -159,13 +159,12 @@ class News extends React.Component {
159159
}, 100);
160160
return;
161161
}
162-
api.getDiscussionsByBlog(query)
163-
.then(discussions => {
164-
this.orderDiscussions(discussions);
165-
})
166-
.catch(() => {
167-
this.setState({isLoading: false, isWrong: true});
168-
});
162+
api.getDiscussionsByTrending(query, (err, result) => {
163+
if(err) {
164+
return this.setState({isLoading: false, isWrong: true});
165+
}
166+
this.orderDiscussions(result);
167+
});
169168
}
170169

171170
componentWillUnmount() {

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
}
144144
},
145145
"dependencies": {
146+
"@hiveio/hive-js": "^2.0.5",
146147
"alt": "https://github.com/bitshares/alt.git",
147148
"alt-container": "https://github.com/bitshares/alt-container.git",
148149
"alt-react": "https://github.com/bitshares/alt-react.git",
@@ -210,7 +211,6 @@
210211
"react-tooltip": "^4.2.21",
211212
"react-transition-group": "^4.4.2",
212213
"react-translate-component": "^0.15.1",
213-
"steem-js-api": "^0.7.1",
214214
"stream-browserify": "^3.0.0",
215215
"string-similarity": "^2.0.0",
216216
"tcomb": "2.5.2",

yarn.lock

+76-40
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,32 @@
11731173
minimatch "^3.0.4"
11741174
strip-json-comments "^3.1.1"
11751175

1176+
"@hiveio/hive-js@^2.0.5":
1177+
version "2.0.5"
1178+
resolved "https://registry.yarnpkg.com/@hiveio/hive-js/-/hive-js-2.0.5.tgz#9e6bc7be5c9fb30f4abef0a84e5eac14b8730e05"
1179+
integrity sha512-1JkakYv//mZjsWCV3ubzMtZ+f9ixEFzT3Gs9Aa5QhyDgYCprK52be7duJZpIwKa/AHdLjIClSPmpn+D4wMpQRw==
1180+
dependencies:
1181+
"@steemit/rpc-auth" "^1.1.1"
1182+
bigi "^1.4.2"
1183+
bluebird "^3.4.6"
1184+
browserify-aes "^1.0.6"
1185+
bs58 "^4.0.0"
1186+
buffer "^5.0.6"
1187+
bytebuffer "^5.0.1"
1188+
create-hash "^1.1.2"
1189+
create-hmac "^1.1.4"
1190+
cross-env "^5.0.0"
1191+
cross-fetch "^3.1.4"
1192+
debug "^2.6.8"
1193+
detect-node "^2.0.3"
1194+
ecurve "^1.0.5"
1195+
jsbi "^3.1.4"
1196+
lodash "^4.16.4"
1197+
retry "^0.12.0"
1198+
ripemd160 "^2.0.2"
1199+
secure-random "^1.1.2"
1200+
ws "^3.3.2"
1201+
11761202
"@hot-loader/react-dom@16":
11771203
version "16.14.0"
11781204
resolved "https://registry.yarnpkg.com/@hot-loader/react-dom/-/react-dom-16.14.0.tgz#3cfc64e40bb78fa623e59b582b8f09dcdaad648a"
@@ -1388,6 +1414,18 @@
13881414
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
13891415
integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
13901416

1417+
"@steemit/libcrypto@^1.0.1":
1418+
version "1.0.1"
1419+
resolved "https://registry.yarnpkg.com/@steemit/libcrypto/-/libcrypto-1.0.1.tgz#c31ab3e5deb667628169b3d54d746b015de31a79"
1420+
integrity sha512-g2y4OrELuPGLLu3GjVaPbVvY/K+4oPGOrv9ec013o/ZB76R9UQ1ufYD9RM5tKxHXpFhzj2k0JgoKYWkdVheFVA==
1421+
1422+
"@steemit/rpc-auth@^1.1.1":
1423+
version "1.1.1"
1424+
resolved "https://registry.yarnpkg.com/@steemit/rpc-auth/-/rpc-auth-1.1.1.tgz#8f6239e89783d2b251b49e9e1b9486b5d167f944"
1425+
integrity sha512-Eb8BW3O1y4+/+Dbf+LqGVmgXYqyfHxP9mBlmzkpjXiIepTpxoK90NIGrneqcnEGq0TR2nSt4BVv9Ur9c+hxoig==
1426+
dependencies:
1427+
"@steemit/libcrypto" "^1.0.1"
1428+
13911429
"@szmarczak/http-timer@^1.1.2":
13921430
version "1.1.2"
13931431
resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -2743,7 +2781,7 @@ bluebird-lst@^1.0.9:
27432781
dependencies:
27442782
bluebird "^3.5.5"
27452783

2746-
bluebird@^3.5.0, bluebird@^3.5.5:
2784+
bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.5.5:
27472785
version "3.7.2"
27482786
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
27492787
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2875,7 +2913,7 @@ [email protected]:
28752913
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
28762914
integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
28772915

2878-
browserify-aes@^1.0.0, browserify-aes@^1.0.4:
2916+
browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6:
28792917
version "1.2.0"
28802918
resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
28812919
integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
@@ -2947,7 +2985,7 @@ browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.17.5, browserslist@^
29472985
node-releases "^2.0.1"
29482986
picocolors "^1.0.0"
29492987

2950-
bs58@^4.0.1:
2988+
bs58@^4.0.0, bs58@^4.0.1:
29512989
version "4.0.1"
29522990
resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
29532991
integrity sha1-vhYedsNU9veIrkBx9j806MTwpCo=
@@ -3018,7 +3056,7 @@ buffer@^4.3.0:
30183056
ieee754 "^1.1.4"
30193057
isarray "^1.0.0"
30203058

3021-
buffer@^5.1.0, buffer@^5.5.0:
3059+
buffer@^5.0.6, buffer@^5.1.0, buffer@^5.5.0:
30223060
version "5.7.1"
30233061
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
30243062
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -3764,21 +3802,20 @@ cross-env@^5.0.0, cross-env@^5.0.5:
37643802
dependencies:
37653803
cross-spawn "^6.0.5"
37663804

3767-
cross-fetch@^1.1.1:
3768-
version "1.1.1"
3769-
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-1.1.1.tgz#dede6865ae30f37eae62ac90ebb7bdac002b05a0"
3770-
integrity sha512-+VJE04+UfxxmBfcnmAu/lKor53RUCx/1ilOti4p+JgrnLQ4AZZIRoe2OEd76VaHyWQmQxqKnV+TaqjHC4r0HWw==
3771-
dependencies:
3772-
node-fetch "1.7.3"
3773-
whatwg-fetch "2.0.3"
3774-
37753805
cross-fetch@^3.0.4:
37763806
version "3.1.4"
37773807
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
37783808
integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
37793809
dependencies:
37803810
node-fetch "2.6.1"
37813811

3812+
cross-fetch@^3.1.4:
3813+
version "3.1.5"
3814+
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
3815+
integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
3816+
dependencies:
3817+
node-fetch "2.6.7"
3818+
37823819
cross-spawn-async@^2.1.1:
37833820
version "2.2.5"
37843821
resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
@@ -4462,7 +4499,7 @@ ecc-jsbn@~0.1.1:
44624499
jsbn "~0.1.0"
44634500
safer-buffer "^2.1.0"
44644501

4465-
ecurve@^1.0.6:
4502+
ecurve@^1.0.5, ecurve@^1.0.6:
44664503
version "1.0.6"
44674504
resolved "https://registry.yarnpkg.com/ecurve/-/ecurve-1.0.6.tgz#dfdabbb7149f8d8b78816be5a7d5b83fcf6de797"
44684505
integrity sha512-/BzEjNfiSuB7jIWKcS/z8FK9jNjmEWvUV2YZ4RLSmcDtP7Lq0m6FvDuSnJpBlDpGRpfRQeTLGLBI8H+kEv0r+w==
@@ -7417,6 +7454,11 @@ js-yaml@^4.1.0:
74177454
dependencies:
74187455
argparse "^2.0.1"
74197456

7457+
jsbi@^3.1.4:
7458+
version "3.2.5"
7459+
resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.2.5.tgz#b37bb90e0e5c2814c1c2a1bcd8c729888a2e37d6"
7460+
integrity sha512-aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ==
7461+
74207462
jsbn@~0.1.0:
74217463
version "0.1.1"
74227464
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -8410,14 +8452,6 @@ node-dir@^0.1.17:
84108452
dependencies:
84118453
minimatch "^3.0.2"
84128454

8413-
[email protected], node-fetch@^1.0.1:
8414-
version "1.7.3"
8415-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
8416-
integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
8417-
dependencies:
8418-
encoding "^0.1.11"
8419-
is-stream "^1.0.1"
8420-
84218455
84228456
version "2.6.1"
84238457
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
@@ -8430,6 +8464,21 @@ [email protected]:
84308464
dependencies:
84318465
whatwg-url "^5.0.0"
84328466

8467+
8468+
version "2.6.7"
8469+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
8470+
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
8471+
dependencies:
8472+
whatwg-url "^5.0.0"
8473+
8474+
node-fetch@^1.0.1:
8475+
version "1.7.3"
8476+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
8477+
integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
8478+
dependencies:
8479+
encoding "^0.1.11"
8480+
is-stream "^1.0.1"
8481+
84338482
node-forge@^1.2.0:
84348483
version "1.3.0"
84358484
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2"
@@ -10612,6 +10661,11 @@ ret@~0.1.10:
1061210661
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
1061310662
integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
1061410663

10664+
retry@^0.12.0:
10665+
version "0.12.0"
10666+
resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
10667+
integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
10668+
1061510669
retry@^0.13.1:
1061610670
version "0.13.1"
1061710671
resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
@@ -10648,7 +10702,7 @@ rimraf@^3.0.0, rimraf@^3.0.2:
1064810702
dependencies:
1064910703
glob "^7.1.3"
1065010704

10651-
ripemd160@^2.0.0, ripemd160@^2.0.1:
10705+
ripemd160@^2.0.0, ripemd160@^2.0.1, ripemd160@^2.0.2:
1065210706
version "2.0.2"
1065310707
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
1065410708
integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
@@ -11304,19 +11358,6 @@ stealthy-require@^1.1.1:
1130411358
resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
1130511359
integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
1130611360

11307-
steem-js-api@^0.7.1:
11308-
version "0.7.1"
11309-
resolved "https://registry.yarnpkg.com/steem-js-api/-/steem-js-api-0.7.1.tgz#57cc3b504662b161fa5e7499949e6a74d1ade2fc"
11310-
integrity sha512-bw+GFhwkbxT/X5YjZovIfyOZz+sqDwqxICWdoViN0bah2JsyLrypgqjkZoj3zmnCA4KMLLcck2NwOvQMglW7wA==
11311-
dependencies:
11312-
bigi "^1.4.2"
11313-
cross-env "^5.0.0"
11314-
cross-fetch "^1.1.1"
11315-
debug "^2.6.8"
11316-
detect-node "^2.0.3"
11317-
lodash "^4.16.4"
11318-
ws "^3.3.2"
11319-
1132011361
stream-browserify@^2.0.1:
1132111362
version "2.0.2"
1132211363
resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -12461,11 +12502,6 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
1246112502
dependencies:
1246212503
iconv-lite "0.4.24"
1246312504

12464-
12465-
version "2.0.3"
12466-
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
12467-
integrity sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=
12468-
1246912505
whatwg-fetch@>=0.10.0:
1247012506
version "3.6.2"
1247112507
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"

0 commit comments

Comments
 (0)