From c83aaf4faa8800d1fe39af65ce5c0a584879fc1e Mon Sep 17 00:00:00 2001 From: Tejas Manohar Date: Tue, 3 Nov 2015 15:07:51 -0600 Subject: [PATCH 1/6] keep url short, get ?i --- js/form.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/js/form.js b/js/form.js index 09d2f96..6234edb 100644 --- a/js/form.js +++ b/js/form.js @@ -1,8 +1,18 @@ +function getQuery(q) { + var query = window.location.search.substring(1); + var vars = query.split('&'); + for (var i=0; i < vars.length; i++) { + var pair = vars[i].split('='); + if(pair[0] == q) return pair[1]; + } +} + (function($) { $(document).ready(function() { $(".signupForm").submit(function(event) { var formData = { - 'phoneNumber': $('input[name=phoneNumber]').val() + 'phoneNumber': $('input[name=phoneNumber]').val(), + 'inviter': getQuery('i') } $.ajax({ From 74f542736519e4d2b2c50426324bf39dba3d1410 Mon Sep 17 00:00:00 2001 From: Tejas Manohar Date: Tue, 3 Nov 2015 15:18:04 -0600 Subject: [PATCH 2/6] inviteCode, not inviter --- js/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/form.js b/js/form.js index 6234edb..3cdda82 100644 --- a/js/form.js +++ b/js/form.js @@ -12,7 +12,7 @@ function getQuery(q) { $(".signupForm").submit(function(event) { var formData = { 'phoneNumber': $('input[name=phoneNumber]').val(), - 'inviter': getQuery('i') + 'inviteCode': getQuery('i') } $.ajax({ From eb28e9a9237445ffbad95b922fb5cb2fe03457b6 Mon Sep 17 00:00:00 2001 From: Tejas Manohar Date: Tue, 3 Nov 2015 16:08:17 -0600 Subject: [PATCH 3/6] redirect to me if created --- js/form.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/form.js b/js/form.js index 3cdda82..306ce30 100644 --- a/js/form.js +++ b/js/form.js @@ -17,16 +17,16 @@ function getQuery(q) { $.ajax({ type: 'POST', - url: 'https://autolotto-backend-production.herokuapp.com/api/v1/pres', + url: 'https://autolotto-backend-production.herokuapp.com/api/v1/users', data: formData, dataType: 'json', crossDomain: true, encode: true }).done(function(res) { if (res.data.created) { - window.parent.location.href = 'http://web.autolotto.com/giveaway/welcome'; + window.parent.location.href = 'http://web.autolotto.com'; } else { - window.parent.location.href = "http://autolotto.com/leaderboard/"; + window.parent.location.href = "http://autolotto.com/me"; } }).fail(function() { alert('Please enter a valid US phone number!'); From 6889500c36fce2cdeb1bea7816805b8e2fe57ab5 Mon Sep 17 00:00:00 2001 From: Tejas Manohar Date: Wed, 4 Nov 2015 20:35:44 -0600 Subject: [PATCH 4/6] user id in u param --- js/form.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/js/form.js b/js/form.js index 306ce30..80077d9 100644 --- a/js/form.js +++ b/js/form.js @@ -23,11 +23,8 @@ function getQuery(q) { crossDomain: true, encode: true }).done(function(res) { - if (res.data.created) { - window.parent.location.href = 'http://web.autolotto.com'; - } else { - window.parent.location.href = "http://autolotto.com/me"; - } + var r = res.data.created ? 'http://web.autolotto.com' : 'http://web.autolotto.com/me'; + window.parent.location.href = '/redirect?r=' + r + '&u=' + res.data.user._id; }).fail(function() { alert('Please enter a valid US phone number!'); }); From e072a77c1773f8caa9bf4f805af2c1135b329d94 Mon Sep 17 00:00:00 2001 From: Tejas Manohar Date: Wed, 4 Nov 2015 20:36:32 -0600 Subject: [PATCH 5/6] search parent window --- js/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/form.js b/js/form.js index 80077d9..84721a8 100644 --- a/js/form.js +++ b/js/form.js @@ -1,5 +1,5 @@ function getQuery(q) { - var query = window.location.search.substring(1); + var query = window.parent.location.search.substring(1); var vars = query.split('&'); for (var i=0; i < vars.length; i++) { var pair = vars[i].split('='); From fd7e96530aba537fc2f8836672e030d48b6e439a Mon Sep 17 00:00:00 2001 From: Tejas Manohar Date: Thu, 5 Nov 2015 12:22:57 -0600 Subject: [PATCH 6/6] giveaway home vs welcome --- js/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/form.js b/js/form.js index 84721a8..9c13d02 100644 --- a/js/form.js +++ b/js/form.js @@ -23,7 +23,7 @@ function getQuery(q) { crossDomain: true, encode: true }).done(function(res) { - var r = res.data.created ? 'http://web.autolotto.com' : 'http://web.autolotto.com/me'; + var r = res.data.created ? 'http://web.autolotto.com/giveaway/welcome' : 'http://web.autolotto.com/giveaway/home'; window.parent.location.href = '/redirect?r=' + r + '&u=' + res.data.user._id; }).fail(function() { alert('Please enter a valid US phone number!');