From d94f25c3def016e7bcd20d82b625a1cd84a99517 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 23 May 2017 14:49:50 -0700 Subject: [PATCH 01/11] Original file structures --- index.html | 12 ++++++++++++ trek.css | 0 trek.js | 0 3 files changed, 12 insertions(+) create mode 100644 index.html create mode 100644 trek.css create mode 100644 trek.js diff --git a/index.html b/index.html new file mode 100644 index 00000000..83bd9b25 --- /dev/null +++ b/index.html @@ -0,0 +1,12 @@ + + + + + + Trek + + + + + + diff --git a/trek.css b/trek.css new file mode 100644 index 00000000..e69de29b diff --git a/trek.js b/trek.js new file mode 100644 index 00000000..e69de29b From 829d87eb12ebcef4d99c4e356edd9d36de1b6548 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 23 May 2017 15:44:36 -0700 Subject: [PATCH 02/11] Writing success callback function --- index.html | 2 ++ trek.js | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/index.html b/index.html index 83bd9b25..96e89fd3 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,8 @@ Trek + + diff --git a/trek.js b/trek.js index e69de29b..55854960 100644 --- a/trek.js +++ b/trek.js @@ -0,0 +1,18 @@ +var url = 'https://trektravel.herokuapp.com/trips'; + +var successCallback = function(response) { + console.log("Success"); + console.log(response); + + var target = $('#trips'); + + for (var i = 0; i < response.length; i++) { + trip = response[i]; + target.append("
  • " + trip + "
    • "); + } +}; + +var failureCallback = function() { + console.log("Didn't work: ("); + $("#errors").html("

    Ajax request failed!

    "); +}; From eb610a7d7185f2bb649691ae85980c5b5b9d320d Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Wed, 24 May 2017 12:42:30 -0700 Subject: [PATCH 03/11] Placed table stubs in index.html --- index.html | 14 +++++++++++--- trek.js | 10 +++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 96e89fd3..7a337d97 100644 --- a/index.html +++ b/index.html @@ -6,9 +6,17 @@ Trek - +
      - - + + + +
      + + + + + + diff --git a/trek.js b/trek.js index 55854960..a8e2d928 100644 --- a/trek.js +++ b/trek.js @@ -8,7 +8,7 @@ var successCallback = function(response) { for (var i = 0; i < response.length; i++) { trip = response[i]; - target.append("
    • " + trip + "
      • "); + target.append("
    • " + trip.name + "
      • "); } }; @@ -16,3 +16,11 @@ var failureCallback = function() { console.log("Didn't work: ("); $("#errors").html("

      Ajax request failed!

      "); }; + +var clickHandler = function() { + $.get(url, successCallback).fail(failureCallback); +}; + +$(document).ready(function() { + $('#load').click(clickHandler); +}); From 020930d0e513ae908cdedcbce8651c785bb02975 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Wed, 24 May 2017 13:55:38 -0700 Subject: [PATCH 04/11] Added link to name, and foundation to site as well --- index.html | 4 +++- trek.js | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 7a337d97..fcc68559 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ + Trek @@ -18,5 +19,6 @@ - + + diff --git a/trek.js b/trek.js index a8e2d928..b5fe2c21 100644 --- a/trek.js +++ b/trek.js @@ -8,8 +8,13 @@ var successCallback = function(response) { for (var i = 0; i < response.length; i++) { trip = response[i]; - target.append("
    • " + trip.name + "
      • "); + var row = $(''); + var name = $('' + trip.name + ''); + + row.append(name); + target.append(row); } + $('#load'); }; var failureCallback = function() { From e479d037eaa8fa2fecebe14f9eb4d7c4a96e83ea Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Thu, 25 May 2017 20:26:27 -0700 Subject: [PATCH 05/11] Still stuck on wave 2, trips showing correctly on same page --- index.html | 7 +++---- trek.js | 14 +++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index fcc68559..e4f3a16f 100644 --- a/index.html +++ b/index.html @@ -8,10 +8,9 @@ -
        - - - +
        + +
        diff --git a/trek.js b/trek.js index b5fe2c21..b15cc2e7 100644 --- a/trek.js +++ b/trek.js @@ -1,3 +1,4 @@ +$(document).ready(function() { var url = 'https://trektravel.herokuapp.com/trips'; var successCallback = function(response) { @@ -10,13 +11,19 @@ var successCallback = function(response) { trip = response[i]; var row = $(''); var name = $('' + trip.name + ''); - - row.append(name); + var continent = $('' + trip.continent + ''); + var weeks = $(''); + row.append(name, continent, weeks); target.append(row); } - $('#load'); }; +$('#load').click( function() { + $('#trips').empty(); + $('#load').hide(); + $.get(url, successCallback); +}); + var failureCallback = function() { console.log("Didn't work: ("); $("#errors").html("

        Ajax request failed!

        "); @@ -29,3 +36,4 @@ var clickHandler = function() { $(document).ready(function() { $('#load').click(clickHandler); }); +}); From fa8d3ef9abd2c280397756190b13f4ff7d513b77 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 26 May 2017 10:39:09 -0700 Subject: [PATCH 06/11] Trying new methods with help from Ashton and Rana to show trips --- index.html | 27 ++++++++++++++--------- trek.js | 64 +++++++++++++++++++++++++++++++++--------------------- 2 files changed, 56 insertions(+), 35 deletions(-) diff --git a/index.html b/index.html index e4f3a16f..61b28d2d 100644 --- a/index.html +++ b/index.html @@ -8,16 +8,23 @@ - - - -
        - - +
        + + + + - - + + + + + + + + + + diff --git a/trek.js b/trek.js index b15cc2e7..92da74f6 100644 --- a/trek.js +++ b/trek.js @@ -1,39 +1,53 @@ -$(document).ready(function() { -var url = 'https://trektravel.herokuapp.com/trips'; -var successCallback = function(response) { + + +var homeSuccessCallback = function(response) { console.log("Success"); - console.log(response); + // console.log(response); - var target = $('#trips'); - - for (var i = 0; i < response.length; i++) { - trip = response[i]; - var row = $(''); - var name = $('' + trip.name + ''); - var continent = $('' + trip.continent + ''); - var weeks = $(''); - row.append(name, continent, weeks); - target.append(row); - } +var homeTemplate = _.template($('#trips-template').html()); + // var target = $('#trips-body'); + // + console.log(response); + for (var i = 0; i < response.length; i++) { + console.log(response[i]); + var generatedHtml = homeTemplate({ + trip: response[i], + }); + $('#trip-list').append(generatedHtml); + } }; -$('#load').click( function() { - $('#trips').empty(); - $('#load').hide(); - $.get(url, successCallback); -}); + // trip = response[i]; + // var row = $(''); + // var name = $('' + trip.name + ''); + // var continent = $('' + trip.continent + ''); + // var weeks = $(''); + // row.append(name, continent, weeks); + // target.append(row); + +// $('#load').click( function() { +// // $('#trips-body').empty(); +// // $('#load').hide(); +// $.get(url, homeSuccessCallback); +// }); + +// $('#trips-body').on('click', 'a', function(e) { +// e.preventDefault(); +// $('#trips-body').show(); +// var tripUrl = $(this).attr('href'); +// }); var failureCallback = function() { - console.log("Didn't work: ("); + console.log("Didn't work:"); $("#errors").html("

        Ajax request failed!

        "); }; -var clickHandler = function() { - $.get(url, successCallback).fail(failureCallback); +var homeClickHandler = function() { +var url = 'https://trektravel.herokuapp.com/trips'; + $.get(url, homeSuccessCallback).fail(failureCallback); }; $(document).ready(function() { - $('#load').click(clickHandler); -}); + $('#load').click(homeClickHandler); }); From 301c1af97c56612aa00ccfb3ab8400a1ca588d55 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 26 May 2017 13:06:19 -0700 Subject: [PATCH 07/11] Getting closer to show page --- index.html | 3 ++- trek.js | 75 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/index.html b/index.html index 61b28d2d..167d9327 100644 --- a/index.html +++ b/index.html @@ -9,13 +9,14 @@
        + diff --git a/trek.js b/trek.js index 92da74f6..82d48125 100644 --- a/trek.js +++ b/trek.js @@ -5,38 +5,26 @@ var homeSuccessCallback = function(response) { console.log("Success"); // console.log(response); -var homeTemplate = _.template($('#trips-template').html()); + var homeTemplate = _.template($('#trips-template').html()); // var target = $('#trips-body'); // - console.log(response); - for (var i = 0; i < response.length; i++) { - console.log(response[i]); - var generatedHtml = homeTemplate({ - trip: response[i], - }); - $('#trip-list').append(generatedHtml); - } + // console.log(response); + for (var i = 0; i < response.length; i++) { + // console.log(response[i]); + var generatedHtml = homeTemplate({ + trip: response[i], + }); + $('#trip-list').append(generatedHtml); + } + console.log("hello from homeClickHandler"); + $('#trip-list').on('click', 'a', showClickHandler); }; - // trip = response[i]; - // var row = $(''); - // var name = $('' + trip.name + ''); - // var continent = $('' + trip.continent + ''); - // var weeks = $(''); - // row.append(name, continent, weeks); - // target.append(row); - -// $('#load').click( function() { -// // $('#trips-body').empty(); -// // $('#load').hide(); -// $.get(url, homeSuccessCallback); -// }); +var showSuccessCallback = function(response) { + console.log("Success"); -// $('#trips-body').on('click', 'a', function(e) { -// e.preventDefault(); -// $('#trips-body').show(); -// var tripUrl = $(this).attr('href'); -// }); + var showTemplate = _.template($('#trips-show-template').html()); +}; var failureCallback = function() { console.log("Didn't work:"); @@ -44,10 +32,41 @@ var failureCallback = function() { }; var homeClickHandler = function() { -var url = 'https://trektravel.herokuapp.com/trips'; + var url = 'https://trektravel.herokuapp.com/trips'; $.get(url, homeSuccessCallback).fail(failureCallback); }; +var showClickHandler = function(e) { +console.log("hello"); + console.log(e.target); + + // var tripId = $(e.target); + var urlShow = 'https://trektravel.herokuapp.com/trips/' + tripId; + $.get(urlShow, showSuccessCallback).fail(failureCallback); +}; + $(document).ready(function() { $('#load').click(homeClickHandler); + // $('#trips-show').on('click', '#trip-link', showClickHandler); }); + + +// trip = response[i]; +// var row = $(''); +// var name = $('' + trip.name + ''); +// var continent = $('' + trip.continent + ''); +// var weeks = $(''); +// row.append(name, continent, weeks); +// target.append(row); + +// $('#load').click( function() { +// // $('#trips-body').empty(); +// // $('#load').hide(); +// $.get(url, homeSuccessCallback); +// }); + +// $('#trips-body').on('click', 'a', function(e) { +// e.preventDefault(); +// $('#trips-body').show(); +// var tripUrl = $(this).attr('href'); +// }); From 411d1a9245fd8d0723dc5d195aa2035c805a57e6 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Fri, 26 May 2017 15:32:34 -0700 Subject: [PATCH 08/11] Show trip now working, yay --- index.html | 21 ++++++++++++++++++--- trek.js | 23 +++++++++++++++-------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 167d9327..810cb237 100644 --- a/index.html +++ b/index.html @@ -14,13 +14,28 @@ - + - + diff --git a/trek.js b/trek.js index 82d48125..3479805e 100644 --- a/trek.js +++ b/trek.js @@ -17,13 +17,20 @@ var homeSuccessCallback = function(response) { $('#trip-list').append(generatedHtml); } console.log("hello from homeClickHandler"); - $('#trip-list').on('click', 'a', showClickHandler); + $('#trip-list').on('click', 'a', showClickHandler); }; var showSuccessCallback = function(response) { - console.log("Success"); + console.log(response); var showTemplate = _.template($('#trips-show-template').html()); + + var generatedHtml = showTemplate({ + trip: response + }); + + $('#trip-list').html($(generatedHtml)); + console.log("Ha"); }; var failureCallback = function() { @@ -36,18 +43,18 @@ var homeClickHandler = function() { $.get(url, homeSuccessCallback).fail(failureCallback); }; -var showClickHandler = function(e) { -console.log("hello"); - console.log(e.target); - - // var tripId = $(e.target); +var showClickHandler = function() { + var tripId = $(this).attr('id'); + // console.log("This is " + e); var urlShow = 'https://trektravel.herokuapp.com/trips/' + tripId; + + console.log('this is the url', urlShow); $.get(urlShow, showSuccessCallback).fail(failureCallback); }; $(document).ready(function() { $('#load').click(homeClickHandler); - // $('#trips-show').on('click', '#trip-link', showClickHandler); + // $('#trips-show').on('click', '.trip-link', showClickHandler); }); From 1826042573539eda999c9dd486bf685bb1f53e77 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 30 May 2017 18:26:24 -0700 Subject: [PATCH 09/11] Post a reservation --- index.html | 48 ++++++++++++++++++++++++++++-------------------- trek.js | 28 +++++++++++++++++++++------- 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/index.html b/index.html index 810cb237..ef06d93a 100644 --- a/index.html +++ b/index.html @@ -9,32 +9,40 @@
        - - - - - + + + diff --git a/trek.js b/trek.js index 3479805e..682038e1 100644 --- a/trek.js +++ b/trek.js @@ -16,23 +16,36 @@ var homeSuccessCallback = function(response) { }); $('#trip-list').append(generatedHtml); } - console.log("hello from homeClickHandler"); $('#trip-list').on('click', 'a', showClickHandler); }; var showSuccessCallback = function(response) { - console.log(response); - + // console.log(response); var showTemplate = _.template($('#trips-show-template').html()); + var url = 'https://trektravel.herokuapp.com/trips/'+ response.id +'/reserve'; + var generatedHtml = showTemplate({ - trip: response + trip: response, + url: url }); $('#trip-list').html($(generatedHtml)); - console.log("Ha"); + // console.log("Ha"); }; +$('#trip-list').on('click', 'button', function(e) { + e.preventDefault(); + + var url = $('form').attr("action"); + var data = $('form').serialize(); + + $.post(url, data, function(response) { + alert("Trip reserved"); + $('form').empty(); + }).fail(failureCallback); +}); + var failureCallback = function() { console.log("Didn't work:"); $("#errors").html("

        Ajax request failed!

        "); @@ -45,13 +58,14 @@ var homeClickHandler = function() { var showClickHandler = function() { var tripId = $(this).attr('id'); - // console.log("This is " + e); var urlShow = 'https://trektravel.herokuapp.com/trips/' + tripId; - console.log('this is the url', urlShow); $.get(urlShow, showSuccessCallback).fail(failureCallback); }; + +// "https://trektravel.herokuapp.com/trips/" + trip.id + "/reserve" + $(document).ready(function() { $('#load').click(homeClickHandler); // $('#trips-show').on('click', '.trip-link', showClickHandler); From 11c50bf969b8220a85a37ff0562b2947f0d79b44 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Tue, 30 May 2017 18:28:37 -0700 Subject: [PATCH 10/11] Deleted commented out lines not needed --- index.html | 5 +---- trek.js | 31 +------------------------------ 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/index.html b/index.html index ef06d93a..369e5646 100644 --- a/index.html +++ b/index.html @@ -38,11 +38,8 @@

        Money

        - - - + diff --git a/trek.js b/trek.js index 682038e1..fdf24713 100644 --- a/trek.js +++ b/trek.js @@ -3,14 +3,10 @@ var homeSuccessCallback = function(response) { console.log("Success"); - // console.log(response); var homeTemplate = _.template($('#trips-template').html()); - // var target = $('#trips-body'); - // - // console.log(response); + for (var i = 0; i < response.length; i++) { - // console.log(response[i]); var generatedHtml = homeTemplate({ trip: response[i], }); @@ -20,7 +16,6 @@ var homeSuccessCallback = function(response) { }; var showSuccessCallback = function(response) { - // console.log(response); var showTemplate = _.template($('#trips-show-template').html()); var url = 'https://trektravel.herokuapp.com/trips/'+ response.id +'/reserve'; @@ -64,30 +59,6 @@ var showClickHandler = function() { }; -// "https://trektravel.herokuapp.com/trips/" + trip.id + "/reserve" - $(document).ready(function() { $('#load').click(homeClickHandler); - // $('#trips-show').on('click', '.trip-link', showClickHandler); }); - - -// trip = response[i]; -// var row = $(''); -// var name = $('' + trip.name + ''); -// var continent = $('' + trip.continent + ''); -// var weeks = $(''); -// row.append(name, continent, weeks); -// target.append(row); - -// $('#load').click( function() { -// // $('#trips-body').empty(); -// // $('#load').hide(); -// $.get(url, homeSuccessCallback); -// }); - -// $('#trips-body').on('click', 'a', function(e) { -// e.preventDefault(); -// $('#trips-body').show(); -// var tripUrl = $(this).attr('href'); -// }); From 8a180fb564cd2583a554766925f156da79639ea4 Mon Sep 17 00:00:00 2001 From: Haby Randall Date: Wed, 31 May 2017 11:56:29 -0700 Subject: [PATCH 11/11] Staring to style --- .DS_Store | Bin 0 -> 6148 bytes index.html | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..bb0273d7637e21950f3ed1ccca31fadd5649a1cb GIT binary patch literal 6148 zcmeHKyH3ME5S$GWB%~l6lrCvN3Y0V^ataC>_yMpJ1i=uI5D7Xr`~$zh_wfNRdv}Wb zfEEGTwf5$`-tpOUC$A5H442~p&Kdy(qrB7@9X{2Zqv?vwuxO0%Ud!Jo z3VZ@Bvt4`u literal 0 HcmV?d00001 diff --git a/index.html b/index.html index 369e5646..4e6a364f 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ Trek +
        @@ -39,6 +40,7 @@

        Money

        +