Skip to content

Commit

Permalink
project 2 submission :)
Browse files Browse the repository at this point in the history
  • Loading branch information
havron committed Sep 21, 2016
1 parent fe691db commit 4f2b402
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Market, Project 2 Submission
A marketplace based on a reputation block-chain. Project 2 Submission
See [api-posts.py](api-posts.py) for making easy create and update post
See [api-posts.py](api-posts.py) for calling create and update post
requests (email us if you encounter issues, or make POST requests in some other
manner).
8 changes: 6 additions & 2 deletions api-posts.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,9 @@ def updateDrone(model_name, drone_desc, demo_link, permissions, owner_email,
#available_for_hire = models.BooleanField()

###### MAKE POST REQUEST CALLS HERE ######################
makeNewDrone("6oreo", "black and white, best drone ever", "http://www.2sly4u.com", "can do everything",
"[email protected]", "datetime.date.today().isoformat()", 56.6, "ready to roll", True)
makeNewDrone("awesome drone name", "black and white, best drone ever", "http://www.2sly4u.com", "can do everything",
"[email protected]", "the date! just a string for now", 56.6, "ready to roll", True)


### make calls to the other methods for simple POST request management : the fields are
# all strings at the moment, so you can fill them with dummy values.
2 changes: 1 addition & 1 deletion db.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"fields": {"model": "logentry", "app_label": "admin"}, "model": "contenttypes.contenttype", "pk": 1}, {"fields": {"model": "permission", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 2}, {"fields": {"model": "group", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 3}, {"fields": {"model": "user", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 4}, {"fields": {"model": "contenttype", "app_label": "contenttypes"}, "model": "contenttypes.contenttype", "pk": 5}, {"fields": {"model": "session", "app_label": "sessions"}, "model": "contenttypes.contenttype", "pk": 6}, {"fields": {"model": "user", "app_label": "webapp"}, "model": "contenttypes.contenttype", "pk": 7}, {"fields": {"model": "message", "app_label": "postman"}, "model": "contenttypes.contenttype", "pk": 8}, {"fields": {"model": "pendingmessage", "app_label": "postman"}, "model": "contenttypes.contenttype", "pk": 9}, {"fields": {"model": "drone", "app_label": "webapp"}, "model": "contenttypes.contenttype", "pk": 10}, {"fields": {"email_address": "[email protected]", "password": "lol", "username": "acjhad"}, "model": "webapp.user", "pk": 18}, {"fields": {"email_address": "[email protected]", "password": "rlol", "username": "new"}, "model": "webapp.user", "pk": 19}, {"fields": {"last_checked_out": "2016-09-20 00:00:00.000000", "battery_level": 56.6, "available_for_hire": true, "drone_desc": "black and white, best drone ever", "demo_link": "http://www.2sly4u.com", "permissions": "can do everything", "maintenance_status": "ready to roll", "model_name": "3oreo", "owner_email": "[email protected]"}, "model": "webapp.drone", "pk": 1}, {"fields": {"last_checked_out": "2016-09-20 00:00:00.000000", "battery_level": 56.6, "available_for_hire": true, "drone_desc": "black and white, best drone ever", "demo_link": "http://www.2sly4u.com", "permissions": "can do everything", "maintenance_status": "ready to roll", "model_name": "5oreo", "owner_email": "[email protected]"}, "model": "webapp.drone", "pk": 2}, {"fields": {"last_checked_out": "datetime.date.today().isoformat()", "battery_level": 56.6, "available_for_hire": true, "drone_desc": "black and white, best drone ever", "demo_link": "http://www.2sly4u.com", "permissions": "can do everything", "maintenance_status": "ready to roll", "model_name": "5oreo", "owner_email": "[email protected]"}, "model": "webapp.drone", "pk": 3}, {"fields": {"content_type": 1, "codename": "add_logentry", "name": "Can add log entry"}, "model": "auth.permission", "pk": 1}, {"fields": {"content_type": 1, "codename": "change_logentry", "name": "Can change log entry"}, "model": "auth.permission", "pk": 2}, {"fields": {"content_type": 1, "codename": "delete_logentry", "name": "Can delete log entry"}, "model": "auth.permission", "pk": 3}, {"fields": {"content_type": 2, "codename": "add_permission", "name": "Can add permission"}, "model": "auth.permission", "pk": 4}, {"fields": {"content_type": 2, "codename": "change_permission", "name": "Can change permission"}, "model": "auth.permission", "pk": 5}, {"fields": {"content_type": 2, "codename": "delete_permission", "name": "Can delete permission"}, "model": "auth.permission", "pk": 6}, {"fields": {"content_type": 3, "codename": "add_group", "name": "Can add group"}, "model": "auth.permission", "pk": 7}, {"fields": {"content_type": 3, "codename": "change_group", "name": "Can change group"}, "model": "auth.permission", "pk": 8}, {"fields": {"content_type": 3, "codename": "delete_group", "name": "Can delete group"}, "model": "auth.permission", "pk": 9}, {"fields": {"content_type": 4, "codename": "add_user", "name": "Can add user"}, "model": "auth.permission", "pk": 10}, {"fields": {"content_type": 4, "codename": "change_user", "name": "Can change user"}, "model": "auth.permission", "pk": 11}, {"fields": {"content_type": 4, "codename": "delete_user", "name": "Can delete user"}, "model": "auth.permission", "pk": 12}, {"fields": {"content_type": 5, "codename": "add_contenttype", "name": "Can add content type"}, "model": "auth.permission", "pk": 13}, {"fields": {"content_type": 5, "codename": "change_contenttype", "name": "Can change content type"}, "model": "auth.permission", "pk": 14}, {"fields": {"content_type": 5, "codename": "delete_contenttype", "name": "Can delete content type"}, "model": "auth.permission", "pk": 15}, {"fields": {"content_type": 6, "codename": "add_session", "name": "Can add session"}, "model": "auth.permission", "pk": 16}, {"fields": {"content_type": 6, "codename": "change_session", "name": "Can change session"}, "model": "auth.permission", "pk": 17}, {"fields": {"content_type": 6, "codename": "delete_session", "name": "Can delete session"}, "model": "auth.permission", "pk": 18}, {"fields": {"content_type": 7, "codename": "add_user", "name": "Can add user"}, "model": "auth.permission", "pk": 19}, {"fields": {"content_type": 7, "codename": "change_user", "name": "Can change user"}, "model": "auth.permission", "pk": 20}, {"fields": {"content_type": 7, "codename": "delete_user", "name": "Can delete user"}, "model": "auth.permission", "pk": 21}, {"fields": {"content_type": 8, "codename": "add_message", "name": "Can add message"}, "model": "auth.permission", "pk": 22}, {"fields": {"content_type": 8, "codename": "change_message", "name": "Can change message"}, "model": "auth.permission", "pk": 23}, {"fields": {"content_type": 8, "codename": "delete_message", "name": "Can delete message"}, "model": "auth.permission", "pk": 24}, {"fields": {"content_type": 8, "codename": "add_pendingmessage", "name": "Can add pending message"}, "model": "auth.permission", "pk": 25}, {"fields": {"content_type": 8, "codename": "change_pendingmessage", "name": "Can change pending message"}, "model": "auth.permission", "pk": 26}, {"fields": {"content_type": 8, "codename": "delete_pendingmessage", "name": "Can delete pending message"}, "model": "auth.permission", "pk": 27}, {"fields": {"content_type": 10, "codename": "add_drone", "name": "Can add drone"}, "model": "auth.permission", "pk": 28}, {"fields": {"content_type": 10, "codename": "change_drone", "name": "Can change drone"}, "model": "auth.permission", "pk": 29}, {"fields": {"content_type": 10, "codename": "delete_drone", "name": "Can delete drone"}, "model": "auth.permission", "pk": 30}]
[{"fields": {"model": "logentry", "app_label": "admin"}, "model": "contenttypes.contenttype", "pk": 1}, {"fields": {"model": "permission", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 2}, {"fields": {"model": "group", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 3}, {"fields": {"model": "user", "app_label": "auth"}, "model": "contenttypes.contenttype", "pk": 4}, {"fields": {"model": "contenttype", "app_label": "contenttypes"}, "model": "contenttypes.contenttype", "pk": 5}, {"fields": {"model": "session", "app_label": "sessions"}, "model": "contenttypes.contenttype", "pk": 6}, {"fields": {"model": "user", "app_label": "webapp"}, "model": "contenttypes.contenttype", "pk": 7}, {"fields": {"model": "message", "app_label": "postman"}, "model": "contenttypes.contenttype", "pk": 8}, {"fields": {"model": "pendingmessage", "app_label": "postman"}, "model": "contenttypes.contenttype", "pk": 9}, {"fields": {"model": "drone", "app_label": "webapp"}, "model": "contenttypes.contenttype", "pk": 10}, {"fields": {"username": "acjhad", "password": "lol", "email_address": "[email protected]"}, "model": "webapp.user", "pk": 18}, {"fields": {"username": "new", "password": "rlol", "email_address": "[email protected]"}, "model": "webapp.user", "pk": 19}, {"fields": {"owner_email": "[email protected]", "battery_level": 56.6, "maintenance_status": "ready to roll", "drone_desc": "black and white, best drone ever", "demo_link": "http://www.2sly4u.com", "last_checked_out": "2016-09-20 00:00:00.000000", "model_name": "3oreo", "available_for_hire": true, "permissions": "can do everything"}, "model": "webapp.drone", "pk": 1}, {"fields": {"owner_email": "[email protected]", "battery_level": 56.6, "maintenance_status": "ready to roll", "drone_desc": "black and white, best drone ever", "demo_link": "http://www.2sly4u.com", "last_checked_out": "2016-09-20 00:00:00.000000", "model_name": "5oreo", "available_for_hire": true, "permissions": "can do everything"}, "model": "webapp.drone", "pk": 2}, {"fields": {"owner_email": "[email protected]", "battery_level": 56.6, "maintenance_status": "ready to roll", "drone_desc": "black and white, best drone ever", "demo_link": "http://www.2sly4u.com", "last_checked_out": "datetime.date.today().isoformat()", "model_name": "5oreo", "available_for_hire": true, "permissions": "can do everything"}, "model": "webapp.drone", "pk": 3}, {"fields": {"owner_email": "[email protected]", "battery_level": 56.6, "maintenance_status": "ready to roll", "drone_desc": "black and white, best drone ever", "demo_link": "http://www.2sly4u.com", "last_checked_out": "datetime.date.today().isoformat()", "model_name": "6oreo", "available_for_hire": true, "permissions": "can do everything"}, "model": "webapp.drone", "pk": 4}, {"fields": {"owner_email": "[email protected]", "battery_level": 56.6, "maintenance_status": "ready to roll", "drone_desc": "black and white, best drone ever", "demo_link": "http://www.2sly4u.com", "last_checked_out": "the date! just a string for now", "model_name": "awesome drone name", "available_for_hire": true, "permissions": "can do everything"}, "model": "webapp.drone", "pk": 5}, {"fields": {"content_type": 1, "name": "Can add log entry", "codename": "add_logentry"}, "model": "auth.permission", "pk": 1}, {"fields": {"content_type": 1, "name": "Can change log entry", "codename": "change_logentry"}, "model": "auth.permission", "pk": 2}, {"fields": {"content_type": 1, "name": "Can delete log entry", "codename": "delete_logentry"}, "model": "auth.permission", "pk": 3}, {"fields": {"content_type": 2, "name": "Can add permission", "codename": "add_permission"}, "model": "auth.permission", "pk": 4}, {"fields": {"content_type": 2, "name": "Can change permission", "codename": "change_permission"}, "model": "auth.permission", "pk": 5}, {"fields": {"content_type": 2, "name": "Can delete permission", "codename": "delete_permission"}, "model": "auth.permission", "pk": 6}, {"fields": {"content_type": 3, "name": "Can add group", "codename": "add_group"}, "model": "auth.permission", "pk": 7}, {"fields": {"content_type": 3, "name": "Can change group", "codename": "change_group"}, "model": "auth.permission", "pk": 8}, {"fields": {"content_type": 3, "name": "Can delete group", "codename": "delete_group"}, "model": "auth.permission", "pk": 9}, {"fields": {"content_type": 4, "name": "Can add user", "codename": "add_user"}, "model": "auth.permission", "pk": 10}, {"fields": {"content_type": 4, "name": "Can change user", "codename": "change_user"}, "model": "auth.permission", "pk": 11}, {"fields": {"content_type": 4, "name": "Can delete user", "codename": "delete_user"}, "model": "auth.permission", "pk": 12}, {"fields": {"content_type": 5, "name": "Can add content type", "codename": "add_contenttype"}, "model": "auth.permission", "pk": 13}, {"fields": {"content_type": 5, "name": "Can change content type", "codename": "change_contenttype"}, "model": "auth.permission", "pk": 14}, {"fields": {"content_type": 5, "name": "Can delete content type", "codename": "delete_contenttype"}, "model": "auth.permission", "pk": 15}, {"fields": {"content_type": 6, "name": "Can add session", "codename": "add_session"}, "model": "auth.permission", "pk": 16}, {"fields": {"content_type": 6, "name": "Can change session", "codename": "change_session"}, "model": "auth.permission", "pk": 17}, {"fields": {"content_type": 6, "name": "Can delete session", "codename": "delete_session"}, "model": "auth.permission", "pk": 18}, {"fields": {"content_type": 7, "name": "Can add user", "codename": "add_user"}, "model": "auth.permission", "pk": 19}, {"fields": {"content_type": 7, "name": "Can change user", "codename": "change_user"}, "model": "auth.permission", "pk": 20}, {"fields": {"content_type": 7, "name": "Can delete user", "codename": "delete_user"}, "model": "auth.permission", "pk": 21}, {"fields": {"content_type": 8, "name": "Can add message", "codename": "add_message"}, "model": "auth.permission", "pk": 22}, {"fields": {"content_type": 8, "name": "Can change message", "codename": "change_message"}, "model": "auth.permission", "pk": 23}, {"fields": {"content_type": 8, "name": "Can delete message", "codename": "delete_message"}, "model": "auth.permission", "pk": 24}, {"fields": {"content_type": 8, "name": "Can add pending message", "codename": "add_pendingmessage"}, "model": "auth.permission", "pk": 25}, {"fields": {"content_type": 8, "name": "Can change pending message", "codename": "change_pendingmessage"}, "model": "auth.permission", "pk": 26}, {"fields": {"content_type": 8, "name": "Can delete pending message", "codename": "delete_pendingmessage"}, "model": "auth.permission", "pk": 27}, {"fields": {"content_type": 10, "name": "Can add drone", "codename": "add_drone"}, "model": "auth.permission", "pk": 28}, {"fields": {"content_type": 10, "name": "Can change drone", "codename": "change_drone"}, "model": "auth.permission", "pk": 29}, {"fields": {"content_type": 10, "name": "Can delete drone", "codename": "delete_drone"}, "model": "auth.permission", "pk": 30}]
Empty file removed err.html
Empty file.
1 change: 0 additions & 1 deletion get-err.html

This file was deleted.

0 comments on commit 4f2b402

Please sign in to comment.