Skip to content

Commit

Permalink
Merge bookings to master
Browse files Browse the repository at this point in the history
  • Loading branch information
Ovy95 committed Feb 27, 2020
2 parents 0d9f3cc + 65a8310 commit 3ea9cd4
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 480 deletions.
10 changes: 1 addition & 9 deletions app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,14 @@ class MakersBnB < Sinatra::Base
end

get '/bookings' do
# @space = session[:space_id]
erb :bookings
end

post '/bookings' do
p "TEst"
p params[:choice]
session[:space_id] = Space.find_by(name: params[:choice]).id
p "session ID"
p session[:space_id]
redirect ('/bookings')
end


run! if app_file == $0
end



end
48 changes: 9 additions & 39 deletions coverage/.resultset.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"RSpec": {
"coverage": {
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/features/booking_spec.rb": {
"/Users/student/Desktop/Week6/MakersBnB/spec/features/create_space_spec.rb": {
"lines": [
1,
1,
Expand All @@ -11,36 +11,6 @@
1,
1,
null,
1,
1,
1,
1,
1,
1,
0,
0,
0,
0,
null,
0,
0,
0,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null
]
},
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/features/create_space_spec.rb": {
"lines": [
1,
1,
1,
Expand All @@ -55,7 +25,7 @@
null
]
},
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/features/logging_out_spec.rb": {
"/Users/student/Desktop/Week6/MakersBnB/spec/features/logging_out_spec.rb": {
"lines": [
1,
1,
Expand All @@ -72,7 +42,7 @@
null
]
},
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/features/logging_page_spec.rb": {
"/Users/student/Desktop/Week6/MakersBnB/spec/features/logging_page_spec.rb": {
"lines": [
1,
1,
Expand All @@ -99,7 +69,7 @@
null
]
},
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/features/sign_up_spec.rb": {
"/Users/student/Desktop/Week6/MakersBnB/spec/features/sign_up_spec.rb": {
"lines": [
1,
1,
Expand Down Expand Up @@ -138,7 +108,7 @@
null
]
},
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/features/testing_infrastructure_spec.rb": {
"/Users/student/Desktop/Week6/MakersBnB/spec/features/testing_infrastructure_spec.rb": {
"lines": [
1,
1,
Expand All @@ -149,7 +119,7 @@
null
]
},
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/features/viewing_spaces_spec.rb": {
"/Users/student/Desktop/Week6/MakersBnB/spec/features/viewing_spaces_spec.rb": {
"lines": [
1,
1,
Expand All @@ -166,7 +136,7 @@
null
]
},
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/unit/create_user_spec.rb": {
"/Users/student/Desktop/Week6/MakersBnB/spec/unit/create_user_spec.rb": {
"lines": [
1,
1,
Expand All @@ -193,7 +163,7 @@
null
]
},
"/Users/jack/Documents/Week6/makers bnb /MakersBnB/spec/unit/space_spec.rb": {
"/Users/student/Desktop/Week6/MakersBnB/spec/unit/space_spec.rb": {
"lines": [
1,
1,
Expand Down Expand Up @@ -221,6 +191,6 @@
]
}
},
"timestamp": 1582818187
"timestamp": 1582805230
}
}
Loading

0 comments on commit 3ea9cd4

Please sign in to comment.