Resolved conflict with master

barberia/src/App/pages/Confirmation.js

@@ -3,9 +3,10 @@ import moment from "moment";
 
 import "./confirmation.css";
 
+
 function Confirmation({ time, formDate, baseDate, ...props }) {
   //states that store form's user information
-  let [name, setName] = useState(null);
+  const [name, setName] = useState(null);
   const [email, setEmail] = useState(null);
   const [phone, setPhone] = useState(null);
   const [error_ms, setError_ms] = useState("");
@@ -132,7 +133,7 @@ function Confirmation({ time, formDate, baseDate, ...props }) {
       </form>
       <p>date picked is {moment(formDate.toJSON()).format("MMM Do YY")}</p>
       <p>
-        time picked is {time} <br />
+        time picked is {time.toString()} <br />
       </p>
     </div>
   );

barberia/src/App/pages/Congratulation.js

@@ -4,13 +4,24 @@ import "./congratulation.css";
 
 function congratulation({ ...props }) {
   const userData = JSON.parse(localStorage.getItem("confirmationData"));
-  const { email, phone } = userData;
+  const { email, phone, name } = userData;
 
-  const moveTo = destination => {
-    window.location.assign(destination);
+  const moveTo = home => {
+    window.location.assign(home);
   };
 
-  const deleteLastBooking = () => {};
+  const deleteLastBooking = () => {
+
+    return fetch("/api/cancelbooking", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(userData)
+    })
+      .then(window.location.assign("/"))
+      .catch(err => console.log(err));
+  };
 
   return (
     <div>

src/controllers/index.js

@@ -27,8 +27,12 @@ router.get("/getBusyTimeSlots", (req, res) => {
     .catch(err => console.log(err));
 });
 
+router.post("/cancelbooking", (req, res) => {
+  const data = req.body;
+  queries.cancelbooking(data).catch(err => console.log(err));
+});
+
 router.get("*", (req, res) => {
-  console.log("you arrived at a none query page");
   res.sendFile(path.join(__dirname + "/barberia/build/index.html"));
 });
 

src/queries/cancelbooking.js

@@ -0,0 +1,10 @@
+const databaseConnection = require("../database/db_connection.js");
+
+const cancelbooking = rawData => {
+  const data = rawData;
+  return databaseConnection.query(
+    `DELETE FROM bookings WHERE (booking_date='${data.date}' AND booking_time='${data.time}' AND customer_name='${data.name}')`
+  );
+};
+
+module.exports = cancelbooking;

src/queries/index.js

@@ -1,9 +1,11 @@
 const getAllBookings = require("./getAllBookings");
 const saveNewBooking = require("./saveNewBooking");
 const getBusyTimeSlots = require("./getUnavailableTimes");
+const cancelbooking = require("./cancelbooking");
 
 module.exports = {
   getAllBookings,
   saveNewBooking,
-  getBusyTimeSlots
+  getBusyTimeSlots,
+  cancelbooking
 };