Add declined and accepted events sorted

README.md

@@ -440,6 +440,86 @@ The response will then look like this:
 The error codes are as follows, `1` indicates an invalid auth code and `2`
 indicates a malformed request.
 
+### /events/accepted/
+To get a users accepted events, a `GET` request should be sent with the following
+data:
+```javascript
+{
+    "auth": "$2a$10$qjkvbcPZ4YC7/a/I0ZpTaeJp6auXjGrG9pgAdI3PP61u4CftQPSL2"
+}
+```
+The response will then look like this:
+```javascript
+{
+    "accepted_events": [
+        {
+            "name": "Super Mario Kart Party 5",
+            "location": "Marioland",
+            "society": "testsociety",
+            "start": "14605026110490",
+            "end": "14605026110500",
+            "details": "Play some Mario Kart with us",
+            "organiser": "test1",
+            "id": "851133039"
+        },
+        {
+            "name": "Super Mario Kart Party 6",
+            "location": "Marioland",
+            "society": "testsociety",
+            "start": "14605026110490",
+            "end": "14605026110500",
+            "details": "Play some Mario Kart with us",
+            "organiser": "test1",
+            "id": "838450388"
+        },
+        { ... }
+    ],
+    "error": 0
+}
+```
+The error codes are as follows, `1` indicates an invalid auth code and `2`
+indicates a malformed request.
+
+### /events/declined/
+To get a users declined events, a `GET` request should be sent with the following
+data:
+```javascript
+{
+    "auth": "$2a$10$qjkvbcPZ4YC7/a/I0ZpTaeJp6auXjGrG9pgAdI3PP61u4CftQPSL2"
+}
+```
+The response will then look like this:
+```javascript
+{
+    "declined_events": [
+        {
+            "name": "Super Mario Kart Party 5",
+            "location": "Marioland",
+            "society": "testsociety",
+            "start": "14605026110490",
+            "end": "14605026110500",
+            "details": "Play some Mario Kart with us",
+            "organiser": "test1",
+            "id": "851133039"
+        },
+        {
+            "name": "Super Mario Kart Party 6",
+            "location": "Marioland",
+            "society": "testsociety",
+            "start": "14605026110490",
+            "end": "14605026110500",
+            "details": "Play some Mario Kart with us",
+            "organiser": "test1",
+            "id": "838450388"
+        },
+        { ... }
+    ],
+    "error": 0
+}
+```
+The error codes are as follows, `1` indicates an invalid auth code and `2`
+indicates a malformed request.
+
 ### /events/accept/:eventid
 To accept an event, a `POST` request should be sent with the following data:
 ```javascript

index.js

@@ -22,20 +22,6 @@ app.listen(3000, function () {
     console.log('Example app listening on port 3000!');
 });
 
-https.createServer({
-   key: prkey,
-   cert: certi
-}, app).listen(3000, function() {
-  console.log("App listening for HTTPS connections on port 3000!");
-});
-
-https.createServer({
-   key: prkey,
-   cert: certi
-}, app).listen(443, function() {
-  console.log("App listening for HTTPS connections on port 3000!");
-});
-
 process.on('SIGINT', function() {
   console.log( "\nRecieved Ctrl-C, shutting down." );
   process.exit(0);

presenters/event-controller.js

@@ -253,7 +253,7 @@ module.exports = {
     user_controller.get_user_from_auth(auth, function (username) {
       if (username) {
         user_controller.get_public_user_info(username, function (data) {
-          var accepted_events = data.accepted_events;
+          var accepted_events = data.user.accepted_events;
           var accepted_events_objs = [];
           accepted_events.map(function (event_id) {
             self.get_event(event_id, "", function (response) {
@@ -282,7 +282,7 @@ module.exports = {
     user_controller.get_user_from_auth(auth, function (username) {
       if (username) {
         user_controller.get_public_user_info(username, function (data) {
-          var declined_events = data.declined_events;
+          var declined_events = data.user.declined_events;
           var declined_events_objs = [];
           declined_events.map(function (event_id) {
             self.get_event(event_id, "", function (response) {

utils/route-manager.js

@@ -13,6 +13,8 @@ var soc_events = require("../routes/events/view-all-society-events.js");
 var event_create = require("../routes/events/create-society-event.js");
 var event_view = require("../routes/events/view-society-events.js");
 var event_pending = require("../routes/events/view-pending-events.js");
+var event_accepted = require("../routes/events/view-accepted-events.js");
+var event_declined = require("../routes/events/view-declined-events.js");
 var event_accept = require("../routes/events/accept-event.js");
 var event_decline = require("../routes/events/decline-event.js");
 var friend_add = require("../routes/friends/add-friend.js");
@@ -36,6 +38,8 @@ router.all('/society/promote/', soc_promote.perform);
 router.all('/events/create/', event_create.perform);
 router.all('/events/view/:eventid', event_view.perform);
 router.all('/events/pending/', event_pending.perform);
+router.all('/events/accepted/', event_accepted.perform);
+router.all('/events/declined/', event_declined.perform);
 router.all('/events/accept/:eventid', event_accept.perform);
 router.all('/events/decline/:eventid', event_decline.perform);