From 00cfe83dc511938999bc45d004082b2f20a8dd9b Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 15:44:04 -0800
Subject: [PATCH 01/41] import quote view

---
 src/app.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app.js b/src/app.js
index 03ec910..8b185e0 100644
--- a/src/app.js
+++ b/src/app.js
@@ -3,8 +3,12 @@ import 'css/app.css';
 
 import $ from 'jquery';
 
+// models
 import Simulator from 'models/simulator';
+//collections
 import QuoteList from 'collections/quote_list';
+//views
+import QuoteView from './views/quote_view';
 
 const quoteData = [
   {

From f0e90478751531f93b114af1c99c2e72d0767fb2 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 15:44:34 -0800
Subject: [PATCH 02/41] create empty history_view.js

---
 src/views/history_view.js | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/views/history_view.js

diff --git a/src/views/history_view.js b/src/views/history_view.js
new file mode 100644
index 0000000..58a9528
--- /dev/null
+++ b/src/views/history_view.js
@@ -0,0 +1,4 @@
+import Backbone from 'backbone';
+
+import QuotesView from './quotes_view';
+import OpenOrdersView from './open_orders_view';

From e6b48a5a484ea843a1343667f17d2f3ec1ece588 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 15:44:51 -0800
Subject: [PATCH 03/41] create empty open_order_view.js

---
 src/views/open_order_view.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/views/open_order_view.js

diff --git a/src/views/open_order_view.js b/src/views/open_order_view.js
new file mode 100644
index 0000000..96273b0
--- /dev/null
+++ b/src/views/open_order_view.js
@@ -0,0 +1 @@
+import Backbone from 'backbone';

From fa97c2120f45fcd2120a9bd17f56d4ddaecf1c35 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 15:45:32 -0800
Subject: [PATCH 04/41] create quote_view.js, basic setup

---
 src/views/quote_view.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/views/quote_view.js

diff --git a/src/views/quote_view.js b/src/views/quote_view.js
new file mode 100644
index 0000000..9f6e391
--- /dev/null
+++ b/src/views/quote_view.js
@@ -0,0 +1,16 @@
+import Backbone from 'backbone';
+import Quote from '../models/quote';
+
+const QuoteView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+  },
+  render() {
+    const compiledTemplate = this.template(this.model.toJSON());
+    // use $el to ensure that we only select items within the view
+    this.$el.html(compiledTemplate);
+    return this;
+  },
+});
+
+export default QuoteView;

From 19c25e31d599b81d2291e43afbafb5b53097fe1b Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 16:13:58 -0800
Subject: [PATCH 05/41] deleted history_view.js

---
 src/views/history_view.js | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/views/history_view.js

diff --git a/src/views/history_view.js b/src/views/history_view.js
deleted file mode 100644
index 58a9528..0000000
--- a/src/views/history_view.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Backbone from 'backbone';
-
-import QuotesView from './quotes_view';
-import OpenOrdersView from './open_orders_view';

From c34dd5d59c0d749054d1c472bb094bb633f506d2 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 16:14:26 -0800
Subject: [PATCH 06/41] made separation of html and templates more clear

---
 dist/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dist/index.html b/dist/index.html
index 8a046fa..19b9bcc 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -33,6 +33,7 @@ <h2>Quotes</h2>
             <h2>Trade History</h2>
             <div class="trades-list-container">
               <ul id="trades" class="trades">
+                <!-- prepend history here -->
               </ul>
             </div>
           </div>
@@ -82,6 +83,8 @@ <h3>Order Entry Form</h3>
     </div>
     </footer>
 
+<!-- ///////////////////////////////////////////// -->
+
     <script type="text/template" id="quote-template">
       <!-- The provided styles assume that you will insert this template
       within an element with the class "quote" applied -->

From d423c4a520c0009eb8c9886847aaefce3e36cf38 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 19:42:22 -0800
Subject: [PATCH 07/41] deleted open_order_view.js

---
 src/views/open_order_view.js | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 src/views/open_order_view.js

diff --git a/src/views/open_order_view.js b/src/views/open_order_view.js
deleted file mode 100644
index 96273b0..0000000
--- a/src/views/open_order_view.js
+++ /dev/null
@@ -1 +0,0 @@
-import Backbone from 'backbone';

From 9fdef1ad58b08db7a22bd1b8a7bd08bc31021bc2 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 19:42:52 -0800
Subject: [PATCH 08/41] create trade_view.js

---
 src/views/trade_view.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/views/trade_view.js

diff --git a/src/views/trade_view.js b/src/views/trade_view.js
new file mode 100644
index 0000000..e69de29

From 2a50327957f1c232a7cdb0936a51f9eca66ce4bc Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 19:43:11 -0800
Subject: [PATCH 09/41] create trade_list_view.js

---
 src/views/trade_list_view.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/views/trade_list_view.js

diff --git a/src/views/trade_list_view.js b/src/views/trade_list_view.js
new file mode 100644
index 0000000..e69de29

From 3b08c76ed3d2664dc374f53f822802f13e6d012f Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 19:43:30 -0800
Subject: [PATCH 10/41] create quote_list_view.js

---
 src/views/quote_list_view.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/views/quote_list_view.js

diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
new file mode 100644
index 0000000..e69de29

From 437fa4317ee872984dc64b3855458112b336016c Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 19:52:21 -0800
Subject: [PATCH 11/41] create functions buy() and sell() to increase/decrease
 the price by 1

---
 src/app.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/app.js b/src/app.js
index 8b185e0..699a1fd 100644
--- a/src/app.js
+++ b/src/app.js
@@ -1,6 +1,6 @@
 import 'foundation-sites/dist/foundation.css';
 import 'css/app.css';
-
+import _ from 'underscore';
 import $ from 'jquery';
 
 // models
@@ -9,6 +9,7 @@ import Simulator from 'models/simulator';
 import QuoteList from 'collections/quote_list';
 //views
 import QuoteView from './views/quote_view';
+import QuoteListView from 'views/quote_list_view';
 
 const quoteData = [
   {
@@ -35,5 +36,15 @@ $(document).ready(function() {
     quotes: quotes,
   });
 
+  const quoteListView = new QuoteListView({
+    model: quotes,
+    template: _.template($('#quote-template').html()),
+    el: 'main',
+  });
+
+  quoteListView.render();
+
+
+// SIMULATOR START //
   simulator.start();
 });

From 1d24a551b6fc2a54568264c9b28b01998ff8dbef Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 19:53:03 -0800
Subject: [PATCH 12/41] create functions buy() and sell() to increase/decrease
 the price by 1

---
 src/models/quote.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/models/quote.js b/src/models/quote.js
index 4fbf466..263bb81 100644
--- a/src/models/quote.js
+++ b/src/models/quote.js
@@ -8,10 +8,12 @@ const Quote = Backbone.Model.extend({
 
   buy() {
     // Implement this function to increase the price by $1.00
+    this.set('price', this.get('price') + 1.00);
   },
 
   sell() {
     // Implement this function to decrease the price by $1.00
+    this.set('price', this.get('price') - 1.00);
   },
 });
 

From d7e129e796e73115137d34427e454b1eba1a4553 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 20:15:06 -0800
Subject: [PATCH 13/41] quote data appears, sell/buy buttons do not yet work

---
 dist/index.html              |  6 +++++-
 src/views/quote_list_view.js | 27 +++++++++++++++++++++++++++
 src/views/quote_view.js      |  5 ++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 19b9bcc..1a30934 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -83,7 +83,7 @@ <h3>Order Entry Form</h3>
     </div>
     </footer>
 
-<!-- ///////////////////////////////////////////// -->
+<!-- ////////////////////////////////////////// -->
 
     <script type="text/template" id="quote-template">
       <!-- The provided styles assume that you will insert this template
@@ -100,6 +100,8 @@ <h3 class="price">$<%- price.toFixed(2) %></h3>
       <!-- </li> -->
     </script>
 
+<!-- ////////////////////////////////////////// -->
+
     <script type="text/template" id="trade-template">
       <li class="trade">
         <span>
@@ -108,6 +110,8 @@ <h3 class="price">$<%- price.toFixed(2) %></h3>
       </li>
     </script>
 
+<!-- ////////////////////////////////////////// -->
+
     <script type="text/template" id="order-template">
       <h3 class="symbol"><%- symbol %></h3>
       <div class="detail">
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index e69de29..d20fa05 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -0,0 +1,27 @@
+import Backbone from 'backbone';
+import QuoteView from './quote_view';
+
+const QuoteListView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+    this.listenTo(this.model, 'update', this.render);
+  },
+
+  render() {
+    const list = this.$('#quotes');
+    list.empty();
+    this.model.each((quote) => {
+      const quoteView = new QuoteView({
+        model: quote,
+        template: this.template,
+        tagName: 'li',
+        // why was class chosen over id here?
+        className: 'quote',
+      });
+      list.append(quoteView.render().$el);
+    });
+    return this;
+  },
+});
+
+export default QuoteListView;
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index 9f6e391..f8ff8c2 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -6,9 +6,12 @@ const QuoteView = Backbone.View.extend({
     this.template = params.template;
   },
   render() {
-    const compiledTemplate = this.template(this.model.toJSON());
+    // why JSON?
+    // const compiledTemplate = this.template(this.model.toJSON());
     // use $el to ensure that we only select items within the view
+    const compiledTemplate = this.template(this.model.attributes);
     this.$el.html(compiledTemplate);
+    
     return this;
   },
 });

From 98c6824d3c2aa9e08ff1e657ea24eb7bff5bbf13 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 20:32:40 -0800
Subject: [PATCH 14/41] fixed bugs, the simulator now WORKS

---
 src/app.js                   | 9 ++-------
 src/views/quote_list_view.js | 3 +--
 src/views/quote_view.js      | 4 +---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/app.js b/src/app.js
index 699a1fd..2ab1ef8 100644
--- a/src/app.js
+++ b/src/app.js
@@ -1,14 +1,11 @@
 import 'foundation-sites/dist/foundation.css';
 import 'css/app.css';
-import _ from 'underscore';
+
 import $ from 'jquery';
+import _ from 'underscore';
 
-// models
 import Simulator from 'models/simulator';
-//collections
 import QuoteList from 'collections/quote_list';
-//views
-import QuoteView from './views/quote_view';
 import QuoteListView from 'views/quote_list_view';
 
 const quoteData = [
@@ -44,7 +41,5 @@ $(document).ready(function() {
 
   quoteListView.render();
 
-
-// SIMULATOR START //
   simulator.start();
 });
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index d20fa05..4fc5172 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -6,7 +6,7 @@ const QuoteListView = Backbone.View.extend({
     this.template = params.template;
     this.listenTo(this.model, 'update', this.render);
   },
-
+  
   render() {
     const list = this.$('#quotes');
     list.empty();
@@ -15,7 +15,6 @@ const QuoteListView = Backbone.View.extend({
         model: quote,
         template: this.template,
         tagName: 'li',
-        // why was class chosen over id here?
         className: 'quote',
       });
       list.append(quoteView.render().$el);
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index f8ff8c2..e90c781 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -1,17 +1,15 @@
 import Backbone from 'backbone';
-import Quote from '../models/quote';
 
 const QuoteView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.listenTo(this.model, "change", this.render);
   },
   render() {
     // why JSON?
     // const compiledTemplate = this.template(this.model.toJSON());
-    // use $el to ensure that we only select items within the view
     const compiledTemplate = this.template(this.model.attributes);
     this.$el.html(compiledTemplate);
-    
     return this;
   },
 });

From 0ae260e8ee12dc24de3abcd631348db06b7d6e8a Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 21:13:16 -0800
Subject: [PATCH 15/41] create Trade model

---
 src/models/trade.js | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/models/trade.js

diff --git a/src/models/trade.js b/src/models/trade.js
new file mode 100644
index 0000000..6034c4b
--- /dev/null
+++ b/src/models/trade.js
@@ -0,0 +1,11 @@
+import Backbone from 'backbone';
+
+const Trade = Backbone.Model.extend({
+  initialize(params) {
+    this.symbol = params.symbol;
+    this.buy = params.buy;
+    this.price = params.price;
+  }
+});
+
+export default Trade;

From 8c44ede5b63f4a546e12d8076322a81d413692b3 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 21:14:53 -0800
Subject: [PATCH 16/41] create Trade collection

---
 src/collections/trade_list.js | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/collections/trade_list.js

diff --git a/src/collections/trade_list.js b/src/collections/trade_list.js
new file mode 100644
index 0000000..1b6152b
--- /dev/null
+++ b/src/collections/trade_list.js
@@ -0,0 +1,8 @@
+import Backbone from 'backbone';
+import Trade from 'models/trade';
+
+const TradeList = Backbone.Collection.extend({
+  model: Trade,
+});
+
+export default TradeList;

From 9e7e144c1c95528ec49698b37c1922b9ad1ab96c Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 21:16:40 -0800
Subject: [PATCH 17/41] import new files for Trade, set up rendering trade list
 template

---
 src/app.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/app.js b/src/app.js
index 2ab1ef8..692e541 100644
--- a/src/app.js
+++ b/src/app.js
@@ -3,10 +3,14 @@ import 'css/app.css';
 
 import $ from 'jquery';
 import _ from 'underscore';
-
+//models
 import Simulator from 'models/simulator';
+//collections
+import TradeList from 'collections/trade_list';
 import QuoteList from 'collections/quote_list';
+//views
 import QuoteListView from 'views/quote_list_view';
+import TradeListView from 'views/trade_list_view';
 
 const quoteData = [
   {
@@ -27,6 +31,19 @@ const quoteData = [
   },
 ];
 
+const tradeData = [
+  {
+    symbol: 'ABCD',
+    buy: true,
+    price: 10.02,
+  },
+  {
+    symbol: 'XYZ',
+    buy: false,
+    price: 15.02,
+  },
+]
+
 $(document).ready(function() {
   const quotes = new QuoteList(quoteData);
   const simulator = new Simulator({
@@ -38,8 +55,15 @@ $(document).ready(function() {
     template: _.template($('#quote-template').html()),
     el: 'main',
   });
-
   quoteListView.render();
 
+  const tradeList = new TradeList(tradeData);
+  const tradeListView = new TradeListView({
+    model: tradeList,
+    template: _.template($('#trade-template').html()),
+    el: 'main',
+  });
+  tradeListView.render();
+
   simulator.start();
 });

From 4d29dbd0eff2822678705c5a1871696115092351 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 21:21:15 -0800
Subject: [PATCH 18/41] create trade list view (based on quote list view)

---
 src/views/quote_view.js      | 15 +++++++++++++--
 src/views/trade_list_view.js | 26 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index e90c781..c1e136a 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -7,11 +7,22 @@ const QuoteView = Backbone.View.extend({
   },
   render() {
     // why JSON?
-    // const compiledTemplate = this.template(this.model.toJSON());
-    const compiledTemplate = this.template(this.model.attributes);
+    const compiledTemplate = this.template(this.model.toJSON());
     this.$el.html(compiledTemplate);
     return this;
   },
+  events: {
+    'click .btn-buy': 'buyQuote',
+    'click .btn-sell': 'sellQuote',
+  },
+  buyQuote() {
+    this.model.buy();
+    console.log('bought!');
+  },
+  sellQuote() {
+    this.model.sell();
+    console.log('sold!');
+  },
 });
 
 export default QuoteView;
diff --git a/src/views/trade_list_view.js b/src/views/trade_list_view.js
index e69de29..ecb7231 100644
--- a/src/views/trade_list_view.js
+++ b/src/views/trade_list_view.js
@@ -0,0 +1,26 @@
+import Backbone from 'backbone';
+import TradeView from './trade_view';
+
+const TradeListView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+    this.listenTo(this.model, 'update', this.render);
+  },
+  
+  render() {
+    const list = this.$('#trades');
+    list.empty();
+    this.model.each((trade) => {
+      const tradeView = new TradeView({
+        model: trade,
+        template: this.template,
+        tagName: 'li',
+        className: 'trade',
+      });
+      list.prepend(tradeView.render().$el);
+    });
+    return this;
+  },
+});
+
+export default TradeListView;

From 44fb5934136dee78c561e1788723c5ad40d4b104 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 21:21:51 -0800
Subject: [PATCH 19/41] create trade view (based on quote view)

---
 src/app.js              |  1 +
 src/views/trade_view.js | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/app.js b/src/app.js
index 692e541..085e735 100644
--- a/src/app.js
+++ b/src/app.js
@@ -31,6 +31,7 @@ const quoteData = [
   },
 ];
 
+// fake history to test
 const tradeData = [
   {
     symbol: 'ABCD',
diff --git a/src/views/trade_view.js b/src/views/trade_view.js
index e69de29..dca7bff 100644
--- a/src/views/trade_view.js
+++ b/src/views/trade_view.js
@@ -0,0 +1,15 @@
+import Backbone from 'backbone';
+
+const TradeView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+    this.listenTo(this.model, "change", this.render);
+  },
+  render() {
+    const compiledTemplate = this.template(this.model.toJSON());
+    this.$el.html(compiledTemplate);
+    return this;
+  },
+});
+
+export default TradeView;

From c9c6eb9995aa19fd5e4a1d11dd622214527ba51c Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 22:00:30 -0800
Subject: [PATCH 20/41] add to buy/sell functions to 'get' symbols and prices

---
 src/views/quote_view.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index c1e136a..93bf5d3 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -1,8 +1,10 @@
 import Backbone from 'backbone';
+import Trade from '../models/trade';
 
 const QuoteView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.trades = params.trades;
     this.listenTo(this.model, "change", this.render);
   },
   render() {
@@ -18,10 +20,22 @@ const QuoteView = Backbone.View.extend({
   buyQuote() {
     this.model.buy();
     console.log('bought!');
+    const trade = new Trade({
+      symbol: this.model.get('symbol'),
+      buy: true,
+      price: this.model.get('price'),
+    });
+    this.trades.add(trade);
   },
   sellQuote() {
     this.model.sell();
     console.log('sold!');
+    const trade = new Trade({
+      symbol: this.model.get('symbol'),
+      buy: false,
+      price: this.model.get('price'),
+    });
+    this.trades.add(trade);
   },
 });
 

From 25d1124ca86887ead7be017cb9db549a892ab4eb Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 22:01:13 -0800
Subject: [PATCH 21/41] remove temporary history

---
 src/app.js                   | 17 ++---------------
 src/views/quote_list_view.js |  4 +++-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/app.js b/src/app.js
index 085e735..e15a732 100644
--- a/src/app.js
+++ b/src/app.js
@@ -31,20 +31,6 @@ const quoteData = [
   },
 ];
 
-// fake history to test
-const tradeData = [
-  {
-    symbol: 'ABCD',
-    buy: true,
-    price: 10.02,
-  },
-  {
-    symbol: 'XYZ',
-    buy: false,
-    price: 15.02,
-  },
-]
-
 $(document).ready(function() {
   const quotes = new QuoteList(quoteData);
   const simulator = new Simulator({
@@ -55,10 +41,11 @@ $(document).ready(function() {
     model: quotes,
     template: _.template($('#quote-template').html()),
     el: 'main',
+    trades: tradeList,
   });
   quoteListView.render();
 
-  const tradeList = new TradeList(tradeData);
+  const tradeList = new TradeList();
   const tradeListView = new TradeListView({
     model: tradeList,
     template: _.template($('#trade-template').html()),
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index 4fc5172..adeb387 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -4,9 +4,10 @@ import QuoteView from './quote_view';
 const QuoteListView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.trades = params.trades;
     this.listenTo(this.model, 'update', this.render);
   },
-  
+
   render() {
     const list = this.$('#quotes');
     list.empty();
@@ -16,6 +17,7 @@ const QuoteListView = Backbone.View.extend({
         template: this.template,
         tagName: 'li',
         className: 'quote',
+        trades: this.trades,
       });
       list.append(quoteView.render().$el);
     });

From f5226b3b34ef6cb2ee268ba47e10959bc3e5646d Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Tue, 12 Dec 2017 22:18:49 -0800
Subject: [PATCH 22/41] adds to history when buy or sell is clicked (just
 needed to move where tradeList was initialized)

---
 src/app.js              | 6 ++++--
 src/views/quote_view.js | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app.js b/src/app.js
index e15a732..5e220ec 100644
--- a/src/app.js
+++ b/src/app.js
@@ -33,10 +33,13 @@ const quoteData = [
 
 $(document).ready(function() {
   const quotes = new QuoteList(quoteData);
+  
   const simulator = new Simulator({
     quotes: quotes,
   });
 
+  const tradeList = new TradeList();
+
   const quoteListView = new QuoteListView({
     model: quotes,
     template: _.template($('#quote-template').html()),
@@ -45,12 +48,11 @@ $(document).ready(function() {
   });
   quoteListView.render();
 
-  const tradeList = new TradeList();
   const tradeListView = new TradeListView({
     model: tradeList,
     template: _.template($('#trade-template').html()),
     el: 'main',
-  });
+  })
   tradeListView.render();
 
   simulator.start();
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index 93bf5d3..214dfb7 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -7,6 +7,7 @@ const QuoteView = Backbone.View.extend({
     this.trades = params.trades;
     this.listenTo(this.model, "change", this.render);
   },
+
   render() {
     // why JSON?
     const compiledTemplate = this.template(this.model.toJSON());
@@ -17,6 +18,7 @@ const QuoteView = Backbone.View.extend({
     'click .btn-buy': 'buyQuote',
     'click .btn-sell': 'sellQuote',
   },
+
   buyQuote() {
     this.model.buy();
     console.log('bought!');
@@ -27,6 +29,7 @@ const QuoteView = Backbone.View.extend({
     });
     this.trades.add(trade);
   },
+
   sellQuote() {
     this.model.sell();
     console.log('sold!');

From df84801e2063553c87bf48cf9e5d86915614806b Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Wed, 13 Dec 2017 15:32:38 -0800
Subject: [PATCH 23/41] create files for orders

---
 src/collections/order_list.js | 8 ++++++++
 src/models/order.js           | 7 +++++++
 src/views/order_list_view.js  | 5 +++++
 src/views/order_view.js       | 5 +++++
 4 files changed, 25 insertions(+)
 create mode 100644 src/collections/order_list.js
 create mode 100644 src/models/order.js
 create mode 100644 src/views/order_list_view.js
 create mode 100644 src/views/order_view.js

diff --git a/src/collections/order_list.js b/src/collections/order_list.js
new file mode 100644
index 0000000..8d7cabd
--- /dev/null
+++ b/src/collections/order_list.js
@@ -0,0 +1,8 @@
+import Backbone from 'backbone';
+import Order from 'models/order';
+
+const OrderList = Backbone.Collection.extend({
+  model: Order,
+});
+
+export default OrderList;
diff --git a/src/models/order.js b/src/models/order.js
new file mode 100644
index 0000000..ac00259
--- /dev/null
+++ b/src/models/order.js
@@ -0,0 +1,7 @@
+import Backbone from 'backbone';
+
+const Order = Backbone.Model.extend({
+
+});
+
+export default Order;
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
new file mode 100644
index 0000000..68b5805
--- /dev/null
+++ b/src/views/order_list_view.js
@@ -0,0 +1,5 @@
+import Backbone from 'backbone';
+import OrderView from './order_view';
+
+
+export default OrderListView;
diff --git a/src/views/order_view.js b/src/views/order_view.js
new file mode 100644
index 0000000..de9bb0f
--- /dev/null
+++ b/src/views/order_view.js
@@ -0,0 +1,5 @@
+import Backbone from 'backbone';
+import Order from '../models/order';
+
+
+export default OrderView;

From 2e2445804c81198a2c91bee250b521f1710c49da Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Thu, 14 Dec 2017 12:55:27 -0800
Subject: [PATCH 24/41] refactor using bus after Charles review

---
 dist/index.html              |  2 +-
 src/app.js                   | 11 ++++++++---
 src/views/order_list_view.js | 11 +++++++++++
 src/views/order_view.js      | 12 +++++++++++-
 src/views/quote_list_view.js |  7 +++++--
 src/views/quote_view.js      |  9 ++++++---
 src/views/trade_list_view.js |  8 +++++++-
 src/views/trade_view.js      |  1 +
 8 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 1a30934..aaefc51 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -58,7 +58,7 @@ <h2>Open Orders</h2>
        <div class="columns large-4 small-12 trade-column">
          <div class="order-entry-form columns small-10 small-offset-1">
            <h3>Order Entry Form</h3>
-           <form>
+           <form id="order-entry-form">
              <label for="symbol">Symbol</label>
              <select name="symbol">
                <!-- Option entries should be added here using JavaScript -->
diff --git a/src/app.js b/src/app.js
index 5e220ec..89d6e5b 100644
--- a/src/app.js
+++ b/src/app.js
@@ -3,11 +3,13 @@ import 'css/app.css';
 
 import $ from 'jquery';
 import _ from 'underscore';
+import Backbone from 'backbone';
 //models
 import Simulator from 'models/simulator';
 //collections
 import TradeList from 'collections/trade_list';
 import QuoteList from 'collections/quote_list';
+import OrderList from './collections/order_list';
 //views
 import QuoteListView from 'views/quote_list_view';
 import TradeListView from 'views/trade_list_view';
@@ -32,19 +34,21 @@ const quoteData = [
 ];
 
 $(document).ready(function() {
+  const bus = _.extend({}, Backbone.Events);
   const quotes = new QuoteList(quoteData);
-  
+  const orderList = new OrderList;
   const simulator = new Simulator({
     quotes: quotes,
   });
-
   const tradeList = new TradeList();
 
   const quoteListView = new QuoteListView({
     model: quotes,
     template: _.template($('#quote-template').html()),
     el: 'main',
-    trades: tradeList,
+    // trades: tradeList,
+    // orders: orderList,
+    bus: bus,
   });
   quoteListView.render();
 
@@ -52,6 +56,7 @@ $(document).ready(function() {
     model: tradeList,
     template: _.template($('#trade-template').html()),
     el: 'main',
+    bus: bus,
   })
   tradeListView.render();
 
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 68b5805..3a08834 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -1,5 +1,16 @@
 import Backbone from 'backbone';
 import OrderView from './order_view';
 
+const OrderListView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+    this.bus = params.bus;
+  },
+
+  render() {
+
+    return this;
+  },
+});
 
 export default OrderListView;
diff --git a/src/views/order_view.js b/src/views/order_view.js
index de9bb0f..e080216 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -1,5 +1,15 @@
 import Backbone from 'backbone';
-import Order from '../models/order';
 
+const OrderView = Backbone.View.extend({
+  initialize(params) {
+    this.template = params.template;
+    this.bus = params.bus;
+  },
+  render() {
+    const compiledTemplate = this.template(this.model.toJSON());
+    this.$el.html(compiledTemplate);
+    return this;
+  },
+});
 
 export default OrderView;
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index adeb387..04048c3 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -4,7 +4,9 @@ import QuoteView from './quote_view';
 const QuoteListView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    this.trades = params.trades;
+    // this.trades = params.trades;
+    // this.orders = params.orders;
+    this.bus = params.bus;
     this.listenTo(this.model, 'update', this.render);
   },
 
@@ -17,7 +19,8 @@ const QuoteListView = Backbone.View.extend({
         template: this.template,
         tagName: 'li',
         className: 'quote',
-        trades: this.trades,
+        // trades: this.trades,
+        bus: this.bus,
       });
       list.append(quoteView.render().$el);
     });
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index 214dfb7..26e4f8d 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -4,7 +4,8 @@ import Trade from '../models/trade';
 const QuoteView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    this.trades = params.trades;
+    // this.trades = params.trades;
+    this.bus = params.bus;
     this.listenTo(this.model, "change", this.render);
   },
 
@@ -27,7 +28,8 @@ const QuoteView = Backbone.View.extend({
       buy: true,
       price: this.model.get('price'),
     });
-    this.trades.add(trade);
+    // this.trades.add(trade);
+    this.bus.trigger('addTrade', trade);
   },
 
   sellQuote() {
@@ -38,7 +40,8 @@ const QuoteView = Backbone.View.extend({
       buy: false,
       price: this.model.get('price'),
     });
-    this.trades.add(trade);
+    // this.trades.add(trade);
+    this.bus.trigger('addTrade', trade);
   },
 });
 
diff --git a/src/views/trade_list_view.js b/src/views/trade_list_view.js
index ecb7231..464dd12 100644
--- a/src/views/trade_list_view.js
+++ b/src/views/trade_list_view.js
@@ -4,9 +4,11 @@ import TradeView from './trade_view';
 const TradeListView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.bus = params.bus;
+    this.listenTo(this.bus, 'addTrade', this.newTrade);
     this.listenTo(this.model, 'update', this.render);
   },
-  
+
   render() {
     const list = this.$('#trades');
     list.empty();
@@ -21,6 +23,10 @@ const TradeListView = Backbone.View.extend({
     });
     return this;
   },
+  
+  newTrade(trade) {
+    this.model.add(trade);
+  },
 });
 
 export default TradeListView;
diff --git a/src/views/trade_view.js b/src/views/trade_view.js
index dca7bff..98f3099 100644
--- a/src/views/trade_view.js
+++ b/src/views/trade_view.js
@@ -3,6 +3,7 @@ import Backbone from 'backbone';
 const TradeView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.bus = params.bus;
     this.listenTo(this.model, "change", this.render);
   },
   render() {

From 6cfb3dfaf2e53e14db3c83070ecf57dff41abfee Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Thu, 14 Dec 2017 13:29:35 -0800
Subject: [PATCH 25/41] populate order dropdown with symbols using .map

---
 src/app.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/app.js b/src/app.js
index 89d6e5b..28539f2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -60,5 +60,13 @@ $(document).ready(function() {
   })
   tradeListView.render();
 
+  quoteData.map(quote => quote.symbol).forEach((symbol) => {
+    $("select[name='symbol']").append($('<option>',
+    {
+      value: symbol,
+      text: symbol,
+    }));
+  });
+
   simulator.start();
 });

From 87a37abf8a53f5bd36c2e38221361e597a81af1c Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Thu, 14 Dec 2017 13:48:31 -0800
Subject: [PATCH 26/41] minor spacing changes and comments before trying to
 work out the form

---
 dist/index.html              |  4 ++--
 src/app.js                   | 22 ++++++++++++++++++++++
 src/models/order.js          | 11 +++++++++++
 src/views/order_list_view.js | 22 ++++++++++++++--------
 src/views/order_view.js      | 26 ++++++++++++++++++++++++++
 5 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index aaefc51..7c7683c 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -66,8 +66,8 @@ <h3>Order Entry Form</h3>
              <label for="price-target">Price</label>
              <input type="number" name="price-target" step="0.10" min="0.00" placeholder="100.00" />
              <label>Action</label>
-             <button class="btn-buy alert button">Buy</button>
-             <button class="btn-sell success button">Sell</button>
+             <button id="order-buy" class="btn-buy alert button">Buy</button>
+             <button id="order-sell" class="btn-sell success button">Sell</button>
            </form>
            <div class="form-errors">
            </div>
diff --git a/src/app.js b/src/app.js
index 28539f2..270db41 100644
--- a/src/app.js
+++ b/src/app.js
@@ -13,6 +13,7 @@ import OrderList from './collections/order_list';
 //views
 import QuoteListView from 'views/quote_list_view';
 import TradeListView from 'views/trade_list_view';
+import OrderListView from 'views/order_list_view';
 
 const quoteData = [
   {
@@ -33,6 +34,27 @@ const quoteData = [
   },
 ];
 
+////////////// TEMPORARY
+const fakeOrderData = [
+  {
+    symbol: 'HUMOR',
+    price: 108.50,
+  },
+  {
+    symbol: 'CLOTH',
+    price: 61.70,
+  },
+  {
+    symbol: 'HABIT',
+    price: 78.00,
+  },
+  {
+    symbol: 'SUPER',
+    price: 103.10,
+  },
+];
+///////////////////////
+
 $(document).ready(function() {
   const bus = _.extend({}, Backbone.Events);
   const quotes = new QuoteList(quoteData);
diff --git a/src/models/order.js b/src/models/order.js
index ac00259..992b701 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -1,7 +1,18 @@
 import Backbone from 'backbone';
 
 const Order = Backbone.Model.extend({
+  defaults: {
+    symbol: 'UNDEF',
+    targetPrice: 0.00
+  },
 
+  buy() {
+    this.get('target-price');
+  },
+
+  sell() {
+    this.get('target-price');
+  },
 });
 
 export default Order;
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 3a08834..6f228ca 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -2,15 +2,21 @@ import Backbone from 'backbone';
 import OrderView from './order_view';
 
 const OrderListView = Backbone.View.extend({
-  initialize(params) {
-    this.template = params.template;
-    this.bus = params.bus;
-  },
+  // initialize(params) {
+  //   this.template = params.template;
+  //   this.bus = params.bus;
+  //   this.listenTo(this.model, 'update', this.render);
+  // },
+  // events: {
+  //   'click #order-buy': 'buyOrder',
+  //   'click #order-sell': 'sellOrder',
+  // },
+  // render() {
+  //
+  //   return this;
+  // },
 
-  render() {
-
-    return this;
-  },
+  
 });
 
 export default OrderListView;
diff --git a/src/views/order_view.js b/src/views/order_view.js
index e080216..5517294 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -10,6 +10,32 @@ const OrderView = Backbone.View.extend({
     this.$el.html(compiledTemplate);
     return this;
   },
+  events: {
+    'click #order-buy': 'buyOrder',
+    'click #order-sell': 'sellOrder',
+  },
+
+  buyOrder() {
+    this.model.buy();
+    console.log('buy order placed!');
+    const order = new Order({
+      symbol: this.model.get('symbol'),
+      buy: true,
+      targetPrice: this.model.get('price-target'),
+    });
+    this.bus.trigger('addOrder', order);
+  },
+
+  sellOrder() {
+    this.model.sell();
+    console.log('sell order placed!');
+    const order = new Order({
+      symbol: this.model.get('symbol'),
+      buy: false,
+      targetPrice: this.model.get('price-target'),
+    });
+    this.bus.trigger('addOrder', order);
+  },
 });
 
 export default OrderView;

From 1a2dccff45053b5e0adbe155d6bd4648d6cf11ef Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Fri, 15 Dec 2017 11:00:25 -0800
Subject: [PATCH 27/41] form collects data, does not yet post to open orders

---
 dist/index.html              |  2 +-
 src/app.js                   | 17 +++++++++--
 src/models/order.js          | 11 +++----
 src/views/order_list_view.js | 56 +++++++++++++++++++++++++++---------
 src/views/order_view.js      | 26 -----------------
 5 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 7c7683c..fb2512f 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -13,7 +13,7 @@
         <h1 class="logo">Ada Trader</h1>
       </header>
 
-      <div class="workspace row">
+      <div id="workspace" class="workspace row">
 
         <div class="columns large-8 small-12">
 
diff --git a/src/app.js b/src/app.js
index 270db41..5ee29f8 100644
--- a/src/app.js
+++ b/src/app.js
@@ -58,12 +58,13 @@ const fakeOrderData = [
 $(document).ready(function() {
   const bus = _.extend({}, Backbone.Events);
   const quotes = new QuoteList(quoteData);
-  const orderList = new OrderList;
+  const tradeList = new TradeList();
+  const orderList = new OrderList();
   const simulator = new Simulator({
     quotes: quotes,
   });
-  const tradeList = new TradeList();
 
+///// quote list view /////
   const quoteListView = new QuoteListView({
     model: quotes,
     template: _.template($('#quote-template').html()),
@@ -74,10 +75,11 @@ $(document).ready(function() {
   });
   quoteListView.render();
 
+///// trade list view /////
   const tradeListView = new TradeListView({
     model: tradeList,
     template: _.template($('#trade-template').html()),
-    el: 'main',
+    el: '#workspace',
     bus: bus,
   })
   tradeListView.render();
@@ -90,5 +92,14 @@ $(document).ready(function() {
     }));
   });
 
+///// order list view /////
+  const orderListView = new OrderListView({
+    model: orderList,
+    template: _.template($('#order-template').html()),
+    el: '#order-workspace'
+  });
+  orderListView.render();
+
+///// simulator /////
   simulator.start();
 });
diff --git a/src/models/order.js b/src/models/order.js
index 992b701..3a7db1d 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -1,17 +1,14 @@
 import Backbone from 'backbone';
 
 const Order = Backbone.Model.extend({
-  defaults: {
-    symbol: 'UNDEF',
-    targetPrice: 0.00
-  },
-
   buy() {
-    this.get('target-price');
+    // Implement this function to increase the price by $1.00
+    this.set('price-target', this.get('price-target'));
   },
 
   sell() {
-    this.get('target-price');
+    // Implement this function to decrease the price by $1.00
+    this.set('price-target', this.get('price-target'));
   },
 });
 
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 6f228ca..5209581 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -1,22 +1,50 @@
 import Backbone from 'backbone';
 import OrderView from './order_view';
+import Order from '../models/order';
 
 const OrderListView = Backbone.View.extend({
-  // initialize(params) {
-  //   this.template = params.template;
-  //   this.bus = params.bus;
-  //   this.listenTo(this.model, 'update', this.render);
-  // },
-  // events: {
-  //   'click #order-buy': 'buyOrder',
-  //   'click #order-sell': 'sellOrder',
-  // },
-  // render() {
-  //
-  //   return this;
-  // },
+  initialize(params) {
+    this.template = params.template;
+    this.listenTo(this.model, 'update', this.render);
+  },
 
-  
+  render() {
+    // Clear the unordered list
+    this.$('#orders').empty();
+    // Iterate through the list rendering each Order
+    this.model.each((order) => {
+      // Create a new OrderView with the model & template
+      const orderView = new OrderView({
+        model: order,
+        template: this.template,
+        tagName: 'li',
+        className: 'order',
+      });
+      // Then render the OrderView
+      // And append the resulting HTML to the DOM.
+      this.$('#orders').append(orderView.render().$el);
+    });
+    return this;
+  },
+
+
+  events: {
+    'click #order-buy': 'buyOrder',
+    'click #order-sell': 'sellOrder',
+  },
+
+  buyOrder(event) {
+    event.preventDefault();
+    console.log('it clicked!');
+    const orderData = {};
+    ['symbol', 'price-target'].forEach( (field) => {
+      const val = this.$(`#order-entry-form  [name=${field}]`).val();
+      console.log(val);
+      orderData[field] = val;
+    });
+    const newOrder = new Order(orderData);
+    console.log(orderData);
+  },
 });
 
 export default OrderListView;
diff --git a/src/views/order_view.js b/src/views/order_view.js
index 5517294..e080216 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -10,32 +10,6 @@ const OrderView = Backbone.View.extend({
     this.$el.html(compiledTemplate);
     return this;
   },
-  events: {
-    'click #order-buy': 'buyOrder',
-    'click #order-sell': 'sellOrder',
-  },
-
-  buyOrder() {
-    this.model.buy();
-    console.log('buy order placed!');
-    const order = new Order({
-      symbol: this.model.get('symbol'),
-      buy: true,
-      targetPrice: this.model.get('price-target'),
-    });
-    this.bus.trigger('addOrder', order);
-  },
-
-  sellOrder() {
-    this.model.sell();
-    console.log('sell order placed!');
-    const order = new Order({
-      symbol: this.model.get('symbol'),
-      buy: false,
-      targetPrice: this.model.get('price-target'),
-    });
-    this.bus.trigger('addOrder', order);
-  },
 });
 
 export default OrderView;

From eefb9aeca93a563cbf2adddde3c3ba71567db875 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Fri, 15 Dec 2017 12:17:15 -0800
Subject: [PATCH 28/41] create addOrder and sellOrder, will refactor into
 newOrder later

---
 src/views/order_list_view.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 5209581..b14d09f 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -36,7 +36,19 @@ const OrderListView = Backbone.View.extend({
   buyOrder(event) {
     event.preventDefault();
     console.log('it clicked!');
-    const orderData = {};
+    const orderData = {buy: true};
+    ['symbol', 'price-target'].forEach( (field) => {
+      const val = this.$(`#order-entry-form  [name=${field}]`).val();
+      console.log(val);
+      orderData[field] = val;
+    });
+    const newOrder = new Order(orderData);
+    console.log(orderData);
+  },
+  sellOrder(event) {
+    event.preventDefault();
+    console.log('it clicked!');
+    const orderData = {buy: false};
     ['symbol', 'price-target'].forEach( (field) => {
       const val = this.$(`#order-entry-form  [name=${field}]`).val();
       console.log(val);

From 966e4e25241d9100fe0aa7cbeb3fbe02fcc4724c Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sat, 16 Dec 2017 15:43:27 -0800
Subject: [PATCH 29/41] change names of variables

---
 dist/index.html              |  4 ++--
 src/app.js                   |  2 ++
 src/views/order_list_view.js | 40 +++++++++++++++++++-----------------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index fb2512f..481656c 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -63,8 +63,8 @@ <h3>Order Entry Form</h3>
              <select name="symbol">
                <!-- Option entries should be added here using JavaScript -->
              </select>
-             <label for="price-target">Price</label>
-             <input type="number" name="price-target" step="0.10" min="0.00" placeholder="100.00" />
+             <label for="target-price">Price</label>
+             <input type="number" name="target-price" step="0.10" min="0.00" placeholder="100.00" />
              <label>Action</label>
              <button id="order-buy" class="btn-buy alert button">Buy</button>
              <button id="order-sell" class="btn-sell success button">Sell</button>
diff --git a/src/app.js b/src/app.js
index 5ee29f8..393ab0e 100644
--- a/src/app.js
+++ b/src/app.js
@@ -95,6 +95,8 @@ $(document).ready(function() {
 ///// order list view /////
   const orderListView = new OrderListView({
     model: orderList,
+    quotes: quotes,
+    bus: bus,
     template: _.template($('#order-template').html()),
     el: '#order-workspace'
   });
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index b14d09f..044794d 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -1,27 +1,26 @@
 import Backbone from 'backbone';
+
 import OrderView from './order_view';
 import Order from '../models/order';
 
 const OrderListView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.quotes = params.quotes;
+    this.bus = this.bus;
     this.listenTo(this.model, 'update', this.render);
+
   },
 
   render() {
-    // Clear the unordered list
     this.$('#orders').empty();
-    // Iterate through the list rendering each Order
     this.model.each((order) => {
-      // Create a new OrderView with the model & template
       const orderView = new OrderView({
         model: order,
         template: this.template,
         tagName: 'li',
         className: 'order',
       });
-      // Then render the OrderView
-      // And append the resulting HTML to the DOM.
       this.$('#orders').append(orderView.render().$el);
     });
     return this;
@@ -29,15 +28,15 @@ const OrderListView = Backbone.View.extend({
 
 
   events: {
-    'click #order-buy': 'buyOrder',
-    'click #order-sell': 'sellOrder',
+    'click .btn-buy': 'buyOrder',
+    'click .btn-sell': 'sellOrder',
   },
 
-  buyOrder(event) {
+  newOrder(buyOrSell) {
     event.preventDefault();
     console.log('it clicked!');
     const orderData = {buy: true};
-    ['symbol', 'price-target'].forEach( (field) => {
+    ['symbol', 'target-price'].forEach( (field) => {
       const val = this.$(`#order-entry-form  [name=${field}]`).val();
       console.log(val);
       orderData[field] = val;
@@ -45,17 +44,20 @@ const OrderListView = Backbone.View.extend({
     const newOrder = new Order(orderData);
     console.log(orderData);
   },
-  sellOrder(event) {
+
+  buyOrder: function(event) {
     event.preventDefault();
-    console.log('it clicked!');
-    const orderData = {buy: false};
-    ['symbol', 'price-target'].forEach( (field) => {
-      const val = this.$(`#order-entry-form  [name=${field}]`).val();
-      console.log(val);
-      orderData[field] = val;
-    });
-    const newOrder = new Order(orderData);
-    console.log(orderData);
+    const order = this.newOrder({buy: true});
+    console.log('buy click');
+    console.log(order);
+
+  },
+
+  sellOrder: function(event) {
+    event.preventDefault();
+    const order = this.newOrder({buy: false});
+    console.log('sell click');
+    console.log(order);
   },
 });
 

From 13a57ddc4d6167604c2e445db3aa76b0cba35a7a Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sat, 16 Dec 2017 16:24:36 -0800
Subject: [PATCH 30/41] recognizes buy or sell, need to refactor form values

---
 dist/index.html              |  4 ++--
 src/app.js                   |  8 ++++----
 src/models/order.js          | 10 ++++++----
 src/views/order_list_view.js | 24 +++++++++++++-----------
 src/views/quote_list_view.js |  1 -
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 481656c..3cf2695 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -63,8 +63,8 @@ <h3>Order Entry Form</h3>
              <select name="symbol">
                <!-- Option entries should be added here using JavaScript -->
              </select>
-             <label for="target-price">Price</label>
-             <input type="number" name="target-price" step="0.10" min="0.00" placeholder="100.00" />
+             <label for="targetPrice">Price</label>
+             <input type="number" name="targetPrice" step="0.10" min="0.00" placeholder="100.00" />
              <label>Action</label>
              <button id="order-buy" class="btn-buy alert button">Buy</button>
              <button id="order-sell" class="btn-sell success button">Sell</button>
diff --git a/src/app.js b/src/app.js
index 393ab0e..8666a42 100644
--- a/src/app.js
+++ b/src/app.js
@@ -64,7 +64,7 @@ $(document).ready(function() {
     quotes: quotes,
   });
 
-///// quote list view /////
+  ///// quote list view /////
   const quoteListView = new QuoteListView({
     model: quotes,
     template: _.template($('#quote-template').html()),
@@ -75,7 +75,7 @@ $(document).ready(function() {
   });
   quoteListView.render();
 
-///// trade list view /////
+  ///// trade list view /////
   const tradeListView = new TradeListView({
     model: tradeList,
     template: _.template($('#trade-template').html()),
@@ -92,7 +92,7 @@ $(document).ready(function() {
     }));
   });
 
-///// order list view /////
+  ///// order list view /////
   const orderListView = new OrderListView({
     model: orderList,
     quotes: quotes,
@@ -102,6 +102,6 @@ $(document).ready(function() {
   });
   orderListView.render();
 
-///// simulator /////
+  ///// simulator /////
   simulator.start();
 });
diff --git a/src/models/order.js b/src/models/order.js
index 3a7db1d..d4a7b15 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -1,14 +1,16 @@
 import Backbone from 'backbone';
 
 const Order = Backbone.Model.extend({
+  defaults: {
+    symbol: 'UNDEF',
+    targetPrice: 0.00
+  },
   buy() {
-    // Implement this function to increase the price by $1.00
-    this.set('price-target', this.get('price-target'));
+    this.set('targetPrice', this.get('targetPrice'));
   },
 
   sell() {
-    // Implement this function to decrease the price by $1.00
-    this.set('price-target', this.get('price-target'));
+    this.set('targetPrice', this.get('targetPrice'));
   },
 });
 
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 044794d..a5006e2 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -6,22 +6,25 @@ import Order from '../models/order';
 const OrderListView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    this.quotes = params.quotes;
     this.bus = this.bus;
     this.listenTo(this.model, 'update', this.render);
 
   },
 
   render() {
-    this.$('#orders').empty();
+    const list = this.$('#orders');
+    list.empty();
+    console.log('render');
     this.model.each((order) => {
+      console.log('html');
+      console.log(order);
       const orderView = new OrderView({
         model: order,
         template: this.template,
         tagName: 'li',
         className: 'order',
       });
-      this.$('#orders').append(orderView.render().$el);
+      list.append(orderView.render().$el);
     });
     return this;
   },
@@ -32,22 +35,21 @@ const OrderListView = Backbone.View.extend({
     'click .btn-sell': 'sellOrder',
   },
 
-  newOrder(buyOrSell) {
+  newOrder(buy) {
     event.preventDefault();
-    console.log('it clicked!');
-    const orderData = {buy: true};
-    ['symbol', 'target-price'].forEach( (field) => {
+    const orderData = {buy};
+  ///// REFACTOR THIS - PRICE NEEDS TO BE IN /////
+    ['symbol', 'targetPrice'].forEach((field) => {
       const val = this.$(`#order-entry-form  [name=${field}]`).val();
       console.log(val);
       orderData[field] = val;
     });
-    const newOrder = new Order(orderData);
-    console.log(orderData);
+    return new Order(orderData);
   },
 
   buyOrder: function(event) {
     event.preventDefault();
-    const order = this.newOrder({buy: true});
+    const order = this.newOrder(true);
     console.log('buy click');
     console.log(order);
 
@@ -55,7 +57,7 @@ const OrderListView = Backbone.View.extend({
 
   sellOrder: function(event) {
     event.preventDefault();
-    const order = this.newOrder({buy: false});
+    const order = this.newOrder(false);
     console.log('sell click');
     console.log(order);
   },
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index 04048c3..faaa6ea 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -19,7 +19,6 @@ const QuoteListView = Backbone.View.extend({
         template: this.template,
         tagName: 'li',
         className: 'quote',
-        // trades: this.trades,
         bus: this.bus,
       });
       list.append(quoteView.render().$el);

From 8ed64097a0cb13a30188993e5f2383507ec13779 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sat, 16 Dec 2017 17:05:06 -0800
Subject: [PATCH 31/41] 'this.model.add in order_list_view to add orders to a
 list'

---
 dist/index.html              |  4 ++--
 src/models/order.js          |  7 -------
 src/views/order_list_view.js | 29 +++++++++++------------------
 src/views/quote_list_view.js |  2 --
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 3cf2695..481656c 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -63,8 +63,8 @@ <h3>Order Entry Form</h3>
              <select name="symbol">
                <!-- Option entries should be added here using JavaScript -->
              </select>
-             <label for="targetPrice">Price</label>
-             <input type="number" name="targetPrice" step="0.10" min="0.00" placeholder="100.00" />
+             <label for="target-price">Price</label>
+             <input type="number" name="target-price" step="0.10" min="0.00" placeholder="100.00" />
              <label>Action</label>
              <button id="order-buy" class="btn-buy alert button">Buy</button>
              <button id="order-sell" class="btn-sell success button">Sell</button>
diff --git a/src/models/order.js b/src/models/order.js
index d4a7b15..6c6754c 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -5,13 +5,6 @@ const Order = Backbone.Model.extend({
     symbol: 'UNDEF',
     targetPrice: 0.00
   },
-  buy() {
-    this.set('targetPrice', this.get('targetPrice'));
-  },
-
-  sell() {
-    this.set('targetPrice', this.get('targetPrice'));
-  },
 });
 
 export default Order;
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index a5006e2..7cdb148 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -8,23 +8,19 @@ const OrderListView = Backbone.View.extend({
     this.template = params.template;
     this.bus = this.bus;
     this.listenTo(this.model, 'update', this.render);
-
   },
 
   render() {
     const list = this.$('#orders');
     list.empty();
-    console.log('render');
     this.model.each((order) => {
-      console.log('html');
-      console.log(order);
       const orderView = new OrderView({
         model: order,
         template: this.template,
         tagName: 'li',
         className: 'order',
       });
-      list.append(orderView.render().$el);
+      list.prepend(orderView.render().$el);
     });
     return this;
   },
@@ -37,29 +33,26 @@ const OrderListView = Backbone.View.extend({
 
   newOrder(buy) {
     event.preventDefault();
-    const orderData = {buy};
-  ///// REFACTOR THIS - PRICE NEEDS TO BE IN /////
-    ['symbol', 'targetPrice'].forEach((field) => {
-      const val = this.$(`#order-entry-form  [name=${field}]`).val();
-      console.log(val);
-      orderData[field] = val;
-    });
-    return new Order(orderData);
+    const symbol = this.$(`[name=symbol]`).val();
+    const targetPrice = parseFloat(this.$(`[name=target-price]`).val());
+    const orderData = {
+      buy,
+      targetPrice,
+      symbol,
+    };
+    const newOrder = new Order(orderData);
+    this.model.add(newOrder);
+    return newOrder;
   },
 
   buyOrder: function(event) {
     event.preventDefault();
     const order = this.newOrder(true);
-    console.log('buy click');
-    console.log(order);
-
   },
 
   sellOrder: function(event) {
     event.preventDefault();
     const order = this.newOrder(false);
-    console.log('sell click');
-    console.log(order);
   },
 });
 
diff --git a/src/views/quote_list_view.js b/src/views/quote_list_view.js
index faaa6ea..e0f8e74 100644
--- a/src/views/quote_list_view.js
+++ b/src/views/quote_list_view.js
@@ -4,8 +4,6 @@ import QuoteView from './quote_view';
 const QuoteListView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    // this.trades = params.trades;
-    // this.orders = params.orders;
     this.bus = params.bus;
     this.listenTo(this.model, 'update', this.render);
   },

From 20a67e2532b84604196386001f695f2006405450 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sat, 16 Dec 2017 17:25:04 -0800
Subject: [PATCH 32/41] delete order when cancel is clicked

---
 src/views/order_view.js | 9 ++++++++-
 src/views/quote_view.js | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/order_view.js b/src/views/order_view.js
index e080216..adaaae9 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -3,13 +3,20 @@ import Backbone from 'backbone';
 const OrderView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    this.bus = params.bus;
+    this.listenTo(this.model, 'placeOrder', this.deleteOrder);
   },
   render() {
     const compiledTemplate = this.template(this.model.toJSON());
     this.$el.html(compiledTemplate);
     return this;
   },
+  events: {
+    'click button.btn-cancel': 'deleteOrder',
+  },
+  deleteOrder() {
+    this.model.destroy();
+    this.remove();
+  },
 });
 
 export default OrderView;
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index 26e4f8d..2b9d202 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -22,7 +22,6 @@ const QuoteView = Backbone.View.extend({
 
   buyQuote() {
     this.model.buy();
-    console.log('bought!');
     const trade = new Trade({
       symbol: this.model.get('symbol'),
       buy: true,
@@ -34,7 +33,6 @@ const QuoteView = Backbone.View.extend({
 
   sellQuote() {
     this.model.sell();
-    console.log('sold!');
     const trade = new Trade({
       symbol: this.model.get('symbol'),
       buy: false,

From 0237a416dee2b11834e19114f80e8dc439b535c2 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sat, 16 Dec 2017 19:10:57 -0800
Subject: [PATCH 33/41] logging shows the order model is listening to the quote
 model

---
 src/app.js                    | 23 -----------------------
 src/collections/quote_list.js |  7 +++++++
 src/models/order.js           | 22 +++++++++++++++++++---
 src/views/order_list_view.js  |  5 +++--
 src/views/order_view.js       | 18 +++++++++++++++++-
 src/views/quote_view.js       |  6 ++----
 src/views/trade_view.js       |  2 +-
 7 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/app.js b/src/app.js
index 8666a42..23fd1c8 100644
--- a/src/app.js
+++ b/src/app.js
@@ -34,27 +34,6 @@ const quoteData = [
   },
 ];
 
-////////////// TEMPORARY
-const fakeOrderData = [
-  {
-    symbol: 'HUMOR',
-    price: 108.50,
-  },
-  {
-    symbol: 'CLOTH',
-    price: 61.70,
-  },
-  {
-    symbol: 'HABIT',
-    price: 78.00,
-  },
-  {
-    symbol: 'SUPER',
-    price: 103.10,
-  },
-];
-///////////////////////
-
 $(document).ready(function() {
   const bus = _.extend({}, Backbone.Events);
   const quotes = new QuoteList(quoteData);
@@ -69,8 +48,6 @@ $(document).ready(function() {
     model: quotes,
     template: _.template($('#quote-template').html()),
     el: 'main',
-    // trades: tradeList,
-    // orders: orderList,
     bus: bus,
   });
   quoteListView.render();
diff --git a/src/collections/quote_list.js b/src/collections/quote_list.js
index 8da08cb..5aaba0a 100644
--- a/src/collections/quote_list.js
+++ b/src/collections/quote_list.js
@@ -3,6 +3,13 @@ import Quote from 'models/quote';
 
 const QuoteList = Backbone.Collection.extend({
   model: Quote,
+
+  bySymbol: function(symbol) {
+    const filtered = this.filter(function (quote) {
+      return quote.get('symbol') === symbol;
+    });
+    return filtered[0];
+  },
 });
 
 export default QuoteList;
diff --git a/src/models/order.js b/src/models/order.js
index 6c6754c..520bc0a 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -1,10 +1,26 @@
 import Backbone from 'backbone';
+import Quote from 'models/quote';
+
+// const zquote = new Quote();
 
 const Order = Backbone.Model.extend({
-  defaults: {
-    symbol: 'UNDEF',
-    targetPrice: 0.00
+  initialize(attributes) {
+    this.buy = attributes.buy;
+    this.targetPrice = attributes.targetPrice;
+    this.symbol = attributes.symbol;
+    // this.listenTo(zquote, 'change', this.placeOrder);
   },
+  //
+  // placeOrder() {
+  //   console.log('click');
+  //   if ((this.buy === true) && (this.targetPrice >= Quote.model.get('price'))) {
+  //     this.trigger('deleteOrder');
+  //     Quote.buy();
+  //   } else if ((this.buy === false) && (this.targetPrice <= Quote.model.get('price'))) {
+  //     this.trigger('deleteOrder');
+  //     Quote.sell();
+  //   }
+  // },
 });
 
 export default Order;
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 7cdb148..36599c3 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -6,7 +6,7 @@ import Order from '../models/order';
 const OrderListView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    this.bus = this.bus;
+    this.quotes = params.quotes;
     this.listenTo(this.model, 'update', this.render);
   },
 
@@ -19,13 +19,13 @@ const OrderListView = Backbone.View.extend({
         template: this.template,
         tagName: 'li',
         className: 'order',
+        quotes: this.quotes,
       });
       list.prepend(orderView.render().$el);
     });
     return this;
   },
 
-
   events: {
     'click .btn-buy': 'buyOrder',
     'click .btn-sell': 'sellOrder',
@@ -40,6 +40,7 @@ const OrderListView = Backbone.View.extend({
       targetPrice,
       symbol,
     };
+    console.log(orderData);
     const newOrder = new Order(orderData);
     this.model.add(newOrder);
     return newOrder;
diff --git a/src/views/order_view.js b/src/views/order_view.js
index adaaae9..cb0de2b 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -1,10 +1,16 @@
 import Backbone from 'backbone';
+import Quote from 'models/quote';
+import QuoteList from 'collections/quote_list';
 
 const OrderView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    this.listenTo(this.model, 'placeOrder', this.deleteOrder);
+    this.listenTo(this.model, 'deleteOrder', this.deleteOrder);
+    this.listenTo(params.quotes, 'change', this.placeOrder);
+    this.quotes = params.quotes;
+    console.log(params);
   },
+
   render() {
     const compiledTemplate = this.template(this.model.toJSON());
     this.$el.html(compiledTemplate);
@@ -17,6 +23,16 @@ const OrderView = Backbone.View.extend({
     this.model.destroy();
     this.remove();
   },
+  placeOrder() {
+    const matchingQuote = this.quotes.bySymbol(this.model.symbol);
+    if (this.model.buy && this.model.targetPrice >= matchingQuote.attributes.price) {
+      this.trigger('deleteOrder');
+      matchingQuote.buy();
+    } //else if ((this.model.buy === false) && (this.targetPrice <= Quote.model.get('price'))) {
+    //   this.trigger('deleteOrder');
+    //   Quote.sell();
+    // }
+  },
 });
 
 export default OrderView;
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index 2b9d202..ed74b49 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -4,9 +4,8 @@ import Trade from '../models/trade';
 const QuoteView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    // this.trades = params.trades;
     this.bus = params.bus;
-    this.listenTo(this.model, "change", this.render);
+    this.listenTo(this.model, 'change', this.render);
   },
 
   render() {
@@ -15,6 +14,7 @@ const QuoteView = Backbone.View.extend({
     this.$el.html(compiledTemplate);
     return this;
   },
+
   events: {
     'click .btn-buy': 'buyQuote',
     'click .btn-sell': 'sellQuote',
@@ -27,7 +27,6 @@ const QuoteView = Backbone.View.extend({
       buy: true,
       price: this.model.get('price'),
     });
-    // this.trades.add(trade);
     this.bus.trigger('addTrade', trade);
   },
 
@@ -38,7 +37,6 @@ const QuoteView = Backbone.View.extend({
       buy: false,
       price: this.model.get('price'),
     });
-    // this.trades.add(trade);
     this.bus.trigger('addTrade', trade);
   },
 });
diff --git a/src/views/trade_view.js b/src/views/trade_view.js
index 98f3099..902a587 100644
--- a/src/views/trade_view.js
+++ b/src/views/trade_view.js
@@ -4,7 +4,7 @@ const TradeView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
     this.bus = params.bus;
-    this.listenTo(this.model, "change", this.render);
+    this.listenTo(this.model, 'change', this.render);
   },
   render() {
     const compiledTemplate = this.template(this.model.toJSON());

From f79d84a86a16957a3cfbe25d22b64ce0bf8efc98 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sun, 17 Dec 2017 14:03:32 -0800
Subject: [PATCH 34/41] order deletes when price matches

---
 src/models/order.js     | 15 ---------------
 src/views/order_view.js |  5 +++--
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/models/order.js b/src/models/order.js
index 520bc0a..6705739 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -1,26 +1,11 @@
 import Backbone from 'backbone';
-import Quote from 'models/quote';
-
-// const zquote = new Quote();
 
 const Order = Backbone.Model.extend({
   initialize(attributes) {
     this.buy = attributes.buy;
     this.targetPrice = attributes.targetPrice;
     this.symbol = attributes.symbol;
-    // this.listenTo(zquote, 'change', this.placeOrder);
   },
-  //
-  // placeOrder() {
-  //   console.log('click');
-  //   if ((this.buy === true) && (this.targetPrice >= Quote.model.get('price'))) {
-  //     this.trigger('deleteOrder');
-  //     Quote.buy();
-  //   } else if ((this.buy === false) && (this.targetPrice <= Quote.model.get('price'))) {
-  //     this.trigger('deleteOrder');
-  //     Quote.sell();
-  //   }
-  // },
 });
 
 export default Order;
diff --git a/src/views/order_view.js b/src/views/order_view.js
index cb0de2b..bf95619 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -5,7 +5,7 @@ import QuoteList from 'collections/quote_list';
 const OrderView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
-    this.listenTo(this.model, 'deleteOrder', this.deleteOrder);
+    this.listenTo(this, 'deleteOrder', this.deleteOrder);
     this.listenTo(params.quotes, 'change', this.placeOrder);
     this.quotes = params.quotes;
     console.log(params);
@@ -24,10 +24,11 @@ const OrderView = Backbone.View.extend({
     this.remove();
   },
   placeOrder() {
+    console.log('placeOrder');
     const matchingQuote = this.quotes.bySymbol(this.model.symbol);
     if (this.model.buy && this.model.targetPrice >= matchingQuote.attributes.price) {
-      this.trigger('deleteOrder');
       matchingQuote.buy();
+      this.trigger('deleteOrder');
     } //else if ((this.model.buy === false) && (this.targetPrice <= Quote.model.get('price'))) {
     //   this.trigger('deleteOrder');
     //   Quote.sell();

From beddb767ac6a9c2ab825cd6b08e6625864b5967d Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sun, 17 Dec 2017 17:09:16 -0800
Subject: [PATCH 35/41] adds HABIT order to history. Check bySymbol filter in
 quote_list for bug

---
 src/views/order_list_view.js |  3 ++-
 src/views/order_view.js      | 16 ++++++++++++++--
 src/views/quote_view.js      |  6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 36599c3..32b99f0 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -6,6 +6,7 @@ import Order from '../models/order';
 const OrderListView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.bus = params.bus;
     this.quotes = params.quotes;
     this.listenTo(this.model, 'update', this.render);
   },
@@ -20,6 +21,7 @@ const OrderListView = Backbone.View.extend({
         tagName: 'li',
         className: 'order',
         quotes: this.quotes,
+        bus: this.bus,
       });
       list.prepend(orderView.render().$el);
     });
@@ -40,7 +42,6 @@ const OrderListView = Backbone.View.extend({
       targetPrice,
       symbol,
     };
-    console.log(orderData);
     const newOrder = new Order(orderData);
     this.model.add(newOrder);
     return newOrder;
diff --git a/src/views/order_view.js b/src/views/order_view.js
index bf95619..87dc1ff 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -1,14 +1,15 @@
 import Backbone from 'backbone';
 import Quote from 'models/quote';
 import QuoteList from 'collections/quote_list';
+import Trade from '../models/trade';
 
 const OrderView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
+    this.bus = params.bus;
     this.listenTo(this, 'deleteOrder', this.deleteOrder);
     this.listenTo(params.quotes, 'change', this.placeOrder);
     this.quotes = params.quotes;
-    console.log(params);
   },
 
   render() {
@@ -23,11 +24,22 @@ const OrderView = Backbone.View.extend({
     this.model.destroy();
     this.remove();
   },
+
   placeOrder() {
-    console.log('placeOrder');
+
+    const trade = new Trade({
+      buy: this.model.buy,
+      price: this.model.targetPrice,
+      symbol: this.model.symbol,
+    });
+    // console.log(trade);
+
     const matchingQuote = this.quotes.bySymbol(this.model.symbol);
+
     if (this.model.buy && this.model.targetPrice >= matchingQuote.attributes.price) {
       matchingQuote.buy();
+      // console.log(this.bus);
+      this.bus.trigger('addTrade', trade);
       this.trigger('deleteOrder');
     } //else if ((this.model.buy === false) && (this.targetPrice <= Quote.model.get('price'))) {
     //   this.trigger('deleteOrder');
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index ed74b49..c0e577c 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -21,23 +21,23 @@ const QuoteView = Backbone.View.extend({
   },
 
   buyQuote() {
-    this.model.buy();
     const trade = new Trade({
       symbol: this.model.get('symbol'),
       buy: true,
       price: this.model.get('price'),
     });
     this.bus.trigger('addTrade', trade);
+    this.model.buy();
   },
 
   sellQuote() {
-    this.model.sell();
     const trade = new Trade({
-      symbol: this.model.get('symbol'),
       buy: false,
       price: this.model.get('price'),
+      symbol: this.model.get('symbol'),
     });
     this.bus.trigger('addTrade', trade);
+    this.model.sell();
   },
 });
 

From 23fb6a259ae1ec395fdb45d9ca3a680232592859 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sun, 17 Dec 2017 20:16:24 -0800
Subject: [PATCH 36/41] adds orders to history when buy or sell is met

---
 src/views/order_view.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/order_view.js b/src/views/order_view.js
index 87dc1ff..278a15a 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -32,19 +32,18 @@ const OrderView = Backbone.View.extend({
       price: this.model.targetPrice,
       symbol: this.model.symbol,
     });
-    // console.log(trade);
 
     const matchingQuote = this.quotes.bySymbol(this.model.symbol);
 
     if (this.model.buy && this.model.targetPrice >= matchingQuote.attributes.price) {
       matchingQuote.buy();
-      // console.log(this.bus);
       this.bus.trigger('addTrade', trade);
       this.trigger('deleteOrder');
-    } //else if ((this.model.buy === false) && (this.targetPrice <= Quote.model.get('price'))) {
-    //   this.trigger('deleteOrder');
-    //   Quote.sell();
-    // }
+    } else if (!this.model.buy && this.model.targetPrice <= matchingQuote.attributes.price) {
+      matchingQuote.sell();
+      this.bus.trigger('addTrade', trade);
+      this.trigger('deleteOrder');
+    }
   },
 });
 

From dc8777fe5354914131381ae4b144911ea38d3985 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sun, 17 Dec 2017 20:49:23 -0800
Subject: [PATCH 37/41] validate price entered with error message

---
 src/models/order.js          | 13 +++++++++++++
 src/views/order_list_view.js | 22 +++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/models/order.js b/src/models/order.js
index 6705739..6deaa52 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -6,6 +6,19 @@ const Order = Backbone.Model.extend({
     this.targetPrice = attributes.targetPrice;
     this.symbol = attributes.symbol;
   },
+
+  validate(attributes) {
+    const errors = {};
+    if (!attributes.targetPrice) {
+      errors['price'] = 'Invalid target price!';
+    }
+
+    if (Object.keys(errors).length > 0) {
+      return errors;
+    } else {
+      return false;
+    }
+  },
 });
 
 export default Order;
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 32b99f0..527ab86 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -1,5 +1,5 @@
 import Backbone from 'backbone';
-
+import $ from 'jquery';
 import OrderView from './order_view';
 import Order from '../models/order';
 
@@ -33,8 +33,9 @@ const OrderListView = Backbone.View.extend({
     'click .btn-sell': 'sellOrder',
   },
 
-  newOrder(buy) {
+  createOrder(buy) {
     event.preventDefault();
+    $('.form-errors').empty();
     const symbol = this.$(`[name=symbol]`).val();
     const targetPrice = parseFloat(this.$(`[name=target-price]`).val());
     const orderData = {
@@ -44,17 +45,28 @@ const OrderListView = Backbone.View.extend({
     };
     const newOrder = new Order(orderData);
     this.model.add(newOrder);
-    return newOrder;
+
+    if (newOrder.isValid()) {
+      return newOrder;
+    } else {
+      newOrder.destroy();
+      this.errorMessage(newOrder.validationError);
+    }
+  },
+  errorMessage(errors) {
+    Object.entries(errors).forEach((error)=> {
+      $('.form-errors').prepend(`<h3>${error[1]}</h3>`);
+    })
   },
 
   buyOrder: function(event) {
     event.preventDefault();
-    const order = this.newOrder(true);
+    const order = this.createOrder(true);
   },
 
   sellOrder: function(event) {
     event.preventDefault();
-    const order = this.newOrder(false);
+    const order = this.createOrder(false);
   },
 });
 

From 7d64b5f4c59b365e87df7d1daa31f81165417e41 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sun, 17 Dec 2017 20:55:02 -0800
Subject: [PATCH 38/41] create spec file for order test

---
 spec/models/order_spec.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 spec/models/order_spec.js

diff --git a/spec/models/order_spec.js b/spec/models/order_spec.js
new file mode 100644
index 0000000..b1c5ab5
--- /dev/null
+++ b/spec/models/order_spec.js
@@ -0,0 +1,20 @@
+import Order from 'models/order';
+import Quote from 'models/quote';
+
+describe('Order spec', () => {
+  let order;
+  beforeEach(() => {
+    order = new Order({
+      symbol: 'HELLO',
+      price: 100.00,
+    });
+  });
+
+  describe('initialize', () => {
+
+  });
+
+  describe('validate', () => {
+
+  });
+});

From a0c25404a3ee7aad0c3d284127c5d6f0dea256a8 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sun, 17 Dec 2017 22:03:24 -0800
Subject: [PATCH 39/41] prettify text, add comments, remove logs

---
 spec/models/order_spec.js    | 28 +++++++++++++++++++++++++---
 src/models/order.js          | 16 +++++++++-------
 src/models/trade.js          |  2 +-
 src/views/order_list_view.js | 16 +++++++++-------
 src/views/order_view.js      | 18 ++++++++++--------
 src/views/quote_view.js      |  5 +++--
 src/views/trade_list_view.js |  2 +-
 src/views/trade_view.js      |  1 +
 8 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/spec/models/order_spec.js b/spec/models/order_spec.js
index b1c5ab5..3dbcb7e 100644
--- a/spec/models/order_spec.js
+++ b/spec/models/order_spec.js
@@ -10,11 +10,33 @@ describe('Order spec', () => {
     });
   });
 
-  describe('initialize', () => {
+  describe('validate', () => {
+    it('validates there is a target price', () => {
+      const prices = ['', NaN, undefined, 0]
 
-  });
+      prices.forEach((price)=> {
+        const order = new Order({
+          targetPrice: price
+        });
+
+        expect(order.isValid()).toBeFalsy();
+      });
+    });
+
+
+    it('buy price is not >= to the current market price', () => {
+      const prices = [100,1000];
+
+      prices.forEach((price)=> {
+        const order = new Order({
+          targetPrice: price,
+          buy: true,
+        });
+
+        expect(order.isValid()).toBeFalsy();
+      });
+    });
 
-  describe('validate', () => {
 
   });
 });
diff --git a/src/models/order.js b/src/models/order.js
index 6deaa52..98f0a0b 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -1,17 +1,19 @@
 import Backbone from 'backbone';
 
 const Order = Backbone.Model.extend({
-  initialize(attributes) {
-    this.buy = attributes.buy;
-    this.targetPrice = attributes.targetPrice;
-    this.symbol = attributes.symbol;
+  initialize(params) {
+    this.buy = params.buy;
+    this.targetPrice = params.targetPrice;
+    this.symbol = params.symbol;
   },
 
-  validate(attributes) {
+  validate(params) {
     const errors = {};
-    if (!attributes.targetPrice) {
+    if (!params.targetPrice) {
       errors['price'] = 'Invalid target price!';
-    }
+    } //else if (params.buy && params.targetPrice >= params.quote.get('price') {
+
+    
 
     if (Object.keys(errors).length > 0) {
       return errors;
diff --git a/src/models/trade.js b/src/models/trade.js
index 6034c4b..57f056d 100644
--- a/src/models/trade.js
+++ b/src/models/trade.js
@@ -5,7 +5,7 @@ const Trade = Backbone.Model.extend({
     this.symbol = params.symbol;
     this.buy = params.buy;
     this.price = params.price;
-  }
+  },
 });
 
 export default Trade;
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 527ab86..0755419 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -1,7 +1,7 @@
 import Backbone from 'backbone';
 import $ from 'jquery';
-import OrderView from './order_view';
 import Order from '../models/order';
+import OrderView from './order_view';
 
 const OrderListView = Backbone.View.extend({
   initialize(params) {
@@ -35,26 +35,28 @@ const OrderListView = Backbone.View.extend({
 
   createOrder(buy) {
     event.preventDefault();
-    $('.form-errors').empty();
+    $('.form-errors').empty(); // clear errors when new order is placed
     const symbol = this.$(`[name=symbol]`).val();
     const targetPrice = parseFloat(this.$(`[name=target-price]`).val());
     const orderData = {
-      buy,
-      targetPrice,
-      symbol,
+      buy, // buy: buy
+      targetPrice, // targetPrice: targetPrice
+      symbol, // symbol: symbol
     };
+
     const newOrder = new Order(orderData);
-    this.model.add(newOrder);
 
     if (newOrder.isValid()) {
-      return newOrder;
+      this.model.add(newOrder); // add to order list
     } else {
       newOrder.destroy();
       this.errorMessage(newOrder.validationError);
     }
   },
+  
   errorMessage(errors) {
     Object.entries(errors).forEach((error)=> {
+      // errors come in an array where 0 is the type and 1 is the message
       $('.form-errors').prepend(`<h3>${error[1]}</h3>`);
     })
   },
diff --git a/src/views/order_view.js b/src/views/order_view.js
index 278a15a..2838d40 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -1,15 +1,13 @@
 import Backbone from 'backbone';
-import Quote from 'models/quote';
-import QuoteList from 'collections/quote_list';
 import Trade from '../models/trade';
 
 const OrderView = Backbone.View.extend({
   initialize(params) {
     this.template = params.template;
     this.bus = params.bus;
+    this.quotes = params.quotes;
     this.listenTo(this, 'deleteOrder', this.deleteOrder);
     this.listenTo(params.quotes, 'change', this.placeOrder);
-    this.quotes = params.quotes;
   },
 
   render() {
@@ -17,32 +15,36 @@ const OrderView = Backbone.View.extend({
     this.$el.html(compiledTemplate);
     return this;
   },
+
   events: {
     'click button.btn-cancel': 'deleteOrder',
   },
+
   deleteOrder() {
     this.model.destroy();
     this.remove();
   },
 
   placeOrder() {
-
     const trade = new Trade({
       buy: this.model.buy,
       price: this.model.targetPrice,
       symbol: this.model.symbol,
     });
 
+    // bySymbol is custom filter created in quote_list
     const matchingQuote = this.quotes.bySymbol(this.model.symbol);
 
     if (this.model.buy && this.model.targetPrice >= matchingQuote.attributes.price) {
       matchingQuote.buy();
-      this.bus.trigger('addTrade', trade);
-      this.trigger('deleteOrder');
+      this.bus.trigger('addTrade', trade); // newTrade() in trade_list_view
+      this.trigger('deleteOrder'); // deleteOrder() above ^^
+
     } else if (!this.model.buy && this.model.targetPrice <= matchingQuote.attributes.price) {
+
       matchingQuote.sell();
-      this.bus.trigger('addTrade', trade);
-      this.trigger('deleteOrder');
+      this.bus.trigger('addTrade', trade); // newTrade() in trade_list_view
+      this.trigger('deleteOrder'); // deleteOrder() above ^^
     }
   },
 });
diff --git a/src/views/quote_view.js b/src/views/quote_view.js
index c0e577c..7141935 100644
--- a/src/views/quote_view.js
+++ b/src/views/quote_view.js
@@ -9,7 +9,6 @@ const QuoteView = Backbone.View.extend({
   },
 
   render() {
-    // why JSON?
     const compiledTemplate = this.template(this.model.toJSON());
     this.$el.html(compiledTemplate);
     return this;
@@ -22,10 +21,11 @@ const QuoteView = Backbone.View.extend({
 
   buyQuote() {
     const trade = new Trade({
-      symbol: this.model.get('symbol'),
       buy: true,
       price: this.model.get('price'),
+      symbol: this.model.get('symbol'),
     });
+
     this.bus.trigger('addTrade', trade);
     this.model.buy();
   },
@@ -36,6 +36,7 @@ const QuoteView = Backbone.View.extend({
       price: this.model.get('price'),
       symbol: this.model.get('symbol'),
     });
+
     this.bus.trigger('addTrade', trade);
     this.model.sell();
   },
diff --git a/src/views/trade_list_view.js b/src/views/trade_list_view.js
index 464dd12..2857d4f 100644
--- a/src/views/trade_list_view.js
+++ b/src/views/trade_list_view.js
@@ -23,7 +23,7 @@ const TradeListView = Backbone.View.extend({
     });
     return this;
   },
-  
+
   newTrade(trade) {
     this.model.add(trade);
   },
diff --git a/src/views/trade_view.js b/src/views/trade_view.js
index 902a587..2ee44b9 100644
--- a/src/views/trade_view.js
+++ b/src/views/trade_view.js
@@ -6,6 +6,7 @@ const TradeView = Backbone.View.extend({
     this.bus = params.bus;
     this.listenTo(this.model, 'change', this.render);
   },
+  
   render() {
     const compiledTemplate = this.template(this.model.toJSON());
     this.$el.html(compiledTemplate);

From 869c6a18bbb75d36792fd868c089ff53caa92999 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sun, 17 Dec 2017 23:13:11 -0800
Subject: [PATCH 40/41] comment out test

---
 spec/models/order_spec.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/models/order_spec.js b/spec/models/order_spec.js
index 3dbcb7e..e7de25f 100644
--- a/spec/models/order_spec.js
+++ b/spec/models/order_spec.js
@@ -24,18 +24,18 @@ describe('Order spec', () => {
     });
 
 
-    it('buy price is not >= to the current market price', () => {
-      const prices = [100,1000];
-
-      prices.forEach((price)=> {
-        const order = new Order({
-          targetPrice: price,
-          buy: true,
-        });
-
-        expect(order.isValid()).toBeFalsy();
-      });
-    });
+    // it('buy price is not >= to the current market price', () => {
+    //   const prices = [100,1000];
+    //
+    //   prices.forEach((price)=> {
+    //     const order = new Order({
+    //       targetPrice: price,
+    //       buy: true,
+    //     });
+    //
+    //     expect(order.isValid()).toBeFalsy();
+    //   });
+    // });
 
 
   });

From 9f2c2ef4258197e5402c238c25eaeadb57bd2282 Mon Sep 17 00:00:00 2001
From: Sara Frandsen <sara.frandsen@gmail.com>
Date: Sun, 17 Dec 2017 23:14:53 -0800
Subject: [PATCH 41/41] move around validations

---
 spec/models/order_spec.js    |  2 +-
 src/models/order.js          |  7 +++++--
 src/views/order_list_view.js |  3 +--
 src/views/order_view.js      | 22 ++++++++++++----------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/spec/models/order_spec.js b/spec/models/order_spec.js
index 3dbcb7e..7a4b956 100644
--- a/spec/models/order_spec.js
+++ b/spec/models/order_spec.js
@@ -25,7 +25,7 @@ describe('Order spec', () => {
 
 
     it('buy price is not >= to the current market price', () => {
-      const prices = [100,1000];
+      const prices = [100, 1000];
 
       prices.forEach((price)=> {
         const order = new Order({
diff --git a/src/models/order.js b/src/models/order.js
index 98f0a0b..95e4902 100644
--- a/src/models/order.js
+++ b/src/models/order.js
@@ -5,15 +5,18 @@ const Order = Backbone.Model.extend({
     this.buy = params.buy;
     this.targetPrice = params.targetPrice;
     this.symbol = params.symbol;
+    this.quotes = params.quotes;
   },
 
   validate(params) {
     const errors = {};
     if (!params.targetPrice) {
       errors['price'] = 'Invalid target price!';
-    } //else if (params.buy && params.targetPrice >= params.quote.get('price') {
+    }
 
-    
+    // if (params.targetPrice >= matchingQuote.attributes.price) {
+    //   errors['buy'] = 'Less than current market price'
+    // }
 
     if (Object.keys(errors).length > 0) {
       return errors;
diff --git a/src/views/order_list_view.js b/src/views/order_list_view.js
index 0755419..93269bd 100644
--- a/src/views/order_list_view.js
+++ b/src/views/order_list_view.js
@@ -53,10 +53,9 @@ const OrderListView = Backbone.View.extend({
       this.errorMessage(newOrder.validationError);
     }
   },
-  
+
   errorMessage(errors) {
     Object.entries(errors).forEach((error)=> {
-      // errors come in an array where 0 is the type and 1 is the message
       $('.form-errors').prepend(`<h3>${error[1]}</h3>`);
     })
   },
diff --git a/src/views/order_view.js b/src/views/order_view.js
index 2838d40..46badc6 100644
--- a/src/views/order_view.js
+++ b/src/views/order_view.js
@@ -35,16 +35,18 @@ const OrderView = Backbone.View.extend({
     // bySymbol is custom filter created in quote_list
     const matchingQuote = this.quotes.bySymbol(this.model.symbol);
 
-    if (this.model.buy && this.model.targetPrice >= matchingQuote.attributes.price) {
-      matchingQuote.buy();
-      this.bus.trigger('addTrade', trade); // newTrade() in trade_list_view
-      this.trigger('deleteOrder'); // deleteOrder() above ^^
-
-    } else if (!this.model.buy && this.model.targetPrice <= matchingQuote.attributes.price) {
-
-      matchingQuote.sell();
-      this.bus.trigger('addTrade', trade); // newTrade() in trade_list_view
-      this.trigger('deleteOrder'); // deleteOrder() above ^^
+    if (this.model.buy) {
+      if (this.model.targetPrice < matchingQuote.attributes.price) {
+        matchingQuote.buy();
+        this.bus.trigger('addTrade', trade); // newTrade() in trade_list_view
+        this.trigger('deleteOrder'); // deleteOrder() above ^^
+      }
+    } else if (!this.model.buy) {
+      if (this.model.targetPrice > matchingQuote.attributes.price) {
+        matchingQuote.sell();
+        this.bus.trigger('addTrade', trade); // newTrade() in trade_list_view
+        this.trigger('deleteOrder'); // deleteOrder() above ^^
+      }
     }
   },
 });