Post Semester

.gitignore

@@ -1,7 +1,9 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
+node_modules
 client/node_modules
+api/node_modules
 client/.pnp
 client/.pnp.js
 
@@ -21,3 +23,5 @@ client/.env.production.local
 client/npm-debug.log*
 client/yarn-debug.log*
 client/yarn-error.log*
+.env
+

README.md

@@ -1,32 +0,0 @@
-# mern-tailwind-vivid-starter
-A repository of Snackmatch App files
-
-# Getting Started
-This repository contains both an Express backend (within api) and a React frontend (within client). To get started, clone the repository. Navigate to your terminal and execute the following command.
-
-```bash
-git clone https://github.com/vivid-labs/mern-tailwind-vivid-starter.git
-```
-In order to have a fully functional web app, you'll need to run both the frontend and the backend simultaneously. 
-## Starting the frontend
-From the root of the repository, you'll need to enter the client folder, install the necessary dependencies, and run the app. 
-```bash
-cd client
-#If you don't already have yarn
-npm install --global yarn
-yarn install
-yarn start
-```
-Navigate to localhost:3000 to see the running app. You'll notice that the Express status will state "Currently down." It will remain that way until you start the backend. 
-
-## Starting the backend
-From the root of the repository, you'll need to enter the api folder, install the necessary dependencies, and run the server. 
-```bash
-cd api
-yarn install
-yarn start
-```
-Navigate to localhost:9000/testAPI to see the results of the /testAPI route. If you refresh your localhost:3000 tab, your Express status should change. 
-
-# Styling with Vivid
-Vivid lets you style with Tailwind in your browser. <kbd>Cmd</kbd>-Click (Windows: <kbd>Ctrl</kbd>) on any component to see its code. Check out [Vivid's docs](https://docs.vivid.lol) for a guide to its full functionality. 

api/app.js

@@ -1,59 +1,68 @@
-// STARTER CODE ---
-var createError = require("http-errors");
-var express = require("express");
-var path = require("path");
-var cookieParser = require("cookie-parser");
-var logger = require("morgan");
-var cors = require("cors");
-
-// built-in router from template
-var indexRouter = require("./routes/index");
-// import party router
-var partyRouter = require("./routes/party");
+// const createError = require("http-errors");
+const express = require("express");
+const cors = require("cors");
+
+const app = express();
+app.use(cors());
+app.use(express.json());
+app.use(express.urlencoded({ extended: false }));
 
-var app = express();
+// websocket.io initialization
+const https = require('https');
+const { Server } = require('socket.io');
+const server = https.createServer(app);
+const io = new Server(server, {
+	cors: {
+		methods: ["GET", "POST"]
+	}
+});
 
-// PORT
-const PORT = process.env.PORT || 9000;
+var partyRouter = require("./routes/party");
+app.use("/party", partyRouter);
 
-// Initiate Mongo Server --- uncomment when db is setup
 const InitiateMongoServer = require("./config/db");
 InitiateMongoServer();
 
-// STARTER CODE --- view engine setup
-app.set("views", path.join(__dirname, "views"));
-app.set("view engine", "jade");
+require('dotenv').config();
+const PORT = process.env.PORT;
 
-app.use(cors());
-app.use(logger("dev"));
-app.use(express.json());
-app.use(express.urlencoded({ extended: false }));
-app.use(cookieParser());
-app.use(express.static(path.join(__dirname, "public")));
+app.get("/", (req, res) => {
+    res.send("this is the test route to make sure server is working")
+})
 
-app.use("/", indexRouter);
-// new party router below
-app.use("/party", partyRouter);
+io.on('connection', (socket) => {
+	// console.log(`a user connected: ${socket.id}`);
 
-// STARTER CODE --- catch 404 and forward to error handler
-app.use(function (req, res, next) {
-  next(createError(404));
-});
+	socket.on('party-creation', (data) => {
+		socket.join(data.partyId);
+	});
+
+	socket.on('party-connection', (data) => {
+		socket.join(data.partyId);
+		socket.to(data.partyId).emit('new-connection');
+	});
+
+	socket.on('start-request', (data) => {
+		socket.in(data.partyId).emit('start-matching');
+	});
+
+	socket.on('finish-voting', (data) => {
+		socket.to(data.partyId).emit('other-user-finished', data.nickname);
+	});
 
-// STARTER CODE --- error handler
-app.use(function (err, req, res, next) {
-  // set locals, only providing error in development
-  res.locals.message = err.message;
-  res.locals.error = req.app.get("env") === "development" ? err : {};
+	socket.on('navigate-to-results', (data) => {
+		socket.in(data.partyId).emit('finish-matching');
+	});
 
-  // render the error page
-  res.status(err.status || 500);
-  res.render("error");
+	// executed when a user disconnects from the server
+	socket.on('disconnect', () => {
+		// console.log('A user disconnected');
+	});
 });
 
 // initiates the server on the provided port
-app.listen(PORT, (req, res) => {
-  console.log(`Server Started at http://localhost:${PORT}`);
+server.listen(PORT, (req, res) => {
+	console.log(`Server hosted on port: ${PORT}`);
 });
 
 module.exports = app;

api/config/db.js

@@ -1,15 +1,18 @@
-const mongoose = require("mongoose");
+const mongoose = require('mongoose');
+mongoose.set('strictQuery', false);
+require('dotenv').config();
 
 // Replace this with your MONGOURI.
-const MONGOURI = "mongodb://127.0.0.1:27017/snack-match-tests";
+const MONGOURI = process.env.MONGODB_URI;
 const InitiateMongoServer = async () => {
     try {
         // attempts a connection to the database
         await mongoose.connect(MONGOURI, {
-        useNewUrlParser: true,
-    });
-    // console message indicates that a proper connection has been made
-    console.log("Connected to DB !!");
+            dbName: 'gameData',
+            useNewUrlParser: true,
+        });
+        // console message indicates that a proper connection has been made
+        console.log("Connected to DB !!");
     } catch (error) {
         console.log(error);
         throw error;

api/models/PartySchema.js

@@ -13,7 +13,7 @@ const PartySchema = mongoose.Schema({
         required: true,
     },
     // list containing all party members (catch if exceeds maximum party size)
-    partyMembers: {
+    memberList: {
         type: Array,
         required: true,
     },
@@ -22,6 +22,15 @@ const PartySchema = mongoose.Schema({
         type: Array,
         required: true,
     },
+    isClosed: {
+        type: Boolean,
+        default: false,
+    },
+    // restaurant match results
+    matchResults: {
+        type: Array,
+        default: [],
+    },
     // provided in default scheme
     // could be used as another parameter for authentification?
     createdAt: {

api/models/UserSchema.js

@@ -15,7 +15,7 @@ const UserSchema = mongoose.Schema({
     // list containing all restaurants taken from the party schema
     voteCounter: {
         type: Object,
-        required: true
+        required: true,
     },
     // provided in default scheme
     // could be used as another parameter for authentification?