Skip to content

Commit

Permalink
'Deals' section - WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
juanroldan1989 committed Dec 28, 2017
1 parent 6ef8c9a commit 38ecf74
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 19 deletions.
10 changes: 5 additions & 5 deletions app/views/deals/index.html.erb
@@ -1,23 +1,23 @@
<div data-role="header" data-position="fixed" data-theme="a">
<a href="/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
<h1>Deals in NZ</h1>
</div><!-- /header -->
</div>

<div data-role="page" data-title="Deals in Auckland">
<div role="main" class="ui-content jqm-content jqm-fullwidth">

<%= render partial: "shared/filters", locals: { section: "deals" } %>
<%#= render partial: "shared/filters", locals: { section: "deals" } %>

<br/>

<div id="loader"></div>

<ul id="deals" data-role="listview" data-inset="false">
<%= render partial: collection %>
<%#= render partial: collection %>
</ul>

</div><!-- /content -->
</div><!-- /page -->
</div>
</div>

<!-- For JS filters -->
<div id="section">deals</div>
Expand Down
3 changes: 3 additions & 0 deletions config/routes.rb
@@ -1,4 +1,5 @@
Rails.application.routes.draw do
# WIP
resources :deals, only: [:index, :show] do
collection do
get :filter
Expand All @@ -12,4 +13,6 @@
end

root "events#index"

get "*a" => redirect("/")
end
28 changes: 14 additions & 14 deletions spec/examples.txt
@@ -1,19 +1,19 @@
example_id | status | run_time |
---------------------------------------------------- | ------ | --------------- |
./spec/controllers/deals_controller_spec.rb[1:1:1] | passed | 0.00442 seconds |
./spec/controllers/deals_controller_spec.rb[1:1:2] | passed | 0.00327 seconds |
./spec/controllers/deals_controller_spec.rb[1:1:3] | passed | 0.01541 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:1] | passed | 0.03176 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:2] | passed | 0.14727 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:3:1] | passed | 0.02973 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:3:2] | passed | 0.03193 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:4] | passed | 0.02699 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:5:1] | passed | 0.03445 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:5:2] | passed | 0.03482 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:5:3] | passed | 0.03969 seconds |
./spec/controllers/deals_controller_spec.rb[1:3:1] | passed | 0.01297 seconds |
./spec/controllers/deals_controller_spec.rb[1:3:2] | passed | 0.02201 seconds |
./spec/controllers/deals_controller_spec.rb[1:3:3] | passed | 0.01385 seconds |
./spec/controllers/deals_controller_spec.rb[1:1:1] | passed | 0.0031 seconds |
./spec/controllers/deals_controller_spec.rb[1:1:2] | passed | 0.00353 seconds |
./spec/controllers/deals_controller_spec.rb[1:1:3] | passed | 0.02252 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:1] | passed | 0.0244 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:2] | passed | 0.04038 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:3:1] | passed | 0.02317 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:3:2] | passed | 0.02438 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:4] | passed | 0.04552 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:5:1] | passed | 0.04673 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:5:2] | passed | 0.18613 seconds |
./spec/controllers/deals_controller_spec.rb[1:2:5:3] | passed | 0.04054 seconds |
./spec/controllers/deals_controller_spec.rb[1:3:1] | passed | 0.01563 seconds |
./spec/controllers/deals_controller_spec.rb[1:3:2] | passed | 0.68274 seconds |
./spec/controllers/deals_controller_spec.rb[1:3:3] | passed | 0.07267 seconds |
./spec/helpers/application_helper.rb[1:1:1:1] | passed | 0.17642 seconds |
./spec/helpers/application_helper.rb[1:1:1:2] | passed | 0.00943 seconds |
./spec/models/deal_spec.rb[1:1:1] | passed | 0.00486 seconds |
Expand Down

0 comments on commit 38ecf74

Please sign in to comment.