From a42f5973646b03d28d8219f7b5ef38a3953355f0 Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Tue, 26 May 2020 21:38:13 +0200
Subject: [PATCH 01/15] Changed Project Name

---
 backend/index.js     | 2 +-
 backend/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/index.js b/backend/index.js
index 8a98308..18c11b9 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -33,7 +33,7 @@ app.use((req, res, next) => {
 })
 
 app.get('/', (req,res) => {
-        res.send(`<h1>CS GO</h1>`)
+        res.send(`<h1>Event Planner</h1>`)
 })
 app.use('/api/events', events)
 app.use('/api/places', places)
diff --git a/backend/package.json b/backend/package.json
index c220307..ff3ef40 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "Event Planner",
+  "name": "event-planner",
   "version": "1.0.0",
   "description": "Event Planning Website",
   "main": "index.js",

From 9dccf4fe5f649aed643f32f3f41cffc4ea371665 Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Tue, 26 May 2020 22:18:57 +0200
Subject: [PATCH 02/15] removed some warning and added package.json for main
 directory

---
 client/public/index.html           |  2 +-
 client/src/App.js                  |  1 -
 client/src/Components/Login.js     |  1 -
 client/src/Components/Register.js  |  8 ++++----
 client/src/Components/stripeBtn.js |  7 ++-----
 client/src/components/NewEvent.js  | 14 ++++----------
 package.json                       | 25 +++++++++++++++++++++++++
 7 files changed, 36 insertions(+), 22 deletions(-)
 create mode 100644 package.json

diff --git a/client/public/index.html b/client/public/index.html
index 8d9691d..5039590 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.css" />
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous" />
-    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.css" />
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.css" />
   <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/client/src/App.js b/client/src/App.js
index 1fa73a1..0ceed49 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -5,7 +5,6 @@ import Login from './Components/Login';
 import { BrowserRouter as Router, Route } from "react-router-dom";
 import Register from './Components/Register';
 import ForgetPassword from './Components/ForgetPassword'
-import ReactDOM from 'react-dom'
 import parseJwt from './helpers/decryptAuthToken'
 import './App.css';
 
diff --git a/client/src/Components/Login.js b/client/src/Components/Login.js
index 88df3a0..616a894 100644
--- a/client/src/Components/Login.js
+++ b/client/src/Components/Login.js
@@ -3,7 +3,6 @@ import { Button, Card, CardDeck } from "react-bootstrap";
 import { Redirect } from "react-router-dom";
 import { Label, Input } from 'semantic-ui-react'
 import axios from "axios";
-import { Collapse } from 'reactstrap'
 import ParticlesBg from "particles-bg";
 
 class Login extends Component {
diff --git a/client/src/Components/Register.js b/client/src/Components/Register.js
index a27f651..c5bd3d7 100644
--- a/client/src/Components/Register.js
+++ b/client/src/Components/Register.js
@@ -7,7 +7,7 @@ import ParticlesBg from "particles-bg";
 
 
 function validateEmail(email) {
-  var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+  var re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
   return re.test(String(email).toLowerCase());
 }
 function validateNumber(num) {
@@ -51,7 +51,7 @@ class Register extends Component {
       ret = "Password has to be atleast 8 characters long";
     else if (req.password !== req.confirmPassword)
       ret = "The repeated password doesn't match the first one"
-    else if (req.name.length == 0)
+    else if (req.name.length === 0)
       ret = "Please enter your name";
     else if (!validateNumber(req.phone))
       ret = "Phone Number contains only digits and cannot be empty";
@@ -78,7 +78,7 @@ class Register extends Component {
       , balance: 0, name: this.state.name, age: this.state.age, phone: this.state.phone, confirmPassword: this.state.confirmPassword, gender: 'Male'
     };
     let valid = this.validateRequest(body);
-    if (valid.msg == 'ok') {
+    if (valid.msg === 'ok') {
 
 
       try {
@@ -104,7 +104,7 @@ class Register extends Component {
   };
   handleGender(event) {
     let id = event.target.id;
-    if (id == 'male') {
+    if (id === 'male') {
       document.getElementById("female").checked = false;
     }
     else
diff --git a/client/src/Components/stripeBtn.js b/client/src/Components/stripeBtn.js
index 5fdd1ca..20f07e2 100644
--- a/client/src/Components/stripeBtn.js
+++ b/client/src/Components/stripeBtn.js
@@ -1,11 +1,9 @@
-import React, { Component, Fragment } from "react";
+import React, { Component } from "react";
 import StripeCheckout from "react-stripe-checkout";
 import axios from "../../node_modules/axios";
 const publishableKey = "pk_test_ehyd5U1bJZcul9sAObB3D8fV00XSCtZpBn";
 export class stripeBtn extends Component {
-  constructor(props) {
-    super(props)
-  }
+  
 
   onToken = (token) => {
     const body = {
@@ -15,7 +13,6 @@ export class stripeBtn extends Component {
     }; axios
       .post("http://localhost:5000/api/users/payfees", body)
       .then(response => {
-        // console.log(111)
         console.log(response);
         alert("Payment Success");
         window.location.reload()
diff --git a/client/src/components/NewEvent.js b/client/src/components/NewEvent.js
index 4e1a959..41132e4 100644
--- a/client/src/components/NewEvent.js
+++ b/client/src/components/NewEvent.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { Navbar, Nav, Button, Alert, Form, FormControl, Col, Row, Dropdown, Badge, Accordion, Card, Spinner } from 'react-bootstrap'
+import { Navbar,  Button, Alert, Form,  Col, Row,  Badge, Accordion, Card, Spinner } from 'react-bootstrap'
 import { Redirect } from 'react-router-dom'
 import axios from 'axios'
 import ParticlesBg from "particles-bg";
@@ -206,7 +206,7 @@ export default class Homepage extends Component {
                 this.setState({ ...this.state })
               }}
             />
-            {this.state.type === undefined || this.state.type != ""
+            {this.state.type === undefined || this.state.type !== ""
               ? <br />
               : <Badge variant="danger">
                 This field is required
@@ -222,7 +222,7 @@ export default class Homepage extends Component {
                 this.setState({ ...this.state })
               }}
             />
-            {this.state.description === undefined || this.state.description != ""
+            {this.state.description === undefined || this.state.description !== ""
               ? <br />
               : <Badge variant="danger">
                 This field is required
@@ -339,12 +339,7 @@ export default class Homepage extends Component {
                           this.state.cateringItems[index].itemAmount = e.target.value
                           this.setState({ ...this.state })
                           this.calculatePrice()
-                          // if (idx === -1)
-                          //   this.newEvent.catering.items.push([{
-                          //     itemName: item.item,
-                          //     itemAmount: e.target.value
-                          //   }])
-                          // else
+                         
                         }} />
                     </Col>
                   </Row>
@@ -399,7 +394,6 @@ export default class Homepage extends Component {
           {this.header()}
           {this.state.submitted && !this.state.submissionError
             ? <Redirect to="/" />
-            // ? <></>
 
             : this.state.loading
               ? <Spinner animation="border" variant="primary"
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..580d860
--- /dev/null
+++ b/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "event-planner",
+  "version": "1.0.0",
+  "description": "Event Planner",
+  "main": "backend/index.js",
+  "scripts": {
+    "server": "nodemon backend/index.js",
+    "client": "npm start --prefix client",
+    "dev": "concurrently \"npm run server\" \"npm run client\""
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ZeyadKhattab/Event-Planner.git"
+  },
+  "author": "ZeyadKhattab",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/ZeyadKhattab/Event-Planner/issues"
+  },
+  "homepage": "https://github.com/ZeyadKhattab/Event-Planner#readme",
+  "dependencies": {
+    "concurrently": "^5.0.0",
+    "nodemon": "^1.19.4"
+  }
+}

From c961f68b37e3db01e826a2ad6ae759ac96bb198b Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Tue, 26 May 2020 23:08:20 +0200
Subject: [PATCH 03/15] fixed some bugs

---
 client/src/components/Homepage.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Homepage.js b/client/src/components/Homepage.js
index 7c76804..6a0284f 100644
--- a/client/src/components/Homepage.js
+++ b/client/src/components/Homepage.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { Navbar, Nav, Alert, Card, ListGroup, ListGroupItem, Button, CardColumns, Row, CardDeck, Modal } from 'react-bootstrap'
+import { Navbar, Nav, Alert, Card, ListGroup, ListGroupItem, Button, Row, CardDeck, Modal } from 'react-bootstrap'
 import axios from 'axios'
 import { Label } from 'semantic-ui-react'
 import { Redirect } from "react-router-dom"
@@ -144,7 +144,7 @@ export default class Homepage extends Component {
                   <Nav.Link onClick={this.displayCaterings}>Caterings</Nav.Link>
                   <Nav.Link href="/login" onClick={() => localStorage.removeItem('jwtToken')}>Logout</Nav.Link>
                 </Nav>
-                <Button href="/newEvent" varient="warning"
+                <Button href="/newEvent" variant="info"
                   style={{ color: "yellow", borderColor: "yellow" }}>
                   New Event
                 </Button>
@@ -205,7 +205,7 @@ export default class Homepage extends Component {
                           {arr.map(val => (
                             <Card className="col-md-2" border="primary" style={{ opacity: 0.85 }}> <Card.Body>
                               <Card.Title>{val.name}</Card.Title>
-                              <Card.Subtitle className="mb-2 text-muted">Rating: {val.rating} EGP/hour</Card.Subtitle>
+                              <Card.Subtitle className="mb-2 text-muted">Rating: {val.rating} stars</Card.Subtitle>
                               <Card.Subtitle className="mb-2 text-muted">{val.pricePerHour} EGP/hour</Card.Subtitle>
                               <Card.Text>{val.location}</Card.Text>
                             </Card.Body> </Card>)
@@ -245,7 +245,6 @@ export default class Homepage extends Component {
         <Modal
           show={this.state.deletePopup.show}
           onHide={this.closePopup}
-          // size="sm"
           aria-labelledby="contained-modal-title-vcenter"
           centered
         >

From 9f21beda142ec852000ce1400e98f511dde3083a Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Tue, 26 May 2020 23:36:52 +0200
Subject: [PATCH 04/15] minor fixes

---
 client/src/components/Homepage.js | 6 +++---
 client/src/components/NewEvent.js | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Homepage.js b/client/src/components/Homepage.js
index 6a0284f..0132ea4 100644
--- a/client/src/components/Homepage.js
+++ b/client/src/components/Homepage.js
@@ -105,8 +105,9 @@ export default class Homepage extends Component {
 
   render() {
     return (
+      
       <div>
-        <ParticlesBg type="cobweb" bg={true} />
+                <ParticlesBg type="cobweb" bg={true} />
 
         <header>
           <link
@@ -133,7 +134,6 @@ export default class Homepage extends Component {
 
         {this.authorized()
           ? <div>
-            <ParticlesBg type="cobweb" bg={true} />
 
             <div>
               <Navbar bg="primary" variant="dark">
@@ -205,7 +205,7 @@ export default class Homepage extends Component {
                           {arr.map(val => (
                             <Card className="col-md-2" border="primary" style={{ opacity: 0.85 }}> <Card.Body>
                               <Card.Title>{val.name}</Card.Title>
-                              <Card.Subtitle className="mb-2 text-muted">Rating: {val.rating} stars</Card.Subtitle>
+                              <Card.Subtitle className="mb-2 text-muted">{val.rating} stars</Card.Subtitle>
                               <Card.Subtitle className="mb-2 text-muted">{val.pricePerHour} EGP/hour</Card.Subtitle>
                               <Card.Text>{val.location}</Card.Text>
                             </Card.Body> </Card>)
diff --git a/client/src/components/NewEvent.js b/client/src/components/NewEvent.js
index 41132e4..38dda22 100644
--- a/client/src/components/NewEvent.js
+++ b/client/src/components/NewEvent.js
@@ -94,10 +94,8 @@ export default class Homepage extends Component {
       console.log(item.price)
       price += Math.max(0, Number(item.itemAmount) * item.price)
     })
-    console.log(price)
     this.state.price = price
     this.setState({ ...this.state })
-    console.log(this.state)
   }
 
   submit() {

From a1168632ea38021cf913e4118db665f1ce91c408 Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Tue, 26 May 2020 23:38:22 +0200
Subject: [PATCH 05/15] adding config

---
 .gitignore                  |  1 -
 backend/.gitignore          |  1 -
 backend/config/keys.js      |  6 ++++++
 backend/config/keys_dev.js  |  7 +++++++
 backend/config/keys_prod.js |  6 ++++++
 backend/config/passport.js  | 17 +++++++++++++++++
 6 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 backend/config/keys.js
 create mode 100644 backend/config/keys_dev.js
 create mode 100644 backend/config/keys_prod.js
 create mode 100644 backend/config/passport.js

diff --git a/.gitignore b/.gitignore
index da1d2d3..a9689ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ coverage/*
 coverage/
 /coverage
 .env
-config
\ No newline at end of file
diff --git a/backend/.gitignore b/backend/.gitignore
index da1d2d3..a9689ba 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -5,4 +5,3 @@ coverage/*
 coverage/
 /coverage
 .env
-config
\ No newline at end of file
diff --git a/backend/config/keys.js b/backend/config/keys.js
new file mode 100644
index 0000000..397f9e7
--- /dev/null
+++ b/backend/config/keys.js
@@ -0,0 +1,6 @@
+if (process.env.NODE_ENV === 'production') {
+    module.exports = require('./keys_prod')
+}
+else {
+    module.exports = require('./keys_dev')
+}
\ No newline at end of file
diff --git a/backend/config/keys_dev.js b/backend/config/keys_dev.js
new file mode 100644
index 0000000..6ece7a1
--- /dev/null
+++ b/backend/config/keys_dev.js
@@ -0,0 +1,7 @@
+module.exports = {
+    mongoURI: 'mongodb://koko:wawa@csgo-shard-00-00-w6a6k.mongodb.net:27017,csgo-shard-00-01-w6a6k.mongodb.net:27017,csgo-shard-00-02-w6a6k.mongodb.net:27017/test?ssl=true&replicaSet=CSGO-shard-0&authSource=admin&retryWrites=true&w=majority',
+    secretOrKey: 'verysecretkey',
+    SSK:'sk_test_2rMMQj3EKds9n7m9s7J6MbK4000p0HbQNu',
+    Email:'csgo.oza@gmail.com',
+    Pass:'kokowawa'
+}
\ No newline at end of file
diff --git a/backend/config/keys_prod.js b/backend/config/keys_prod.js
new file mode 100644
index 0000000..28ec09f
--- /dev/null
+++ b/backend/config/keys_prod.js
@@ -0,0 +1,6 @@
+module.exports = {
+    mongoURI: process.env.MONGO_URI,
+    SSK:(process.env.STRIPE_SECRET_KEY),
+    Email:(process.env.Email),
+    Pass:(process.env.Pass)
+}
\ No newline at end of file
diff --git a/backend/config/passport.js b/backend/config/passport.js
new file mode 100644
index 0000000..b3c6b59
--- /dev/null
+++ b/backend/config/passport.js
@@ -0,0 +1,17 @@
+const JwtStrategy = require('passport-jwt').Strategy
+ const ExtractJwt = require('passport-jwt').ExtractJwt
+ const mongoose = require('mongoose')
+ const User = mongoose.model('users')
+ const tokenKey = require('./keys').secretOrKey
+  
+ let opts = {};
+ opts.jwtFromRequest = ExtractJwt.fromAuthHeaderAsBearerToken()
+ opts.secretOrKey = tokenKey
+
+ module.exports = passport => {
+     passport.use(new JwtStrategy(opts, async (jwt_payload, done) => {
+        const currentUser = await User.findById(jwt_payload.id)
+        if(currentUser) return done(null,currentUser)
+        return done(null,false)
+     }))
+ }
\ No newline at end of file

From deb746e72e5e6cb5159ab2d37e2f4c815ef1aed8 Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Tue, 26 May 2020 23:58:52 +0200
Subject: [PATCH 06/15] Update README.md

---
 README.md | 150 +++++-------------------------------------------------
 1 file changed, 12 insertions(+), 138 deletions(-)

diff --git a/README.md b/README.md
index 550c9f1..5e5eb6b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# CSGO
-Event Planner Application
-
-#How to run ?
+# Event Planner
 
+# Getting Started
+* Clone the repo
+* run <code> npm run setup</code> to download the dependenices of the backend and frontend
 To run the App, follow the following steps:
 1. change the directory to /backend
 2. run the command **node index**
@@ -10,148 +10,22 @@ To run the App, follow the following steps:
 4. change the directory to /client
 5. run the command **npm start**
 
-#Dependencies
-
-To install the dependencies please run **npm i** once backend folder and another in client folder
-Backend Dependencies:
-
-1. Axios
-2. bycrypt
-3. passport
-4. express
-5. nodemailer
-6. stripe
-7. mongoose
-
-Frontend Dependencies:
-
-1. Axios
-2. React libraries
-3. particles-bg
-
-#CONFIG
-
-1) create *config* folder
-2) create 4 files:
-  - keys.js
-  - keys_dev.js
-  - keys_prod.js
-  - passport.js
-  
-Example for *keys.js*:
-
-########################
-
-if (process.env.NODE_ENV === 'production') {
-
-    module.exports = require('./keys_prod')
-    
-}
-
-else {
-
-    module.exports = require('./keys_dev')
-    
-}
-
-########################
-  
-Example for *keys_dev.js*:
-
-########################
-
-module.exports = {
-
-    mongoURI: *The Url extracted from atlas*,
-    
-    secretOrKey: *Any Hashing Key*,
-    
-    SSK: *The Sercret Key extracted from stipe*,
-    
-    Email: *The Gmail used for sending emails*,
-    
-    Pass: *The Gmail Password*
-    
-}
-
-########################
-
-Example for *keys_prod.js*:
-
-########################
-
-module.exports = {
-
-    *Mongo variable used in keys_dev.js*: process.env.MONGO_URI,
-    
-    *Secret key variable used in keys_dev.js*:(process.env.STRIPE_SECRET_KEY),
-    
-    *Email variable used in keys_dev.js*:(process.env.Email),
-    
-    *Password variable used in keys_dev.js*:(process.env.Pass)
-    
-}
-
-########################
-
-Example for *passport.js*:
-
-########################
-
-const JwtStrategy = require('passport-jwt').Strategy
-
- const ExtractJwt = require('passport-jwt').ExtractJwt
- 
- const mongoose = require('mongoose')
- 
- const User = mongoose.model('users')
- 
- const tokenKey = require('./keys').secretOrKey
-  
- let opts = {};
- 
- opts.jwtFromRequest = ExtractJwt.fromAuthHeaderAsBearerToken()
- 
- opts.secretOrKey = tokenKey
-
- module.exports = passport => {
- 
-     passport.use(new JwtStrategy(opts, async (jwt_payload, done) => {
-     
-        const currentUser = await User.findById(jwt_payload.id)
-        
-        if(currentUser) return done(null,currentUser)
-        
-        return done(null,false)
-        
-     }))
-     
- }
- 
-########################
-
-#Docker
-
-
-The Backend and Forntend are Dockerized and can be run through **docker-compose up** but you have to make sure that you have docker installed.
+# Docker
 
-You can also build through **docker-compose build**
 
-You can stop running **docker-compose down**
+* The Backend and Forntend are Dockerized and can be run through **docker-compose up** but you have to make sure that you have docker installed.
 
-The backend runs on port 5000 and the Frontend runs on port 3000
+* You can also build through **docker-compose build**
 
-*docker-compose.yml* runs the two docker files(one for backend and another for frontend)
+* You can stop running **docker-compose down**
 
-The Docker file for backend runs commands **npm i** to install dependencies and **node index** to run the backend in *./Backend* directory
+* The backend runs on port 5000 and the Frontend runs on port 3000
 
-The Docker file for frontend runs commands **npm i** to install dependencies and **npm start** to run the front in *./client* directory
+* *docker-compose.yml* runs the two docker files(one for backend and another for frontend)
 
-#Backing Service
+* The Docker file for backend runs commands **npm i** to install dependencies and **node index** to run the backend in *./Backend* directory
 
-MongoDb: NoSQL Database.
+*The Docker file for frontend runs commands **npm i** to install dependencies and **npm start** to run the front in *./client* directory
 
-Stripe: Online Payment method
 
-Nodemailer: Used for sending emails.
 

From afbb91faf0222ac81e923ef0579144c5706c56be Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 00:00:04 +0200
Subject: [PATCH 07/15] added script to install front and back dependencies at
 once

---
 package.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 580d860..6b2e092 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,11 @@
   "scripts": {
     "server": "nodemon backend/index.js",
     "client": "npm start --prefix client",
-    "dev": "concurrently \"npm run server\" \"npm run client\""
+    "dev": "concurrently \"npm run server\" \"npm run client\"",
+    "installHome": "npm install",
+    "installClient": "npm install --prefix client",
+    "installBack": "npm install --prefix=~/backend",
+    "setup": "concurrently \"npm run installHome\" \"npm run installClient\" \"npm run installBack\""
   },
   "repository": {
     "type": "git",

From a4c764cdda088c4f1f91bebaf37fa5550cc4c03d Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 00:20:26 +0200
Subject: [PATCH 08/15] Update README.md

---
 README.md | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 5e5eb6b..e5c5309 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,25 @@
 # Event Planner
+Create Events with specificed timing, location, catering, and pay for it online.
+
+# Features
+* Create a new Event and specify all the details through the web interface
+* Create a new location (through api)
+* Create a new catering (through api)
 
 # Getting Started
 * Clone the repo
 * run <code> npm run setup</code> to download the dependenices of the backend and frontend
-To run the App, follow the following steps:
-1. change the directory to /backend
-2. run the command **node index**
-3. open another terminal
-4. change the directory to /client
-5. run the command **npm start**
 
-# Docker
+# About the app
+* This app is written using the MERN stack
+* The main components to the app are:
+  * Backend (Database Schema and routes)
+  * Frontend (React Components)
+  * Authentication (using JWT token)
+  * Docker (Explained below)
 
+![](https://i.ibb.co/8BZ31y6/MERN.jpg "Logo Title Text 1")
+# Docker
 
 * The Backend and Forntend are Dockerized and can be run through **docker-compose up** but you have to make sure that you have docker installed.
 
@@ -25,7 +33,9 @@ To run the App, follow the following steps:
 
 * The Docker file for backend runs commands **npm i** to install dependencies and **node index** to run the backend in *./Backend* directory
 
-*The Docker file for frontend runs commands **npm i** to install dependencies and **npm start** to run the front in *./client* directory
-
+* The Docker file for frontend runs commands **npm i** to install dependencies and **npm start** to run the front in *./client* directory
 
+# Furhter Development
+* Create frontend to create new caterings, places
+* Modify the event to model to allow users to be invited and for users to sign up
 

From 68a97a6655dc79a53799c92d82d1ee77cac5f35c Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 00:25:06 +0200
Subject: [PATCH 09/15] Update README.md

---
 README.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e5c5309..bb7d172 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # Event Planner
 Create Events with specificed timing, location, catering, and pay for it online.
 
+![](https://i.ibb.co/G5jJ0JL/Event-Planner.png)
+
 # Features
 * Create a new Event and specify all the details through the web interface
 * Create a new location (through api)
@@ -18,7 +20,7 @@ Create Events with specificed timing, location, catering, and pay for it online.
   * Authentication (using JWT token)
   * Docker (Explained below)
 
-![](https://i.ibb.co/8BZ31y6/MERN.jpg "Logo Title Text 1")
+![](https://i.ibb.co/8BZ31y6/MERN.jpg "MERN Stack")
 # Docker
 
 * The Backend and Forntend are Dockerized and can be run through **docker-compose up** but you have to make sure that you have docker installed.
@@ -35,7 +37,7 @@ Create Events with specificed timing, location, catering, and pay for it online.
 
 * The Docker file for frontend runs commands **npm i** to install dependencies and **npm start** to run the front in *./client* directory
 
-# Furhter Development
-* Create frontend to create new caterings, places
-* Modify the event to model to allow users to be invited and for users to sign up
+# Further Development
+* Create frontend components to allow users to create new caterings and new places
+* Modify the event model to allow users to be invited to events and for users to sign up for events
 

From 765b5f80ff33ca13964345406de87f4ba7cc6d1e Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 00:32:50 +0200
Subject: [PATCH 10/15] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bb7d172..184d922 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
 # Event Planner
 Create Events with specificed timing, location, catering, and pay for it online.
 
-![](https://i.ibb.co/G5jJ0JL/Event-Planner.png)
+![](https://pasteboard.co/JadJ2mz.png)
 
 # Features
 * Create a new Event and specify all the details through the web interface
 * Create a new location (through api)
 * Create a new catering (through api)
+* Pay for any event you created online
 
 # Getting Started
 * Clone the repo

From 3cd51faa083577260d0c1f53e4dfdf34606dbb78 Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 00:34:50 +0200
Subject: [PATCH 11/15] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 184d922..e303615 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Event Planner
 Create Events with specificed timing, location, catering, and pay for it online.
 
-![](https://pasteboard.co/JadJ2mz.png)
+![](https://img.techpowerup.org/200526/event-planner.png)
 
 # Features
 * Create a new Event and specify all the details through the web interface

From ed25434b39c1bd1531b5bc784e51e9587f62ffac Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 00:38:59 +0200
Subject: [PATCH 12/15] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e303615..b712bb1 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ Create Events with specificed timing, location, catering, and pay for it online.
 
 # Features
 * Create a new Event and specify all the details through the web interface
-* Create a new location (through api)
-* Create a new catering (through api)
+* Create a new location (through <code>/api/places</code>)
+* Create a new catering (through <code>/api/caterings</code>)
 * Pay for any event you created online
 
 # Getting Started

From 8b8702bcc55d60bd67d2dece8e409e281479f796 Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 11:38:39 +0200
Subject: [PATCH 13/15] updated run scripts

---
 README.md            |  3 ++-
 backend/package.json |  2 +-
 package.json         | 29 -----------------------------
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 package.json

diff --git a/README.md b/README.md
index b712bb1..9f73c9a 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,8 @@ Create Events with specificed timing, location, catering, and pay for it online.
 
 # Getting Started
 * Clone the repo
-* run <code> npm run setup</code> to download the dependenices of the backend and frontend
+* run <code> npm install</code> once in the **backend* folder, and once in the **client* folder
+* run <code> npm run dev</code> in the **backend* folder to run both the frontend and backend simultaneously 
 
 # About the app
 * This app is written using the MERN stack
diff --git a/backend/package.json b/backend/package.json
index ff3ef40..a4adb1f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "server": "nodemon index.js",
-    "client": "npm start --prefix client",
+    "client": "npm start --prefix=../client",
     "dev": "concurrently \"npm run server\" \"npm run client\""
   },
   "author": "El-Sherif",
diff --git a/package.json b/package.json
deleted file mode 100644
index 6b2e092..0000000
--- a/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "event-planner",
-  "version": "1.0.0",
-  "description": "Event Planner",
-  "main": "backend/index.js",
-  "scripts": {
-    "server": "nodemon backend/index.js",
-    "client": "npm start --prefix client",
-    "dev": "concurrently \"npm run server\" \"npm run client\"",
-    "installHome": "npm install",
-    "installClient": "npm install --prefix client",
-    "installBack": "npm install --prefix=~/backend",
-    "setup": "concurrently \"npm run installHome\" \"npm run installClient\" \"npm run installBack\""
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ZeyadKhattab/Event-Planner.git"
-  },
-  "author": "ZeyadKhattab",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/ZeyadKhattab/Event-Planner/issues"
-  },
-  "homepage": "https://github.com/ZeyadKhattab/Event-Planner#readme",
-  "dependencies": {
-    "concurrently": "^5.0.0",
-    "nodemon": "^1.19.4"
-  }
-}

From 7f0a59bbfef27cc2baa00d1c4595a14ecb1fa28a Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 11:40:14 +0200
Subject: [PATCH 14/15] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9f73c9a..de0637a 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ Create Events with specificed timing, location, catering, and pay for it online.
 
 # Getting Started
 * Clone the repo
-* run <code> npm install</code> once in the **backend* folder, and once in the **client* folder
-* run <code> npm run dev</code> in the **backend* folder to run both the frontend and backend simultaneously 
+* Run <code> npm install</code> once in the *backend* folder, and once in the *client* folder
+* Run <code> npm run dev</code> in the *backend* folder to run both the frontend and backend simultaneously 
 
 # About the app
 * This app is written using the MERN stack

From 5fa643d23844aca8ae7f3c92747b7609ef8e8e9e Mon Sep 17 00:00:00 2001
From: Zeyad Khattab <41998602+ZeyadKhattab@users.noreply.github.com>
Date: Wed, 27 May 2020 12:00:39 +0200
Subject: [PATCH 15/15] typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index de0637a..c70ae86 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Event Planner
-Create Events with specificed timing, location, catering, and pay for it online.
+Create Events with specified timing, location, catering, and pay for it online.
 
 ![](https://img.techpowerup.org/200526/event-planner.png)