diff --git a/src/client/components/Navigation/Topnav.js b/src/client/components/Navigation/Topnav.js
index d9bfb48f4e..5b18fb15f3 100644
--- a/src/client/components/Navigation/Topnav.js
+++ b/src/client/components/Navigation/Topnav.js
@@ -4,7 +4,7 @@ import _ from 'lodash';
import { injectIntl, FormattedMessage } from 'react-intl';
import { withRouter, Link } from 'react-router-dom';
import { connect } from 'react-redux';
-import { Menu, Input, AutoComplete, Dropdown, Icon, Tooltip, Alert } from 'antd';
+import { Menu, Input, AutoComplete, } from 'antd';
import classNames from 'classnames';
import { searchAutoComplete } from '../../search/searchActions';
import { getUpdatedSCUserMetadata } from '../../auth/authActions';
@@ -164,11 +164,6 @@ class Topnav extends React.Component {
const displayBadge = notificationsCount > 0;
const notificationsCountDisplay = notificationsCount > 99 ? '99+' : notificationsCount;
- const SubMenu = Menu.SubMenu;
- const MenuItemGroup = Menu.ItemGroup;
-
-
-
return (
{},
notify: () => {},
replace: () => {},
+ isFetchingFollowingList: () => {},
};
constructor(props) {
@@ -96,7 +100,10 @@ class Write extends React.Component {
initialUpdatedDate: Date.now(),
isUpdating: false,
showModalDelete: false,
+ certifiedUloggers: [],
};
+
+ this.getCertifiedUloggers = this.getCertifiedUloggers.bind(this);
}
componentDidMount() {
@@ -135,6 +142,10 @@ class Write extends React.Component {
} else {
this.draftId = uuidv4();
}
+
+ if (!this.props.isFetchingFollowingList) {
+ this.getCertifiedUloggers();
+ }
}
componentWillReceiveProps(nextProps) {
@@ -165,6 +176,10 @@ class Write extends React.Component {
initialTopics,
});
}
+
+ if (!nextProps.isFetchingFollowingList) {
+ this.getCertifiedUloggers();
+ }
}
componentDidUpdate(prevProps) {
@@ -219,6 +234,22 @@ class Write extends React.Component {
return data;
};
+ getCertifiedUloggers() {
+ steemAPI
+ .sendAsync('call', ['condenser_api', 'get_following', ['uloggers', '', 'blog', 100]])
+ .then(result => {
+ const certifiedUloggers = _.sortBy(result, 'following')
+ .map(user => {
+ let name = _.get(user, 0);
+ if (_.isEmpty(name)) {
+ name = _.get(user, 'following');
+ }
+ return name;
+ });
+ this.setState({ certifiedUloggers });
+ });
+ }
+
handleCancelDeleteDraft = () => this.setState({ showModalDelete: false });
saveDraft = _.debounce(form => {
@@ -235,9 +266,22 @@ class Write extends React.Component {
const redirect = id !== this.draftId;
const editorUrl = this.props.location.pathname.split('/')[1];
- this.props.saveDraft({ postData: data, id: this.draftId, editorUrl: editorUrl }, redirect, this.props.intl);
+ this.props.saveDraft({ postData: data, id: this.draftId, editorUrl }, redirect, this.props.intl);
}, 2000);
+ /*
+ * Display a coming soon message when user clicks on any "Click Here" button
+ */
+ handleExtraMonetization = () => {
+ const { user } = this.props
+
+ if (this.state.certifiedUloggers.indexOf(user.name) >= 0) {
+ message.success('Coming soon!', 3);
+ } else {
+ message.success("This feature is only available to 'certified uloggers'. Click here to get certified!!", 3);
+ }
+ }
+
render() {
const { initialTitle, initialTopics, initialBody, initialReward, initialUpvote } = this.state;
const { loading, saving, draftId } = this.props;
@@ -292,6 +336,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
@@ -312,6 +357,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
@@ -332,6 +378,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
@@ -352,6 +399,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
@@ -372,6 +420,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
@@ -392,6 +441,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
@@ -412,6 +462,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
@@ -432,6 +483,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
@@ -452,6 +504,7 @@ class Write extends React.Component {
onUpdate={this.saveDraft}
onSubmit={this.onSubmit}
onDelete={this.onDelete}
+ handleExtraMonetization={this.handleExtraMonetization}
/>
)}
/>
diff --git a/src/common/routes.js b/src/common/routes.js
index 889dae7b6f..5bf0c1b220 100644
--- a/src/common/routes.js
+++ b/src/common/routes.js
@@ -69,7 +69,6 @@ const routes = [
'/(editor|main-editor|teardrops|untalented|fanlove|ulog-ned|ulog-surpassinggoogle|ulog-diy|ulog-howto|ulog-quotes)',
exact: true,
component: Editor,
- exact: true,
},
{
path: '/settings',
diff --git a/yarn.lock b/yarn.lock
index b434ae84f5..410d67f4c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2664,6 +2664,11 @@ dot-prop@^4.1.0:
dependencies:
is-obj "^1.0.0"
+dotenv@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
+ integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+
draft-js@^0.10.0, draft-js@~0.10.0:
version "0.10.5"
resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.10.5.tgz#bfa9beb018fe0533dbb08d6675c371a6b08fa742"