Merge pull request #11 from weyoume/devHaz

Chain Relaunch Updates - New Year, New chain

.env

@@ -6,7 +6,7 @@ DOMAIN='io'
 # SUBDOMAIN_PARSED=$(if [ ! -z "$SUBDOMAIN" ] ; then echo $SUBDOMAIN'.' ; fi)
 # URL=$CLIENT_PROTOCOL$SUBDOMAIN_PARSED$BRAND'.'$DOMAIN
 URL=https://alpha.weyoume.io
-AUTH_API_CLIENT_ID=alpha.weyoume
+AUTH_API_CLIENT_ID=weyoume.alpha
 # AUTH_API_REDIRECT_URL=$URL':'$SSR_PORT'/callback'
 AUTH_API_REDIRECT_URL=https://alpha.weyoume.io/callback
 API_URL=https://node.weyoume.io

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Busy
+WeYouMe 2019
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,24 +1,28 @@
-[![CircleCI Build Status](https://circleci.com/gh/busyorg/busy.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/busyorg/busy)
-[![Crowdin](http://d322cqt584bo4o.cloudfront.net/busy/localized.svg)](https://translate.busy.org/project/busy)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/busyorg/busy/new-design/LICENSE)
-[![Busy channel on Discord](https://img.shields.io/badge/chat-discord-738bd7.svg)](https://discord.gg/G95rNZs)
+[![WeYouMe channel on Discord](https://img.shields.io/badge/chat-discord-738bd7.svg)](https://discord.gg/QztnDQc)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com)
 
-# Busy 🚀
+# WeYouMe App - https://alpha.weyoume.io
 
-Busy is an Open Source social network and communications platform which extends itself to a variety of rich features and functionality including free digital payments and a marketplace for goods and services.
+### WeYouMe is the next generation of social media. 
 
-For more info: https://busy.org/@busy.org
+* It is a blockchain protocol to enable everyone to share information and value freely. 
+* Creators earn cryptocurrency when they upload great content, and control their own data. 
+* Social media should be a driver of positive change and individual freedom.
+
+For more info: https://www.weyoume.io
+
+Visit the testnet and try it out at https://alpha.weyoume.io
 
 ## Preview
 
-![Preview](https://user-images.githubusercontent.com/16245250/35974135-6fe56d5a-0d0a-11e8-99f6-a90d59696f82.png)
+![Preview](https://ipfs.busy.org/ipfs/QmZRjP1aPYKznYW4FUadJnUsAKvmGyzqqD1n2fbWi2XFrs)
 
 ## Quick Setup
 
 ```bash
-git clone https://github.com/busyorg/busy.git
-cd busy
+git clone https://github.com/weyoume/weapp.git
+cd weapp
 
 yarn
 yarn dev
@@ -27,8 +31,8 @@ yarn dev
 ## Production build
 
 ```bash
-git clone https://github.com/busyorg/busy.git
-cd busy
+git clone https://github.com/weyoume/weapp.git
+cd weapp
 
 yarn
 yarn build
@@ -37,12 +41,19 @@ yarn start
 
 ## Getting involved
 
-We at Busy really appreciate help from the community. We want to make the Busy project as friendly as possible to contributors. It doesn't matter if you are a beginner looking for a place to improve your skills or just want to help us build something great.
+We at WeYouMe really appreciate help from the community. We want to make WeYouMe as friendly as possible to contributors. It doesn't matter if you are a beginner looking for a place to improve your skills or just want to help us build something great.
 If you would like to contribute, but don't know what to work on, check our [Contributing guide][contributing].
 
+## Preliminary ICO contributors
+
+WeYouMe is funded by the contributors to the preliminary ICO conducted in 2018, who hold the EZIRA bitshares asset.
+Holders of EZIRA will recieve mainnet WYM when the network is launched.
+[Thank you to all EZIRA holders for making this project possible.](http://www.bts.ai/a/EZIRA)
+[You can purchase EZIRA from Bitshares](https://exchange.weyoume.io/market/EZIRA_BTS)
+
 ## Backers
 
-Busy is an MIT-licensed open source project. It's an independent project with its ongoing development made possible entirely thanks to the support by these awesome backers.
+The WeYouMe Alpha is based on [Busy](https://busy.org), which is an MIT-licensed open source project. It's an independent project with its ongoing development made possible entirely thanks to the support by these awesome backers.
 
 [@steemit](https://busy.org/@steemit)
 [@smooth](https://busy.org/@smooth)
@@ -79,9 +90,4 @@ Busy is an MIT-licensed open source project. It's an independent project with it
 [@buzzbeergeek](https://busy.org/@buzzbeergeek)
 [@timcliff](https://busy.org/@timcliff)
 
-## Partners
-
-[![](https://res.cloudinary.com/hpiynhbhq/image/upload/v1507199425/hevqheh9nltx0dfbuvo8.png)](https://crowdin.com/project/busy)  
-[![](https://res.cloudinary.com/hpiynhbhq/image/upload/v1507199050/fqxowyhiwlj9vhb5wdue.png)](https://www.browserstack.com/)
-
 [contributing]: ./docs/CONTRIBUTING.md

docs/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-## Contributing to Busy
+## Contributing to WeYouMe
 
 Want to get involved in Busy development? Thanks! There are plenty of ways you can help!
 
@@ -22,7 +22,7 @@ Please take a moment to review this document in order to make the contribution p
 
 ### Using the issue tracker
 
-The [issue tracker](https://github.com/busyorg/busy/issues) is the preferred channel
+The [issue tracker](https://github.com/weyoume/weapp/issues) is the preferred channel
 for [bug reports](#bug-reports), [features requests](#feature-requests) and [submitting pull requests](#pull-requests).
 
 ### Bug reports

docs/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,5 @@
-Fixes #
-
 ### Changes
 
-Summary of changes you made.
-
 * Change 1
 * Change 2
-
-### Test plan
-
-Explain how to test changes you made.
-
-* [ ] Step 1
-* [ ] Step 2
-
-### Demo (optional)
-
-Sreenshots (before & after) or video that show result of your work.
+* Change 3

src/client/components/Avatar.js

@@ -54,7 +54,6 @@ class Avatar extends React.Component {
 				if(!err && res){
 					let profile = res[0].json ? JSON.parse(res[0].json)['profile'] : undefined
 					let profilePicture = profile ? profile['profile_image'] : undefined
-					console.log('profilePicture', profilePicture)
 					this.setState({
 						profilePicture: profilePicture
 					})

src/client/components/BBackTop.less

@@ -2,12 +2,16 @@
 @import (reference) '../styles/modules/variables.less';
 
 .BBackTop {
+  @media @small {
+    display: none;
+  }
   position: fixed;
   width: 100%;
   height: 0px;
   bottom: 60px;
   right: 20px;
   z-index: @backtop-z-index;
+
 
   .BBackTop__container {
     position: relative;

src/client/components/Button/Action.less

@@ -11,7 +11,7 @@
   border-radius: 14px;
   align-items: center;
   &--primary {
-		.colorize-button(@primary-color, @primary-button-border);
+		.colorize-button(@primary-color, @primary-color);
 
     color: @white-darker;
 

src/client/components/Navigation/Sidenav.js

@@ -12,6 +12,7 @@ const isHot = (match, location) => location.pathname.match(/hot/);
 const isReplies = (match, location) => location.pathname.match(/replies/);
 const isPics = (match, location) => location.pathname.match(/pics/);
 const isFeed = (match, location) => location.pathname.match(/feed/);
+const isDiscover = (match, location) => location.pathname.match(/discover/);
 
 const Sidenav = ({ username }) =>
 	<ul className="Sidenav">
@@ -54,6 +55,12 @@ const Sidenav = ({ username }) =>
 				<FormattedMessage id="pics" defaultMessage="Pictures" />
 			</NavLink>
 		</li>
+		<li>
+			<NavLink to="/discover" activeClassName="Sidenav__item--active" exact isActive={isDiscover}>
+				<i className="iconfont icon-addressbook" />
+				<FormattedMessage id="discover" defaultMessage="Discover" />
+			</NavLink>
+		</li>
 
 		{ username ? (
 		<li>
@@ -83,12 +90,23 @@ const Sidenav = ({ username }) =>
 			</li>
 		) : null }
 		<li>
-			<a href="https://exchange.weyoume.io" >
+			<a href="https://exchange.weyoume.io/market/EZIRA_BTS" target='_blank'>
 				<i className="iconfont icon-chart" />
 				<FormattedMessage id="exchange" defaultMessage="Exchange" />
 			</a>
 		</li>
-
+		<li>
+			<a href="https://t.me/WeYouMeNetwork" target='_blank' >
+				<i className="iconfont icon-message" />
+				<FormattedMessage id="messenger" defaultMessage="Telegram" />
+			</a>
+		</li>
+		<li>
+			<a href="https://discord.gg/QztnDQc" target='_blank' >
+				<i className="iconfont icon-interactive_fill" />
+				<FormattedMessage id="messenger" defaultMessage="Discord" />
+			</a>
+		</li>
 		<li>
 			<div className="floating-label-container">
 				<div className="floating-label-positioner">
@@ -102,20 +120,6 @@ const Sidenav = ({ username }) =>
 				<FormattedMessage id="Groups" defaultMessage="Groups" />
 			</NavLink>
 		</li>
-		<li>
-			<div className="floating-label-container">
-				<div className="floating-label-positioner">
-					<div className="floating-label">
-						<span>soon</span>
-					</div>
-				</div>
-			</div>
-			<NavLink to="/apps" activeClassName="Sidenav__item--active" isActive={function(){return false}}>
-				{/* <i className="iconfont icon-manage" /> */}
-				<i className="iconfont icon-mobilephone_fill" />
-				<FormattedMessage id="apps" defaultMessage="Apps" />
-			</NavLink>
-		</li>
 		<li>
 			<div className="floating-label-container">
 				<div className="floating-label-positioner">
@@ -129,19 +133,6 @@ const Sidenav = ({ username }) =>
 				<FormattedMessage id="marketplace" defaultMessage="Marketplace" />
 			</NavLink>
 		</li>
-		<li>
-			<div className="floating-label-container">
-				<div className="floating-label-positioner">
-					<div className="floating-label">
-						<span>soon</span>
-					</div>
-				</div>
-			</div>
-			<NavLink to="/events" activeClassName="Sidenav__item--active" isActive={function(){return false}}>
-				<i className="iconfont icon-remind_fill" />
-				<FormattedMessage id="events" defaultMessage="Events" />
-			</NavLink>
-		</li>
 		<li>
 			<div className="floating-label-container">
 				<div className="floating-label-positioner">
@@ -155,32 +146,6 @@ const Sidenav = ({ username }) =>
 				<FormattedMessage id="boards" defaultMessage="Boards" />
 			</NavLink>
 		</li>
-		<li>
-			<div className="floating-label-container">
-				<div className="floating-label-positioner">
-					<div className="floating-label">
-						<span>soon</span>
-					</div>
-				</div>
-			</div>
-			<NavLink to="/feeds" activeClassName="Sidenav__item--active" isActive={function(){return false}}>
-				<i className="iconfont icon-keyboard" />
-				<FormattedMessage id="feeds" defaultMessage="Feeds" />
-			</NavLink>
-		</li>
-		<li>
-			<div className="floating-label-container">
-				<div className="floating-label-positioner">
-					<div className="floating-label">
-						<span>soon</span>
-					</div>
-				</div>
-			</div>
-			<NavLink to="/messenger" activeClassName="Sidenav__item--active" isActive={function(){return false}}>
-				<i className="iconfont icon-interactive_fill" />
-				<FormattedMessage id="messenger" defaultMessage="Messenger" />
-			</NavLink>
-		</li>
 		<li>
 			<div className="floating-label-container">
 				<div className="floating-label-positioner">

src/client/components/Navigation/Topnav.js

@@ -140,9 +140,9 @@ class Topnav extends React.Component {
               <FormattedMessage id="login" defaultMessage="Log in" />
             </a>
           </Menu.Item>
-          <Menu.Item key="language">
+          {/* <Menu.Item key="language">
             <LanguageSettings />
-          </Menu.Item>
+          </Menu.Item> */}
         </Menu>
       </div>
     );
@@ -346,8 +346,6 @@ class Topnav extends React.Component {
   render() {
     const { intl, autoCompleteSearchResults } = this.props;
     const { searchBarActive, searchBarValue } = this.state;
-
-		// console.log('autoCompleteSearchResults', autoCompleteSearchResults)
     const dropdownOptions = _.map(autoCompleteSearchResults, option => (
       <AutoComplete.Option key={option.replace(/^@/ig, '')} value={option.replace(/^@/ig,'')} className="Topnav__search-autocomplete">
         {'@'+option}

src/client/components/Navigation/Topnav.less

@@ -35,7 +35,7 @@
   }
 
   &__postButton {
-    .colorize-button(@primary-color, @primary-button-border);
+    .colorize-button(@primary-color, @primary-color);
     border-radius: 14px;
     align-items: center;
     color: @white-darker;