diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..44a5614 Binary files /dev/null and b/.DS_Store differ diff --git a/bug1/index.js b/bug1/index.js index f728ce3..33c3373 100644 --- a/bug1/index.js +++ b/bug1/index.js @@ -1,5 +1,5 @@ function renderTransactions(transactions) { - var finalHTML = '
TRANSACTIONS
+ var finalHTML = '
TRANSACTIONS
' var transactionsHTML = _.map(transactions, function(transaction) { var transactionHTML = '
'; diff --git a/bug2/index.html b/bug2/index.html index 3b7bb06..0f4e9ed 100644 --- a/bug2/index.html +++ b/bug2/index.html @@ -3,9 +3,9 @@ Skware Cash (Bug 2) - - - + + + diff --git a/bug3/index.css b/bug3/index.css index b0d104b..5773666 100644 --- a/bug3/index.css +++ b/bug3/index.css @@ -78,7 +78,8 @@ li.active { width: 170px; height: 36px; border-radius: 8px; - padding-top: 13px; + padding-top: 13px; + background-color: #15D642; font-weight: bold; font-size: 20px; cursor: pointer; diff --git a/bug3/index.html b/bug3/index.html index aae4eff..4da8c33 100644 --- a/bug3/index.html +++ b/bug3/index.html @@ -21,7 +21,7 @@
  • Settings
  • Sign Out
    • -
    New
    +
    New
    diff --git a/bug4/index.js b/bug4/index.js index e972be4..d277323 100644 --- a/bug4/index.js +++ b/bug4/index.js @@ -21,12 +21,12 @@ $(document).ready(function(){ $('.transactions').html(renderTransactions(fullTransactionData)); $('.search-input').on('input', function(e) { - var searchString = e.target.value; + var searchString = e.target.value.toLowerCase(); var filteredData = _.filter(fullTransactionData, function(transaction){ - var foundInName = transaction.name.indexOf(searchString) > -1; - var foundInFor = transaction.for.indexOf(searchString) > -1; - var foundInDate = transaction.date.indexOf(searchString) > -1; - var foundInAmount = transaction.amount.indexOf(searchString) > -1; + var foundInName = transaction.name.toLowerCase().indexOf(searchString) > -1; + var foundInFor = transaction.for.toLowerCase().indexOf(searchString) > -1; + var foundInDate = transaction.date.toLowerCase().indexOf(searchString) > -1; + var foundInAmount = transaction.amount.toLowerCase().indexOf(searchString) > -1; return foundInName || foundInFor || foundInDate || foundInAmount; }); diff --git a/bug5/index.html b/bug5/index.html index 39b0643..66b87e4 100644 --- a/bug5/index.html +++ b/bug5/index.html @@ -1,7 +1,7 @@ - + Skware Cash (Bug 4) diff --git a/bug6/index.js b/bug6/index.js index fff2f3d..d277323 100644 --- a/bug6/index.js +++ b/bug6/index.js @@ -1,7 +1,7 @@ function renderTransactions(transactions) { var finalHTML = '
    TRANSACTIONS
    '; - var transactionsHTML = _.map(transactions, function() { + var transactionsHTML = _.map(transactions, function(transaction) { var transactionHTML = '
    '; transactionHTML += '
    ' + transaction.name + '
    '; transactionHTML += '
    ' + transaction.for + '
    '; diff --git a/bug7/index.js b/bug7/index.js index d6c7eaa..d277323 100644 --- a/bug7/index.js +++ b/bug7/index.js @@ -12,7 +12,7 @@ function renderTransactions(transactions) { return transactionHTML; }); - finalHTML += transactionsHTML.join(); + finalHTML += transactionsHTML.join(''); return finalHTML; } diff --git a/bug8/index.js b/bug8/index.js index 677d0d4..3b2fecb 100644 --- a/bug8/index.js +++ b/bug8/index.js @@ -20,7 +20,7 @@ function renderTransactions(transactions) { $(document).ready(function(){ $('.transactions').html(renderTransactions(fullTransactionData)); - $('.search-input').on('change', function(e) { + $('.search-input').keypress('change', function(e) { var searchString = e.target.value.toLowerCase(); var filteredData = _.filter(fullTransactionData, function(transaction){ var foundInName = transaction.name.toLowerCase().indexOf(searchString) > -1;