Merge pull request #101 from Anastasia-Demetriou/seed-updates

made event show page avatar photo dynamic
Anastasia-Demetriou · Nov 29, 2018 · 86f267c · 86f267c
2 parents dca4a09 + 7b18d10
commit 86f267c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 27 deletions.
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -49,6 +49,7 @@ def index
   def show
     @event = Event.find(params[:id])
     @user = current_user
+    @event_user = @event.user
     @bid = Bid.new()
     authorize @event
   end

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
@@ -5,7 +5,7 @@
       <p class="date">Posted on: <%= @event.date.strftime("%b %e, %l:%M %p") %></p>
       <h2><%= @event.name %></h2>
       <div class="event-show-header-inline">
-        <img class="avatar" src="http://kitt.lewagon.com/placeholder/users/ssaunier" alt="avatar">
+        <img class="avatar" <%= cl_image_tag @event.user.photo %>
         <div class="header-description">
           <p>Hosted by</p>
           <p class="text-yellow"><%= User.find(@event.user_id).first_name %> <%= User.find(@event.user_id).last_name %></p>

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -13,17 +13,17 @@
 mixologist = Service.create!(name: "Mixologist")
 waiter = Service.create!(name: "Waiter")
 
-louise = User.create!(first_name: "Louise", last_name:"Jones", email:"louise@gmail.com", password:"password", professional: true, bio:"Experienced Chef")
-john = User.create!(first_name: "John", last_name:"Doe", email:"johndoe@gmail.com", password:"password", professional: true, bio:"Experienced Waiter")
-andrew = User.create!(first_name: "Andrew", last_name:"Smith", email:"andrewsmith@gmail.com", password:"password", professional: true, bio:"Experienced Mixologist")
-lisa = User.create!(first_name: "Lisa", last_name:"Cooper", email:"lisa@gmail.com", password:"password", professional: false, bio:"")
-rob = User.create!(first_name: "Rob", last_name:"Forbs", email:"rob@gmail.com", password:"password", professional: false, bio:"")
-steve = User.create!(first_name: "Steve", last_name:"Jenkins", email:"steve@gmail.com", password:"password", professional: false, bio:"")
-meghan = User.create!(first_name: "Meghan", last_name:"Wiseman", email:"meghan@gmail.com", password:"password", professional: false, bio:"")
-julia = User.create!(first_name: "Julia", last_name:"Hawkins", email:"julia@gmail.com", password:"password", professional: false, bio:"")
-irene = User.create!(first_name: "Irene", last_name:"Mendez", email:"irene@gmail.com", password:"password", professional: false, bio:"")
-james = User.create!(first_name: "james", last_name:"Ward", email:"james@gmail.com", password:"password", professional: false, bio:"")
-jack = User.create!(first_name: "jack", last_name:"Styles", email:"jack@gmail.com", password:"password", professional: false, bio:"")
+louise = User.create!(first_name: "Louise", last_name:"Jones", email:"louise@gmail.com", password:"password", professional: true, bio:"Experienced Chef", remote_photo_url: "https://randomuser.me/api/portraits/women/89.jpg")
+john = User.create!(first_name: "John", last_name:"Miles", email:"johnmiles@gmail.com", password:"password", professional: true, bio:"Experienced Waiter", remote_photo_url: "https://randomuser.me/api/portraits/men/97.jpg")
+andrew = User.create!(first_name: "Andrew", last_name:"Smith", email:"andrewsmith@gmail.com", password:"password", professional: true, bio:"Experienced Mixologist", remote_photo_url: "https://randomuser.me/api/portraits/men/43.jpg")
+lisa = User.create!(first_name: "Lisa", last_name:"Cooper", email:"lisa@gmail.com", password:"password", professional: false, bio:"", remote_photo_url: "https://randomuser.me/api/portraits/women/63.jpg")
+rob = User.create!(first_name: "Rob", last_name:"Forbs", email:"rob@gmail.com", password:"password", professional: false, bio:"", remote_photo_url: "https://randomuser.me/api/portraits/men/78.jpg")
+steve = User.create!(first_name: "Steve", last_name:"Jenkins", email:"steve@gmail.com", password:"password", professional: false, bio:"", remote_photo_url: "https://randomuser.me/api/portraits/men/18.jpg")
+meghan = User.create!(first_name: "Meghan", last_name:"Wiseman", email:"meghan@gmail.com", password:"password", professional: false, bio:"", remote_photo_url: "https://randomuser.me/api/portraits/women/57.jpg")
+julia = User.create!(first_name: "Julia", last_name:"Hawkins", email:"julia@gmail.com", password:"password", professional: false, bio:"", remote_photo_url: "https://randomuser.me/api/portraits/women/79.jpg")
+irene = User.create!(first_name: "Irene", last_name:"Mendez", email:"irene@gmail.com", password:"password", professional: false, bio:"", remote_photo_url: "https://randomuser.me/api/portraits/women/71.jpg")
+james = User.create!(first_name: "James", last_name:"Ward", email:"james@gmail.com", password:"password", professional: false, bio:"", remote_photo_url: "https://randomuser.me/api/portraits/men/36.jpg")
+jack = User.create!(first_name: "Jack", last_name:"Styles", email:"jack@gmail.com", password:"password", professional: false, bio:"", remote_photo_url: "https://randomuser.me/api/portraits/men/58.jpg")
 
 
 
@@ -34,26 +34,26 @@
 
 event1 = Event.create!(name:"Birthday Party (kids party)", date:"2018/12/18", event_type: "birthday", location:"London", description:"Hosting a party for my 5 year old daughter I need a chef to prepare simple, healthy fun finger food for small kids and adults ", party_size: 20, service: chef, min_price: 150, max_price: 250, user_id: andrew.id)
 event2 =  Event.create!(name:"Leaving Do", date:"2019/01/10", event_type: "work party", location:"Manchester", description:"The time has come to finally leave Manchester. Yes it is short notice but I'm hosting a leaving party for myself.  What time, 7ish", party_size: 20, service: chef, min_price: 100, max_price: 200, user_id: andrew.id)
-event3 =  Event.create!(name:"Casual Dinner", date:"2018/12/18", event_type: "dinner", location:"Liverpool", description:"", party_size: 40, service: waiter, min_price: 100, max_price: 150, user_id: andrew.id)
+event3 =  Event.create!(name:"Casual Dinner", date:"2018/12/18", event_type: "dinner", location:"Liverpool", description:"party", party_size: 40, service: waiter, min_price: 100, max_price: 150, user_id: andrew.id)
 event4 =  Event.create!(name:"House Warming", date:"2018/12/17", event_type: "house party", location:"London", description:"I'm hosting a house warming party, I'm looking for a chef who is professional and experienced. The kitchen is large with plenty of space and all amenities will be provided. I'm hoping to host a main dinner and a dessert and I'm open to suggestions ", party_size: 12, service: chef, min_price: 400, max_price: 500, user_id: john.id)
 event5 =  Event.create!(name:"Dinner with Friends", date:"2018/12/16", event_type: "dinner", location:"London", description:"I'm hosting a dinner party, I'm looking for a chef who is professional and experienced. The kitchen is of a medium size but should be sufficient and all amenities will be provided. I'm hoping to host a main dinner and a dessert however, I'm open to suggestions", party_size: 10, service: chef, min_price: 200, max_price: 250, user_id: lisa.id)
 event6 =  Event.create!(name:"Cocktail Night", date:"2018/12/15", event_type: "cocktail party", location:"London", description:"I'm looking for a mixologist for my event, I'll need an experienced and proffessional individual who knows how to make a good classic cocktials", party_size: 10, service: mixologist, min_price: 150, max_price: 500, user_id: andrew.id)
-event7 =  Event.create!(name:"Birthday Dinner", date:"2018/01/19", event_type: "birthday", location:"London", description:"", party_size: 10, service: chef, min_price: 1, max_price: 5, user_id: andrew.id)
+event7 =  Event.create!(name:"Birthday Dinner", date:"2018/01/19", event_type: "birthday", location:"London", description:"I'm open to suggestions", party_size: 10, service: chef, min_price: 1, max_price: 5, user_id: andrew.id)
 event8 =  Event.create!(name:"Brunch", date:"2018/01/26", event_type: "Brunch", location:"London", description:"I'm hosting a brunch party, I'm looking for a chef who is professional and experience. The kitchen is large with plenty of space and all amenities will be provided. I'm hoping to have the classic avo with poached eggs, eggs benedict etc, dessert would also be nice but I'm open to suggestions", party_size: 10, service: chef, min_price: 200, max_price: 400, user_id: lisa.id)
 event9 =  Event.create!(name:"Small wedding party", date:"2018/01/26", event_type: "wedding", location:"London", description:"I'm hosting a very low key wedding party, I'm looking for a chef who is professional and experienced. The kitchen is large with plenty of space and all amenities will be provided. I'm hoping to provide a 3 course meal plus dessert and I'm open to suggestions", party_size: 20, service: chef, min_price: 350, max_price: 500, user_id: lisa.id)
-event10 =  Event.create!(name:"Birthday party", date:"2018/12/29", event_type: "party", location:"London", description:"", party_size: 17, service: chef, min_price: 100, max_price: 250, user_id: andrew.id)
-event12 =  Event.create!(name:"Reunion Dinner", date:"2018/12/05", event_type: "Dinner", location:"London", description:"", party_size: 10, service: chef, min_price: 250, max_price: 400, user_id: louise.id)
-event13 =  Event.create!(name:"30th Birthday!", date:"2018/12/19", event_type: "birthday", location:"London", description:"", party_size: 13, service: mixologist, min_price: 150, max_price: 250, user_id: andrew.id)
-event14 =  Event.create!(name:"Fred's Farewell", date:"2018/12/17", event_type: "family event", location:"London", description:"", party_size: 10, service: chef, min_price: 150, max_price: 300, user_id: andrew.id)
-event15 =  Event.create!(name:"Welcome Home party", date:"2018/12/10", event_type: "family event", location:"London", description:"", party_size: 20, service: chef, min_price: 240, max_price: 300, user_id: louise.id)
-event16 =  Event.create!(name:"Fashion blogger Event", date:"2018/12/05", event_type: "business event", location:"London", description:"", party_size: 60, service: chef, min_price: 350, max_price: 400, user_id: lisa.id)
-event17 =  Event.create!(name:"Launch party", date:"2018/12/01", event_type: "launch party", location:"London", description:"", party_size: 40, service: chef, min_price: 200, max_price: 300, user_id: andrew.id)
-event18 =  Event.create!(name:"Sweet 16", date:"2018/12/20", event_type: "party", location:"London", description:"", party_size: 16, service: chef, min_price: 225, max_price: 300, user_id: louise.id)
-event19 =  Event.create!(name:"New Years Eve Party", date:"2018/12/31", event_type: "new years", location:"London", description:"", party_size: 50, service: mixologist, min_price: 150, max_price: 300, user_id: andrew.id)
-event20 =  Event.create!(name:"Engagement Party", date:"2018/09/01", event_type: "Engagement", location:"London", description:"", party_size: 50, service: mixologist, min_price: 260, max_price: 350, user_id: john.id)
-event21 =  Event.create!(name:"Baby shower", date:"2018/11/17", event_type: "summer", location:"London", description:"", party_size: 50, service: waiter, min_price: 100, max_price: 150, user_id: lisa.id)
-event22 =  Event.create!(name:"Summer Party", date:"2018/08/17", event_type: "tea party", location:"London", description:"", party_size: 50, service: chef, min_price: 150, max_price: 200, user_id: andrew.id)
-event23 =  Event.create!(name:"Tea party", date:"2018/07/08", event_type: "tea party", location:"London", description:"", party_size: 50, service: mixologist, min_price: 200, max_price: 300, user_id: andrew.id)
+event10 =  Event.create!(name:"Birthday party", date:"2018/12/29", event_type: "party", location:"London", description:"I'm open to suggestions", party_size: 17, service: chef, min_price: 100, max_price: 250, user_id: andrew.id)
+event12 =  Event.create!(name:"Reunion Dinner", date:"2018/12/05", event_type: "Dinner", location:"London", description:"I'm open to suggestions", party_size: 10, service: chef, min_price: 250, max_price: 400, user_id: louise.id)
+event13 =  Event.create!(name:"30th Birthday!", date:"2018/12/19", event_type: "birthday", location:"London", description:"I'm open to suggestions", party_size: 13, service: mixologist, min_price: 150, max_price: 250, user_id: andrew.id)
+event14 =  Event.create!(name:"Fred's Farewell", date:"2018/12/17", event_type: "family event", location:"London", description:"I'm open to suggestions", party_size: 10, service: chef, min_price: 150, max_price: 300, user_id: andrew.id)
+event15 =  Event.create!(name:"Welcome Home party", date:"2019/12/10", event_type: "family event", location:"London", description:"I'm open to suggestions", party_size: 20, service: chef, min_price: 240, max_price: 300, user_id: louise.id)
+event16 =  Event.create!(name:"Fashion blogger Event", date:"2019/12/05", event_type: "business event", location:"London", description:"I'm open to suggestions", party_size: 60, service: chef, min_price: 350, max_price: 400, user_id: lisa.id)
+event17 =  Event.create!(name:"Launch party", date:"2019/12/01", event_type: "launch party", location:"London", description:"I'm open to suggestions", party_size: 40, service: chef, min_price: 200, max_price: 300, user_id: andrew.id)
+event18 =  Event.create!(name:"Sweet 16", date:"2019/12/20", event_type: "party", location:"London", description:"I'm open to suggestions", party_size: 16, service: chef, min_price: 225, max_price: 300, user_id: louise.id)
+event19 =  Event.create!(name:"New Years Eve Party", date:"2018/12/31", event_type: "new years", location:"London", description:"I'm open to suggestions", party_size: 50, service: mixologist, min_price: 150, max_price: 300, user_id: andrew.id)
+event20 =  Event.create!(name:"Engagement Party", date:"2019/09/01", event_type: "Engagement", location:"London", description:"I'm open to suggestions", party_size: 50, service: mixologist, min_price: 260, max_price: 350, user_id: john.id)
+event21 =  Event.create!(name:"Baby shower", date:"2019/11/17", event_type: "summer", location:"London", description:"I'm open to suggestions", party_size: 50, service: waiter, min_price: 100, max_price: 150, user_id: lisa.id)
+event22 =  Event.create!(name:"Summer Party", date:"2019/08/17", event_type: "tea party", location:"London", description:"I'm open to suggestions", party_size: 50, service: chef, min_price: 150, max_price: 200, user_id: andrew.id)
+event23 =  Event.create!(name:"Tea party", date:"2019/07/08", event_type: "tea party", location:"London", description:"I'm open to suggestions", party_size: 50, service: mixologist, min_price: 200, max_price: 300, user_id: andrew.id)