merge fix

css/style.css

@@ -118,10 +118,6 @@ main article {
     word-break: break-all;
 }
 
-#restaurants li {
-    padding: 0.3em;
-}
-
 /*__________ retaurant _________________________*/
 
 #main-restaurants {
@@ -151,6 +147,20 @@ main article {
     grid-row-end: 3;
 }
 
+#add-to-favourites {
+    width: 3em;
+    height: 3em;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-left: 11em;
+}
+
+#add-to-favourites ion-icon {
+    width: 2.5em;
+    height: 2.5em;
+}
+
 #restaurant #edit-restaurant {
     grid-column-start: 2;
     grid-column-end: 3;
@@ -222,7 +232,7 @@ main article {
     font-size: 1.2em;
 }
 
-#category-and-plates article img{
+#category-and-plates article img {
     width: 14em;
 }
 
@@ -234,13 +244,14 @@ main article {
 #item-number {
     display: none;
 }
+
 .dishID {
     display: none;
 }
 
 /*__________ reviews ____________________________*/
 
-#reviews{
+#reviews {
     background-color: var(--background-color);
     color:black;
     padding: 0.5em;
@@ -253,11 +264,31 @@ main article {
     margin: 1em 0em;
 }
 
-.review-response{
+.review-response {
     margin: 0em;
     padding: 0em 1em;
 }
 
+#add-comment {
+    margin-top: 3em;
+}
+
+#add-comment-form {
+    display: grid;
+}
+
+#add-comment-form textarea {
+    width: 75%;
+}
+
+#add-response-form {
+    display: grid;
+}
+
+#add-response-form textarea {
+    width: 75%;
+}
+
 /*__________ form _______________________________*/
 
 main form {
@@ -328,6 +359,14 @@ main input{
     padding: 1em;
 }
 
+#restaurants li {
+    padding: 0.3em;
+}
+
+#favourite-restaurants li {
+    padding: 0.3em
+}
+
 /*__________ footer _____________________________*/
 
 footer {

database/data-fetching/favourites.php

@@ -0,0 +1,30 @@
+<?php
+    function getAllFavourites($db, $userID) {
+        $stmt = $db->prepare(
+            'SELECT Restaurant.restaurantID, name
+            FROM Favourite JOIN Restaurant ON Favourite.restaurantID = Restaurant.restaurantID
+            WHERE userID = :userID
+            ORDER BY name'
+        );
+        $stmt->bindParam(':userID', $userID);
+        $stmt->execute();
+        $favourites = $stmt->fetchAll();
+        return $favourites;
+    }
+
+    function checkIfFavourite($db, $userID, $restaurantID) {
+        $stmt = $db->prepare(
+            'SELECT * FROM Favourite
+            WHERE userID = :userID
+            AND restaurantID = :restaurantID'
+        );
+        $stmt->bindParam(':userID', $userID);
+        $stmt->bindParam(':restaurantID', $restaurantID);
+        $stmt->execute();
+        $favourites = $stmt->fetchAll();
+
+        if (sizeof($favourites) === 0)
+            return false;
+        return true;
+    }
+?>

database/data-fetching/user-orders.php

@@ -12,4 +12,20 @@ function getUserOrders($db) {
         $orders = $stmt->fetchAll();
         return $orders;
     }
+
+    function checkIfOrderExists($db, $userID, $restaurantID) {
+        $stmt = $db->prepare(
+            'SELECT * FROM FoodOrder
+            WHERE customerID = :customerID
+            AND restaurantID = :restaurantID'
+        );
+        $stmt->bindParam(':customerID', $userID);
+        $stmt->bindParam(':restaurantID', $restaurantID);
+        $stmt->execute();
+        $orders = $stmt->fetchAll();
+
+        if (sizeof($orders) === 0)
+            return false;
+        return true;
+    }
 ?>

database/data-insertion/insert-new-comment.php

@@ -0,0 +1,35 @@
+<?php
+    function addCommentToDatabase($db, $comment, $date, $custommerID, $restaurantID) {
+        $stmt = $db->prepare(
+            'INSERT INTO Review (comment, date, customerID, restaurantID) VALUES (
+                :comment,
+                :date,
+                :customerID,
+                :restaurantID
+            )'
+        );
+        $stmt->bindParam(':comment', $comment);
+        $stmt->bindParam(':date', $date);
+        $stmt->bindParam(':customerID', $custommerID);
+        $stmt->bindParam(':restaurantID', $restaurantID);
+
+        $stmt->execute();
+    }
+
+    function addResponseToDatabase($db, $comment, $date, $reviewID, $ownerID) {
+        $stmt = $db->prepare(
+            'INSERT INTO ReviewResponse (comment, date, reviewID, ownerID) VALUES (
+                :comment,
+                :date,
+                :reviewID,
+                :ownerID
+            )'
+        );
+        $stmt->bindParam(':comment', $comment);
+        $stmt->bindParam(':date', $date);
+        $stmt->bindParam(':reviewID', $reviewID);
+        $stmt->bindParam(':ownerID', $ownerID);
+
+        $stmt->execute();
+    }
+?>

database/data-insertion/update-favourite-status.php

@@ -0,0 +1,24 @@
+<?php
+    function addToFavourties($db, $userID, $restaurantID) {
+        $stmt = $db->prepare(
+            'INSERT INTO Favourite VALUES(
+                :userID,
+                :restaurantID
+            )'
+        );
+        $stmt->bindParam(':userID', $userID);
+        $stmt->bindParam(':restaurantID', $restaurantID);
+        $stmt->execute();
+    }
+
+    function removeFromFavourites($db, $userID, $restaurantID) {
+        $stmt = $db->prepare(
+            'DELETE FROM Favourite
+            WHERE userID = :userID
+            AND restaurantID = :restaurantID'
+        );
+        $stmt->bindParam(':userID', $userID);
+        $stmt->bindParam(':restaurantID', $restaurantID);
+        $stmt->execute();
+    }
+?>

database/restaurants.sql

@@ -1,5 +1,6 @@
 PRAGMA foreign_keys = ON;
 
+DROP TABLE IF EXISTS Favourite;
 DROP TABLE if EXISTS DishFoodOrder;
 DROP TABLE if EXISTS ReviewResponse;
 DROP TABLE if EXISTS Review;
@@ -74,6 +75,12 @@ CREATE TABLE DishFoodOrder(
 
 );
 
+CREATE TABLE Favourite(
+    userID          INTEGER REFERENCES User(userID),
+    restaurantID    INTEGER REFERENCES Restaurant(restaurantID),
+    PRIMARY KEY(userID, restaurantID)
+);
+
 --INSERTS-------------------------------------------------------------
 
 --USERS---------------------------------------------------------------

dish-info-edit-page.php

@@ -1,6 +1,6 @@
 <?php
     session_start();
-    require_once('php/output-functions/draw-dish-edit-form.php');
+    require_once('php/output-functions/forms/draw-dish-edit-form.php');
     require_once('php/output-functions/draw-header.php');
     require_once('php/output-functions/draw-footer.php');
 

dish-register-page.php

@@ -1,6 +1,6 @@
 <?php
     session_start();
-    require_once('php/output-functions/draw-dish-register-form.php');
+    require_once('php/output-functions/forms/draw-dish-register-form.php');
     require_once('php/output-functions/draw-header.php');
     require_once('php/output-functions/draw-footer.php');