From 047ef068f5b2fd9d216350ed8d22541f94376b70 Mon Sep 17 00:00:00 2001 From: Feruz Date: Wed, 2 Jan 2019 15:39:52 +0200 Subject: [PATCH] no_image upd, posts filter fix on list and profile page --- .../UserInterfaceState.xcuserstate | Bin 40952 -> 41895 bytes src/assets/no_image@2x.png | Bin 1873 -> 2577 bytes .../view/commentsDisplayView.js | 6 +-- .../filterBar/view/filterBarView.js | 1 + src/components/posts/view/postsView.js | 43 +++++++++++++----- src/constants/options/filters.js | 2 + src/constants/options/filters.json | 1 - src/screens/home/screen/homeScreen.js | 12 +++-- src/screens/profile/screen/profileScreen.js | 11 ++++- src/utils/postParser.js | 2 +- 10 files changed, 56 insertions(+), 22 deletions(-) create mode 100644 src/constants/options/filters.js delete mode 100644 src/constants/options/filters.json diff --git a/ios/eSteem.xcworkspace/xcuserdata/m.xcuserdatad/UserInterfaceState.xcuserstate b/ios/eSteem.xcworkspace/xcuserdata/m.xcuserdatad/UserInterfaceState.xcuserstate index 7c7a795391ac7e8a729ee44159e7109a31d0a39a..15077a8e837bf42fb00ec2767e433b2d1ed8d941 100644 GIT binary patch delta 17636 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 diff --git a/src/assets/no_image@2x.png b/src/assets/no_image@2x.png index c5728990c99ab4b5254dcffff162ec0297744460..624f9e9bd304acb84b6f9d65c3fac81a39cffd59 100644 GIT binary patch literal 2577 zcmV+s3hwoZP)9u011srL_t(|+U&uB00000fS~=U7pVdO0000000000000000GK^{ z+iDdC!T>z;GieS4!lCc~teXI}CZ!g(-X-7C+LfhV{EkC1sm^PjsQSZHNu=vK@BQ*B zLN(w&5L4~EcB&5{7-N>#UODY!z%}0AG4`TTZtECo4B-s(#Rj8}_L9JRp8fj;i;(+H$&%8C#h^V%Ogv^ZNC;!c~YSx~bXrGD8IQItN7dEzpj;e1|{x7~)r5$=L zbVT>|^+zxek<{bEH*3wNdjMwK;@I%rz`G$Az$q|d+1_hQcxW7hbAbJD!fJdAaHbU^ zU0cF~pO9vY_|ZC{46ct#mC#8OXH*Q_)Myvu1Ww(Iqtg^;<`}K5N8Ux7HCnz6n$Ei;Gp~z*s*w{h zS>IfVmNRNyw4SK&gP9EA1cE2}MYL1>ZfWJXzzfp5szhZwOb zHWa!Ilk_YFTrM$ZIpc|FjH@k0J<9C1U0QQ&_4V7dOrXWQcZS8xC~}i zz?n72ffu&hPtirr6S7hEbT!!)oB$h%{a{_jNQ(|U6?p03ZQ5z)i^-Zi*=_74?Q@tw zVu1puxAU)xRvT~zEiF86)MMj3mDdph5;L9G$ZWw#?SliA{Jse&??EOu%|+J0KV^eT|kH-T{91X&zH-k?}^2UzQ$F@7rLt50BN25@Jd#6Tk)Afiw zCdC$=tf#cHt=$Hih%=MdHF}$t3{V-e`xfw#?Ff(e`5|p<)30=uYhUO}HaeZc7Rs)~ zU$x1LveH~e^tJ}uIT2`kBI{t>>H`)~9Y7&wla+6raT$p`O|5lFBCQF%YP`Pe)`+IHq;RI0n zzt?H1I3LX)qt}#DJqdY+E0k``{w{TRA7?YSM!LfSYHdA6(3P1CWM&}5r2m+vSPKGx zp2HSO>OPnt=RBk_^NS$3pu>(90I)wG(ezpQsOCX4B{H`L>F|Mu9od$&#oTK}9|25I zgG0r%g#5!T{4FBBY)aaEi#wWD@D^TJX*r2`_l0-+7!Sx2U$-mmI(W>?-tB?Fq*es) zU&Lny#a$|$hqM*7c~Y!rv;gP@QP|By@0NdUiuC?bO3^QDK?64?cdgX?soobJtz2;8Q8Q9(80wHEkcgr=HR3N2-q1Msj20F<(pI5TR@VzaT7#?U{LQ5*Qb@LC z&2V8{B@5zyV2p31p6JkCrN}7nGZAoTi1ao9(zWOy`44#j%=jS4C z4os%UP0(64-5)luOUfucusQ%@b-3Oeq`|Z#4~M+evCN>e!1Cm|!V(k84Y)|oIj@5D zs+-7?9=fpA@;;Rn_vv1HhkKd|Th>+Up*|ov0G0G-Wd&S+S8eu3@wg?QsnXw-JptWp(C%|vxbUk3$i?OR+H5m%+q~At?e~$U zQe~mlXIQ`?KpFbWSR-^vhwj!a@SIf^uJ)|Rmxn%~3yozT)Yy~36AzZjF9KK1`*3nj z4p3vY`W41nukcR;ms^>nls9S9mW)dpw=r<}@Gf|y0sviO7B!aEaRXMxi5Ky}3-aE% zuyo$P;8eEp8Et-=NI^Ww^%cC91_pDRu1p15Xd5e-W~!Wz%o-RIuB-r-#C(X^me&d? zB#a4V4K71+)|8W>WK?z%GCvCvLd^EVU$eM{9E3uu{bcF7az5@j&R0t9ELkOQ5%rkO zAzOXC4S$9`8!-ojkjGA0d3p}e9xL` z;48wNy2Y*WH^4-Fdq#1L_qB)YeP2Hv;}3m8jCIY2{s6njtO5Xi3;>88vafJjz(>PE z5SF?gvM(V{KOX;po^s~jQrAQF4e($#i{PPdo$JSf@-FNLkxS7b-(AT_kYCV|^r7Gt zrK=UVU7Vqb@-FPh;DL=H9NrKpWi zrQB!;8M>}N6Ow7kfq$pV`ajv#?4jD}bUK|*r_Ms8h6%_g~K00000NkvXXu0mjfV@m=f literal 1873 zcmb7_`#aN%1IOidI)=jdX2NMGj$3C79ZM6_Ou2Iilib=clY3G+VkMVT#++iVu^dM9 z!Q45KT&7`$xqVr(8JSWp$K~7iKlpy1=k>gw_w&4-=l$zD&B*~RCj*fY6BCoe*rHs- z#Ey7%EouB7@SQf0XCZ^tvu>U2L zZW0rd{)9nYa*OA#6%4vUFekcNLsU|D(Q>cuglQiqvUfYAuw`?8*vz?}m#58~9<-XV z$Nx>>Z0`}9?i9|RJysQ5jBvkRnf;G< zf!sN)`c&x7#}r-rbfm9VIP+qxas@rHQtQ@|s|xWkP#$`&9#}`&b3-(x=x(=M%M73C z#_w1CM4)Smrvnm8xD6EsC6OL9%yb;0oRj zdLJ|YEmfsRuFi0N_2l}&@gebUlmgcUi?RT^BG#XKNXO~$#_<;-7cqiso|TkqCY9>#iY~kD)|ZvC0p7%mn-SwYqicA9HknLi3Yg1 z_dp~6So}mGIh2Qn7I8#w@Fa+6@$1p!wAs!a z2cf=|h+-TGL~SlSa^r3p*;9H(g9U%cJp(#yj@DJ!9DWJT;`i!T)|+TGaPllNBmUVT z`FiDGglR@$Kg9TOrA_tf>QLIF4tLI;dOo_fDA}SpZGJG4ixyU{`THbNf)3kWY$L)Y0`PwG*12wl#5|)1n6+1s zn7G+l?6|3#XF6hf#mYO}NmM3&7f5zD8DOjo^pO^vT zq{x1oq+QxoVE787$u#);6qyQ=t~MVPwnGcC;n#rM7$B<|E1<%}e0-5DY628f2{}OU z4%WsD{fSa4@Ms?$kw)~P{b}8DVUGK{f9epKqLbmUdM4Q_9=?povvewf!J&Dk=nR%T zTYMoB9xOXa94J>#-?8GQg?E(-wlr2V^>R($xGO%)n9#eP61b482qeIde{;%+Y;`~x zP#eK4>-SB)x_MJmP!~&L%-;K#!!G?YN~f-w-OFp*;u-leLg z06a?3C)xSoh47>{)S8NAZv(mROvlhF8JjkoKMPJ3W3|5RMs7O8$>XTcmlh&w9 zd27Zap=f0?f&f~K8b1pVO*|>yyI+gaxfRqO!mF5;eVuep{6Qp>z;|E4FbOd3N2e<- zfU?Q5uO&v#6UH5mXjVf&OV?rBdCB#z70a$dQU9e~?9C-e8JJ<=`S_{iJhp?D-hBFCWj~@zxM^_S9sY z>#ukm+j(z5(FP~c5>ytHdM?YdJnAEOD*#^<6NLL3cdO+IUKgdt{o=S|NwfpHr4aKv zLc5VgFE{+2YL(3uEqcTZja{Q{yM8*8Wp`ke5Ql$(PVXGI)~YIdpdQ=E9_u6?1q_sFcI^j}*h$IG}2*{F46zfYzN4 diff --git a/src/components/commentsDisplay/view/commentsDisplayView.js b/src/components/commentsDisplay/view/commentsDisplayView.js index 173239d1a..7bd1ec401 100644 --- a/src/components/commentsDisplay/view/commentsDisplayView.js +++ b/src/components/commentsDisplay/view/commentsDisplayView.js @@ -32,15 +32,15 @@ class CommentsDisplayView extends PureComponent { const { author, permlink, commentCount, fetchPost, } = this.props; - + //TODO: implement comments filtering return ( {commentCount > 0 && ( diff --git a/src/components/filterBar/view/filterBarView.js b/src/components/filterBar/view/filterBarView.js index 1b1c7ddd9..3ccbecb24 100644 --- a/src/components/filterBar/view/filterBarView.js +++ b/src/components/filterBar/view/filterBarView.js @@ -22,6 +22,7 @@ const FilterBarView = ({ iconSize, isHide, onDropdownSelect, + pageType, onRightIconPress, options, rightIconName, diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index e184280df..121753e81 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -12,8 +12,8 @@ import { getPostsSummary } from '../../../providers/steem/dsteem'; import { PostCard } from '../../postCard'; import { FilterBar } from '../../filterBar'; import { PostCardPlaceHolder, NoPost } from '../../basicUIElements'; +import {filters, profile_filters} from '../../../constants/options/filters'; -import filters from '../../../constants/options/filters.json'; // Styles import styles from './postsStyles'; import { default as ROUTES } from '../../../constants/routeNames'; @@ -21,6 +21,7 @@ import { default as ROUTES } from '../../../constants/routeNames'; class PostsView extends Component { constructor(props) { super(props); + const { selectedOptionIndex } = this.props; this.state = { posts: [], startAuthor: '', @@ -29,7 +30,7 @@ class PostsView extends Component { isLoading: false, isPostsLoading: true, isHideImage: false, - selectedFilterIndex: 0, + selectedFilterIndex: selectedOptionIndex||0, isNoPost: false, }; } @@ -79,25 +80,32 @@ class PostsView extends Component { }; _loadPosts = () => { - const { getFor, tag, currentAccountUsername } = this.props; + + const { getFor, tag, currentAccountUsername, pageType } = this.props; const { posts, startAuthor, startPermlink, refreshing, selectedFilterIndex, } = this.state; - const filter = selectedFilterIndex !== 0 ? filters[selectedFilterIndex] : getFor; + const filter = pageType === 'posts' ? filters[selectedFilterIndex].toLowerCase() : profile_filters[selectedFilterIndex].toLowerCase(); let options; let newPosts = []; this.setState({ isLoading: true }); - - if ((!filter && tag) || filter === 'feed' || getFor === 'blog') { + if ((!filter && tag) || filter === 'feed' || filter === 'blog' || getFor === 'blog') { options = { tag, limit: 3, }; } else { - options = { - limit: 3, - }; + if (filter=='reblogs'){ + options = { + tag, + limit: 3, + }; + } else { + options = { + limit: 3, + }; + } } if (startAuthor && startPermlink && !refreshing) { @@ -110,9 +118,18 @@ class PostsView extends Component { if (result.length > 0) { let _posts = result; + if (filter==='reblogs') { + for (var i = _posts.length - 1; i >= 0; i--) { + if (_posts[i].author === currentAccountUsername) { + _posts.splice(i, 1); + } + } + } if (_posts.length > 0) { if (posts.length > 0) { if (refreshing) { + //TODO: make sure post is not duplicated, because checking with `includes` might re-add post + //if there was change in post object from blockchain newPosts = _posts.filter(post => posts.includes(post)); _posts = [...newPosts, ...posts]; } else { @@ -126,6 +143,7 @@ class PostsView extends Component { posts: _posts, }); } else if (!refreshing) { + this.setState({ posts: _posts, startAuthor: result[result.length - 1] && result[result.length - 1].author, @@ -215,6 +233,7 @@ class PostsView extends Component { } = this.state; const { filterOptions, + selectedOptionIndex, intl, isLoggedIn, getFor, @@ -229,8 +248,8 @@ class PostsView extends Component { )} - {filters[selectedFilterIndex] === 'feed' + {profile_filters[selectedFilterIndex] === 'feed' && getFor === 'feed' && !isLoggedIn && isLoginDone && ( diff --git a/src/constants/options/filters.js b/src/constants/options/filters.js new file mode 100644 index 000000000..7bd194143 --- /dev/null +++ b/src/constants/options/filters.js @@ -0,0 +1,2 @@ +export const filters = ["TRENDING", "HOT", "CREATED", "ACTIVE", "PROMOTED", "VOTES", "CHILDREN"]; +export const profile_filters = ["BLOG","FEED"]; diff --git a/src/constants/options/filters.json b/src/constants/options/filters.json deleted file mode 100644 index f27d5a224..000000000 --- a/src/constants/options/filters.json +++ /dev/null @@ -1 +0,0 @@ -["feed", "trending", "hot", "created", "active", "promoted", "votes", "children"] diff --git a/src/screens/home/screen/homeScreen.js b/src/screens/home/screen/homeScreen.js index b60c65a94..1a28efe27 100644 --- a/src/screens/home/screen/homeScreen.js +++ b/src/screens/home/screen/homeScreen.js @@ -12,6 +12,9 @@ import { Header } from '../../../components/header'; // Styles import styles from './homeStyles'; +import {filters, profile_filters} from '../../../constants/options/filters'; + + class HomeScreen extends PureComponent { constructor(props) { super(props); @@ -33,6 +36,7 @@ class HomeScreen extends PureComponent { 'COMMENTS', 'PAYOUT', ]; + let tag; if (isLoginDone && !isLoggedIn) { @@ -62,9 +66,11 @@ class HomeScreen extends PureComponent { style={styles.tabbarItem} > - + diff --git a/src/screens/profile/screen/profileScreen.js b/src/screens/profile/screen/profileScreen.js index 37ffbe35a..f640c60df 100644 --- a/src/screens/profile/screen/profileScreen.js +++ b/src/screens/profile/screen/profileScreen.js @@ -12,6 +12,7 @@ import { Posts } from '../../../components/posts'; import { ProfileSummary } from '../../../components/profileSummary'; import { TabBar } from '../../../components/tabBar'; import { Wallet } from '../../../components/wallet'; +import {profile_filters} from '../../../constants/options/filters'; // Utilitites import { getFormatedCreatedDate } from '../../../utils/time'; @@ -25,7 +26,7 @@ class ProfileScreen extends PureComponent { super(props); this.state = { isSummaryOpen: true, - collapsibleMoreHeight: 0, + collapsibleMoreHeight: 0 }; } @@ -65,7 +66,11 @@ class ProfileScreen extends PureComponent { user, username, } = this.props; + const { isSummaryOpen, collapsibleMoreHeight } = this.state; + + let filters=profile_filters; + let _about; let coverImage; let location; @@ -151,7 +156,9 @@ class ProfileScreen extends PureComponent { style={styles.postTabBar} > { } if (imageLink) { - return `https://img.esteem.app/600x0/${imageLink}`; + return `https://steemitimages.com/600x0/${imageLink}`; } return ''; };