From 31ced1b4aa9a06fdf022fa9cfe6837524ec78294 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Wed, 29 Nov 2017 14:21:55 -0800 Subject: [PATCH 01/16] Baseline html, favicon added, npm install --- dist/favicon.png | Bin 0 -> 13505 bytes dist/index.html | 40 ++++++++++++++++++++++++++++++++++++---- src/app.js | 2 +- 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 dist/favicon.png diff --git a/dist/favicon.png b/dist/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..abdc3a8f1a79844df24ce2e290d62ae2c58c59ac GIT binary patch literal 13505 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 I8-D%20C0f2d;kCd literal 0 HcmV?d00001 diff --git a/dist/index.html b/dist/index.html index b873b1e..3d0eae2 100644 --- a/dist/index.html +++ b/dist/index.html @@ -2,19 +2,51 @@ - My JavaScript App + TrekTrek +
- +

BackTREKAdd a trip

-
+
+
+
+ + +
+
+
+
Trips
+
+
+
-
+
+ © 2017
+ + + + diff --git a/src/app.js b/src/app.js index e7af594..f387740 100644 --- a/src/app.js +++ b/src/app.js @@ -9,5 +9,5 @@ import './css/style.css'; console.log('it loaded!'); $(document).ready( () => { - $('main').html('

Hello World!

'); + // $('main').html('

Hello World!

'); }); From f78db72c333d3fbfa46bf58b9b058152487c4410 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Wed, 29 Nov 2017 15:05:42 -0800 Subject: [PATCH 02/16] Model and collection added --- dist/index.html | 2 ++ src/app.js | 21 +++++++++++++++++++-- src/app/collections/trip_list.js | 13 +++++++++++++ src/app/models/trip.js | 7 +++++++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 src/app/collections/trip_list.js create mode 100644 src/app/models/trip.js diff --git a/dist/index.html b/dist/index.html index 3d0eae2..d9538f1 100644 --- a/dist/index.html +++ b/dist/index.html @@ -3,6 +3,8 @@ TrekTrek + + diff --git a/src/app.js b/src/app.js index f387740..2940332 100644 --- a/src/app.js +++ b/src/app.js @@ -2,12 +2,29 @@ import $ from 'jquery'; import _ from 'underscore'; +import Trip from './models/trip'; +import TripList from './collections/trip_list'; + // CSS import './css/foundation.css'; import './css/style.css'; -console.log('it loaded!'); +const tripList = new TripList(); +let tripTemplate; + +const render = function render(tripList) { + const $tripList = $('#trip-list'); + $tripList.empty(); + + tripList.forEach((trip) => { + $tripList.append(tripTemplate(trip.attributes)); + }); +}; + +const continents = ['Africa', 'Antarctica', 'Asia', 'Australasia', 'Europe', 'South America', 'North America', 'Null']; $(document).ready( () => { - // $('main').html('

Hello World!

'); + tripTemplate = _.template($('#trip-template').html()); + + tripList.fetch(); }); diff --git a/src/app/collections/trip_list.js b/src/app/collections/trip_list.js new file mode 100644 index 0000000..672b79f --- /dev/null +++ b/src/app/collections/trip_list.js @@ -0,0 +1,13 @@ +import Backbone from 'backbone'; +import Trip from '../models/trip'; + +const TripList = Backbone.Collection.extend({ + model: Trip, + url: 'https://ada-backtrek-api.herokuapp.com/trips', + parse(response) { + console.log(response); + return response['trips']; + }, +}); + +export default TripList; diff --git a/src/app/models/trip.js b/src/app/models/trip.js new file mode 100644 index 0000000..2926af8 --- /dev/null +++ b/src/app/models/trip.js @@ -0,0 +1,7 @@ +import Backbone from 'backbone'; + +const Trip = Backbone.Model.extend({ + +}); + +export default Trip; From b90557032b007f230e38f266ceabc45be5ceeed4 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Wed, 29 Nov 2017 15:18:35 -0800 Subject: [PATCH 03/16] A user can see a list of trips --- src/app.js | 11 ++++++----- src/app/collections/trip_list.js | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app.js b/src/app.js index 2940332..956394d 100644 --- a/src/app.js +++ b/src/app.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import _ from 'underscore'; -import Trip from './models/trip'; -import TripList from './collections/trip_list'; +import Trip from './app/models/trip'; +import TripList from './app/collections/trip_list'; // CSS import './css/foundation.css'; @@ -17,14 +17,15 @@ const render = function render(tripList) { $tripList.empty(); tripList.forEach((trip) => { - $tripList.append(tripTemplate(trip.attributes)); + $('#trip-list').append(tripTemplate(trip.attributes)); }); }; -const continents = ['Africa', 'Antarctica', 'Asia', 'Australasia', 'Europe', 'South America', 'North America', 'Null']; +// const continents = ['Africa', 'Antarctica', 'Asia', 'Australasia', 'Europe', 'South America', 'North America', 'Null']; $(document).ready( () => { tripTemplate = _.template($('#trip-template').html()); - tripList.fetch(); + tripList.on('update', render, tripList); + }); diff --git a/src/app/collections/trip_list.js b/src/app/collections/trip_list.js index 672b79f..9bc9239 100644 --- a/src/app/collections/trip_list.js +++ b/src/app/collections/trip_list.js @@ -6,7 +6,7 @@ const TripList = Backbone.Collection.extend({ url: 'https://ada-backtrek-api.herokuapp.com/trips', parse(response) { console.log(response); - return response['trips']; + return response; }, }); From 7d0b759ccc464bad09df0735be2d77aa9694a563 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Wed, 29 Nov 2017 22:33:42 -0800 Subject: [PATCH 04/16] Trips toggle between show and hide with a button --- dist/index.html | 2 +- src/app.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dist/index.html b/dist/index.html index d9538f1..d6b9400 100644 --- a/dist/index.html +++ b/dist/index.html @@ -21,7 +21,7 @@

BackTREKAdd a trip

-
Trips
+
diff --git a/src/app.js b/src/app.js index 956394d..a7644d0 100644 --- a/src/app.js +++ b/src/app.js @@ -17,7 +17,7 @@ const render = function render(tripList) { $tripList.empty(); tripList.forEach((trip) => { - $('#trip-list').append(tripTemplate(trip.attributes)); + $tripList.append($(tripTemplate(trip.attributes)).attr('id', `${trip.id}`)); }); }; @@ -25,7 +25,11 @@ const render = function render(tripList) { $(document).ready( () => { tripTemplate = _.template($('#trip-template').html()); - tripList.fetch(); + $('#trip-list').hide(); tripList.on('update', render, tripList); + tripList.fetch(); + $('#all-trips').on('click', function() { + $('#trip-list').toggle(); + }); }); From 7d22d073d276dd9343f4fe7a1c4a927eb43e5784 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Wed, 29 Nov 2017 22:59:00 -0800 Subject: [PATCH 05/16] About details append a Trip --- dist/index.html | 9 +++------ src/app.js | 12 ++++++++++++ src/app/collections/trip_list.js | 1 - src/app/models/trip.js | 6 +++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dist/index.html b/dist/index.html index d6b9400..33f1a49 100644 --- a/dist/index.html +++ b/dist/index.html @@ -35,20 +35,17 @@

BackTREKAdd a trip

<%- name %>

<%- continent %>
-
<%- weeks %>
+
<%- weeks %> weeks
- + diff --git a/src/app.js b/src/app.js index a7644d0..2e41e5f 100644 --- a/src/app.js +++ b/src/app.js @@ -11,6 +11,7 @@ import './css/style.css'; const tripList = new TripList(); let tripTemplate; +let tripDetails; const render = function render(tripList) { const $tripList = $('#trip-list'); @@ -25,6 +26,8 @@ const render = function render(tripList) { $(document).ready( () => { tripTemplate = _.template($('#trip-template').html()); + tripDetails = _.template($('#trip-details-template').html()); + $('#trip-list').hide(); tripList.on('update', render, tripList); tripList.fetch(); @@ -32,4 +35,13 @@ $(document).ready( () => { $('#all-trips').on('click', function() { $('#trip-list').toggle(); }); + + $('#trip-list').on('click', 'article', function() { + const id = $(this).attr('id'); + const url = new Trip(this).url(); + + $.get(url, response => { + $(`#${id}`).append(`

${response.about}

`); + }); + }); }); diff --git a/src/app/collections/trip_list.js b/src/app/collections/trip_list.js index 9bc9239..4c4dd2e 100644 --- a/src/app/collections/trip_list.js +++ b/src/app/collections/trip_list.js @@ -5,7 +5,6 @@ const TripList = Backbone.Collection.extend({ model: Trip, url: 'https://ada-backtrek-api.herokuapp.com/trips', parse(response) { - console.log(response); return response; }, }); diff --git a/src/app/models/trip.js b/src/app/models/trip.js index 2926af8..2865048 100644 --- a/src/app/models/trip.js +++ b/src/app/models/trip.js @@ -1,7 +1,11 @@ import Backbone from 'backbone'; const Trip = Backbone.Model.extend({ - + baseUrl: 'https://ada-backtrek-api.herokuapp.com/trips/', + url: function() { + const url = this.baseUrl + this.id; + return url; + } }); export default Trip; From 04e7edd025e128941aea4c487a9cc4dd38584d42 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Wed, 29 Nov 2017 23:18:15 -0800 Subject: [PATCH 06/16] Trips details added using a template --- src/app.js | 4 ++-- src/app/models/trip.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app.js b/src/app.js index 2e41e5f..c877e5b 100644 --- a/src/app.js +++ b/src/app.js @@ -40,8 +40,8 @@ $(document).ready( () => { const id = $(this).attr('id'); const url = new Trip(this).url(); - $.get(url, response => { - $(`#${id}`).append(`

${response.about}

`); + $.get(url, function(response) { + $(`#${id}`).append(tripDetails(response)); }); }); }); diff --git a/src/app/models/trip.js b/src/app/models/trip.js index 2865048..210c438 100644 --- a/src/app/models/trip.js +++ b/src/app/models/trip.js @@ -5,7 +5,7 @@ const Trip = Backbone.Model.extend({ url: function() { const url = this.baseUrl + this.id; return url; - } + }, }); export default Trip; From d2246eed365c79f9fefccd200a6defb7e0b70d59 Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Thu, 30 Nov 2017 18:53:55 -0800 Subject: [PATCH 07/16] Formatted Trips list to table style in wireframe --- favicon.ico => dist/favicon.ico | Bin dist/favicon.png | Bin 13505 -> 0 bytes dist/index.html | 27 +++++++++++++++++++-------- 3 files changed, 19 insertions(+), 8 deletions(-) rename favicon.ico => dist/favicon.ico (100%) delete mode 100644 dist/favicon.png diff --git a/favicon.ico b/dist/favicon.ico similarity index 100% rename from favicon.ico rename to dist/favicon.ico diff --git a/dist/favicon.png b/dist/favicon.png deleted file mode 100644 index abdc3a8f1a79844df24ce2e290d62ae2c58c59ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13505 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 I8-D%20C0f2d;kCd diff --git a/dist/index.html b/dist/index.html index 33f1a49..445b595 100644 --- a/dist/index.html +++ b/dist/index.html @@ -19,11 +19,19 @@

BackTREKAdd a trip

+ + + + + + + + + +
NameContinentWeeks
- -
-
+
@@ -32,15 +40,18 @@

BackTREKAdd a trip

diff --git a/src/app.js b/src/app.js index c877e5b..9e3c052 100644 --- a/src/app.js +++ b/src/app.js @@ -36,12 +36,15 @@ $(document).ready( () => { $('#trip-list').toggle(); }); - $('#trip-list').on('click', 'article', function() { + $('#trip-list').on('click', 'tr', function() { + $('tr').css('background', ''); const id = $(this).attr('id'); const url = new Trip(this).url(); + $(`#${id}`).css('background','pink'); + $.get(url, function(response) { - $(`#${id}`).append(tripDetails(response)); + $(`#trip-details`).html(tripDetails(response)); }); }); }); From 4422d1898726475b776e3cce074a03beddc3667a Mon Sep 17 00:00:00 2001 From: Laura Robertson Date: Thu, 30 Nov 2017 20:41:26 -0800 Subject: [PATCH 09/16] Modal added for add a trip --- dist/index.html | 23 ++++++++++++++++++++++- src/app.js | 12 ++++++++++++ src/css/style.css | 22 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dist/index.html b/dist/index.html index 6e20ce5..a9c4e17 100644 --- a/dist/index.html +++ b/dist/index.html @@ -10,7 +10,7 @@
-

BackTREKAdd a trip

+

BackTREKAdd a trip

@@ -33,6 +33,19 @@

BackTREKAdd a trip

+
+
+

Add a trip

+ + + + + + + +
+
+