fix merge conflict

backend/api/games.js

@@ -34,5 +34,40 @@ router.get("/", (req, res) => {
   );
 });
 
+router.get("/gamename/:gameid", (req, res) => {
+  // Connect to database
+  MongoClient.connect(
+    connectionUrl,
+    { useNewUrlParser: true, useUnifiedTopology: true },
+    (err, client) => {
+      // Unable to connect to database
+      if (err) {
+        res.sendStatus(500); // Internal server error
+        return;
+      }
+
+      // Using the database gameWare and collection games
+      const db = client.db("gameWare");
+      const collection = "games";
+
+      const id = mongo.ObjectId(req.params.gameid);
+
+      db.collection(collection)
+        .find({
+          _id: id
+        })
+        .project({ name: 1 })
+        .toArray((err, result) => {
+          if (err) {
+            res.sendStatus(500);
+            //console.log(err);
+            return;
+          }
+          res.json(result);
+        });
+    }
+  );
+});
+
 // Export API routes
 module.exports = router;

backend/api/highscores.js

@@ -37,11 +37,19 @@ router.get("/gamescore/:userid/:gameid", (req, res) => {
   );
 });
 
+<<<<<<< HEAD
 router.post("/highscore", (req, res) => {
   MongoClient.connect(
     connectionUrl,
     { useNewUrlParser: true, useUnifiedTopology: true },
     (err, client) => {
+=======
+router.post("/highscore/:userid/:gameid/:score", (req, res) => {
+  MongoClient.connect(
+    connectionUrl,
+    { useNewUrlParser: true, useUnifiedTopology: true },
+    async (err, client) => {
+>>>>>>> 4e2462fe51615bf8aa1aed7144654cf98a918327
       // Unable to connect to database
       if (err) {
         res.sendStatus(500); // Internal server error
@@ -51,6 +59,7 @@ router.post("/highscore", (req, res) => {
       const db = client.db("gameWare");
       const collection = "highscores";
 
+<<<<<<< HEAD
       db.collection(collection).updateOne(
         {
           gameid: req.body.gameid,
@@ -66,6 +75,44 @@ router.post("/highscore", (req, res) => {
           res.json(result);
         }
       );
+=======
+      const queryresult = await db.collection(collection).findOne({
+        gameid: req.params.gameid,
+        userid: req.params.userid
+      });
+
+      if (queryresult) {
+        db.collection(collection).updateOne(
+          {
+            gameid: req.params.gameid,
+            userid: req.params.userid
+          },
+          { $set: { value: parseInt(req.params.score) } },
+          (err, result) => {
+            if (err) {
+              res.sendStatus(500); // Internal server error
+              return;
+            }
+            res.json(result);
+          }
+        );
+      } else {
+        db.collection(collection).insertOne(
+          {
+            gameid: req.params.gameid,
+            userid: req.params.userid,
+            value: parseInt(req.params.score)
+          },
+          (err, result) => {
+            if (err) {
+              res.sendStatus(500); // Internal server error
+              return;
+            }
+            res.json(result);
+          }
+        );
+      }
+>>>>>>> 4e2462fe51615bf8aa1aed7144654cf98a918327
     }
   );
 });

backend/api/players.js

+const express = require("express");
+const router = express.Router();
+const mongo = require("mongodb");
+const MongoClient = mongo.MongoClient;
+const connectionUrl = process.env.MONGO_CONNECTION_STRING;
+
+router.get("/username/:userid", (req, res) => {
+  // Connect to database
+  MongoClient.connect(
+    connectionUrl,
+    { useNewUrlParser: true, useUnifiedTopology: true },
+    (err, client) => {
+      // Unable to connect to database
+      if (err) {
+        res.sendStatus(500); // Internal server error
+        return;
+      }
+
+      // Using the database gameWare and collection games
+      const db = client.db("gameWare");
+      const collection = "players";
+
+      const id = mongo.ObjectId(req.params.userid);
+
+      db.collection(collection)
+        .find({
+          _id: id
+        })
+        .project({ name: 1 })
+        .toArray((err, result) => {
+          if (err) {
+            res.sendStatus(500);
+            //console.log(err);
+            return;
+          }
+          res.json(result);
+        });
+    }
+  );
+});
+
+// Export API routes
+module.exports = router;

backend/api/tournament.js

@@ -3,7 +3,7 @@ const router = express.Router();
 const mongo = require("mongodb");
 const MongoClient = mongo.MongoClient;
 const connectionUrl = process.env.MONGO_CONNECTION_STRING;
-
+/*
 router.post("/new/:host/:games/:name/:tpr/:players/:rpg", (req, res) => {
   MongoClient.connect(
     connectionUrl,
@@ -48,4 +48,4 @@ router.post("/new/:host/:games/:name/:tpr/:players/:rpg", (req, res) => {
       )
     }
   );
-});
+});*/

backend/index.js

@@ -10,7 +10,10 @@ app.use(cors());
 app.use(bodyParser.json());
 app.disable("x-powered-by"); // Minium security
 
-app.use("/api/games", require("./api/games")); // Use games.js for route /api/movies
+app.use("/api/games", require("./api/games")); // Use games.js for route /api/games
+app.use("/api/highscores", require("./api/highscores"));
+app.use("/api/players", require("./api/players"));
+//app.use("/api/tournament", require("./api/tournament"));
 
 // Default route
 app.get("/api", (req, res) => {
@@ -23,4 +26,5 @@ app.get("/api", (req, res) => {
 app.listen(port, () => {
   // Start server on port
   console.log("Running express on port " + port);
+  console.log("Mongo Connection: " + process.env.MONGO_CONNECTION_STRING);
 });

frontend/core/src/com/gameware/game/sprites/Sprite.java

+package com.gameware.game.sprites;
+
+import com.badlogic.gdx.math.Vector2;
+
+public abstract class Sprite {
+
+    private Vector3 position;
+    private int width;
+    private int height;
+    private Object bounds;
+
+    public abstract void reset();
+    public abstract Object report();
+
+    public abstract void draw();
+    public abstract void update();
+    public abstract void dispose();
+
+}
\ No newline at end of file