Merge pull request #46 from CMU-17-356/front-back-connection

Link frontend + backend
CMU-17-356 · Mar 19, 2022 · 2298fce · 2298fce
2 parents e1cb976 + 1e668ed
commit 2298fce
Show file tree

Hide file tree

Showing 29 changed files with 1,074 additions and 20,785 deletions.
diff --git a/.gitignore b/.gitignore
@@ -164,3 +164,5 @@ dist
 backend/src/**/*.js
 backend/scripts/**/*.js
 backend/test/**/*.js
+backend/config.json
+
diff --git a/backend/config.json b/backend/config.json
@@ -1,4 +1,4 @@
 {
     "port": 3000,
-    "db": "mongodb://127.0.0.1/db"
+    "db": "mongodb://127.0.0.1/dronuts"
 }
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -22,6 +22,7 @@
   },
   "homepage": "https://github.com/CMU-17-356/dronuts2022-group-5#readme",
   "dependencies": {
+    "@types/cors": "^2.8.12",
     "body-parser": "^1.19.2",
     "cors": "^2.8.5",
     "express": "^4.17.3",
@@ -31,11 +32,11 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/jest": "^27.4.0",
-    "@types/node": "^17.0.19",
+    "@types/jest": "^27.4.1",
+    "@types/node": "^17.0.21",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.12.1",
-    "eslint": "^8.9.0",
+    "eslint": "^8.10.0",
     "eslint-config-google": "^0.14.0",
     "jest": "^27.5.1",
     "mongodb-memory-server": "^8.4.0",

diff --git a/backend/scripts/menu.json b/backend/scripts/menu.json
@@ -21,14 +21,84 @@
             "tags": []
         },
         {
-            "name": "Apple Krumb",
+            "name": "Blueberry",
             "price": 3.99,
             "weight": 10,
             "discount": 0,
             "picture": "https://cmu-17-356.github.io/Dronuts/assets/donut_flavors/blueberry.jpg",
             "description": "Blueberry donut",
             "availability": false,
             "tags": []
+        },
+        {
+            "name": "Boston Cream",
+            "price": 3.99,
+            "weight": 10,
+            "discount": 0,
+            "picture": "https://cmu-17-356.github.io/Dronuts/assets/donut_flavors/boston_kreme.jpg",
+            "description": "Boston Cream",
+            "availability": true,
+            "tags": []
+        },
+        {
+            "name": "Chocolate Frosted",
+            "price": 3.99,
+            "weight": 10,
+            "discount": 0,
+            "picture": "https://cmu-17-356.github.io/Dronuts/assets/donut_flavors/chocolate_frosted.jpg",
+            "description": "Chocolate Frosted",
+            "availability": true,
+            "tags": []
+        },
+        {
+            "name": "Chocolate Glaze",
+            "price": 3.99,
+            "weight": 10,
+            "discount": 0,
+            "picture": "https://cmu-17-356.github.io/Dronuts/assets/donut_flavors/chocolate_glaze.jpg",
+            "description": "Chocolate Glaze",
+            "availability": true,
+            "tags": []
+        },
+        {
+            "name": "Chocolate Kreme",
+            "price": 3.99,
+            "weight": 10,
+            "discount": 0,
+            "picture": "https://cmu-17-356.github.io/Dronuts/assets/donut_flavors/chocolate_kreme.jpg",
+            "description": "Chocolate Kreme",
+            "availability": true,
+            "tags": []
+        },
+        {
+            "name": "Cinnamon Sugar",
+            "price": 3.99,
+            "weight": 10,
+            "discount": 0,
+            "picture": "https://cmu-17-356.github.io/Dronuts/assets/donut_flavors/cinnamon_sugar.jpg",
+            "description": "Cinnamon Sugar",
+            "availability": true,
+            "tags": []
+        },
+        {
+            "name": "Boston Cream",
+            "price": 3.99,
+            "weight": 10,
+            "discount": 0,
+            "picture": "https://cmu-17-356.github.io/Dronuts/assets/donut_flavors/boston_kreme.jpg",
+            "description": "Boston Cream",
+            "availability": true,
+            "tags": []
+        },
+        {
+            "name": "Coconut",
+            "price": 3.99,
+            "weight": 10,
+            "discount": 0,
+            "picture": "https://cmu-17-356.github.io/Dronuts/assets/donut_flavors/coconut.jpg",
+            "description": "Coconut",
+            "availability": true,
+            "tags": []
         }
     ]
 }
diff --git a/backend/src/app.ts b/backend/src/app.ts
@@ -4,16 +4,23 @@ import mongoose from 'mongoose';
 
 import config from '../config.json';
 import router from "./routes";
-
+import cors from 'cors';
 
 const app = express();
+app.use(cors());
 const jsonParser = bodyParser.json();
 // const urlencoded = bodyParser.urlencoded({extended: false});
 app.use(jsonParser);
 
-app.use(router);
+
 // app.use(express.json())
 // app.use(express.urlencoded({ extended: false }));
+const corsOptions ={
+    origin:'*',
+    credentials:true,            //access-control-allow-credentials:true
+    optionSuccessStatus:200,
+}
+app.use(router);
 app.use(express.static(__dirname + '/public'));
 
 mongoose.connect(config.db, () => {

diff --git a/backend/src/models/customer.ts b/backend/src/models/customer.ts
@@ -53,6 +53,7 @@ const customerSchema: Schema = new Schema({
 
 customerSchema.methods.toJSON = function () {
     return {
+        id: this._id,
         username: this.username,
         password: this.password,
         phoneNumber: this.phoneNumber,

diff --git a/backend/src/models/order.ts b/backend/src/models/order.ts
@@ -24,8 +24,13 @@ const orderSchema: Schema = new Schema({
     amounts: [Number],
     status: {
         type: String,
-        enum: ['IN-PROGRESS', 'IN-DELIVERY', 'COMPLETED'],
-        default: 'IN-PROGRESS'
+        enum: [
+            'UNCONFIRMED',  // entered in the system by customer, but not yet confirmed
+            'IN-PROGRESS',  // confirmed by customer
+            'IN-DELIVERY',  // confirmed and set out by employee
+            'COMPLETED'     // received by customer
+        ],
+        default: 'UNCONFIRMED'
     }, 
     tax: Number,
     serviceFee: Number,