Merge branch 'img_upload'

Author: TheNoobGoda

css/style.css

@@ -181,6 +181,11 @@ main article {
     color: black;
 }
 
+#restaurants img {
+    width: 40em;
+    height: 20em;
+}
+
 .category {
     display: flex;
     flex-wrap: wrap;

database/data-fetching/dishes.php

@@ -33,4 +33,13 @@ function getDishsByOrder($db, $orderid){
         $dishes = $stmt->fetchAll();
         return $dishes;
     }
+
+    function getDishes($db){
+        $stmt = $db ->prepare(
+            'SELECT dishID FROM Dish'
+        );
+        $stmt->execute();
+        $dishes = $stmt->fetchAll();
+        return $dishes;
+    }
 ?>

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

@@ -1,14 +1,15 @@
 <?php
-    function addRestaurantToDatabase($db, $name, $description, $category, $email, $phone, $address, $ownerID) {;
+    function addRestaurantToDatabase($db, $name, $description, $category, $email, $phone, $address, $ownerID,$picture) {;
         $stmt = $db->prepare(
-            'INSERT INTO Restaurant (name, description, category, email, phoneNumber, address, ownerID) Values(
+            'INSERT INTO Restaurant (name, description, category, email, phoneNumber, address, ownerID, picture) Values(
                 :name,
                 :description,
                 :category,
                 :email,
                 :phone,
                 :address,
-                :ownerID
+                :ownerID,
+                :picture
             )'
         );
         $stmt->bindParam(':name', $name);
@@ -18,6 +19,7 @@ function addRestaurantToDatabase($db, $name, $description, $category, $email, $p
         $stmt->bindParam(':phone', $phone);
         $stmt->bindParam(':address', $address);
         $stmt->bindParam(':ownerID', $ownerID);
+        $stmt->bindParam(':picture', $picture);
 
         $stmt->execute();
     }

database/data-insertion/update-restaurant-info.php

@@ -1,10 +1,10 @@
 <?php
-    function updateRestaurantInfo($db, $restaurantID, $name, $description, $category, $email, $phone, $address) {
+    function updateRestaurantInfo($db, $restaurantID, $name, $description, $category, $email, $phone, $address,$picture) {
         $stmt = $db->prepare(
             'UPDATE Restaurant
             SET name = :name, description = :description,
                 category = :category, email = :email, 
-                phoneNumber = :phone, address = :address
+                phoneNumber = :phone, address = :address, picture = :picture
             WHERE restaurantID = :id'
         );
         $stmt->bindParam(':id', $restaurantID);
@@ -14,6 +14,7 @@ function updateRestaurantInfo($db, $restaurantID, $name, $description, $category
         $stmt->bindParam(':email', $email);
         $stmt->bindParam(':phone', $phone);
         $stmt->bindParam(':address', $address);
+        $stmt->bindParam(':picture',$picture);
 
         $stmt->execute();
     }

database/restaurants.sql

@@ -29,15 +29,16 @@ CREATE TABLE Restaurant(
     email           VARCHAR(32),
     phoneNumber     CHAR(9) NOT NULL,
     category        VARCHAR(16),
-    ownerID         INTEGER REFERENCES USER(userID)
+    ownerID         INTEGER REFERENCES USER(userID),
+    picture        TEXT NOT NULL
 );
 
 CREATE TABLE Dish(
     dishID          INTEGER PRIMARY KEY,
     name            VARCHAR(32) NOT NULL,
     description     TEXT NOT NULL,
     price           FLOAT NOT NULL,
-    picture         TEXT NOT NULL,
+    picture        TEXT NOT NULL,
     category        VARCHAR(32) NOT NULL,
     restaurantID    INTEGER REFERENCES Restaurant(restaurantID)
 );
@@ -117,7 +118,8 @@ INSERT INTO Restaurant VALUES(
     '[email protected]',
     '225081401',
     'Family Style',
-    2
+    2,
+    'restaurant1.png'
 );
 
 INSERT INTO Restaurant VALUES(
@@ -128,7 +130,8 @@ INSERT INTO Restaurant VALUES(
     '[email protected]',
     '225081402',
     'Desert',
-    2
+    2,
+    'restaurant2.png'
 );
 
 INSERT INTO Restaurant VALUES(
@@ -139,7 +142,8 @@ INSERT INTO Restaurant VALUES(
     '[email protected]',
     '225081403',
     'Family Style',
-    3
+    3,
+    'restaurant3.png'
 );
 
 INSERT INTO Restaurant VALUES(
@@ -151,7 +155,8 @@ INSERT INTO Restaurant VALUES(
     '[email protected]',
     '225081404',
     'Seafood',
-    2
+    2,
+    'restaurant4.png'
 );
 
 INSERT INTO Restaurant VALUES(
@@ -162,7 +167,8 @@ INSERT INTO Restaurant VALUES(
     '[email protected]',
     '225081405',
     'Seafood',
-    2
+    2,
+    'restaurant5.png'
 );
 
 INSERT INTO Restaurant VALUES(
@@ -174,7 +180,8 @@ INSERT INTO Restaurant VALUES(
     '[email protected]',
     '225081406',
     'Vegetarian',
-    3
+    3,
+    'restaurant6.png'
 );
 
 INSERT INTO Restaurant VALUES(
@@ -185,7 +192,8 @@ INSERT INTO Restaurant VALUES(
     '[email protected]',
     '225081402',
     'Desert',
-    2
+    2,
+    'restaurant7.png'
 );
 
 
@@ -196,7 +204,7 @@ INSERT INTO Dish VALUES(
     'Neapolitan Pizza',
     'This is just a Pizza',
     22.50,
-    'picture1.png',
+    'dish1.png',
     'Pizza',
     1
 );
@@ -206,7 +214,7 @@ INSERT INTO Dish VALUES(
     'Pasta',
     'Pasta',
     5.60,
-    'picture2.png',
+    'dish2.png',
     'Pasta',
     1
 );
@@ -216,7 +224,7 @@ INSERT INTO Dish VALUES(
     'Burger',
     'Burger',
     22.50,
-    'picture3.png',
+    'dish3.png',
     'Burger',
     2
 );
@@ -226,7 +234,7 @@ INSERT INTO Dish VALUES(
     'Cheese Pizza',
     'This is just a Pizza',
     22.50,
-    'picture4.png',
+    'dish4.png',
     'Pizza',
     1
 );
@@ -236,7 +244,7 @@ INSERT INTO Dish VALUES(
     'Veggie Pizza',
     'This is just a Pizza',
     22.50,
-    'picture5.png',
+    'dish5.png',
     'Pizza',
     1
 );
@@ -246,7 +254,7 @@ INSERT INTO Dish VALUES(
     'Pepperoni Pizza',
     'This is just a Pizza',
     22.50,
-    'picture6.png',
+    'dish6.png',
     'Pizza',
     1
 );

img/dish1.png

@@ -3,7 +3,11 @@
     require_once('../../database/data-fetching/user.php');
     require_once('../../database/data-fetching/restaurants.php');
     require_once('../../database/data-insertion/insert-new-dish.php');
-    
+    require_once('img-insertion.php');
+    require_once('../../database/data-fetching/dishes.php');
+    require_once('../../database/data-insertion/update-dish-info.php');
+    session_start();
+
     $db = getDatabaseConnection('../../database/restaurants.db');
     $user_info = getUserbyID($db, $_SESSION['userID']);
     $restaurant_info = getRestaurantInfo($db, $_GET['restaurantID']);
@@ -19,9 +23,14 @@
     $description = $_POST['description'];
     $price = $_POST['price'];
     $category = $_POST['category'];
-    $picture = $_POST['picture'];
+    $picture = "picture1";
     $restaurantID = $_GET['restaurantID'];
 
     addDishToDatabase($db, $name, $description, $price, $picture, $category, $restaurantID);
+    $dishID =count(getDishes($db));
+    $dish_info = getDishInfo($db, $dishID);
+    $picture = insertImage($dish_info);
+    updateDishInfo($db, $dishID, $name, $description, $price, $category, $picture);
+
     header('Location: ../../restaurant-page.php?id=' . $restaurantID);
 ?>

img/dish2.png

@@ -2,6 +2,9 @@
     require_once('../../database/db-connection.php');
     require_once('../../database/data-fetching/user.php');
     require_once('../../database/data-insertion/insert-new-restaurant.php');
+    require_once('../../database/data-fetching/restaurants.php');
+    require_once('../../database/data-insertion/update-restaurant-info.php');
+    require_once('img-insertion-restaurants.php');
 
     session_start();
     $db = getDatabaseConnection('../../database/restaurants.db');
@@ -18,7 +21,13 @@
     $email = $_POST['email'];
     $phone = $_POST['phone'];
     $address = $_POST['address'];
+    $picture = "picture1";
+
+    addRestaurantToDatabase($db, $name, $description, $category, $email, $phone, $address, $_SESSION['userID'],$picture);
+    $restaurantID = count(getAllRestaurants($db));
+    $restaurant_info = getRestaurantInfo($db, $restaurantID);
+    $picture = insertImageRestaurant($restaurant_info);
+    updateRestaurantInfo($db, $restaurantID, $name, $description, $category, $email, $phone, $address, $picture);
 
-    addRestaurantToDatabase($db, $name, $description, $category, $email, $phone, $address, $_SESSION['userID']);
     header('Location: ../../user-info-page.php');
 ?>

img/dish3.png

@@ -4,6 +4,7 @@
     require_once('../../database/data-fetching/dishes.php');
     require_once('../../database/data-fetching/restaurants.php'); 
     require_once('../../database/data-insertion/update-dish-info.php');
+    require_once('img-insertion.php');
 
     session_start();
     $db = getDatabaseConnection('../../database/restaurants.db');
@@ -24,9 +25,7 @@
     $category = $_POST['category'];
     $picture = $_POST['picture'];
 
-    if ($picture === '') {
-        $picture = $dish_info['picture'];
-    }
+    $picture = insertImage($dish_info);
 
     updateDishInfo($db, $_GET['dishID'], $name, $description, $price, $category, $picture);
     header('Location: ../../restaurant-page.php?id=' . $_GET['restaurantID']);

img/dish4.png

@@ -2,6 +2,7 @@
     require_once('../../database/db-connection.php');
     require_once('../../database/data-fetching/restaurants.php'); 
     require_once('../../database/data-insertion/update-restaurant-info.php');
+    require_once('img-insertion-restaurants.php');
 
     session_start();
     $restaurantID = $_GET['id'];
@@ -17,7 +18,8 @@
     $email = $_POST['email'];
     $phone = $_POST['phone'];
     $address = $_POST['address'];
+    $picture = insertImageRestaurant($current_restaurant_info);
 
-    updateRestaurantInfo($db, $restaurantID, $name, $description, $category, $email, $phone, $address);
+    updateRestaurantInfo($db, $restaurantID, $name, $description, $category, $email, $phone, $address,$picture);
     header('Location: ../../restaurant-page.php?id=' . $restaurantID);
 ?>

img/dish5.png

@@ -0,0 +1,27 @@
+<?php
+  function insertImageRestaurant($restaurant_info){
+    $target_dir = "../../img/";
+    $target_file = $target_dir . basename($_FILES["picture"]["name"]); 
+    $uploadOk = 1;
+    $imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
+    
+    $check = getimagesize($_FILES["picture"]["tmp_name"]); 
+    if($check !== false) {
+        $uploadOk = 1;
+    } else {
+        $uploadOk = 0;
+    }
+    if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg" && $imageFileType != "gif" ) {
+        $uploadOk = 0;
+        
+    }
+    if ($uploadOk == 0) {
+        $picture = $restaurant_info['picture'];
+      } else {
+        $picture = "restaurant".$restaurant_info['restaurantID'].".".$imageFileType;
+        move_uploaded_file($_FILES["picture"]["tmp_name"], $target_dir."restaurant".$restaurant_info['restaurantID'].".".$imageFileType); {
+        }
+      }
+      return $picture;
+  }
+?>

img/dish6.png

@@ -0,0 +1,27 @@
+<?php
+  function insertImage($dish_info){
+    $target_dir = "../../img/";
+    $target_file = $target_dir . basename($_FILES["picture"]["name"]); 
+    $uploadOk = 1;
+    $imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
+    
+    $check = getimagesize($_FILES["picture"]["tmp_name"]); 
+    if($check !== false) {
+        $uploadOk = 1;
+    } else {
+        $uploadOk = 0;
+    }
+    if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg" && $imageFileType != "gif" ) {
+        $uploadOk = 0;
+        
+    }
+    if ($uploadOk == 0) {
+        $picture = $dish_info['picture'];
+      } else {
+        $picture = "dish".$dish_info['dishID'].".".$imageFileType;
+        move_uploaded_file($_FILES["picture"]["tmp_name"], $target_dir."dish".$dish_info['dishID'].".".$imageFileType); {
+        }
+      }
+      return $picture;
+  }
+?>

img/dish7.png

@@ -18,12 +18,12 @@ function outputDishEditForm() {
         } ?>
         <main>
             <section id="dishInfo">
-                <form action="../../php/actions/edit-dish-info.php?restaurantID=<?=$_GET['restaurantID']?>&dishID=<?=$_GET['dishID']?>" method="post">
+                <form action="../../php/actions/edit-dish-info.php?restaurantID=<?=$_GET['restaurantID']?>&dishID=<?=$_GET['dishID']?>" method="post" enctype="multipart/form-data">
                     Name: <input type="text" name="name" value="<?=$dish_info['name']?>">
                     Description: <input type="text" name="description" value="<?=$dish_info['description']?>">
                     Price: <input type="number" name="price" step="0.01" value="<?=$dish_info['price']?>">
                     Category: <input type="text" name="category" value="<?=$dish_info['category']?>">
-                    Image: <input type="file" , name="picture">
+                    Image: <input type="file" , name="picture" id="picture">
                     <input class="submit" type="submit" value="Submit">
                 </form>
             </section>

img/restaurant1.png

@@ -16,12 +16,12 @@ function outputDishRegisterForm() {
         } ?>
         <main>
             <section id="dishInfo">
-                <form action="../../php/actions/add-dish.php?restaurantID=<?=$_GET['restaurantID']?>" method="post">
+                <form action="../../php/actions/add-dish.php?restaurantID=<?=$_GET['restaurantID']?>" method="post" enctype="multipart/form-data">
                     Name: <input type="text" name="name">
                     Description: <input type="text" name="description">
                     Price: <input type="number" name="price" step="0.01">
                     Category: <input type="text" name="category">
-                    Image: <input type="file" , name="picture">
+                    Image: <input type="file" , name="picture" id="picture">
                     <input class="submit" type="submit" value="Submit">
                 </form>
             </section>