still in progress

apiFunctions.js

@@ -0,0 +1,98 @@
+function menu(){
+
+const menuClosure = {
+    1: {
+      id:1,
+      title: "Strawberry cheesecake",
+      price: 6,
+      image: 'strawberrycheesecake.jpeg',
+      description: 'A medium sized Strawberry Cheesecake',
+      category: 'dessert'
+    },
+    2: {
+      id:2,
+      title: 'Blueberry cheesecake',
+      price: 6.50,
+      image: 'blueberry cheesecake.jpeg',
+      description: 'A medium sized Blueberry Cheesecake',
+      category: 'dessert'
+    },
+    3:{
+        id:3,
+        title:'Chocolate cheesecake',
+        price: 6.50,
+        image: 'chocolate cheesecake.jpeg',
+        description: 'A medium sized Chocolate Cheesecake',
+        category: 'dessert'
+  },
+  4:{
+    id:4,
+    title:'chesse',
+    price: 6.50,
+    image: 'chocolate cheesecake.jpeg',
+    description: 'cheese',
+    category: 'main'
+  },
+  5:{
+    id:5,
+    title:'Lamb Kebab',
+    price: 11.50,
+    image: 'chocolate cheesecake.jpeg',
+    description: 'A nice kebab',
+    category: 'main'
+  },
+  6:{
+    id:6,
+    title:'flatiron steak',
+    price: 10.50,
+    image: 'chocolate cheesecake.jpeg',
+    description: 'A nice steak',
+    category: 'main'
+}
+
+}
+return {
+      getAllItems(){
+      return menuClosure;
+    },
+
+    getItem(itemId){
+    return menuClosure[itemId]
+    },
+}
+}
+
+
+
+function orders(){
+  const orderClosure = {} // order will start as empty since orders need to be placed
+    let orderId =''//think I will need an order id
+  return {
+    getAllOrders(){
+    return orderClosure;
+      },
+
+    getOrder(orderId){
+    return orderClosure[orderId]
+      },
+
+    createNewOrder(newOrder){
+      const orderKeys = Object.keys(orderClosure);
+      const highestiD = Math.max(...orderKeys);
+      const newId = highestiD + 1;
+        orders = Object.assign({},orderClosure,{[newId]:newOrder})
+        return orderClosure
+      },
+
+      deleteStudent(orderId){
+        delete orderClosure[orderId]
+      }
+    }
+  }
+
+
+
+  module.exports = {
+      menu,
+      orders
+  }

package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "test": "jest",
     "dev": "webpack --mode development",
-    "build": "webpack --mode production"
+    "build": "webpack --mode production",
+    "start": "nodemon server.js"
   },
   "author": "",
   "license": "ISC",
@@ -18,6 +19,7 @@
   },
   "dependencies": {
     "body-parser": "^1.18.3",
+    "classnames": "^2.2.6",
     "express": "^4.16.3",
     "hbs": "^4.0.1",
     "jest": "^22.3.0",
@@ -36,10 +38,10 @@
     "jest": "^22.4.2",
     "jest-fetch-mock": "^1.6.6",
     "node-sass": "^4.9.1",
-    "nodemon": "1.17.5",
+    "nodemon": "^1.17.5",
+    "react-test-renderer": "^16.2.0",
     "sass-loader": "^7.0.3",
     "style-loader": "^0.21.0",
-    "react-test-renderer": "^16.2.0",
     "webpack": "^4.0.1",
     "webpack-cli": "^2.0.9"
   }

server.js

@@ -2,22 +2,63 @@ const express = require('express');
 const bodyParser = require('body-parser');
 const app = express();
 
+const{
+ menu, orders
+} = require('./apiFunctions.js')
+
+const {getAllItems, getItem} = menu() 
+const {getAllOrders,getOrder,createNewOrder} = orders()
+
 app.use(bodyParser.json());
 app.use('/static', express.static('static'));
 app.set('view engine', 'hbs');
 
-const menu = {
-  1: {
-    id: 1,
-    name: "Strawberry cheesecake",
-    price: 6
-  }
-};
+
 
 app.get('/', function(req, res){
   res.render('index');
 });
 
+//Menu Routes
+app.get('/menu', function(req, res){
+
+  const allItems = getAllItems()
+  res.json(allItems)
+});
+
+app.get('/menu/:itemId', function(req, res){
+  const item = getItem(req.params.itemId)
+  if(item){
+    return res.json(item)
+  } else res.status(404).json({error: 'this item does not exist'})
+});
+
+
+
+
+
+
+
+//Order Routes
+app.get('/order', function(req,res){
+  const allOrders = getAllOrders()
+  res.json(allOrders)
+})
+
+app.get('/order:orderId', function(req,res){
+  const specificOrder = getOrder()
+  res.json(specificOrder)
+})
+
+app.post('/order', function(req,res){
+    const newOrder = req.body;
+    res.status(201).json(createNewOrder(newOrder))
+})
+
+
+
+
+//Listen Route
 app.listen(8080, function(){
   console.log('Listening on port 8080');
 });

src/components/App.js

@@ -1,16 +1,89 @@
 import React from 'react';
+import Homepage from './Homepage'
+import Basket from './Basket'
+import MenuResults from './MenuResults'
 
 import '../styles/App.scss';
 
 class App extends React.Component {
   constructor(){
     super();
+    this.state = {
+      menu: {},
+      order: {},  //to add empty history of order
+
+
+    }
+    this.getOrder = this.getOrder.bind(this);
+    // this.fetchMenu = this.fetchMenu.bind(this)
+    this.sendOrder = this.sendOrder.bind(this)
+
   }
 
+  componentDidMount(){
+    this.fetchMenu()
+  }
+
+  fetchMenu(){
+    fetch('/menu')
+    .then(response => response.json())
+    .then(body => {
+      console.log(body)
+      this.setState({
+        menu: body,
+      })
+  })
+}
+
+sendOrder(){
+  this.setState({
+    order: {}
+  })
+}
+
+
+  getOrder(order) {
+    const matchingOrders = Array.from(this.state.order).find(newOrder => {
+      return order.id === newOrder.id;
+    });
+
+    if (matchingOrders) {
+      matchingOrders.quantity += order.quantity;
+      matchingOrders.price += order.price;
+
+      const ordersWithoutCurrentOrder = this.state.order.filter(
+        newOrder => {
+          return newOrder.id !== order.id;
+        }
+      );
+
+      this.setState({
+        order: ordersWithoutCurrentOrder.concat(matchingOrders)
+      });
+    } else {
+      this.setState({
+        order: [...this.state.order, order]
+      });
+    }
+  }
+
+
+
+
+
+
+
+
+
+
   render(){
     return (
       <div>
-        Delivereat app
+        <div className='homepage-header'>
+          <Homepage/>
+        </div>
+          <Basket   sendOrder={this.sendOrder} order={this.state.order}/>
+        <MenuResults  getOrder={this.getOrder} menu={this.state.menu}/>
       </div>
     )
   }