From db25c82b1cf5af23e933246df8be09256d0f22e5 Mon Sep 17 00:00:00 2001
From: Marsha Hall <mphall77@gmail.com>
Date: Sun, 19 Sep 2021 13:56:41 -0400
Subject: [PATCH 1/7] fix css on navbar

---
 front-end/src/App.css              | 6 +-----
 front-end/src/Components/NavBar.js | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/front-end/src/App.css b/front-end/src/App.css
index 6315257..319ef75 100644
--- a/front-end/src/App.css
+++ b/front-end/src/App.css
@@ -91,7 +91,7 @@ h6 {
 /* End of Global Styles */
 
 /* N A V B A R */
-.navbar {
+.navBar {
 	position: sticky;
 	top: 0;
 	width: 100vw;
@@ -349,7 +349,6 @@ h6 {
 	display: grid;
 	grid-template-columns: 1fr;
 	margin: 2rem auto;
-
 }
 .description,
 .info {
@@ -398,7 +397,6 @@ h6 {
 
 /* End React Calendar */
 
-
 /* Booking Form */
 
 .BookingFormContainer {
@@ -413,5 +411,3 @@ h6 {
 }
 
 /* End Chef Availibility Calendar */
-
-
diff --git a/front-end/src/Components/NavBar.js b/front-end/src/Components/NavBar.js
index dace823..81a2674 100644
--- a/front-end/src/Components/NavBar.js
+++ b/front-end/src/Components/NavBar.js
@@ -14,7 +14,7 @@ const NavBar = () => {
 	};
 
 	return (
-		<nav className="navbar">
+		<nav className="navBar">
 			<div className="nav-center">
 				<div className="nav-header">
 					{/* replace this home icon with the Logo Image  */}

From b6037ffa21d05620f8bc7ffd6a3f33c7e462673b Mon Sep 17 00:00:00 2001
From: Marsha Hall <mphall77@gmail.com>
Date: Sat, 25 Sep 2021 17:47:24 -0400
Subject: [PATCH 2/7] heroku

---
 back-end/db/schema.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/back-end/db/schema.sql b/back-end/db/schema.sql
index 54bd588..af61321 100644
--- a/back-end/db/schema.sql
+++ b/back-end/db/schema.sql
@@ -1,6 +1,6 @@
-DROP DATABASE IF EXISTS chef_app_dev;
-CREATE DATABASE chef_app_dev;
-\c chef_app_dev;
+-- DROP DATABASE IF EXISTS chef_app_dev;
+-- CREATE DATABASE chef_app_dev;
+-- \c chef_app_dev;
 
 DROP TABLE IF EXISTS users;
 

From c79cdeee6eeb8e8fcd04a8e0b06d5372953cd1e0 Mon Sep 17 00:00:00 2001
From: Marsha Hall <mphall77@gmail.com>
Date: Sat, 25 Sep 2021 17:48:18 -0400
Subject: [PATCH 3/7] heroku2

---
 back-end/db/seed.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back-end/db/seed.sql b/back-end/db/seed.sql
index f6e4f7f..014e415 100644
--- a/back-end/db/seed.sql
+++ b/back-end/db/seed.sql
@@ -1,4 +1,4 @@
-\c chef_app_dev;
+-- \c chef_app_dev;
 
 INSERT INTO users (
     id, email, first_name, last_name, is_chef, cuisine, zip_code, availability)

From 0c4bb3c011681d7395eccaff919f1be7bf1b35d8 Mon Sep 17 00:00:00 2001
From: Marsha Hall <mphall77@gmail.com>
Date: Sat, 2 Oct 2021 13:15:36 -0400
Subject: [PATCH 4/7] pull 10.2.2021

---
 back-end/controllers/bookingsController.js |  6 +++++-
 back-end/db/schema.sql                     |  1 -
 back-end/queries/bookings.js               | 20 +++++++++++---------
 front-end/src/Components/BookingForm.js    | 15 +++++++--------
 front-end/src/Components/Requests.js       | 19 ++++++++++++++++---
 front-end/src/Pages/IndexBookings.js       | 12 ++++++++----
 front-end/src/Pages/ShowBookings.js        |  2 +-
 7 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/back-end/controllers/bookingsController.js b/back-end/controllers/bookingsController.js
index 317f307..8c20a2d 100644
--- a/back-end/controllers/bookingsController.js
+++ b/back-end/controllers/bookingsController.js
@@ -25,7 +25,11 @@ bookings.get("/:id", async (req, res) => {
 
 bookings.post("/", async (req, res) => {
 	const newBooking = await createBooking(req.body);
-	res.json({ success: true, payload: newBooking });
+	if (newBooking.id) {
+		res.json({ success: true, payload: newBooking });
+	} else {
+		res.json({success:false, payload: "Booking was not able to be created"})
+	}
 });
 
 bookings.put("/:id", async (req, res) => {
diff --git a/back-end/db/schema.sql b/back-end/db/schema.sql
index 950475e..b29c584 100644
--- a/back-end/db/schema.sql
+++ b/back-end/db/schema.sql
@@ -12,7 +12,6 @@ CREATE TABLE users (
     is_chef BOOLEAN DEFAULT FALSE, 
     cuisine TEXT, 
     availability TEXT
-    -- availability_id INT REFERENCES availability (id) NOT NULL,  
 );
 
 DROP TABLE IF EXISTS bookings;
diff --git a/back-end/queries/bookings.js b/back-end/queries/bookings.js
index 73aaf3a..41fd498 100644
--- a/back-end/queries/bookings.js
+++ b/back-end/queries/bookings.js
@@ -1,16 +1,17 @@
+const { use } = require("../controllers/bookingsController");
 const db = require("../db/dbConfig");
 
-// const fetchAllBookings = async () => {
-//   try {
-//     return await db.any("SELECT * FROM bookings");
-//   } catch (err) {
-//     return err;
-//   }
-// };
-
+const fetchAllBookings = async () => {
+  try {
+    return await db.one('SELECT * FROM bookings')
+  } catch (error) {  
+  }
+}
 const fetchUserBookings = async (user_id) => {
   try {
-    return await db.oneOrNone('SELECT * FROM bookings WHERE user_id = $1 OR chef_id = $1', user_id)
+    const userBookings = await db.oneOrNone('SELECT * FROM bookings WHERE user_id = $1 OR chef_id = $1', user_id)
+    console.log(userBookings)
+    return userBookings;
   } catch (error) {
     return error;
   }
@@ -104,6 +105,7 @@ const updateBooking = async (id, booking) => {
 
 
 module.exports = {
+  fetchAllBookings,
   fetchBooking,
   createBooking,
   updateBooking,
diff --git a/front-end/src/Components/BookingForm.js b/front-end/src/Components/BookingForm.js
index 1b96578..4aa1f02 100644
--- a/front-end/src/Components/BookingForm.js
+++ b/front-end/src/Components/BookingForm.js
@@ -1,4 +1,4 @@
-import { withRouter } from "react-router-dom";
+import { withRouter } from 'react-router-dom';
 import { useState } from "react";
 import BookingCal from "./BookingCal";
 import axios from "axios";
@@ -20,7 +20,7 @@ const BookingForm = () => {
     state: "",
     zip_code: "",
     start_event: "",
-    end_event: "",
+    end_event: ""
   });
   let history = useHistory();
 
@@ -36,17 +36,16 @@ const BookingForm = () => {
         ...newRequest,
       };
       await axios.post(`${API}/bookings`, chefRequest);
-      debugger
-      history.push("/bookings/:id");
-    } catch (error) {}
-  };
+    } catch (error) {
+      return error
+    }
 
-  console.log(request)
+    console.log(request);
 
   const handleSubmit = async (e) => {
     e.preventDefault();
     await addNewRequest(request);
-    history.push("/bookings/:id");
+    history.push("/bookings/");
   };
 
   return (
diff --git a/front-end/src/Components/Requests.js b/front-end/src/Components/Requests.js
index 9c13670..06de918 100644
--- a/front-end/src/Components/Requests.js
+++ b/front-end/src/Components/Requests.js
@@ -10,21 +10,34 @@ const Requests = () => {
 
     const { currentUser } = useAuth()
     const [bookings, setBookings] = useState([]);
-    const currentUserId = currentUser.uid;
+
+    debugger
+    const currentUserId = currentUser && currentUser.uid;
 
     useEffect(() => {
         const fetchAllBookings = async () => {
+          if (currentUserId){
+          try {
           console.log("chicken", currentUserId)
           const res = await axios.get(`${API}/users/${currentUserId}/bookings/`);
           setBookings([res.data.payload]);
-          try {
+          console.log(res)
+          console.log("Bookings =>", bookings)
+          debugger
+
           } catch (error) {
             console.log(error);
           }
+        }
         };
         fetchAllBookings();
       }, [currentUserId]);
- console.log("pickles", bookings)
+      debugger
+    if (!currentUser || !bookings.length){
+      return null
+    }
+
+
     return (
         <div>
             {bookings.map((booking) => {
diff --git a/front-end/src/Pages/IndexBookings.js b/front-end/src/Pages/IndexBookings.js
index b8c5d04..d3876a3 100644
--- a/front-end/src/Pages/IndexBookings.js
+++ b/front-end/src/Pages/IndexBookings.js
@@ -1,11 +1,15 @@
 import React from "react";
 import AddReview from "../Components/AddReview";
-
+import Requests from "../Components/Requests";
 
 const IndexBookings = () => {
-	return <div>List of your bookings
-		<AddReview/>
-</div>;
+  return (
+    <div>
+      List of your bookings
+      <Requests />
+      <AddReview />
+    </div>
+  );
 };
 
 export default IndexBookings;
diff --git a/front-end/src/Pages/ShowBookings.js b/front-end/src/Pages/ShowBookings.js
index 45b29a7..a9d6413 100644
--- a/front-end/src/Pages/ShowBookings.js
+++ b/front-end/src/Pages/ShowBookings.js
@@ -1,7 +1,7 @@
 import Requests from "../Components/Requests";
 const ShowBookings = () => {
 	return (
-		<Requests/>
+		<div></div>
 	);
 };
 

From bb945b2594d278a118c1d4aa055c4ade892db868 Mon Sep 17 00:00:00 2001
From: Marsha Hall <mphall77@gmail.com>
Date: Sun, 3 Oct 2021 11:32:16 -0400
Subject: [PATCH 5/7] test

---
 back-end/db/schema.sql                     |  36 +++---
 back-end/db/seed.sql                       |  39 +++----
 back-end/queries/bookings.js               |   6 +-
 front-end/src/App.css                      |  28 +++--
 front-end/src/Components/BookingForm.js    |  76 +++++++------
 front-end/src/Components/ChefDetails.js    | 121 ++++++++++-----------
 front-end/src/Components/LoginForm.js      |   9 +-
 front-end/src/Components/NavBar.js         |  15 ++-
 front-end/src/Components/RequestDetails.js |  50 +++++----
 front-end/src/Components/Requests.js       |  19 ++--
 front-end/src/Components/Services.js       |  12 +-
 front-end/src/Images/googleicon.png        | Bin 20617 -> 0 bytes
 front-end/src/Pages/IndexBookings.js       |   1 -
 front-end/src/Pages/ShowBookings.js        |   1 +
 14 files changed, 217 insertions(+), 196 deletions(-)
 delete mode 100644 front-end/src/Images/googleicon.png

diff --git a/back-end/db/schema.sql b/back-end/db/schema.sql
index b29c584..c790d4d 100644
--- a/back-end/db/schema.sql
+++ b/back-end/db/schema.sql
@@ -10,8 +10,7 @@ CREATE TABLE users (
     first_name VARCHAR(100) NOT NULL, 
     last_name VARCHAR(100) NOT NULL, 
     is_chef BOOLEAN DEFAULT FALSE, 
-    cuisine TEXT, 
-    availability TEXT
+    cuisine TEXT
 );
 
 DROP TABLE IF EXISTS bookings;
@@ -28,7 +27,8 @@ CREATE TABLE bookings (
     state TEXT NOT NULL, 
     zip_code VARCHAR(5),
     start_event TIMESTAMP,
-    end_event TIMESTAMP
+    end_event TIMESTAMP,
+    chef TEXT
 );
 
 DROP TABLE IF EXISTS ratings;
@@ -42,23 +42,21 @@ CREATE TABLE ratings (
     -- booking_id INT REFERENCES bookings(id)
 );
 
--- DROP TABLE IF EXISTS availability;
+DROP TABLE IF EXISTS availability;
 
--- CREATE TABLE availability (
---     id SERIAL PRIMARY KEY,
---     chef_id INT REFERENCES users (id) NOT NULL,
---     sunday TEXT DEFAULT NULL,
---     monday TEXT DEFAULT NULL,
---     tuesday TEXT DEFAULT NULL,
---     wednesday TEXT DEFAULT NULL,
---     thursday TEXT DEFAULT NULL,
---     friday TEXT DEFAULT NULL,
---     saturday TEXT DEFAULT NULL,
---     -- might need to move is_booked and booked_by to the bookings table
---     -- time TIME DEFAULT NULL,
---     is_booked BOOLEAN DEFAULT NULL,
---     booked_by INT REFERENCES users (id)
--- );
+CREATE TABLE availability (
+    id SERIAL PRIMARY KEY,
+    chef_id TEXT REFERENCES users (id) NOT NULL,
+    sunday TEXT DEFAULT NULL,
+    monday TEXT DEFAULT NULL,
+    tuesday TEXT DEFAULT NULL,
+    wednesday TEXT DEFAULT NULL,
+    thursday TEXT DEFAULT NULL,
+    friday TEXT DEFAULT NULL,
+    saturday TEXT DEFAULT NULL,
+    is_booked BOOLEAN DEFAULT NULL,
+    booked_by TEXT REFERENCES users (id)
+);
 
 -- STACKOVERFLOW 
 -- https://stackoverflow.com/questions/4521020/calculate-open-timeslots-given-availability-and-existing-appointments-by-day
diff --git a/back-end/db/seed.sql b/back-end/db/seed.sql
index 57a7a78..27f8aae 100644
--- a/back-end/db/seed.sql
+++ b/back-end/db/seed.sql
@@ -1,15 +1,14 @@
 -- \c chef_app_dev;
 
 INSERT INTO users (
-    id, email, first_name, last_name, is_chef, cuisine, availability)
+    id, email, first_name, last_name, is_chef, cuisine)
 VALUES 
-    ('ahdjw82iks','chef_boyardee@gmail.com', 'Chef', 'Boyardee', true, 'Italian', 'Monday, Tuesday'),
-    ('bsujdyh822','juliaChild23@yahoo.com', 'Julia', 'Child', true, 'French', 'Wednesday, Thursday'),
-    ('chgwq72ijd','lesliemann@gmail.com', 'Leslie', 'Mann', false, NULL, NUll),
-    ('morimoto4545@gmail.com', 'sushi11', 'Masaharu', 'Morimoto', true, 'Japanese', 'Friday, Sunday'),
-    ('butter@gmail.com', 'deepFried1', 'Paula', 'Dean', true, 'Southern', 'Saturday, Sunday');
-    -- ('vicCruz89@yahoo.com', 'football88', 'Victor Cruz', false, NULL, NULL, NULL);
-
+    ('ahdjw82iks','chef_boyardee@gmail.com', 'Chef', 'Boyardee', true, 'Italian'),
+    ('bsujdyh822','juliaChild23@yahoo.com', 'Julia', 'Child', true, 'French' ),
+    ('chgwq72ijd','lesliemann@gmail.com', 'Leslie', 'Mann', false, NULL),
+    ('hytrkew345', 'morimoto4545@gmail.com', 'Masaharu', 'Morimoto', true, 'Japanese'),
+    ('nhyt54pgtn', 'butter@gmail.com', 'Paula', 'Dean', true, 'Southern'),
+    ('p0ot54fdh8', 'vicCruz89@yahoo.com', 'Victor', 'Cruz', false, NULL);
 
 INSERT INTO bookings (
     		chef_id,
@@ -23,21 +22,23 @@ INSERT INTO bookings (
         state, 
         zip_code, 
 		start_event,
-        end_event) 
+        end_event, chef) 
 VALUES
         ('ahdjw82iks','chgwq72ijd' , 'Birthday Party', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00');
-        -- (2, 5, 'French', 'Sept 1, 2021', '19:00:00', '21:00:00'),
-        -- (4, 3, 'Asian', 'March 8 , 2021', '18:00:00', '22:00:00' );
+        -- ('bsujdyh822', 5, 'French', 'Sept 1, 2021', '19:00:00', '21:00:00'),
+        -- (4, 'chgwq72ijd', 'Asian', 'March 8 , 2021', '18:00:00', '22:00:00' );
         -- YYYY-MM-DD hh:mm:ss[.nnn]
 
--- INSERT INTO availability (
---     chef_id, sunday, monday, tuesday, wednesday, thursday, friday, saturday, is_booked, booked_by
--- )        
--- VALUES 
--- ('ahdjw82iks', NULL,'10am - 3pm','10am - 3pm', NULL, NULL, NULL, NULL, NULL, false, 'bsujdyh822');
--- (2, NULL, NULL,'10am - 3pm','10am - 3pm',NULL, NULL, NULL, NULL, false, 4),
--- (4, '10am - 3pm', NULL, NULL, NULL, NULL, '10am - 3pm', NULL, NULL, true, 3),
--- (5, '10am - 3pm', NULL, NULL, NULL, NULL, NULL,'10am - 3pm',  NULL, false, 3);
+
+INSERT INTO availability (
+    chef_id, sunday, monday, tuesday, wednesday, thursday, friday, saturday, is_booked, booked_by
+)        
+VALUES 
+('ahdjw82iks', NULL,'10am - 3pm','10am - 3pm', NULL, NULL, NULL, NULL, false, 'bsujdyh822');
+-- ('bsujdyh822', NULL, NULL,'10am - 3pm','10am - 3pm', NULL, NULL, NULL, false, 'hytrkew345'),
+-- ('hytrkew345', '10am - 3pm', NULL, NULL, NULL, NULL, '10am - 3pm', NULL,  true, 'chgwq72ijd'),
+-- ('nhyt54pgtn', '10am - 3pm', NULL, NULL,  NULL, NULL,'10am - 3pm',  NULL, false, 'chgwq72ijd');
+
 
 INSERT INTO ratings (chef_id, user_id, review, rating)
 VALUES
diff --git a/back-end/queries/bookings.js b/back-end/queries/bookings.js
index 05226ea..e2297c9 100644
--- a/back-end/queries/bookings.js
+++ b/back-end/queries/bookings.js
@@ -39,12 +39,13 @@ const createBooking = async (newBooking) => {
 		zip_code,
 		start_event,
 		end_event,
+		chef,
 	} = newBooking;
 	try {
 		const res = await db.one(
 			`INSERT INTO bookings
-            (chef_id, user_id, event_type, party_size, address, address2, city, state, zip_code,  start_event, end_event )
-            VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
+            (chef_id, user_id, event_type, party_size, address, address2, city, state, zip_code,  start_event, end_event, chef )
+            VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
             RETURNING *`,
 			[
 				chef_id,
@@ -58,6 +59,7 @@ const createBooking = async (newBooking) => {
 				zip_code,
 				start_event,
 				end_event,
+				chef,
 			]
 		);
 		return res;
diff --git a/front-end/src/App.css b/front-end/src/App.css
index b624940..3c3cd86 100644
--- a/front-end/src/App.css
+++ b/front-end/src/App.css
@@ -139,6 +139,7 @@ h6 {
 	height: 0;
 	overflow: hidden;
 	transition: var(--mainTransition);
+	padding-left: 20vw;
 	list-style-type: none;
 	display: flex;
 	justify-content: space-between;
@@ -147,12 +148,11 @@ h6 {
 .nav-links a {
 	display: block;
 	text-decoration: none;
-	padding: 1rem 0;
 	color: var(--mainBlack);
 	transition: var(--mainTransition);
 	font-family: "Ropa Sans", sans-serif;
 	text-align: center;
-	font-size: 16px;
+	font-size: 18px;
 	letter-spacing: var(--mainSpacing);
 }
 
@@ -168,10 +168,12 @@ h6 {
 	border: none;
 	background-color: #f7f7f7;
 	font-family: "Ropa Sans", sans-serif;
-	font-size: 16px;
+	font-size: 18px;
 	font-weight: 500;
 	padding-top: 8px;
 	letter-spacing: var(--mainSpacing);
+	padding-left: 1vw;
+	padding-right: 1vw;
 }
 
 @media screen and (min-width: 768px) {
@@ -218,7 +220,7 @@ h6 {
 	display: inline-block;
 	background: rgba(1, 12, 29, 0.475);
 	color: var(--mainWhite);
-	padding: 2rem 1rem;
+	padding: 5rem 1rem;
 	text-align: center;
 	letter-spacing: var(--mainSpacing);
 }
@@ -538,7 +540,7 @@ h6 {
 .login-container {
 	background: #004aa2;
 	width: 35vw;
-	height: 70vh;
+	height: 60vh;
 	border-radius: 20px;
 	display: flex;
 	justify-content: center;
@@ -551,7 +553,7 @@ h6 {
 	font-size: 2em;
 	font-weight: bold;
 	color: rgba(0, 255, 238, 0.968);
-	margin-bottom: 0.5em;
+	margin-bottom: 5vh;
 }
 
 .login-box {
@@ -566,7 +568,7 @@ h6 {
 	position: relative;
 	width: 100%;
 	height: 40px;
-	margin: 0.8em 0;
+	margin: 3vh 0;
 }
 
 .login-container .login-box input {
@@ -623,7 +625,7 @@ h6 {
 
 .textTwo {
 	font-size: 0.9em;
-	margin-top: 0.5em;
+	margin-top: 5vh;
 	text-align: center;
 	color: rgb(0, 255, 238);
 }
@@ -682,7 +684,7 @@ h6 {
 .signup-container {
 	background: #004aa2;
 	width: 40vw;
-	height: 110vh;
+	height: 90vh;
 	border-radius: 20px;
 	display: flex;
 	justify-content: center;
@@ -694,7 +696,7 @@ h6 {
 .sign-heading {
 	font-size: 2em;
 	font-weight: bold;
-	margin-bottom: 0.5em;
+	margin-bottom: 22vh;
 	color: rgb(0, 255, 238);
 }
 
@@ -763,8 +765,8 @@ h6 {
 
 .first_last {
 	display: grid;
-	grid-template-columns: 18vw 18vw;
-	gap: 1vw;
+	grid-template-columns: 17vw 17vw;
+	gap: 2vw;
 }
 
 /* modal */
@@ -780,6 +782,8 @@ h6 {
    z-index: 10;
 }
 
+/* RequestDetails */
+
 .requestsCard{
 	background-color: var(--medTan);
 	height: 100vh;
diff --git a/front-end/src/Components/BookingForm.js b/front-end/src/Components/BookingForm.js
index 14da28b..d2bca28 100644
--- a/front-end/src/Components/BookingForm.js
+++ b/front-end/src/Components/BookingForm.js
@@ -8,7 +8,7 @@ import { useAuth } from "../Providers/AuthProvider";
 
 const API = apiURL();
 
-const BookingForm = () => {
+const BookingForm = ({ chef }) => {
 	const { id } = useParams();
 	const chef_id = id;
 	const { currentUser } = useAuth();
@@ -34,33 +34,30 @@ const BookingForm = () => {
 			const chefRequest = {
 				chef_id: chef_id,
 				user_id: currentUser.uid,
+				chef: `chef.first_name chef.last_name`,
 				...newRequest,
 			};
-			console.log("CHEFR", chefRequest);
 			let res = await axios.post(`${API}/bookings`, chefRequest);
+			console.log("CHEFR", res.data.payload);
 			return res;
 		} catch (err) {
 			return "error";
 		}
 	};
-	console.log(request);
 
 	const handleSubmit = async (e) => {
 		e.preventDefault();
+		const userID = currentUser.uid;
 		let res = await addNewRequest(request);
-		console.log("RES", res);
-
-		if (res.data.payload.success === true) {
-			history.push(`/users/${currentUser.uid}/bookings`);
-		} else {
-			console.log(res);
-		}
+		history.push(`/users/${userID}/bookings`);
 	};
 
 	return (
 		<div>
 			<form onSubmit={handleSubmit} className="booking-container">
-				<h1 className="booking-heading"> Book Chef</h1>
+				<h1 className="booking-heading">
+					Book Chef: {chef.first_name} {chef.last_name}
+				</h1>
 				<div>
 					<label className="mb-1">Event Type:</label>
 					<select
@@ -68,15 +65,33 @@ const BookingForm = () => {
 						className="form-select"
 						aria-label="Default select example"
 					>
-						<option type="text" value={"Birthday Party"}>
-							Birthday Party
+						<option type="text" value={"---"} default>
+							---
+						</option>
+						<option type="text" value={"Other"}>
+							Special Occasion
 						</option>
 						<option type="text" value={"Corporate Function"}>
-							Corporate Function
+							Corporate Event
+						</option>
+						<option type="text" value={"Birthday Party"}>
+							Birthday Party
 						</option>
 						<option type="text" value={"Dinner Party"}>
 							Dinner Party
 						</option>
+						<option type="text" value={"Meal Prep"}>
+							Meal Prep
+						</option>
+						<option type="text" value={"Brunch"}>
+							Brunch
+						</option>
+						<option type="text" value={"Meal Prep"}>
+							Meal Prep
+						</option>
+						<option type="text" value={"Brunch"}>
+							Brunch
+						</option>
 						<option type="text" value={"Other"}>
 							Other
 						</option>
@@ -85,28 +100,12 @@ const BookingForm = () => {
 
 				<div>
 					<label className="mb-1 mt-3">Party Size:</label>
-					<select
+					<input
 						onChange={handleChange("party_size")}
-						defaultValue=""
-						className="form-select"
-						aria-label="Default select example"
-					>
-						<option type="text" value={"1-2"}>
-							1-2
-						</option>
-						<option type="text" value={"3-4"}>
-							3-4
-						</option>
-						<option type="text" value={"4-10"}>
-							4-10
-						</option>
-						<option type="text" value={"10-20"}>
-							10-20
-						</option>
-						<option type="text" value={"20+"}>
-							20+
-						</option>
-					</select>
+						type="number"
+						name="party_size"
+						id="party_size"
+					/>
 				</div>
 
 				<h6 className="booking-heading">Event Location</h6>
@@ -152,8 +151,11 @@ const BookingForm = () => {
 							value={request.state}
 							type="text"
 							name="state"
+							maxlength="2"
+							pattern="[A-Za-z]{2}"
 							className="form-control"
 							onChange={handleChange("state")}
+							placeholder="NY"
 							required
 						/>
 						<label htmlFor="floatingInput">State</label>
@@ -164,6 +166,9 @@ const BookingForm = () => {
 							value={request.zip_code}
 							type="text"
 							name="zip_code"
+							maxlength="5"
+							pattern="[0-9]{5}"
+							placeholder="Zip code"
 							className="form-control"
 							onChange={handleChange("zip_code")}
 							required
@@ -179,5 +184,4 @@ const BookingForm = () => {
 		</div>
 	);
 };
-
 export default withRouter(BookingForm);
diff --git a/front-end/src/Components/ChefDetails.js b/front-end/src/Components/ChefDetails.js
index 93a3873..e5a4e59 100644
--- a/front-end/src/Components/ChefDetails.js
+++ b/front-end/src/Components/ChefDetails.js
@@ -10,70 +10,69 @@ import BookingForm from "./BookingForm.js";
 const API = apiURL();
 
 const ChefDetails = ({ chefs }) => {
-  const [chef, setChef] = useState({});
-  const [chefAvail, setChefAvail] = useState({});
-  let { id } = useParams();
+	const [chef, setChef] = useState({});
+	const [chefAvail, setChefAvail] = useState({});
+	let { id } = useParams();
 
-  useEffect(() => {
-    const fetchSingleChef = async () => {
-      try {
-        const res = chefs.filter((chef) => chef.id === id);
-        const resAvail = await axios.get(`${API}/availability/${id}`);
-        setChef(res[0]);
-        setChefAvail(resAvail.data.payload);
-      } catch (err) {
-        return err;
-      }
-    };
-    fetchSingleChef();
-  }, [id, chefs]);
+	useEffect(() => {
+		const fetchSingleChef = async () => {
+			try {
+				const res = chefs.filter((chef) => chef.id === id);
+				const resAvail = await axios.get(`${API}/availability/${id}`);
+				setChef(res[0]);
+				setChefAvail(resAvail.data.payload);
+			} catch (err) {
+				return err;
+			}
+		};
+		fetchSingleChef();
+	}, [id, chefs]);
 
-  if (!chef) {
-    return null;
-  }
+	if (!chef) {
+		return null;
+	}
 
-  return (
-    <section className="single-chef">
-      <div className="single-chef-img-avail">
-        <img
-          src={imageChef}
-          className="img-fluid rounded-start"
-          alt={chef.first_name}
-        />
-        <article className="info">
-          <h3>Chef's Availability Calendar</h3>
-          <h6>Availability: {chef.availability}</h6>
-          {/* <ChefAvailability chefAvail={chefAvail} /> */}
-        </article>
-      </div>
-      <div className="chef-info-form">
-        <div className="single-chef-info">
-          <article className="single-chef-info">
-            <h2>
-              {chef.first_name} {chef.last_name}
-            </h2>
-            <h6>Cuisine(s): {chef.cuisine}</h6>
-          </article>
-          <article className="info">
-            <h3>bio:</h3>
-            <p>
-              Lorem ipsum, dolor sit amet consectetur adipisicing elit. Incidunt
-              explicabo asperiores sequi soluta quae sit tempore delectus
-              corrupti recusandae, animi ea ab! Sint, voluptas id? Lorem ipsum
-              dolor sit amet consectetur adipisicing elit. Blanditiis sequi odio
-              suscipit ea similique nobis.
-            </p>
-          </article>
-          <div>
-            <Reviews />
-          </div>
-        </div>
-        <div className="chef-booking-form">
-          <BookingForm />
-        </div>
-      </div>
-    </section>
-  );
+	return (
+		<section className="single-chef">
+			<div className="single-chef-img-avail">
+				<img
+					src={imageChef}
+					className="img-fluid rounded-start"
+					alt={chef.first_name}
+				/>
+				<article className="info">
+					<h3>Chef's Availability Calendar</h3>
+					<ChefAvailability chefAvail={chefAvail} />
+				</article>
+			</div>
+			<div className="chef-info-form">
+				<div className="single-chef-info">
+					<article className="single-chef-info">
+						<h2>
+							{chef.first_name} {chef.last_name}
+						</h2>
+						<h6>Cuisine(s): {chef.cuisine}</h6>
+					</article>
+					<article className="info">
+						<h3>bio:</h3>
+						<p>
+							Lorem ipsum, dolor sit amet consectetur adipisicing elit. Incidunt
+							explicabo asperiores sequi soluta quae sit tempore delectus
+							corrupti recusandae, animi ea ab! Sint, voluptas id? Lorem ipsum
+							dolor sit amet consectetur adipisicing elit. Blanditiis sequi odio
+							suscipit ea similique nobis.
+						</p>
+					</article>
+					<div>
+						<Reviews />
+					</div>
+				</div>
+				<div className="chef-booking-form">
+					<BookingForm chef={chef} />
+				</div>
+			</div>
+		</section>
+	);
 };
 
 export default ChefDetails;
diff --git a/front-end/src/Components/LoginForm.js b/front-end/src/Components/LoginForm.js
index defb229..810078d 100644
--- a/front-end/src/Components/LoginForm.js
+++ b/front-end/src/Components/LoginForm.js
@@ -1,8 +1,7 @@
 import React, { useRef, useState } from "react";
 import { useAuth } from "../Providers/AuthProvider";
 import { Link, useHistory } from "react-router-dom";
-// import { signInWithGoogle } from "../Services/Firebase";
-// import googleIcon from "../Images/googleicon.png"
+
 
 const LoginForm = ({ setModalOpen }) => {
   const emailRef = useRef();
@@ -11,8 +10,7 @@ const LoginForm = ({ setModalOpen }) => {
   const [error, setError] = useState("");
   const [loading, setLoading] = useState(false);
   const history = useHistory();
-
-
+  
   async function handleSubmit(e) {
     e.preventDefault();
     try {
@@ -51,9 +49,6 @@ const LoginForm = ({ setModalOpen }) => {
           <div className="textOne">
             <Link to="/forgot-password">Forgot Password?</Link>
           </div>
-          {/* <button className="loginBtn2" onClick={signInWithGoogle}><img alt="googleImg"className="googleImg" src={googleIcon}/>
-          Sign in with Google
-        </button> */}
           <p className="textTwo">
             Dont have an account? <Link to="/users/new">Sign up</Link>
           </p>
diff --git a/front-end/src/Components/NavBar.js b/front-end/src/Components/NavBar.js
index 3cc0f37..1c6ce9c 100644
--- a/front-end/src/Components/NavBar.js
+++ b/front-end/src/Components/NavBar.js
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
-import { FaAlignRight, FaHome } from "react-icons/fa";
+import { FaAlignRight } from "react-icons/fa";
 import { signOut } from "../Services/Firebase";
 import { useAuth } from "../Providers/AuthProvider";
 import LoginForm from "./LoginForm";
@@ -12,8 +12,13 @@ const NavBar = () => {
 	const handleToggle = () => {
 		setToggleMenu((isOpen) => !isOpen);
 	};
+	// let userID;
+	// if (currentUser.uid === undefined) {
+	// 	console.log("undefined");
+	// } else {
+	// 	return (userID = currentUser.uid);
+	// }
 
-	console.log(currentUser);
 	return (
 		<nav className="navBar">
 			<div className="nav-center">
@@ -41,10 +46,12 @@ const NavBar = () => {
 						</Link>
 					</li>
 					<li>
-						<Link to={"/bookings/:id"}>Requests</Link>
+						<Link to={`/users/:id/bookings`}>Requests</Link>
 					</li>
 				</ul>
-				<p> Hi, {currentUser && currentUser.email} </p>
+
+					{/* <p> Hi, {currentUser && currentUser.email} </p>					 */}
+
 			</div>
 			{modalOpen ? <LoginForm setModalOpen={setModalOpen} /> : null}
 		</nav>
diff --git a/front-end/src/Components/RequestDetails.js b/front-end/src/Components/RequestDetails.js
index d4e2c85..eece7f0 100644
--- a/front-end/src/Components/RequestDetails.js
+++ b/front-end/src/Components/RequestDetails.js
@@ -2,32 +2,42 @@
 // import { apiURL } from "../util/apiURL";
 // import StarRating from "./StarRating"
 
-const RequestDetails = ({booking}) => {
+const RequestDetails = ({ booking }) => {
+	const endDate = new Date(booking.end_event).toDateString("en-US");
+	const endTime = new Date(booking.end_event).toLocaleTimeString("en-US");
 
-  return (
-    <section className="requestsCard">
-      <h2>Bookings</h2>
-      <div className="card" style={{width: "25rem"}}>
-        <div className="card-body">
-              <h3 className="card-title"> </h3>
-              <p className="card-text"> {booking.start_event} {booking.end_event} </p>
-              <p className="card-text">Event Type: {booking.event_type} </p>
-              <p className="card-text">Chef:</p>
-              <p>Address: {booking.address} {booking.city} {booking.state} </p>
-              <p className="card-text"></p>
-              {/* <div className="detailsButtons">
+	const startDate = new Date(booking.start_event).toDateString("en-US");
+	const startTime = new Date(booking.start_event).toLocaleTimeString("en-US");
+	console.log(booking);
+	return (
+		<section className="requestsCard">
+			<div className="card" style={{ width: "25rem" }}>
+				<div className="card-body">
+					<h3 className="card-title">Event Type: {booking.event_type} </h3>
+					<p className="card-text"> </p>
+
+					<p className="card-text">Chef:</p>
+					<p className="card-text">Party Size: {booking.party_size}</p>
+					<h5>Start Time: {startTime}</h5>
+					<h5>Start Date: {startDate}</h5>
+					<p className="card-text">End Date: {endDate}</p>
+					<p className="card-text">End Time: {endTime}</p>
+					<p>
+						Address: {booking.address} {booking.address2}
+						{booking.city}, {booking.state} {booking.zip_code}
+					</p>
+					<p className="card-text"></p>
+					{/* <div className="detailsButtons">
                 <Link >
                   <button className="loginBtn">Edit</button>
                 </Link>
                 <button >Delete</button>
               </div> */}
-            </div>
-      </div>
-      <div>
-     {/* <StarRating /> */}
-      </div>
-    </section>
-  );
+				</div>
+			</div>
+			<div>{/* <StarRating /> */}</div>
+		</section>
+	);
 };
 
 export default RequestDetails;
diff --git a/front-end/src/Components/Requests.js b/front-end/src/Components/Requests.js
index 97fa739..ef76510 100644
--- a/front-end/src/Components/Requests.js
+++ b/front-end/src/Components/Requests.js
@@ -10,7 +10,6 @@ const API = apiURL();
 const Requests = () => {
 	const { currentUser } = useAuth();
 	const [bookings, setBookings] = useState([]);
-
 	const { user_id } = useParams();
 	const currentUserId = user_id;
 
@@ -22,13 +21,13 @@ const Requests = () => {
 						`${API}/users/${currentUserId}/bookings/`
 					);
 					setBookings(res.data.payload);
+					console.log("BOOKINGS", bookings);
 				} catch (error) {
-					console.log(error);
+					return error;
 				}
 			}
 		};
 		fetchAllBookings();
-		console.log("fetch", currentUserId);
 	}, [currentUserId]);
 
 	if (!currentUser || !bookings.length) {
@@ -36,12 +35,14 @@ const Requests = () => {
 	}
 
 	return (
-		<div>
-			{bookings.map((booking) => {
-				return <RequestDetails key={booking.id} booking={booking} />;
-			})}
-			<p>bookings</p>
-		</div>
+		<section>
+			<h2>Bookings</h2>
+			<div>
+				{bookings.map((booking) => {
+					return <RequestDetails key={booking.id} booking={booking} />;
+				})}
+			</div>
+		</section>
 	);
 };
 
diff --git a/front-end/src/Components/Services.js b/front-end/src/Components/Services.js
index 5a03baa..148c6a2 100644
--- a/front-end/src/Components/Services.js
+++ b/front-end/src/Components/Services.js
@@ -1,27 +1,27 @@
 import Title from "./Title";
-import { FaGlassCheers, FaHamburger, FaCocktail, FaJava } from "react-icons/fa";
+import { FaGlassCheers, FaHamburger, FaCocktail, FaSuitcase } from "react-icons/fa";
 
 const Services = () => {
 	const services = [
 		{
 			icon: <FaGlassCheers />,
 			title: "special events",
-			info: "Lorem ipsum dolor, sit amet consectetur adipisicing elit. Quo vitae architecto unde harum repellat quia.",
+			info: "Hire a personal chef to make important occasions like Valentine's Day or Mother's Day more memorable.",
 		},
 		{
 			icon: <FaHamburger />,
 			title: "meal prep",
-			info: "Lorem ipsum dolor, sit amet consectetur adipisicing elit. Quo vitae architecto unde harum repellat quia.",
+			info: "Use Savor services to breathe new life into your weekly meals when you're too busy or disinterested of cooking the same meals.",
 		},
 		{
 			icon: <FaCocktail />,
 			title: "parties",
-			info: "Lorem ipsum dolor, sit amet consectetur adipisicing elit. Quo vitae architecto unde harum repellat quia.",
+			info: "Instead of the usual party fare, let Savor Chefs create a one-of-a-kind menu for you and your guests that they will remember forever.",
 		},
 		{
-			icon: <FaJava />,
+			icon: <FaSuitcase />,
 			title: "business events",
-			info: "Lorem ipsum dolor, sit amet consectetur adipisicing elit. Quo vitae architecto unde harum repellat quia.",
+			info: "By having a personal chef develop a meal for your next corporate event, you may introduce your coworkers to new flavors.",
 		},
 	];
 
diff --git a/front-end/src/Images/googleicon.png b/front-end/src/Images/googleicon.png
deleted file mode 100644
index ccf789627412f53eba12cf108156345ed02f6428..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20617
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
NU}9`RWE#2L`41~5GJ^mB

diff --git a/front-end/src/Pages/IndexBookings.js b/front-end/src/Pages/IndexBookings.js
index b4a8501..7a69cb8 100644
--- a/front-end/src/Pages/IndexBookings.js
+++ b/front-end/src/Pages/IndexBookings.js
@@ -7,7 +7,6 @@ const IndexBookings = () => {
 	// pass into Requests
 	return (
 		<div>
-			List of ALL the bookings in the database
 			<Requests />
 			<AddReview />
 		</div>
diff --git a/front-end/src/Pages/ShowBookings.js b/front-end/src/Pages/ShowBookings.js
index 6c0687c..149acf9 100644
--- a/front-end/src/Pages/ShowBookings.js
+++ b/front-end/src/Pages/ShowBookings.js
@@ -1,4 +1,5 @@
 import Requests from "../Components/Requests";
+
 const ShowBookings = () => {
 	return (
 		<div>

From 1792e1a8e79d3e1d65af5f553a28d74853fd529f Mon Sep 17 00:00:00 2001
From: Marsha Hall <mphall77@gmail.com>
Date: Thu, 7 Oct 2021 19:15:26 -0400
Subject: [PATCH 6/7] heroku deployment

---
 back-end/db/schema.sql                  | 2 +-
 back-end/db/seed.sql                    | 2 +-
 front-end/src/Components/BookingForm.js | 3 +--
 front-end/src/Components/NavBar.js      | 5 ++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/back-end/db/schema.sql b/back-end/db/schema.sql
index aa59535..632c504 100644
--- a/back-end/db/schema.sql
+++ b/back-end/db/schema.sql
@@ -1,6 +1,6 @@
 -- DROP DATABASE IF EXISTS chef_app_dev;
 -- CREATE DATABASE chef_app_dev;
-\c chef_app_dev;
+-- \c chef_app_dev;
 
 DROP TABLE IF EXISTS users;
 CREATE TABLE users (
diff --git a/back-end/db/seed.sql b/back-end/db/seed.sql
index 3a525a5..cd5c393 100644
--- a/back-end/db/seed.sql
+++ b/back-end/db/seed.sql
@@ -1,4 +1,4 @@
-\c chef_app_dev;
+-- \c chef_app_dev;
 
 INSERT INTO users (
     id, email, img_url, bio, first_name, last_name, is_chef, cuisine)
diff --git a/front-end/src/Components/BookingForm.js b/front-end/src/Components/BookingForm.js
index 72b96e5..1629bd3 100644
--- a/front-end/src/Components/BookingForm.js
+++ b/front-end/src/Components/BookingForm.js
@@ -36,14 +36,13 @@ const BookingForm = ({ chef }) => {
 				user_id: currentUser.uid,
 				...newRequest,
 			};
-			
+
 			let res = await axios.post(
 				`${API}/users/${currentUser?.uid}/bookings`,
 				chefRequest
 			);
 			return res;
 		} catch (err) {
-			console.log(err);
 			return "error";
 		}
 	};
diff --git a/front-end/src/Components/NavBar.js b/front-end/src/Components/NavBar.js
index 9bda7fc..2d7dc7f 100644
--- a/front-end/src/Components/NavBar.js
+++ b/front-end/src/Components/NavBar.js
@@ -8,6 +8,7 @@ import AuthModal from "./AuthModal";
 import { apiURL } from "../util/apiURL";
 
 const API = apiURL();
+
 const NavBar = () => {
 	const [toggleMenu, setToggleMenu] = useState(false);
 	const [modalOpen, setModalOpen] = useState(false);
@@ -20,7 +21,6 @@ const NavBar = () => {
 	useEffect(() => {
 		const getUser = async () => {
 			let res = await axios.get(`${API}/users/${currentUser?.uid}`);
-
 			setUser(res.data.payload);
 		};
 		getUser();
@@ -48,7 +48,6 @@ const NavBar = () => {
 						<button className="lgnBtn" onClick={() => setModalOpen(!modalOpen)}>
 							Login
 						</button>
-
 					</li>
 					<div className="nav-in-out">
 						<Link>
@@ -63,7 +62,7 @@ const NavBar = () => {
 						<Link to={"/"} onClick={signOut}>
 							<button className="lgnBtn"> Logout</button>
 						</Link>
-					</li>
+					</div>
 				</ul>
 			</div>
 			{user ? <p>Hi, {user.first_name}</p> : null}

From d1d64d549ebccac1e47a2f42a01eaaabcc7cfb89 Mon Sep 17 00:00:00 2001
From: Marsha Hall <mphall77@gmail.com>
Date: Sat, 23 Oct 2021 16:33:46 -0400
Subject: [PATCH 7/7] staged changes

---
 back-end/db/prod_schema.sql                | 59 ++++++++++++++++++++--
 back-end/db/prod_seed.sql                  | 59 ++++++++++++++++++----
 back-end/db/schema.sql                     |  1 +
 back-end/db/seed.sql                       |  7 +--
 back-end/queries/bookings.js               | 10 ++--
 front-end/src/Components/BookingForm.js    | 19 +++++++
 front-end/src/Components/RequestDetails.js | 15 ++----
 7 files changed, 139 insertions(+), 31 deletions(-)

diff --git a/back-end/db/prod_schema.sql b/back-end/db/prod_schema.sql
index a345ab2..632c504 100644
--- a/back-end/db/prod_schema.sql
+++ b/back-end/db/prod_schema.sql
@@ -1,8 +1,59 @@
--- \c production_database_name;
+-- DROP DATABASE IF EXISTS chef_app_dev;
+-- CREATE DATABASE chef_app_dev;
+-- \c chef_app_dev;
 
-DROP TABLE IF EXISTS test;
+DROP TABLE IF EXISTS users;
+CREATE TABLE users (
+    id TEXT PRIMARY KEY UNIQUE,
+    email VARCHAR(100) UNIQUE, 
+    img_url TEXT,
+    bio TEXT,
+    first_name VARCHAR(100) NOT NULL, 
+    last_name VARCHAR(100) NOT NULL, 
+    is_chef BOOLEAN DEFAULT FALSE, 
+    cuisine TEXT
+);
+
+DROP TABLE IF EXISTS bookings;
 
-CREATE TABLE test (
+CREATE TABLE bookings (
     id SERIAL PRIMARY KEY, 
-    name TEXT
+    chef_id TEXT REFERENCES users (id) NOT NULL, 
+    user_id TEXT REFERENCES users (id) NOT NULL, 
+    event_type TEXT NOT NULL, 
+    party_size TEXT NOT NULL, 
+    address TEXT NOT NULL, 
+    address2 TEXT, 
+    city TEXT NOT NULL, 
+    state TEXT NOT NULL, 
+    zip_code VARCHAR(5),
+    start_event TIMESTAMP,
+    end_event TIMESTAMP
+);
+
+DROP TABLE IF EXISTS ratings;
+
+CREATE TABLE ratings (
+    id BIGSERIAL NOT NULL PRIMARY KEY, 
+    chef_id TEXT NOT NULL REFERENCES users (id), 
+    user_id TEXT NOT NULL REFERENCES users (id),
+    name VARCHAR(100) NOT NULL, 
+    review TEXT NOT NULL,
+    rating INT NOT NULL CHECK (rating >=0 AND rating <= 5) 
+);
+
+DROP TABLE IF EXISTS availability;
+
+CREATE TABLE availability (
+    id SERIAL PRIMARY KEY,
+    chef_id TEXT REFERENCES users (id) NOT NULL,
+    sunday TEXT DEFAULT NULL,
+    monday TEXT DEFAULT NULL,
+    tuesday TEXT DEFAULT NULL,
+    wednesday TEXT DEFAULT NULL,
+    thursday TEXT DEFAULT NULL,
+    friday TEXT DEFAULT NULL,
+    saturday TEXT DEFAULT NULL,
+    is_booked BOOLEAN DEFAULT NULL,
+    booked_by TEXT REFERENCES users (id)
 );
diff --git a/back-end/db/prod_seed.sql b/back-end/db/prod_seed.sql
index 771323f..839ec2c 100644
--- a/back-end/db/prod_seed.sql
+++ b/back-end/db/prod_seed.sql
@@ -1,10 +1,49 @@
--- \c production_database_name;
-
-INSERT INTO test (name) VALUES
-('Monday'),
-('Tuesday'),
-('Wednesday'),
-('Thursday'),
-('Friday'),
-('Saturday'),
-('Sunday');
+-- \c chef_app_dev;
+
+INSERT INTO users (
+    id, email, img_url, bio, first_name, last_name, is_chef, cuisine)
+VALUES 
+    ('285cfccb-2064-4794-a51d-6ca38e6580c6', 'kiara.azize@yahoo.com', 'https://i.imgur.com/T3JSBpH.jpg', 'Graduated from Culinary Insititue and worked at restaurants owned by Tom Colicchio', 'Kiara', 'Azize', true, 'French, Japanese, & New American' ),
+    ('11389417-4ab2-44d5-90f0-e717ccd887f0', 'kellanwatanbe1@gmail.com', 'https://i.imgur.com/PdJtb04.jpg', 'Up and coming Chef', 'Kellan', 'Watanabe', true, 'Japanese' ),
+    ('9e517784-98d3-43a5-bd2b-1e24772671f0', 'dannypetrose@hotmail.com', 'https://i.imgur.com/Bon7zjI.jpg', 'Cooked at many restaurants', 'Danny', 'Petrose', true, 'New American, Japanese, & Mediterranean '),
+    ('ahdjw82iks','chef_boyardee@gmail.com', 'https://images.unsplash.com/photo-1576064535185-9f6e3f24b63e?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1740&q=80', 'I am an Italian-American chef who set up my own packaged food business named Chef Boyardee. Began my career as a kitchen helper, worked hard to eventually become the head chef of the Plaza Hotel in New York City.', 'Ettore', 'Boiardi', true, 'Italian'),
+    ('bsujdyh822','juliaChild23@yahoo.com', 'https://images.unsplash.com/photo-1576064535185-9f6e3f24b63e?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1740&q=80', 'I am a cultural phenomenon who is the face of French cooking in America. I introduced Americans to culinary excellence but to fine dining as well. I made the drudgery and labour within the kitchen seem effortless and easy.' ,'Julia', 'Child', true, 'French' ),
+    ('chgwq72ijd','lesliemann@gmail.com', NULL, NULL, 'Leslie', 'Mann', false, NULL),
+    ('hytrkew345', 'morimoto4545@gmail.com', 'https://images.unsplash.com/photo-1576064535185-9f6e3f24b63e?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1740&q=80', 'Japanese chef who became famous for my appearances on the Food Networks program Iron Chef. I started out as an aspiring athlete from a poor family, turning to cooking after a severe injury. But once I set my heart on becoming a chef, it seemed like nothing could stand in my way.' ,'Masaharu', 'Morimoto', true, 'Japanese'),
+    ('nhyt54pgtn', 'butter@gmail.com', 'https://images.unsplash.com/photo-1576064535185-9f6e3f24b63e?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1740&q=80', 'An American TV personality, cooking show host, author of numerous cookbooks and owner of various restaurants. I began my cooking career pretty late in my life with a catering service, but soon became popular with my southern cooking.', 'Paula', 'Dean', true, 'Southern'),
+    ('p0ot54fdh8', 'vicCruz89@yahoo.com', NULL, NULL, 'Victor', 'Cruz', false, NULL);
+
+INSERT INTO bookings (
+    	chef_id,
+        user_id,
+		event_type,
+        party_size,
+        address, 
+        address2, 
+        city, 
+        state, 
+        zip_code, 
+		start_event,
+        end_event) 
+VALUES
+        ('ahdjw82iks','chgwq72ijd' , 'Birthday Party', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00'),
+        ('ahdjw82iks','nhyt54pgtn' , 'Birthday Party', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00'),
+        ('bsujdyh822','p0ot54fdh8' , 'Birthday Party', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00');
+
+INSERT INTO availability (
+    chef_id, sunday, monday, tuesday, wednesday, thursday, friday, saturday, is_booked, booked_by
+)        
+VALUES 
+('ahdjw82iks', NULL,'10am - 3pm','10am - 3pm', NULL, NULL, NULL, NULL, false, 'bsujdyh822');
+-- ('bsujdyh822', NULL, NULL,'10am - 3pm','10am - 3pm', NULL, NULL, NULL, false, 'hytrkew345'),
+-- ('hytrkew345', '10am - 3pm', NULL, NULL, NULL, NULL, '10am - 3pm', NULL,  true, 'chgwq72ijd'),
+-- ('nhyt54pgtn', '10am - 3pm', NULL, NULL,  NULL, NULL,'10am - 3pm',  NULL, false, 'chgwq72ijd');
+
+INSERT INTO ratings (chef_id, user_id, name, review, rating)
+VALUES
+('ahdjw82iks', 'p0ot54fdh8', 'Victor Cruz', 'Always delicious food! Even my picky children ate all their veggies this time.', 5),
+('ahdjw82iks', 'chgwq72ijd', 'Leslie Mann', 'Discovered this app through a friend and I love it! Have not stopped using it. I lost so much pandemic weight through the meal plans!', 4),
+('bsujdyh822', 'p0ot54fdh8', 'Victor Cruz', 'An OK chef', 3),
+('bsujdyh822', 'chgwq72ijd', 'Leslie Mann', 'Wow! Wow! Wow! The variety of cuisines is amazing!', 4),
+('hytrkew345', 'chgwq72ijd', 'Leslie Mann', 'Since becoming a Savor client my life has been to much easier!', 4),
+('nhyt54pgtn', 'p0ot54fdh8', 'Victor Cruz', 'Food is always delicious! Service is impeccable', 4);
diff --git a/back-end/db/schema.sql b/back-end/db/schema.sql
index 632c504..847013d 100644
--- a/back-end/db/schema.sql
+++ b/back-end/db/schema.sql
@@ -21,6 +21,7 @@ CREATE TABLE bookings (
     chef_id TEXT REFERENCES users (id) NOT NULL, 
     user_id TEXT REFERENCES users (id) NOT NULL, 
     event_type TEXT NOT NULL, 
+    pricing_option TEXT NOT NULL,
     party_size TEXT NOT NULL, 
     address TEXT NOT NULL, 
     address2 TEXT, 
diff --git a/back-end/db/seed.sql b/back-end/db/seed.sql
index 839ec2c..18de7f3 100644
--- a/back-end/db/seed.sql
+++ b/back-end/db/seed.sql
@@ -17,6 +17,7 @@ INSERT INTO bookings (
     	chef_id,
         user_id,
 		event_type,
+        pricing_option,
         party_size,
         address, 
         address2, 
@@ -26,9 +27,9 @@ INSERT INTO bookings (
 		start_event,
         end_event) 
 VALUES
-        ('ahdjw82iks','chgwq72ijd' , 'Birthday Party', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00'),
-        ('ahdjw82iks','nhyt54pgtn' , 'Birthday Party', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00'),
-        ('bsujdyh822','p0ot54fdh8' , 'Birthday Party', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00');
+        ('ahdjw82iks','chgwq72ijd' , 'Birthday Party', 'Comfort - $15', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00'),
+        ('ahdjw82iks','nhyt54pgtn' , 'Birthday Party', 'Fine - $70', '1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00'),
+        ('bsujdyh822','p0ot54fdh8' , 'Birthday Party', 'Casual - $30','1-2', '511 Bakers St', NULL, 'Yonkers', 'NY', 10031, '2021-09-25 5:00:00', '2021-09-25 9:00:00');
 
 INSERT INTO availability (
     chef_id, sunday, monday, tuesday, wednesday, thursday, friday, saturday, is_booked, booked_by
diff --git a/back-end/queries/bookings.js b/back-end/queries/bookings.js
index 3a3e4c9..f83fe8c 100644
--- a/back-end/queries/bookings.js
+++ b/back-end/queries/bookings.js
@@ -33,6 +33,7 @@ const createBooking = async (newBooking) => {
 		chef_id,
 		user_id,
 		event_type,
+		pricing_option,
 		party_size,
 		address,
 		address2,
@@ -45,13 +46,14 @@ const createBooking = async (newBooking) => {
 	try {
 		const res = await db.one(
 			`INSERT INTO bookings
-            (chef_id, user_id, event_type, party_size, address, address2, city, state, zip_code, start_event, end_event)
-            VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
+            (chef_id, user_id, event_type, pricing_option, party_size, address, address2, city, state, zip_code, start_event, end_event)
+            VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
             RETURNING *`,
 			[
 				chef_id,
 				user_id,
 				event_type,
+				pricing_option,
 				party_size,
 				address,
 				address2,
@@ -73,6 +75,7 @@ const updateBooking = async (id, booking) => {
 		chef_id,
 		user_id,
 		event_type,
+		pricing_option,
 		party_size,
 		address,
 		address2,
@@ -84,11 +87,12 @@ const updateBooking = async (id, booking) => {
 	} = booking;
 	try {
 		const query =
-			"UPDATE bookings SET chef_id =$1, user_id =$2, event_type = $3,  party_size = $4, address = $5, address2 = $6, city = $7, state = $8, zip_code = $9, start_event = $10, end_event = $11 WHERE id = $12 RETURNING *";
+			"UPDATE bookings SET chef_id =$1, user_id =$2, event_type = $3, pricing_option = $4,  party_size = $5, address = $6, address2 = $7, city = $8, state = $9, zip_code = $10, start_event = $11, end_event = $12 WHERE id = $13 RETURNING *";
 		const updatedBooking = await db.one(query, [
 			chef_id,
 			user_id,
 			event_type,
+			pricing_option,
 			party_size,
 			address,
 			address2,
diff --git a/front-end/src/Components/BookingForm.js b/front-end/src/Components/BookingForm.js
index cd962a1..25c2824 100644
--- a/front-end/src/Components/BookingForm.js
+++ b/front-end/src/Components/BookingForm.js
@@ -14,6 +14,7 @@ const BookingForm = ({ chef }) => {
 	const { currentUser } = useAuth();
 	const [request, setRequest] = useState({
 		event_type: "",
+		pricing_option: "",
 		party_size: "",
 		address: "",
 		address2: "",
@@ -102,6 +103,24 @@ const BookingForm = ({ chef }) => {
 						</div>
 					</div>
 				</div>
+				<div>
+					<p>Service Type:</p>
+					<select
+						onChange={handleChange("pricing_option")}
+						className="form-select form-select-sm"
+						aria-label="Default select example"
+					>
+						<option type="text" value={"Comfort"}>
+							Comfort - $15
+						</option>
+						<option type="text" value={"Casual"}>
+							Casual - $30
+						</option>
+						<option type="text" value={"Fine"}>
+							Fine - $70
+						</option>
+					</select>
+				</div>
 				<p className="booking-heading1">Event Location</p>
 				<div className="booking-box">
 					<p>Address</p>
diff --git a/front-end/src/Components/RequestDetails.js b/front-end/src/Components/RequestDetails.js
index 45a1566..60d1b07 100644
--- a/front-end/src/Components/RequestDetails.js
+++ b/front-end/src/Components/RequestDetails.js
@@ -28,19 +28,12 @@ const RequestDetails = ({ booking }) => {
 							{booking.party_size}
 						</p>
 						<p>
-							<h5>Start Time: </h5>
-							{startTime}
+							<h5>Service Type:</h5>
+							{booking.pricing_option}
 						</p>
 						<p>
-							<h5>Start Date: </h5>
-							{startDate}
-						</p>
-						<p>
-							<h5>Start Time:</h5> {endTime}
-						</p>
-						<p>
-							<h5>Start Date: </h5>
-							{endDate}
+							<h5>Event Date & Time: </h5>
+							{startDate} from {startTime} to {endTime}
 						</p>
 					</div>
 					<div className="booking-address">