Merged Feeds - Network Monitor - About - Promotion Button - Follow Box

package.json

@@ -73,6 +73,7 @@
     "lightrpc": "0.0.1",
     "lodash": "^4.0.0",
     "matchmedia": "^0.1.2",
+    "npm": "^5.6.0",
     "npm-run-all": "^4.0.2",
     "prop-types": "^15.6.1",
     "react": "^16.2.0",

public/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#ffc40d</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

public/index.html

@@ -17,7 +17,13 @@
   <meta name=description content="WeYouMe is a decentralized blockchain social network">
   <meta id=viewport name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" />
   <meta http-equiv=Content-Type content="text/html; charset=utf-8" />
-  <link rel=manifest href=/manifest.json />
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+  <link rel="manifest" href="/site.webmanifest">
+  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+  <meta name="msapplication-TileColor" content="#ffc40d">
+  <meta name="theme-color" content="#312323">
   <!--server:header-->
   <script>
     ! function () {

public/site.webmanifest

@@ -0,0 +1,23 @@
+{
+    "name": "WeYouMe",
+    "short_name": "WeYouMe",
+    "description": "WeYouMe is a decentralized blockchain social network",
+    "theme_color": "#4757b2",
+    "background_color": "#fcfcff",
+    "display": "standalone",
+    "Scope": "/",
+    "start_url": "/",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
+
+}

src/client/Wrapper.js

@@ -20,7 +20,7 @@ import {
   getNightmode,
 } from './reducers';
 import { login, logout, busyLogin } from './auth/authActions';
-import { getFollowing, getNotifications } from './user/userActions';
+import { getFollowing, getNotifications, getNetworkUserList } from './user/userActions';
 import {
   getRate,
   getRewardFund,
@@ -50,6 +50,7 @@ import BBackTop from './components/BBackTop';
   {
     login,
     logout,
+    getNetworkUserList,
     getFollowing,
     getNotifications,
     getRate,
@@ -72,6 +73,7 @@ export default class Wrapper extends React.PureComponent {
     login: PropTypes.func,
     logout: PropTypes.func,
     getFollowing: PropTypes.func,
+    getNetworkUserList: PropTypes.func,
     getRewardFund: PropTypes.func,
     getRebloggedList: PropTypes.func,
     getRate: PropTypes.func,
@@ -89,6 +91,7 @@ export default class Wrapper extends React.PureComponent {
     login: () => {},
     logout: () => {},
     getFollowing: () => {},
+    getNetworkUserList: () => {},
     getRewardFund: () => {},
     getRebloggedList: () => {},
     getRate: () => {},
@@ -138,6 +141,7 @@ export default class Wrapper extends React.PureComponent {
   componentDidMount() {
     this.props.login().then(() => {
       this.props.getFollowing();
+      this.props.getNetworkUserList();
       this.props.getNotifications();
       this.props.busyLogin();
     });
@@ -196,19 +200,25 @@ export default class Wrapper extends React.PureComponent {
         this.props.history.push('/settings');
         break;
 			case 'feed':
-        this.props.history.push('/feed');
+        this.props.history.push(`/feed-${this.props.username}/feed-${this.props.username}`);
         break;
 			case 'hot':
-        this.props.history.push('/hot');
-        break;
-			case 'news':
-        this.props.history.push('/trending');
+        this.props.history.push('/hot-all/hot-all');
         break;
 			case 'trending':
-        this.props.history.push('/trending');
+        this.props.history.push('/trending-all/trending-all');
+        break;
+      case 'boards':
+        this.props.history.push('/boards');
+        break;
+      case 'discover':
+        this.props.history.push('/discover');
         break;
 			case 'wallet':
         this.props.history.push('/wallet');
+        break;
+      case 'network':
+        this.props.history.push('/network');
         break;
 			case 'edit-profile':
         this.props.history.push('/edit-profile');

src/client/app/Sidebar/Navigation.js

@@ -13,7 +13,7 @@ import Sidenav from '../../components/Navigation/Sidenav';
 const Navigation = ({ authenticatedUser, trendingTopicsLoading, trendingTopics }) => (
   <div>
     <Sidenav username={authenticatedUser.name} />
-    {/* <Topics loading={trendingTopicsLoading} topics={trendingTopics} /> */}
+    <Topics loading={trendingTopicsLoading} topics={trendingTopics} />
   </div>
 );
 

src/client/app/Sidebar/RightSidebar.js

@@ -8,7 +8,9 @@ import {
   getIsAuthFetching,
   getRecommendations,
   getFollowingList,
+  getNetworkUserList,
   getIsFetchingFollowingList,
+  getIsFetchingNetworkUserList,
 } from '../../reducers';
 import { updateRecommendations } from '../../user/userActions';
 import InterestingPeople from '../../components/Sidebar/InterestingPeople';
@@ -29,8 +31,10 @@ import FeedSidebar from '../../components/Sidebar/FeedSidebar';
     recommendations: getRecommendations(state),
     followingList: getFollowingList(state),
     isFetchingFollowingList: getIsFetchingFollowingList(state),
+    isFetchingNetworkUserList: getIsFetchingNetworkUserList(state),
   }),
   {
+    getNetworkUserList,
     updateRecommendations,
   },
 )
@@ -44,6 +48,7 @@ export default class RightSidebar extends React.Component {
     updateRecommendations: PropTypes.func,
     followingList: PropTypes.arrayOf(PropTypes.string).isRequired,
     isFetchingFollowingList: PropTypes.bool.isRequired,
+    isFetchingNetworkUserList: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -61,6 +66,7 @@ export default class RightSidebar extends React.Component {
       isAuthFetching,
       followingList,
       isFetchingFollowingList,
+      isFetchingNetworkUserList
     } = this.props;
 
     if (isAuthFetching) {
@@ -74,12 +80,9 @@ export default class RightSidebar extends React.Component {
           <Route path="/activity" component={UserActivitySearch} />
           <Route path="/@:name/activity" component={UserActivitySearch} />
           <Route path="/@:name/transfers" render={() => <WalletSidebar />} />
-          <Route path="/trending/:tag" component={FeedSidebar} />
-          <Route path="/created/:tag" component={FeedSidebar} />
-          <Route path="/active/:tag" component={FeedSidebar} />
-          <Route path="/hot/:tag" component={FeedSidebar} />
-          <Route path="/promoted/:tag" component={FeedSidebar} />
-          {/* <Route
+          <Route path="/:sortBy1-:category1/:sortBy2-:category2" component={FeedSidebar} />
+
+           <Route
             path="/@:name"
             render={() =>
               authenticated && (
@@ -90,8 +93,8 @@ export default class RightSidebar extends React.Component {
                 />
               )
             }
-          /> */}
-          {/* <Route
+          />
+           <Route
             path="/"
             render={() => (
               <div>
@@ -101,13 +104,14 @@ export default class RightSidebar extends React.Component {
                   <InterestingPeople
                     users={this.props.recommendations}
                     onRefresh={this.handleInterestingPeopleRefresh}
+                    isFetchingNetworkUserList={isFetchingNetworkUserList}
                   />
                 ) : (
                   <div/>
                 )}
               </div>
             )}
-          /> */}
+          /> 
         </Switch>
         {showPostRecommendation && <PostRecommendation isAuthFetching={isAuthFetching} />}
       </div>

src/client/comments/Comments.js

@@ -151,6 +151,7 @@ export default class Comments extends React.Component {
       to: comment.author,
       amount: 1,
       memo: "Tip for comment: " + ellipsis(comment.body, 50, { ellipsis: '…' }),
+      currency: 'TME',
     };
     this.props.openTransfer(this.transfer);
   }

src/client/components/Button/Topic.js

@@ -49,7 +49,7 @@ class Topic extends React.Component {
           'Topic--favorite': favorite,
           'Topic--closing': this.state.closing,
         })}
-        to={`/trending/${name}`}
+        to={`/trending-${name}/hot-${name}`}
       >
         {name}
         {closable && (

src/client/components/CommentFooter/Buttons.js

@@ -243,7 +243,7 @@ class Buttons extends React.Component {
           </span>
         )}
          <span className="CommentFooter__link" >
-          <BTooltip title= "Send">
+          <BTooltip title= "Send Tip">
 				    <a role ="presentation" className={classNames('CommentFooter__link', {
               'CommentFooter__link--active': false})}
               onClick={this.handleTransferClick}>