diff options
| -rw-r--r-- | client/button.js | 9 | ||||
| -rw-r--r-- | client/colors.less | 9 | ||||
| -rw-r--r-- | client/templates/photos.html | 5 | ||||
| -rw-r--r-- | server/methods.js | 3 |
4 files changed, 24 insertions, 2 deletions
diff --git a/client/button.js b/client/button.js index 9e3e834..2cdac14 100644 --- a/client/button.js +++ b/client/button.js @@ -116,7 +116,12 @@ function animate2() { _.delay(function() { $('h2.title').html('Done!<div class="sec">This is your icon!</div>'); + $('span.final-username').text(Session.get('username')); + var months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; + $('span.final-date').text(months[Session.get('date').month-1] + ' ' + Session.get('date').year); $('div.final div.final-dominants').hide(); + + $('div.final-userdate').show(); $('div.final div.share').show(); $('div.about-link').show(); }, delay + 2000); @@ -166,6 +171,10 @@ Template.dates.events({ Session.set('date', { month: month, year: year }); Session.set('photos', photos); + Meteor.call('getInstagramUsername', function (err, res) { + Session.set('username', res); + }); + $('form.dates div.error').hide(); $('form.dates button.dates').show(); } diff --git a/client/colors.less b/client/colors.less index d1c87d7..0b151a2 100644 --- a/client/colors.less +++ b/client/colors.less @@ -267,6 +267,13 @@ body { text-align: center; -webkit-justify-content: center; justify-content: center; + margin-top: 80px; + div.canvas { + div.final-userdate { + margin-top: 12px; + font-family: 'Cutive Mono', serif; + } + } div.final-dominants { margin-left: 40px; width: 260px; @@ -291,7 +298,7 @@ body { } } div.share { - margin-left: 40px; + margin-left: 70px; width: 260px; button { display: block; diff --git a/client/templates/photos.html b/client/templates/photos.html index 9259385..2b9cfef 100644 --- a/client/templates/photos.html +++ b/client/templates/photos.html @@ -33,7 +33,10 @@ <button class="continue">Continue</button> </div> <div class="final" style="display: none"> - <canvas id="canvas-final" style="height: 315px; width: 315px;"></canvas> + <div class="canvas"> + <canvas id="canvas-final" style="height: 315px; width: 315px;"></canvas> + <div class="final-userdate" style="display: none;">@<span class="final-username"></span> / <span class="final-date"></span></div> + </div> <div class="final-dominants"> <div id="dominant1" class="color"></div> <ol id="dominant1"> diff --git a/server/methods.js b/server/methods.js index 5713479..0137cac 100644 --- a/server/methods.js +++ b/server/methods.js @@ -11,6 +11,9 @@ Meteor.methods({ } }); }, + getInstagramUsername: function () { + return Meteor.user().services.instagram.username; + }, getInstagramProfilePhoto: function () { return Meteor.user().services.instagram.profile_picture; }, |