api commit

Author: bassem-shoukry

.idea/OAuth2.0.iml

@@ -1 +1 @@
-1.5:3e0ab3e6-b921-47c3-8dd8-0b40624f2bf1
+1.5:b9cb8e46-52f3-4a53-8670-fb7c998fd4ab

.idea/misc.xml

@@ -1 +1 @@
-1569168461
+1569480829

.vagrant/machines/default/virtualbox/action_provision

@@ -1 +1 @@
-1000
+0

.vagrant/machines/default/virtualbox/action_set_name

@@ -1 +1 @@
-3e0ab3e6-b921-47c3-8dd8-0b40624f2bf1
+b9cb8e46-52f3-4a53-8670-fb7c998fd4ab

.vagrant/machines/default/virtualbox/creator_uid

@@ -1 +1 @@
-c464abb2de7e4768b716e49fea041068
+8d957560a4e243bb8b81bf95ff1eea0c

.vagrant/machines/default/virtualbox/id

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

.vagrant/machines/default/virtualbox/index_uuid

@@ -1 +1 @@
-{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/home/basem/fullstack-nanodegree-vm/vagrant/OAuth2.0","disabled":false,"__vagrantfile":true}}}
+{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"C:/Users/Basem/code/oauth","disabled":false,"__vagrantfile":true}}}

.vagrant/machines/default/virtualbox/private_key

@@ -1 +1 @@
-/home/basem/fullstack-nanodegree-vm/vagrant/OAuth2.0
+C:/Users/Basem/code/oauth

.vagrant/machines/default/virtualbox/synced_folders

@@ -0,0 +1,27 @@
+#THIS IS A WEBSERVER FOR DEMONSTRATING THE TYPES OF RESPONSES WE SEE FROM AN API ENDPOINT
+from flask import Flask
+app = Flask(__name__)
+
+#GET REQUEST
+
+@app.route('/readHello')
+def getRequestHello():
+    return "Hi, I got your GET Request!"
+
+#POST REQUEST
+@app.route('/createHello', methods = ['POST'])
+def postRequestHello():
+    return "I see you sent a POST message :-)"
+#UPDATE REQUEST
+@app.route('/updateHello', methods = ['PUT'])
+def updateRequestHello():
+    return "Sending Hello on an PUT request!"
+
+#DELETE REQUEST
+@app.route('/deleteHello', methods = ['DELETE'])
+def deleteRequestHello():
+    return "Deleting your hard drive.....haha just kidding! I received a DELETE request!"
+
+if __name__ == '__main__':
+    app.debug = True
+    app.run(host='0.0.0.0', port=5000,threaded=False)

.vagrant/machines/default/virtualbox/vagrant_cwd

@@ -0,0 +1,6 @@
+{
+  "web": {
+    "app_id": "564914114313490",
+    "app_secret": "8fa09deac0f046f599a091c38016b5c6"
+  }
+}

api_server.py

@@ -27,16 +27,6 @@
 APPLICATION_NAME = "Restaurant Menu Application"
 
 
-# Create anti-forgery state token
-@app.route('/login')
-def showLogin():
-    state = ''.join(random.choice(string.ascii_uppercase + string.digits)
-                    for x in xrange(32))
-    login_session['state'] = state
-    # return "The current session state is %s" % login_session['state']
-    return render_template('login.html', STATE=state)
-
-
 @app.route('/gconnect', methods=['POST'])
 def gconnect():
     # Validate state token
@@ -109,6 +99,11 @@ def gconnect():
     login_session['picture'] = data['picture']
     login_session['email'] = data['email']
 
+    user_id = getUserID(login_session['email'])
+    if not user_id :
+        user_id = createUser(login_session)
+    login_session['user_id'] = user_id
+
     output = ''
     output += '<h1>Welcome, '
     output += login_session['username']
@@ -122,6 +117,39 @@ def gconnect():
     return output
 
 
+# Create anti-forgery state token
+@app.route('/login')
+def showLogin():
+    state = ''.join(random.choice(string.ascii_uppercase + string.digits)
+                    for x in xrange(32))
+    login_session['state'] = state
+    # return "The current session state is %s" % login_session['state']
+    return render_template('login.html', STATE=state)
+
+
+
+def createUser(login_session):
+    newUser = User(name=login_session['username'], email=login_session[
+                   'email'], picture=login_session['picture'])
+    session.add(newUser)
+    session.commit()
+    user = session.query(User).filter_by(email=login_session['email']).one()
+    return user.id
+
+
+def getUserInfo(user_id):
+    user = session.query(User).filter_by(id=user_id).one()
+    return user
+
+
+def getUserID(email):
+    try:
+        user = session.query(User).filter_by(email=email).one()
+        return user.id
+    except:
+        return None
+
+
 @app.route('/gdisconnect')
 def gdisconnect():
     access_token = login_session.get('access_token')
@@ -188,7 +216,7 @@ def showRestaurants():
 @app.route('/restaurant/new/', methods=['GET', 'POST'])
 def newRestaurant():
     if request.method == 'POST':
-        newRestaurant = Restaurant(name=request.form['name'])
+        newRestaurant = Restaurant(name=request.form['name'],user_id=login_session['user_id'])
         session.add(newRestaurant)
         flash('New Restaurant %s Successfully Created' % newRestaurant.name)
         session.commit()
@@ -236,7 +264,17 @@ def showMenu(restaurant_id):
     restaurant = session.query(Restaurant).filter_by(id=restaurant_id).one()
     items = session.query(MenuItem).filter_by(
         restaurant_id=restaurant_id).all()
-    return render_template('menu.html', items=items, restaurant=restaurant)
+
+    creator = getUserInfo(login_session['user_id'])
+
+    if creator.id == restaurant.user_id:
+        # return True
+        return render_template('menu.html', items=items, restaurant=restaurant, creator=creator)
+
+    creator = getUserInfo(restaurant.user_id)
+
+    return render_template('publicmenu.html', items=items, restaurant=restaurant, creator=creator)
+
 
 
 # Create a new menu item
@@ -245,10 +283,10 @@ def newMenuItem(restaurant_id):
     restaurant = session.query(Restaurant).filter_by(id=restaurant_id).one()
     if request.method == 'POST':
         newItem = MenuItem(name=request.form['name'], description=request.form[
-            'description'], price=request.form['price'], course=request.form['course'], restaurant_id=restaurant_id)
+            'description'], price=request.form['price'], course=request.form['course'], restaurant_id=restaurant_id,user_id=login_session['user_id'])
         session.add(newItem)
         session.commit()
-        flash('New Menu %s Item Successfully Created' % (newItem.name))
+        flash('New Menu %s Item Successfully Created' % newItem.name)
         return redirect(url_for('showMenu', restaurant_id=restaurant_id))
     else:
         return render_template('newmenuitem.html', restaurant_id=restaurant_id)
@@ -281,7 +319,6 @@ def editMenuItem(restaurant_id, menu_id):
 # Delete a menu item
 @app.route('/restaurant/<int:restaurant_id>/menu/<int:menu_id>/delete', methods=['GET', 'POST'])
 def deleteMenuItem(restaurant_id, menu_id):
-    restaurant = session.query(Restaurant).filter_by(id=restaurant_id).one()
     itemToDelete = session.query(MenuItem).filter_by(id=menu_id).one()
     if request.method == 'POST':
         session.delete(itemToDelete)
@@ -292,13 +329,7 @@ def deleteMenuItem(restaurant_id, menu_id):
         return render_template('deleteMenuItem.html', item=itemToDelete)
 
 
-def CreateUser(login_session):
-    new_user = User(name=login_session['username'], email=login_session['email'], picture=login_session['picture'])
-    session.add(new_user)
-    session.commit()
-
-
 if __name__ == '__main__':
     app.secret_key = 'super_secret_key'
     app.debug = True
-    app.run(host='0.0.0.0', port=5000)
+    app.run(host='0.0.0.0', port=5000,threaded=False)