diff --git a/src/components/Appointment/Appointment.js b/src/components/Appointment/Appointment.js
index 1729a23..7b8e7b0 100644
--- a/src/components/Appointment/Appointment.js
+++ b/src/components/Appointment/Appointment.js
@@ -2,7 +2,7 @@ import React from "react";
 import Button from "react-bootstrap/Button";
 import Badge from "react-bootstrap/Badge";
 import useModal from "../../hooks/useModal";
-import { setStatus } from "../../util/helpers";
+import { setStatus } from "../../utils/helpers";
 import { Card } from "antd";
 import "./Appointment.css";
 
diff --git a/src/components/Booking/Booking.js b/src/components/Booking/Booking.js
index 38ed7cb..1fac3c3 100644
--- a/src/components/Booking/Booking.js
+++ b/src/components/Booking/Booking.js
@@ -2,7 +2,7 @@ import React from "react";
 import Button from "react-bootstrap/esm/Button";
 import Badge from "react-bootstrap/Badge";
 import "./Booking.css";
-import { setStatus } from "../../util/helpers";
+import { setStatus } from "../../utils/helpers";
 
 const Booking = ({ booking, onView }) => {
   // console.log("booking", booking);
diff --git a/src/components/BookingForm/BookingForm.js b/src/components/BookingForm/BookingForm.js
index c845318..bdcb229 100644
--- a/src/components/BookingForm/BookingForm.js
+++ b/src/components/BookingForm/BookingForm.js
@@ -41,7 +41,7 @@ const BookingForm = ({ onCancel, onConfirm, oldData, slots, onGetSlots, slotStat
           authCtx.handleCustomerLogin();
           return;
         }
-        onConfirm({ ...values, userId: authCtx.userId, googleAccountName: authCtx.user.displayName, email: authCtx.user.email, photoURL: authCtx.user.photoURL });
+        onConfirm({ ...values, userId: authCtx.userId, googleAccountName: authCtx.user.displayName, email: authCtx.user.email, photoURL: authCtx.user.photoURL, createdTime: new Date() });
         resetForm();
       }}
       initialValues={{
diff --git a/src/components/Settings/GeneralSettings.js b/src/components/Settings/GeneralSettings.js
index 23c8854..4c3b122 100644
--- a/src/components/Settings/GeneralSettings.js
+++ b/src/components/Settings/GeneralSettings.js
@@ -1,17 +1,17 @@
-import React, { useState } from "react"
-import { Button } from "react-bootstrap"
-import ClockPicker from "../ClockPicker/ClockPicker"
-import { useFormik } from "formik"
+import React, { useState } from "react";
+import { Button } from "react-bootstrap";
+import ClockPicker from "../ClockPicker/ClockPicker";
+import { useFormik } from "formik";
 
-import * as yup from "yup"
-import { compareTimes } from "../../util/helpers"
-import "./GeneralSettings.css"
+import * as yup from "yup";
+import { compareTimes } from "../../utils/helpers";
+import "./GeneralSettings.css";
 
 const GeneralSettings = ({ onConfirm, onBack, initialValues: defaults }) => {
-  const [pickerTime, setPickerTime] = useState(null)
-  const [showPicker, setShowPicker] = useState(false)
-  const [pickerFunction, setPickerFunction] = useState(() => () => {})
-  const [editMode, setEditMode] = useState(false)
+  const [pickerTime, setPickerTime] = useState(null);
+  const [showPicker, setShowPicker] = useState(false);
+  const [pickerFunction, setPickerFunction] = useState(() => () => {});
+  const [editMode, setEditMode] = useState(false);
 
   const formik = useFormik({
     initialValues: {
@@ -21,75 +21,62 @@ const GeneralSettings = ({ onConfirm, onBack, initialValues: defaults }) => {
     validationSchema: yup.object().shape({
       startTime: yup.string().required("Starting time is required!"),
       endTime: yup.string().required("Ending time is required!"),
-      slotSize: yup
-        .number()
-        .min(0, "Minutes must be positive numbers")
-        .max(120, "Max slot size is 120 minutes")
-        .required("*Slot size is required!"),
-      address: yup
-        .string()
-        .min(8, "address is Too Short!")
-        .max(50, "address is Too Long!")
-        .required("*Address is required!"),
+      slotSize: yup.number().min(0, "Minutes must be positive numbers").max(120, "Max slot size is 120 minutes").required("*Slot size is required!"),
+      address: yup.string().min(8, "address is Too Short!").max(50, "address is Too Long!").required("*Address is required!"),
     }),
     onSubmit: (values) => {
       if (validateTime()) {
         // console.log("time is valid")
         // alert(JSON.stringify(values, null, 2))
-        setEditMode(false)
-        onConfirm({ ...values })
+        setEditMode(false);
+        onConfirm({ ...values });
       }
     },
-  })
+  });
 
   const validateTime = () => {
-    const isValid = compareTimes(formik.values.startTime, formik.values.endTime)
+    const isValid = compareTimes(formik.values.startTime, formik.values.endTime);
     if (!isValid) {
-      formik.setFieldError("startTime", "Start time must be before end time")
-      formik.setFieldError("endTime", "Start time must be before end time")
+      formik.setFieldError("startTime", "Start time must be before end time");
+      formik.setFieldError("endTime", "Start time must be before end time");
     } else {
-      formik.setFieldError("startTime", "")
-      formik.setFieldError("endTime", "")
+      formik.setFieldError("startTime", "");
+      formik.setFieldError("endTime", "");
     }
-    return isValid
-  }
+    return isValid;
+  };
 
   const handleChangeStartTime = (value) => {
-    formik.setFieldValue("startTime", value)
-    formik.setFieldTouched("startTime")
-  }
+    formik.setFieldValue("startTime", value);
+    formik.setFieldTouched("startTime");
+  };
 
   const handleChangeEndTime = (value) => {
-    formik.setFieldValue("endTime", value)
-    formik.setFieldTouched("endTime")
-  }
+    formik.setFieldValue("endTime", value);
+    formik.setFieldTouched("endTime");
+  };
 
   const handleUsePicker = (setValueFunction, initalValue = null) => {
-    setPickerTime(initalValue)
-    setPickerFunction(() => setValueFunction)
-    setShowPicker(true)
-  }
+    setPickerTime(initalValue);
+    setPickerFunction(() => setValueFunction);
+    setShowPicker(true);
+  };
 
   const handleClosePicker = () => {
-    setPickerFunction(() => () => {})
-    setPickerTime(null)
-    setShowPicker(false)
-  }
+    setPickerFunction(() => () => {});
+    setPickerTime(null);
+    setShowPicker(false);
+  };
 
   const handleGoBack = () => {
     //TODO: findout why this needs to be called twice
     // onBack()
-    onBack()
-  }
+    onBack();
+  };
 
   return (
     <>
-      <ClockPicker
-        show={showPicker}
-        time={pickerTime}
-        onChange={pickerFunction}
-        onClose={handleClosePicker}
-      />
+      <ClockPicker show={showPicker} time={pickerTime} onChange={pickerFunction} onClose={handleClosePicker} />
       <div className="container min-vh-100 p-3">
         <h2>General Shop Settings</h2>
         <div className="d-flex justify-content-between align-items-center mb-4">
@@ -97,28 +84,16 @@ const GeneralSettings = ({ onConfirm, onBack, initialValues: defaults }) => {
           <div className="hstack gap-3">
             {editMode ? (
               <>
-                <Button
-                  variant="outline-secondary"
-                  size="sm"
-                  onClick={formik.handleSubmit}
-                >
+                <Button variant="outline-secondary" size="sm" onClick={formik.handleSubmit}>
                   Save
                 </Button>
-                <Button
-                  variant="outline-secondary"
-                  size="sm"
-                  onClick={() => setEditMode(false)}
-                >
+                <Button variant="outline-secondary" size="sm" onClick={() => setEditMode(false)}>
                   Cancel
                 </Button>
               </>
             ) : (
               <>
-                <Button
-                  variant="outline-secondary"
-                  size="sm"
-                  onClick={() => setEditMode(true)}
-                >
+                <Button variant="outline-secondary" size="sm" onClick={() => setEditMode(true)}>
                   Edit
                 </Button>
                 <Button variant="secondary" size="sm" onClick={handleGoBack}>
@@ -137,25 +112,13 @@ const GeneralSettings = ({ onConfirm, onBack, initialValues: defaults }) => {
             <span>{formik.values.startTime}</span>
             {editMode && (
               <>
-                <span
-                  className="text-primary fw-light fst-italic ms-3 change-text"
-                  onClick={() =>
-                    handleUsePicker(
-                      handleChangeStartTime,
-                      formik.values.startTime
-                    )
-                  }
-                >
+                <span className="text-primary fw-light fst-italic ms-3 change-text" onClick={() => handleUsePicker(handleChangeStartTime, formik.values.startTime)}>
                   Change
                 </span>
               </>
             )}
           </div>
-          {formik.touched.startTime && formik.errors.startTime && (
-            <span className="help-block text-danger col-8 offset-4">
-              {formik.errors.startTime}
-            </span>
-          )}
+          {formik.touched.startTime && formik.errors.startTime && <span className="help-block text-danger col-8 offset-4">{formik.errors.startTime}</span>}
         </div>
 
         <div className="mb-3 row">
@@ -165,21 +128,12 @@ const GeneralSettings = ({ onConfirm, onBack, initialValues: defaults }) => {
           <div className="col-8 d-flex align-items-center">
             <span>{formik.values.endTime}</span>
             {editMode && (
-              <span
-                className="text-primary fw-light fst-italic ms-3 change-text"
-                onClick={() =>
-                  handleUsePicker(handleChangeEndTime, formik.values.endTime)
-                }
-              >
+              <span className="text-primary fw-light fst-italic ms-3 change-text" onClick={() => handleUsePicker(handleChangeEndTime, formik.values.endTime)}>
                 Change
               </span>
             )}
           </div>
-          {formik.touched.endTime && formik.errors.endTime && (
-            <span className="help-block text-danger col-8 offset-4">
-              {formik.errors.endTime}
-            </span>
-          )}
+          {formik.touched.endTime && formik.errors.endTime && <span className="help-block text-danger col-8 offset-4">{formik.errors.endTime}</span>}
         </div>
 
         <div className="mb-3 row">
@@ -188,56 +142,31 @@ const GeneralSettings = ({ onConfirm, onBack, initialValues: defaults }) => {
           </label>
           <div className="col-8 d-flex align-items-center">
             {editMode ? (
-              <input
-                type="number"
-                className="form-control w-25"
-                id="slotSize"
-                name="slotSize"
-                onChange={formik.handleChange}
-                value={formik.values.slotSize}
-              />
+              <input type="number" className="form-control w-25" id="slotSize" name="slotSize" onChange={formik.handleChange} value={formik.values.slotSize} />
             ) : (
               <span>{formik.values.slotSize}</span>
             )}
             <span className="ms-3">Minutes</span>
           </div>
-          {formik.touched.slotSize && formik.errors.slotSize && (
-            <span className="help-block text-danger col-8 offset-4">
-              {formik.errors.slotSize}
-            </span>
-          )}
+          {formik.touched.slotSize && formik.errors.slotSize && <span className="help-block text-danger col-8 offset-4">{formik.errors.slotSize}</span>}
         </div>
 
         <div className="mb-3 row">
-          <label
-            htmlFor="inputAddress"
-            className="col-4 col-form-label fw-bold"
-          >
+          <label htmlFor="inputAddress" className="col-4 col-form-label fw-bold">
             Address
           </label>
           <div className="col-8 d-flex align-items-center">
             {editMode ? (
-              <textarea
-                className="form-control input-address"
-                id="inputAddress"
-                rows="3"
-                name="address"
-                value={formik.values.address}
-                onChange={formik.handleChange}
-              />
+              <textarea className="form-control input-address" id="inputAddress" rows="3" name="address" value={formik.values.address} onChange={formik.handleChange} />
             ) : (
               <span>{formik.values.address}</span>
             )}
           </div>
-          {formik.touched.address && formik.errors.address && (
-            <span className="help-block text-danger col-8 offset-4">
-              {formik.errors.address}
-            </span>
-          )}
+          {formik.touched.address && formik.errors.address && <span className="help-block text-danger col-8 offset-4">{formik.errors.address}</span>}
         </div>
       </div>
     </>
-  )
-}
+  );
+};
 
-export default GeneralSettings
+export default GeneralSettings;
diff --git a/src/components/SideBar/SideBar.js b/src/components/SideBar/SideBar.js
index 1b59bdb..3105eb0 100644
--- a/src/components/SideBar/SideBar.js
+++ b/src/components/SideBar/SideBar.js
@@ -3,7 +3,7 @@ import "./SideBar.css";
 import { IconContext } from "react-icons";
 import { Link } from "react-router-dom";
 import { Backdrop } from "@mui/material";
-import { SIDEITEMS } from "../../util/data";
+import { SIDEITEMS } from "../../utils/data";
 import { useContext } from "react";
 import AuthContext from "../../store/auth-context";
 import styled from "styled-components";
diff --git a/src/components/TimeSelector/TimeSelector.js b/src/components/TimeSelector/TimeSelector.js
index 1b270b0..bc38399 100644
--- a/src/components/TimeSelector/TimeSelector.js
+++ b/src/components/TimeSelector/TimeSelector.js
@@ -2,7 +2,7 @@ import { v4 as uuidv4 } from "uuid";
 import "./TimeSelector.css";
 import LinearProgress from "@mui/material/LinearProgress";
 
-import { combineDateTimeMoment } from "../../util/helpers";
+import { combineDateTimeMoment } from "../../utils/helpers";
 import { STATUS_PENDING } from "../../hooks/useHttp";
 import FiberManualRecordIcon from "@mui/icons-material/FiberManualRecord";
 
diff --git a/src/hooks/request.js b/src/http/serverInterface.ts
similarity index 76%
rename from src/hooks/request.js
rename to src/http/serverInterface.ts
index 9cc1486..f8e18f3 100644
--- a/src/hooks/request.js
+++ b/src/http/serverInterface.ts
@@ -1,5 +1,6 @@
-import moment from "moment";
-import { combineDateTimeMoment } from "../util/helpers";
+import moment, { Moment } from "moment";
+
+import { combineDateTimeMoment } from "../utils/helpers";
 import { db } from "../database/firebase-config";
 import { collection, addDoc, Timestamp, getDoc, updateDoc, doc, query, where, getDocs, orderBy, runTransaction, deleteDoc, writeBatch, limit } from "firebase/firestore";
 
@@ -9,6 +10,19 @@ const settingsCollectionRef = collection(db, "settings");
 
 const API_URL = "";
 
+interface NewBooking {
+  email: string;
+  googleAccountName: string | null;
+  name: string;
+  phone: string;
+  photoURL: string | null;
+  time: string;
+  userId: string;
+  date: Moment;
+}
+
+type BookingStatus = "confirmed" | "blocked" | "cancelled";
+
 function processBooking(result) {
   const isDone = moment(result.date.toDate()) < moment();
   let bookingData = {
@@ -34,15 +48,32 @@ function processSlot(result) {
   return slotData;
 }
 
-function makeSlotMoment(momentDate, timeString) {
+async function checkUserAlreadyBookedDay(bookingData: NewBooking): Promise<boolean> {
+  const startOfDay = new Date(bookingData.date.toDate().setHours(0, 0, 0, 0));
+  const endOfDay = new Date(bookingData.date.toDate().setHours(23, 59, 59, 999));
+
+  const bookingsQuery = query(
+    bookingsCollectionRef,
+    where("userId", "==", bookingData.userId),
+    where("date", ">=", Timestamp.fromMillis(startOfDay.getTime())),
+    where("date", "<=", Timestamp.fromMillis(endOfDay.getTime())),
+    where("status", "==", "confirmed")
+  );
+
+  const bookingsSnap = await getDocs(bookingsQuery);
+
+  return bookingsSnap.empty;
+}
+
+function makeSlotMoment(momentDate: Moment, timeString) {
   let timeMoment = moment(timeString, "h:mm a");
   let slotMoment = combineDateTimeMoment(momentDate, timeMoment);
   return slotMoment;
 }
 
-async function getSlotsForDay(momentDate, status) {
-  const dateMoment = new moment(momentDate);
-  let time = new moment().set({ hour: 0, minute: 0, second: 0 });
+async function getSlotsForDay(momentDate: Moment, status = null) {
+  const dateMoment = moment(momentDate);
+  let time = moment().set({ hour: 0, minute: 0, second: 0 });
 
   let choosenDate = combineDateTimeMoment(dateMoment, time);
 
@@ -58,7 +89,7 @@ async function getSlotsForDay(momentDate, status) {
 }
 
 //delete bookings
-async function deleteRemoteSlot(slotMoment, status) {
+export async function deleteRemoteSlot(slotMoment: Moment, status: BookingStatus) {
   try {
     const snapQuery = query(slotsCollectionRef, where("date", "==", Timestamp.fromDate(slotMoment.toDate())), where("status", "==", status));
 
@@ -76,7 +107,7 @@ async function deleteRemoteSlot(slotMoment, status) {
 }
 
 //tells you that the slot you have choosen is not in the db
-async function checkSlotNotInDB(slotMoment, status) {
+export async function checkSlotNotInDB(slotMoment: Moment, status: BookingStatus) {
   try {
     const snapQuery = query(
       slotsCollectionRef,
@@ -87,7 +118,7 @@ async function checkSlotNotInDB(slotMoment, status) {
 
     const slotQuerySnap = await getDocs(snapQuery);
 
-    return slotQuerySnap.empty; //it empty is true, the slot is not in the db
+    return slotQuerySnap.empty; //if empty is true, the slot is not in the db
   } catch (err) {
     console.log("error in check slot in db", err);
     throw err;
@@ -102,12 +133,12 @@ async function uploadSlot(slotObject) {
 }
 
 //load bookings for given date as json
-async function httpGetBooking(id) {
+export async function httpGetBooking(id) {
   try {
     const bookingRef = doc(db, "bookings", id);
-    const bookingSnap = await getDoc(bookingRef);
+    const bookingSnap = await getDoc<any>(bookingRef);
     if (bookingSnap.exists()) {
-      let result = { ...bookingSnap.data(), id: bookingSnap.id };
+      let result: any = { ...bookingSnap.data(), id: bookingSnap.id };
       let bookingData = processBooking(result);
 
       return bookingData;
@@ -121,13 +152,13 @@ async function httpGetBooking(id) {
 
 //get the settings from the db
 //TODO: get the latest settings from the collection of settings
-async function httpGetSettings() {
+export async function httpGetSettings() {
   try {
     const settingsSnap = await getDocs(settingsCollectionRef);
 
     if (settingsSnap) {
-      let result = settingsSnap.docs[0];
-      result = { ...result.data(), id: result.id };
+      const currentSettings = settingsSnap.docs[0];
+      const result = { ...currentSettings.data(), id: currentSettings.id };
       return result;
     } else {
       throw new Error(`No default settings found`);
@@ -139,7 +170,7 @@ async function httpGetSettings() {
 
 //post new settings to the db
 //TODO: just let him add new setting each time and then we fetch the latest ones , so we can see what changes he made
-async function httpSubmitSettings(newSettings) {
+export async function httpSubmitSettings(newSettings) {
   try {
     // const settingsSnap = await getDocs(settingsCollectionRef)
     const settingsDoc = doc(db, "settings", newSettings.id);
@@ -153,9 +184,9 @@ async function httpSubmitSettings(newSettings) {
 
 //returns bookings for an email since yesterday,
 //TODO: make a new one that returns all bookings for an email every made ahaha
-async function httpCheckBooking(phoneNumber) {
+export async function httpCheckBooking(phoneNumber) {
   try {
-    const yesterdayMoment = new moment().clone().subtract(1, "days");
+    const yesterdayMoment = moment().clone().subtract(1, "days");
     const q = query(bookingsCollectionRef, where("phone", "==", phoneNumber), where("date", ">", Timestamp.fromMillis(yesterdayMoment.valueOf())), orderBy("date", "desc"));
 
     const bookingQuerySnap = await getDocs(q);
@@ -176,9 +207,9 @@ async function httpCheckBooking(phoneNumber) {
 }
 
 //load bookings for given date as json
-async function httpGetBookings(dateMoment) {
+export async function httpGetBookings(dateMoment) {
   try {
-    dateMoment = new moment(dateMoment);
+    dateMoment = moment(dateMoment);
     let queriedDate = dateMoment.format("YYYY-MM-DD").toString();
     let nextDate = dateMoment.add(1, "day").format("YYYY-MM-DD").toString();
     let parsedqueriedDate = Date.parse(queriedDate + "T00:00");
@@ -201,7 +232,7 @@ async function httpGetBookings(dateMoment) {
 }
 
 //load already booked time slots for given date as json
-async function httpGetSlots(dateMoment) {
+export async function httpGetSlots(dateMoment) {
   try {
     const slotSnap = await getSlotsForDay(dateMoment);
     if (slotSnap) {
@@ -218,7 +249,7 @@ async function httpGetSlots(dateMoment) {
 
 //TODO:
 //submit an array of slot for  a given day to block and if some slots are not in that day then make sure to unblock them!!!
-async function httpSubmitBlockedSlots(momentDate, localTimesArray) {
+export async function httpSubmitBlockedSlots(momentDate: Moment, localTimesArray) {
   try {
     return runTransaction(db, async (transaction) => {
       const batch = writeBatch(db); //TODO: use this to delete all and write all slots
@@ -237,7 +268,8 @@ async function httpSubmitBlockedSlots(momentDate, localTimesArray) {
       //TODO: upload new blocked slots...
       for (let localSlotTime of localTimesArray) {
         const slotMoment = makeSlotMoment(momentDate, localSlotTime);
-        if (checkSlotNotInDB(slotMoment, "confirmed")) {
+        const isNotBookedOrBlockedSlot = await checkSlotNotInDB(slotMoment, "confirmed");
+        if (isNotBookedOrBlockedSlot) {
           //make sure the slot is not already taken
           const slot = {
             date: Timestamp.fromDate(slotMoment.toDate()),
@@ -272,19 +304,26 @@ async function httpSubmitBlockedSlots(momentDate, localTimesArray) {
 }
 
 //submit a new booking to the system
-async function httpSubmitBooking(bookingData) {
+export async function httpSubmitBooking(bookingData) {
   try {
     return await runTransaction(db, async (transaction) => {
       let bookingTimeMoment = makeSlotMoment(bookingData.date, bookingData.time);
+      const isNotBookedOrBlockedSlot = await checkSlotNotInDB(bookingTimeMoment, "confirmed");
+
+      // const isUserBlocked = await checkUserBlocked(bookingData.phone);
+
+      const hasNotAlreadyBookedOnDay = await checkUserAlreadyBookedDay(bookingData);
 
-      if (checkSlotNotInDB(bookingTimeMoment, "confirmed")) {
+      if (!hasNotAlreadyBookedOnDay) {
+        throw new Error("Looks like you have already booked today :).");
+      }
+
+      if (isNotBookedOrBlockedSlot) {
         const slot = {
           date: Timestamp.fromDate(bookingTimeMoment.toDate()),
           status: "confirmed",
         };
 
-        //alert(JSON.stringify({ ...bookingData, ...slot }));
-
         const response = await addDoc(bookingsCollectionRef, {
           ...bookingData,
           ...slot,
@@ -304,7 +343,7 @@ async function httpSubmitBooking(bookingData) {
 }
 
 //edit a booking, //NOTE: note being used yet
-async function httpEditBooking(booking) {
+export async function httpEditBooking(booking) {
   try {
     const response = await fetch(`${API_URL}/bookings`, {
       method: "patch",
@@ -319,7 +358,7 @@ async function httpEditBooking(booking) {
   }
 }
 
-async function httpCancelBooking(id) {
+export async function httpCancelBooking(id) {
   try {
     return await runTransaction(db, async (transaction) => {
       //get reference to booking to be deleted
@@ -327,6 +366,10 @@ async function httpCancelBooking(id) {
 
       let bookingSnap = await getDoc(bookingDocRef);
 
+      if (!bookingSnap || !bookingSnap.exists()) {
+        throw new Error("The booking you are attempting to cancel was not found!");
+      }
+
       let firebaseTimeStamp = bookingSnap.data().date;
       await deleteRemoteSlot(firebaseTimeStamp, "confirmed");
 
@@ -338,15 +381,6 @@ async function httpCancelBooking(id) {
 
       bookingSnap = await getDoc(bookingDocRef);
 
-      if (bookingSnap.exists()) {
-        //delete slot for this booking from blocked and confirmed slot collection
-        // let firebaseTimeStamp = bookingSnap.data().date;
-        // await deleteRemoteSlot(firebaseTimeStamp, "confirmed");
-      } else {
-        //TODO: stop transaction....
-        throw new Error("The booking you are attempting to cancel was not found!");
-      }
-
       return bookingSnap.data();
     });
   } catch (err) {
@@ -354,5 +388,3 @@ async function httpCancelBooking(id) {
     throw err;
   }
 }
-
-export { httpGetBooking, httpGetBookings, httpGetSlots, httpSubmitBooking, httpEditBooking, httpCancelBooking, httpCheckBooking, httpGetSettings, httpSubmitSettings, httpSubmitBlockedSlots };
diff --git a/src/pages/Admin.js b/src/pages/Admin.js
index b2d6af5..ffaef2d 100644
--- a/src/pages/Admin.js
+++ b/src/pages/Admin.js
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import Dashboard from "../components/Dashboard/Dashboard";
 import useHttp from "../hooks/useHttp";
 import moment from "moment";
-import { httpGetBookings } from "../hooks/request";
+import { httpGetBookings } from "../http/serverInterface";
 import { Modal } from "antd";
 import { useHistory } from "react-router-dom";
 import TrackingCode from "../components/TrackingCode";
diff --git a/src/pages/CheckAppointment.js b/src/pages/CheckAppointment.js
index 5817455..fbdd052 100644
--- a/src/pages/CheckAppointment.js
+++ b/src/pages/CheckAppointment.js
@@ -2,7 +2,7 @@ import { useEffect, useState, useCallback } from "react";
 import CheckingForm from "../components/CheckingForm/CheckingForm";
 import { useHistory } from "react-router-dom";
 import useHttp, { STATUS_COMPLETED, STATUS_PENDING } from "../hooks/useHttp";
-import { httpCheckBooking, httpCancelBooking } from "../hooks/request";
+import { httpCheckBooking, httpCancelBooking } from "../http/serverInterface";
 import SimpleBackdrop from "../components/BackDrop/BackDrop";
 import ErrorModal from "../components/ErrorModal/ErrorModal";
 import { Modal } from "antd";
@@ -31,8 +31,6 @@ const CheckAppointment = () => {
     queryPhoneNumber = "+" + queryPhoneNumber.trim();
   }
 
- 
-
   const { status: checkBookingStatus, data: response, error: errorMessage, sendRequest } = useHttp(httpCheckBooking);
 
   const { error: cancelBookingError, sendRequest: cancelRequest } = useHttp(httpCancelBooking, true);
@@ -47,7 +45,7 @@ const CheckAppointment = () => {
   }
 
   useEffect(() => {
-    const phoneNumber = queryPhoneNumber; 
+    const phoneNumber = queryPhoneNumber;
     console.log(phoneNumber);
     schema
       .isValid({
diff --git a/src/pages/GeneralSettingsPage.js b/src/pages/GeneralSettingsPage.js
index e527254..c22dc34 100644
--- a/src/pages/GeneralSettingsPage.js
+++ b/src/pages/GeneralSettingsPage.js
@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import GeneralSettings from "../components/Settings/GeneralSettings";
 import useHttp, { STATUS_COMPLETED, STATUS_PENDING } from "../hooks/useHttp";
-import { httpGetSettings, httpSubmitSettings } from "../hooks/request";
+import { httpGetSettings, httpSubmitSettings } from "../http/serverInterface";
 import SimpleBackdrop from "../components/BackDrop/BackDrop";
 import { useHistory } from "react-router-dom";
 import ErrorModal from "../components/ErrorModal/ErrorModal";
diff --git a/src/pages/NewBooking.js b/src/pages/NewBooking.js
index 3c51ce9..d29fb0b 100644
--- a/src/pages/NewBooking.js
+++ b/src/pages/NewBooking.js
@@ -3,7 +3,7 @@ import BookingForm from "../components/BookingForm/BookingForm";
 import { useHistory } from "react-router-dom";
 import { Modal } from "antd";
 import useHttp, { STATUS_COMPLETED, STATUS_PENDING } from "../hooks/useHttp";
-import { httpSubmitBooking, httpGetSlots, httpGetSettings } from "../hooks/request";
+import { httpSubmitBooking, httpGetSlots, httpGetSettings } from "../http/serverInterface";
 import SimpleBackdrop from "../components/BackDrop/BackDrop";
 import moment from "moment";
 import Swal from "sweetalert2";
@@ -14,7 +14,7 @@ const NewBooking = () => {
   const history = useHistory();
   const { status: getSettingsStatus, data: settings, error: getSettingsErrorMessage, sendRequest: getSettings } = useHttp(httpGetSettings);
 
-  const { status: submitBookingStatus, data: response, error, sendRequest } = useHttp(httpSubmitBooking);
+  const { status: submitBookingStatus, data: response, error: submitBookingsError, sendRequest } = useHttp(httpSubmitBooking);
 
   const { status: slotStatus, data: slotsArray, sendRequest: sendRequestSlots } = useHttp(httpGetSlots);
 
@@ -30,22 +30,6 @@ const NewBooking = () => {
     sendRequest({ ...bookingData });
   }
 
-  // useEffect(() => {
-  //   Swal.fire({
-  //     title: `Welcome! Incase there are no
-  //     slots`,
-  //     html: `<p>Please contact the owner on WhatsApp (+82 10-9539-9012) and he will help you make an appointment.</p>  <a aria-label="Chat on WhatsApp" href="https://wa.me/821095399012">
-  //       <img alt="Chat on WhatsApp" src="assets/images/whatsapp/WhatsAppButtonGreenLarge.svg" />
-  //     </a>`,
-  //     icon: `info`,
-  //     iconHtml: `<span>&#128522;</span>`,
-  //     confirmButtonText: "Okay",
-  //     customClass: {
-  //       icon: "no-border",
-  //     },
-  //   });
-  // }, []);
-
   useEffect(() => {
     //TODO: fetch for the date today or the provided date when modifying date
     //make sure these fire at the same time...
@@ -53,29 +37,45 @@ const NewBooking = () => {
   }, []);
 
   useEffect(() => {
-    if (submitBookingStatus === STATUS_COMPLETED) {
+    if (submitBookingStatus === STATUS_COMPLETED && !submitBookingsError) {
       //navigate to the see appointment page with the made appointment..
       //may be show some status of the appointment..
       history.push(`/appointment/${response}`);
     }
-  }, [submitBookingStatus, response, history]);
+  }, [submitBookingStatus, response, history, submitBookingsError]);
 
-  function modalError(message) {
-    Modal.error({
-      title: "Oops...!!",
-      content: message ? message : "An error occurred. Please try again later",
-      onOk: () => {
-        history.push("/");
-      },
-    });
-  }
+  useEffect(() => {
+    function modalError(message) {
+      Modal.error({
+        title: "Oops...!!",
+        content: message ? message : "An error occurred. Please try again later",
+        onOk: () => {
+          history.push("/");
+        },
+      });
+    }
 
-  if (error) {
-    modalError(error);
-  }
-  if (getSettingsErrorMessage) {
-    modalError(getSettingsErrorMessage);
-  }
+    if (submitBookingsError && submitBookingsError.includes("Looks like you have already booked today")) {
+      Swal.fire({
+        title: `Oops!`,
+        html: `<p>Looks like you have already booked on this day. Please cancel your previous appointment to make a new one.</p>
+          `,
+        icon: `info`,
+        confirmButtonText: "Okay",
+      }).then((result) => {
+        //TODO: fetch user appointments and navigate to the appointment page..
+        history.push("/check-appointment");
+      });
+    } else if (submitBookingsError || getSettingsErrorMessage) {
+      Swal.fire({
+        icon: "error",
+        title: "Oops...",
+        text: "Something went wrong!",
+      }).then((result) => {
+        history.push("/");
+      });
+    }
+  }, [submitBookingsError, getSettingsErrorMessage, history]);
 
   return (
     <div>
diff --git a/src/pages/SlotSettingsPage.js b/src/pages/SlotSettingsPage.js
index 7efcd88..0266482 100644
--- a/src/pages/SlotSettingsPage.js
+++ b/src/pages/SlotSettingsPage.js
@@ -3,7 +3,7 @@ import useHttp, { STATUS_COMPLETED, STATUS_PENDING } from "../hooks/useHttp";
 import Swal from "sweetalert2";
 import moment from "moment";
 import { useHistory } from "react-router-dom";
-import { httpSubmitBlockedSlots, httpGetSlots, httpGetSettings } from "../hooks/request";
+import { httpSubmitBlockedSlots, httpGetSlots, httpGetSettings } from "../http/serverInterface";
 import SimpleBackdrop from "../components/BackDrop/BackDrop";
 import BlockSettingsBoard from "../components/blockSettingsBoard/BlockSettingsBoard";
 import TrackingCode from "../components/TrackingCode";
diff --git a/src/pages/ViewAppointment.js b/src/pages/ViewAppointment.js
index f29584a..f28fcc0 100644
--- a/src/pages/ViewAppointment.js
+++ b/src/pages/ViewAppointment.js
@@ -2,7 +2,7 @@ import { useEffect, useContext } from "react";
 import Appointment from "../components/Appointment/Appointment";
 import { useHistory, useParams } from "react-router-dom";
 import useHttp, { STATUS_COMPLETED, STATUS_PENDING } from "../hooks/useHttp";
-import { httpGetBooking, httpCancelBooking } from "../hooks/request";
+import { httpGetBooking, httpCancelBooking } from "../http/serverInterface";
 import SimpleBackdrop from "../components/BackDrop/BackDrop";
 import { Modal } from "antd";
 import AuthContext from "../store/auth-context";
diff --git a/src/store/auth-context.js b/src/store/auth-context.js
index 2b75f4d..a0ff817 100644
--- a/src/store/auth-context.js
+++ b/src/store/auth-context.js
@@ -67,7 +67,7 @@ export const AuthContextProvider = (props) => {
         // The AuthCredential type that was used.
         const credential = GoogleAuthProvider.credentialFromError(error);
         // ...
-        alert("error when logging in" + JSON.stringify(error));
+        alert("Error when logging in" + JSON.stringify(error));
         setUser(null);
       });
   };
@@ -76,13 +76,12 @@ export const AuthContextProvider = (props) => {
     try {
       const user = await createUserWithEmailAndPassword(auth, email, password);
     } catch (err) {
-      console.log("error when registering user", err);
+      console.log("Error when registering user", err);
       throw new Error(err);
     }
   };
 
   onAuthStateChanged(auth, (currentUser) => {
-    console.log("user", currentUser);
     setUser(currentUser);
   });
   const contextValue = {
diff --git a/src/util/data.js b/src/utils/data.js
similarity index 100%
rename from src/util/data.js
rename to src/utils/data.js
diff --git a/src/util/helpers.js b/src/utils/helpers.js
similarity index 96%
rename from src/util/helpers.js
rename to src/utils/helpers.js
index 421c577..e4d5260 100644
--- a/src/util/helpers.js
+++ b/src/utils/helpers.js
@@ -1,4 +1,4 @@
-import moment from "moment";
+import moment, { Moment } from "moment";
 import { v4 as uuidv4 } from "uuid";
 const combineDateTimeMoment = (dateMoment, timeMoment) => {
   return dateMoment
diff --git a/src/version.json b/src/version.json
index 5bf3c32..c962616 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.11.0"
+  "version": "1.12.0"
 }