From 3f7053a2ac171745d934f7b015d7af6021fa4c25 Mon Sep 17 00:00:00 2001 From: Sara C Date: Wed, 29 Nov 2017 19:40:50 -0800 Subject: [PATCH 01/16] adding tables to html file --- dist/index.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/dist/index.html b/dist/index.html index b873b1e..883d680 100644 --- a/dist/index.html +++ b/dist/index.html @@ -2,19 +2,66 @@ - My JavaScript App + BackTREK + +
- +

BackTREK

-
+
+
+ + +
    +
+
+ +
+

Trips!

+ + + + + + + + + + + +
NameCategoryContinentWeeksCost
+
+ + + From 9ef0ebfef7a96dbe795887713c447c2c42712d5e Mon Sep 17 00:00:00 2001 From: Sara C Date: Wed, 29 Nov 2017 20:38:58 -0800 Subject: [PATCH 02/16] added a model file --- dist/index.html | 4 +++- src/app.js | 2 ++ src/app/models/trip.js | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/app/models/trip.js diff --git a/dist/index.html b/dist/index.html index 883d680..7e8e4f7 100644 --- a/dist/index.html +++ b/dist/index.html @@ -21,6 +21,8 @@

BackTREK

+
+

Trips!

@@ -62,6 +64,6 @@

Trips!

- + diff --git a/src/app.js b/src/app.js index e7af594..09cf9eb 100644 --- a/src/app.js +++ b/src/app.js @@ -6,6 +6,8 @@ import _ from 'underscore'; import './css/foundation.css'; import './css/style.css'; +import Trip from '.app/models/trip'; + console.log('it loaded!'); $(document).ready( () => { diff --git a/src/app/models/trip.js b/src/app/models/trip.js new file mode 100644 index 0000000..d7691e4 --- /dev/null +++ b/src/app/models/trip.js @@ -0,0 +1,8 @@ +import Backbone from 'backbone'; + +const Trip = Backbone.Model.extend({ + +}); + + +export default Trip; From 53710b24aa60876ac957bd33adb27563cd3132fa Mon Sep 17 00:00:00 2001 From: Sara C Date: Thu, 30 Nov 2017 17:52:42 -0800 Subject: [PATCH 03/16] added collection file --- src/app/collections/trip_list.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/app/collections/trip_list.js diff --git a/src/app/collections/trip_list.js b/src/app/collections/trip_list.js new file mode 100644 index 0000000..67e2684 --- /dev/null +++ b/src/app/collections/trip_list.js @@ -0,0 +1,8 @@ +import Backbone from 'backbone'; +import Trip from '../models/trip'; + +const TripList = Backbone.Collection.extend({ + model: Trip +}); + +export default TripList; From e69e99707814a21dc1feae00d54a3b1d7e9f996e Mon Sep 17 00:00:00 2001 From: Sara C Date: Thu, 30 Nov 2017 19:39:38 -0800 Subject: [PATCH 04/16] added function to render triplist --- dist/index.html | 2 +- src/app.js | 20 +++++++++++++++++++- src/app/collections/trip_list.js | 3 ++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dist/index.html b/dist/index.html index 7e8e4f7..71bab8b 100644 --- a/dist/index.html +++ b/dist/index.html @@ -44,7 +44,7 @@

Trips!

- + diff --git a/src/app.js b/src/app.js index 7107928..a6bca8a 100644 --- a/src/app.js +++ b/src/app.js @@ -14,6 +14,7 @@ console.log('it loaded!'); const tripList = new TripList(); let tripTemplate; let atripTemplate; +let trip; const render = function render(tripList) { const $tripList = $('#trip-list'); @@ -25,13 +26,22 @@ const render = function render(tripList) { const seeTrip = function seeTrip(id){ trip = tripList.get(id); - + console.log(trip) + trip.fetch({success: events.getTrip}); } + + const events = { showTrips() { $('#trips-table').toggle({'display': 'block'}); - } + }, + getTrip(trip) { + const $onetrip = $('.onetrip'); + $onetrip.empty(); + $onetrip.append(atripTemplate(trip.attributes)); + }, + }; $(document).ready( () => { @@ -42,5 +52,10 @@ $(document).ready( () => { }); tripList.on('update', render, tripList); tripList.fetch(); + + $('#trips-table').on('click', '.trip', function() { + let tripID = $(this).attr('atrip-id'); + seeTrip(tripID); + }) // $('main').html('

Hello World!

'); }); diff --git a/src/app/collections/trip_list.js b/src/app/collections/trip_list.js index 35919a1..a887cf2 100644 --- a/src/app/collections/trip_list.js +++ b/src/app/collections/trip_list.js @@ -3,7 +3,7 @@ import Trip from '../models/trip'; const TripList = Backbone.Collection.extend({ model: Trip, - url: 'https://ada-backtrek-api.herokuapp.com/trips', + url: 'https://ada-backtrek-api.herokuapp.com/trips/', }); export default TripList; diff --git a/src/app/models/trip.js b/src/app/models/trip.js index 868e708..8afa22e 100644 --- a/src/app/models/trip.js +++ b/src/app/models/trip.js @@ -1,7 +1,7 @@ import Backbone from 'backbone'; const Trip = Backbone.Model.extend({ - + urlRoot: 'https://ada-backtrek-api.herokuapp.com/trips/', }); From b5e68348d1faf5f5d5e4d1bfe8279856ec461ed4 Mon Sep 17 00:00:00 2001 From: Sara C Date: Sun, 10 Dec 2017 16:43:55 -0800 Subject: [PATCH 09/16] updating reservation --- dist/index.html | 21 ++++++++++++++++++ src/app.js | 42 +++++++++++++++++++++++++++++++++-- src/app/models/reservation.js | 8 +++++++ 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 src/app/models/reservation.js diff --git a/dist/index.html b/dist/index.html index de6125a..23de9ac 100644 --- a/dist/index.html +++ b/dist/index.html @@ -60,6 +60,27 @@

<%- name %>

<%- weeks %>

<%- cost %>

+

Make a Reservation!

+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+
+