diff --git a/src/app/components/pages/Post.jsx b/src/app/components/pages/Post.jsx
index 4a22fdda82..c0ccab9cb3 100644
--- a/src/app/components/pages/Post.jsx
+++ b/src/app/components/pages/Post.jsx
@@ -1,24 +1,24 @@
import React from 'react';
-// import ReactMarkdown from 'react-markdown';
import PropTypes from 'prop-types';
import Comment from 'app/components/cards/Comment';
import PostFull from 'app/components/cards/PostFull';
import { connect } from 'react-redux';
import { sortComments } from 'app/components/cards/Comment';
-// import { Link } from 'react-router';
import DropdownMenu from 'app/components/elements/DropdownMenu';
-import GptAd from 'app/components/elements/GptAd';
-import BiddingAd from 'app/components/elements/BiddingAd';
import { Set } from 'immutable';
import tt from 'counterpart';
import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';
import { serverApiRecordEvent } from 'app/utils/ServerApiClient';
import { INVEST_TOKEN_UPPERCASE } from 'app/client_config';
import { SIGNUP_URL } from 'shared/constants';
-
+import { GptUtils } from 'app/utils/GptUtils';
+import GptAd from 'app/components/elements/GptAd';
+import BiddingAd from 'app/components/elements/BiddingAd';
import { isLoggedIn } from 'app/utils/UserUtil';
+import Icon from 'app/components/elements/Icon';
+
class Post extends React.Component {
static propTypes = {
content: PropTypes.object.isRequired,
@@ -63,7 +63,47 @@ class Post extends React.Component {
}
const dis = content.get(post);
- if (!dis) return null;
+ // check if the post doesn't exist
+ // !dis may be enough but keep 'created' & 'body' test for potential compatibility
+ const emptyPost =
+ !dis ||
+ (dis.get('created') === '1970-01-01T00:00:00' &&
+ dis.get('body') === '');
+
+ if (emptyPost)
+ return (
+
+
+
+
+ Sorry! This page doesnt exist.
+
+
+ Not to worry. You can head back to{' '}
+
+ our homepage
+ , or check out some great posts.
+
+
+
+
+ );
// A post should be hidden if it is not pinned, is not told to "show
// anyway", and is designated "gray".
@@ -157,44 +197,6 @@ class Post extends React.Component {
link: selflink + '?sort=' + sort_orders[o] + '#comments',
});
}
- const emptyPost =
- dis.get('created') === '1970-01-01T00:00:00' &&
- dis.get('body') === '';
- if (emptyPost)
- return (
-
-
-
-
- Sorry! This page doesnt exist.
-
-
- Not to worry. You can head back to{' '}
-
- our homepage
- , or check out some great posts.
-
-
-
-
- );
return (
@@ -228,11 +230,21 @@ class Post extends React.Component {
)}
{this.props.gptEnabled ? (
-
+ {isLoggedIn() ? (
+
+ ) : (
+
+ )}
) : null}
{this.props.gptEnabled ? (
-
+ {/* TODO: Switch to Mobile Ad when, well, mobile! */}
+ {false ? (
+
+ ) : (
+
+ )}
) : null}
diff --git a/src/app/components/pages/PostsIndex.jsx b/src/app/components/pages/PostsIndex.jsx
index 4c1670877a..8a883207ba 100644
--- a/src/app/components/pages/PostsIndex.jsx
+++ b/src/app/components/pages/PostsIndex.jsx
@@ -11,11 +11,11 @@ import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';
import PostsList from 'app/components/cards/PostsList';
import { isFetchingOrRecentlyUpdated } from 'app/utils/StateFunctions';
import Callout from 'app/components/elements/Callout';
-// import SidebarStats from 'app/components/elements/SidebarStats';
import SidebarLinks from 'app/components/elements/SidebarLinks';
import SidebarNewUsers from 'app/components/elements/SidebarNewUsers';
import Notices from 'app/components/elements/Notices';
import SteemMarket from 'app/components/elements/SteemMarket';
+import { GptUtils } from 'app/utils/GptUtils';
import GptAd from 'app/components/elements/GptAd';
import BiddingAd from 'app/components/elements/BiddingAd';
import ArticleLayoutSelector from 'app/components/modules/ArticleLayoutSelector';
@@ -267,7 +267,21 @@ class PostsIndex extends React.Component {
{this.props.gptEnabled ? (
-
+ {this.props.maybeLoggedIn ? (
+
+ ) : (
+
+ )}
) : null}
@@ -294,7 +308,21 @@ class PostsIndex extends React.Component {
{this.props.gptEnabled ? (
-
+ {this.props.maybeLoggedIn ? (
+
+ ) : (
+
+ )}
diff --git a/src/app/utils/DomUtils.js b/src/app/utils/DomUtils.js
index 4a5e99f490..d61cb26231 100644
--- a/src/app/utils/DomUtils.js
+++ b/src/app/utils/DomUtils.js
@@ -8,3 +8,26 @@ export function findParent(el, class_name) {
if (el.parentNode) return findParent(el.parentNode, class_name);
return null;
}
+
+// From https://stackoverflow.com/a/18284182
+export function getViewportDimensions(w) {
+ // Bail if server-side
+ if (!process.env.BROWSER) return { w: 0, h: 0 };
+
+ // Use the specified window or the current window if no argument
+ w = w || window;
+
+ // This works for all browsers except IE8 and before
+ if (w.innerWidth != null) return { w: w.innerWidth, h: w.innerHeight };
+
+ // For IE (or any browser) in Standards mode
+ var d = w.document;
+ if (document.compatMode == 'CSS1Compat')
+ return {
+ w: d.documentElement.clientWidth,
+ h: d.documentElement.clientHeight,
+ };
+
+ // For browsers in Quirks mode
+ return { w: d.body.clientWidth, h: d.body.clientHeight };
+}
diff --git a/src/app/utils/GptUtils.js b/src/app/utils/GptUtils.js
new file mode 100644
index 0000000000..46f28e4acb
--- /dev/null
+++ b/src/app/utils/GptUtils.js
@@ -0,0 +1,26 @@
+import { getViewportDimensions } from './DomUtils';
+
+class GptUtils {
+ /**
+ * Should we show the mobile version of an ad?
+ *
+ * @returns {boolean}
+ */
+ static ShowGptMobileSize() {
+ return getViewportDimensions().w <= 768;
+ }
+
+ /**
+ * Naively append-mobile to a given string representing an ad slot name.
+ *
+ * @param {string} slotName
+ * @returns {string}
+ */
+ static MobilizeSlotName(slotName) {
+ let mobileSlotAddendum = '';
+ if (this.ShowGptMobileSize()) mobileSlotAddendum = '-mobile';
+ return `${slotName}${mobileSlotAddendum}`;
+ }
+}
+
+export { GptUtils };
diff --git a/src/server/server-html.jsx b/src/server/server-html.jsx
index 518e80a067..d706a1aa18 100644
--- a/src/server/server-html.jsx
+++ b/src/server/server-html.jsx
@@ -190,60 +190,7 @@ export default function ServerHTML({
// a new config file for ads would be good
var PREBID_TIMEOUT = 2000;
var FAILSAFE_TIMEOUT = 3000;
- var adUnits = [
- {
- code: "div-gpt-ad-1551233873698-0",
- mediaTypes: {
- banner: {
- sizes: [728, 90]
- }
- },
- bids: [
- {
- bidder: "coinzilla",
- params: {
- placementId: "6425c7b9886e0045972"
- }
- }
- ]
- },
- {
- code: "div-gpt-ad-1554687231046-0",
- mediaTypes: {
- banner: {
- sizes: [160, 600]
- }
- },
- bids: [
- {
- bidder: "coinzilla",
- params: {
- placementId: "3575c7b9886e2cb3619"
- }
- }
- ]
- }
- ];
- const customConfigObject = {
- buckets: [
- {
- precision: 2,
- min: 0,
- max: 1,
- increment: 0.05
- },
- {
- precision: 2,
- min: 1,
- max: 8,
- increment: 0.1
- }
- ]
- };
- const systemCurrency = {
- adServerCurrency: "USD",
- granularityMultiplier: 1
- };
+ var MAX_RETRIES = 20;
// Begin GPT Ad Setup
var googletag = googletag || {};
@@ -253,8 +200,6 @@ export default function ServerHTML({
googletag.pubads().disableInitialLoad();
googletag.pubads().setTargeting("edition", ["new-york"]);
googletag.pubads().collapseEmptyDivs(true, true);
- googletag.pubads().enableSingleRequest();
- googletag.enableServices();
});
@@ -263,39 +208,37 @@ export default function ServerHTML({
pbjs.que = pbjs.que || [];
pbjs.que.push(function() {
- console.log('pbjs.que.push(function() {->IN THE SERVER CODE STUFFS');
- pbjs.addAdUnits(adUnits);
+ pbjs.addAdUnits(${JSON.stringify(
+ gptBidding.ad_units
+ )});
+
pbjs.setConfig({
- priceGranularity: customConfigObject,
- currency: systemCurrency
+ priceGranularity: ${JSON.stringify(
+ gptBidding.custom_config
+ )},
+ currency: ${JSON.stringify(
+ gptBidding.system_currency
+ )}
});
- console.log('pbjs.que.push(function() {->BEFOR requestBids');
+
pbjs.requestBids({
bidsBackHandler: initAdserver,
timeout: PREBID_TIMEOUT
});
});
- var noBids = {}
+ // var noBids = {}
function initAdserver() {
- console.log('function initAdserver() {', arguments)
- if (arguments.length > 0) {
- console.log('Received args @ initAdServer')
- noBids = pbjs.getNoBids();
- console.log('Result of noBids: ', noBids)
- }
- // Ensure this runs with our "failsafe" timeout
- for (var slotId in noBids) {
- var event = new Event('prebidNoBids');
- event.slotId = slotId;
- window.dispatchEvent(event);
- console.log('Eventing a no bid event', event)
+ if (pbjs.initAdserverSet) return;
+
+ if(!googletag.pubadsReady && pbjs.retries <= MAX_RETRIES) {
+ setTimeout(initAdserver, 50); //poll ms can be adjusted as desired.
+ pbjs.retries++;
+ return;
}
- if (pbjs.initAdserverSet) return;
pbjs.initAdserverSet = true;
googletag.cmd.push(function() {
- pbjs.que.push(function() {
- console.log('pbjs.que.push(function() {')
+ pbjs.cmd.push(function() {
pbjs.setTargetingForGPTAsync();
googletag.pubads().refresh();
});
@@ -304,31 +247,8 @@ export default function ServerHTML({
// TODO: Do we need to do this twice?
setTimeout(function() {
- // TODO: Why would we call initAdserver a second time but with no params?
initAdserver();
}, FAILSAFE_TIMEOUT);
-
- // Begin Globally defining possible bidding ad slots.
- // TODO: Slot defs need to be moved to config.
- googletag.cmd.push(function() {
- console.log("BiddingAd::componentDidMount::googletag.cmd.push");
- googletag
- .defineSlot(
- "/21784675435/steemit_bottom-of-post/steemit_bottom-of-post_prebid",
- [[728, 90]],
- "div-gpt-ad-1551233873698-0"
- )
- .addService(googletag.pubads());
- googletag
- .defineSlot(
- "/21784675435/steemit_left-navigation/steemit_left-navigation_prebid",
- [[120, 600], [160, 600]],
- "div-gpt-ad-1554687231046-0"
- )
- .addService(googletag.pubads());
- googletag.pubads().enableSingleRequest();
- googletag.enableServices();
- });
`,
}}
/>