Skip to content

Commit

Permalink
merge code
Browse files Browse the repository at this point in the history
  • Loading branch information
leon9665 committed Jul 14, 2020
2 parents c63a9bd + e720a4b commit f301e73
Show file tree
Hide file tree
Showing 3 changed files with 227 additions and 8 deletions.
Binary file added src/app/assets/images/poloniex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
193 changes: 193 additions & 0 deletions src/app/assets/images/poloniex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 34 additions & 8 deletions src/app/components/pages/Post.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import GptAd from 'app/components/elements/GptAd';
import { isLoggedIn } from 'app/utils/UserUtil';
import { recordAdsView } from 'app/utils/ServerApiClient';
import SteemMarket from 'app/components/elements/SteemMarket';
import SvgImage from 'app/components/elements/SvgImage';

import Icon from 'app/components/elements/Icon';

function isEmptyPost(post) {
Expand Down Expand Up @@ -62,10 +64,10 @@ class Post extends React.Component {
showAnywayClick = () => {
this.setState({ showAnyway: true });
};
setRecordAdsView() {
setRecordAdsView(tag) {
recordAdsView({
trackingId: this.props.trackingId,
adTag: 'SteemitDlivebanner240*240Post',
adTag: tag,
});
}

Expand Down Expand Up @@ -216,7 +218,11 @@ class Post extends React.Component {
<a
href="https://dlive.tv/"
target="_blank"
onClick={this.setRecordAdsView}
onClick={() =>
this.setRecordAdsView(
'SteemitDlivebanner240*240Post'
)
}
>
<img
src="/images/dlive.png"
Expand All @@ -230,11 +236,31 @@ class Post extends React.Component {
<div className="row">
<div className="column">{postBody}</div>
</div>
{/* <div style={{margin: 'auto', maxWidth: '75rem'}}>
<a href="https://poloniex.com/" target="_blank">
<img src="" alt="" width="1200" height="120" />
</a>
</div> */}
<div className="row">
<div className="column">
<div
style={{
margin: '0.5rem auto 0',
maxWidth: '54rem',
}}
>
<a
href="https://poloniex.com/"
target="_blank"
onClick={() =>
this.setRecordAdsView(
'SteemitPoloniexbanner864*86Post'
)
}
>
<SvgImage
name="poloniex"
width="100%"
/>
</a>
</div>
</div>
</div>
{false &&
!isLoggedIn() && (
<div className="row">
Expand Down

0 comments on commit f301e73

Please sign in to comment.