diff --git a/public/assets/js/memePublish.js b/public/assets/js/memePublish.js index 57192811..0696db86 100644 --- a/public/assets/js/memePublish.js +++ b/public/assets/js/memePublish.js @@ -89,11 +89,10 @@ socket.on('publish-failure', function(msg){ }); socket.on('publish-complete', function(msg){ var publishResults = '

Your publish is complete!

'; - publishResults += '

NOTE: the transaction still needs to be mined by the network before you can access it! This will take a few minutes. To view the transaction on the blockchain explorer click the Transaction ID link below.

'; + publishResults += '

NOTE: the blockchain will need a few minutes to process your amazing work. Please allow some time for your asset to appear in the entries below.

'; + publishResults += '

Your meme has been published to spee.ch/' + msg.name + '

'; + publishResults += '

Here is a direct link to where your meme will be stored: spee.ch/' + msg.name + '/' + msg.result.claim_id + '

'; publishResults += '

Your Transaction ID is: ' + msg.result.txid + '

'; - publishResults += '

Your Claim ID is: ' + msg.result.claim_id + '

'; - publishResults += '

Here is a link to the claim where your asset will be published: spee.ch/' + msg.name + '

'; - publishResults += '

Here is a direct link to where your asset will be stored: spee.ch/' + msg.name + '/' + msg.result.claim_id + '

'; - publishResults += '

Reload to publish another asset

'; + publishResults += '

Reload to publish another

'; document.getElementById('publish-active-area').innerHTML = publishResults; }); \ No newline at end of file diff --git a/routes/show-routes.js b/routes/show-routes.js index 24f67cd3..d446404e 100644 --- a/routes/show-routes.js +++ b/routes/show-routes.js @@ -5,15 +5,24 @@ const logger = require('winston'); module.exports = (app, ua, googleAnalyticsId) => { // route to fetch all free public claims app.get('/meme-fodder/play', ({ originalUrl }, res) => { + // google analytics logger.debug(`GET request on ${originalUrl}`); - res.status(200).render('memeFodder'); + // get and serve content + showController + .getAllClaims('meme-fodder-entry') + .then(orderedFreePublicClaims => { + res.status(200).render('memeFodder', { claims: orderedFreePublicClaims }); + }) + .catch(error => { + errorHandlers.handleRequestError(error, res); + }); }); // route to fetch all free public claims app.get('/:name/all', ({ originalUrl, params }, res) => { logger.debug(`GET request on ${originalUrl}`); // google analytics ua(googleAnalyticsId, { https: true }).event('Show Routes', '/name/all', `${params.name}/all`).send(); - // fetch all free public claims + // get and serve content showController .getAllClaims(params.name) .then(orderedFreePublicClaims => { diff --git a/views/partials/memeMaker.handlebars b/views/partials/memeMaker.handlebars index 48427098..e6f59058 100644 --- a/views/partials/memeMaker.handlebars +++ b/views/partials/memeMaker.handlebars @@ -7,7 +7,7 @@

Congratulations, you found the /meme-fodder game!

-

Here's how it is played...

+

Here's how it's played...

(1) /meme-fodder will always use the winning public, free image published to lbry://meme-fodder. (meaning the most recent, highest bid). Want to put a different image on the chopping block? Go publish it!

(2) Create a meme based on the current claim with the tool below. Think you got a winner? Share it with the community and see what they think!

diff --git a/views/partials/memeResults.handlebars b/views/partials/memeResults.handlebars index dc547eb6..1c147bfa 100644 --- a/views/partials/memeResults.handlebars +++ b/views/partials/memeResults.handlebars @@ -1,13 +1,24 @@
-

Recent Publishes

+

Recent Entries

-

Below are some of the most recent entries published via /meme-fodder

- (pull all the claims published to 'lbryMemeFodder' and display most recent 20 here) - (maybe a voting system? Is there a way to allow people to donate funds to a claimId so that it will show up higher in the results?) +
+

Below are some of the most recent entries published via /meme-fodder

+ (pull all the claims published to 'lbryMemeFodder' and display most recent 20 here) + (maybe a voting system? Is there a way to allow people to donate funds to a claimId so that it will show up higher in the results?) +
+
+
+ {{#each claims}} +
+ + +
+
+ {{/each}}