From 2bac1503b86c10353a5966df0e8db5d73b9c3e39 Mon Sep 17 00:00:00 2001
From: Dorothy <xuzhengwen23@gmail.com>
Date: Thu, 18 Nov 2021 18:29:49 -0500
Subject: [PATCH] Fixed sign up problems

---
 backend/modules/api.js                   | 12 +++++++++++-
 backend/modules/auth.js                  |  2 +-
 frontend/src/components/AppFormUpper.vue | 12 ++++++------
 frontend/src/views/FormFreshmen.vue      |  5 ++++-
 frontend/src/views/FormUpper.vue         |  5 ++++-
 package-lock.json                        |  5 +++++
 package.json                             | 15 +++++++++++++++
 7 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/backend/modules/api.js b/backend/modules/api.js
index d6ba25d..562ec19 100644
--- a/backend/modules/api.js
+++ b/backend/modules/api.js
@@ -14,8 +14,18 @@ module.exports = (db) => {
     });
     
     router.post('/upperclassmen', (req, res) => {
-	r = db.addUpper(req.body, res);
+	    r = db.addUpper(req.body, res);
     });
 
+    router.get('/freshmen', (req, res) => {
+        r=db.collection.find({ "type": "freshmen" })
+        res.send(r);
+    })
+
+    router.get('/upperclassmen', (req, res) => {
+        r=db.collection.find({ "type": "upperclass" })
+        res.send(r);
+    })
+
     return router;
 }
diff --git a/backend/modules/auth.js b/backend/modules/auth.js
index b17d4fa..e3b3c05 100644
--- a/backend/modules/auth.js
+++ b/backend/modules/auth.js
@@ -12,7 +12,7 @@ router.post('/', async (req, res) => {
 
     // check if user exists
     let user = await User.findOne({name: req.body.name});
-    if (!user) return res.status(400).send('Invalid name or password.');
+    if (!user) return res.status(400).send('User not exist');
 
     // check password
     const validPass = await bcrypt.compare(req.body.pass, user.pass);
diff --git a/frontend/src/components/AppFormUpper.vue b/frontend/src/components/AppFormUpper.vue
index a6f5391..a138c71 100644
--- a/frontend/src/components/AppFormUpper.vue
+++ b/frontend/src/components/AppFormUpper.vue
@@ -442,7 +442,7 @@ export default {
     }
   },
   methods: {
-    validateForm(evt) {
+    validateForm(evt) { 
       evt.preventDefault();
       // at least 1 block should be selected
       if (this.blocksCount < 1) {
@@ -450,11 +450,11 @@ export default {
         this.showAlert = true
         return;
       }
-      if (this.formData.majors.length > 2) {
-        this.alertText = "You can only select up to 2 majors."
-        this.showAlert = true
-        return;
-      }
+      //if (this.formData.majors.length > 2) {
+        //this.alertText = "You can only select up to 2 majors."
+        //this.showAlert = true
+        //return;
+      //}
       this.$emit("validateSuccess")  // validate success
     },
     clearHome() {
diff --git a/frontend/src/views/FormFreshmen.vue b/frontend/src/views/FormFreshmen.vue
index 0a78f0e..12f1711 100644
--- a/frontend/src/views/FormFreshmen.vue
+++ b/frontend/src/views/FormFreshmen.vue
@@ -36,7 +36,10 @@ export default {
   methods: {
     async submitUnder() {
       try {
-        await axios.post('/api/form/underclassmen', this.formData);
+        await axios.post('/api/form/underclassmen', this.formData)
+        .catch(function (error) {
+          console.log(error)
+        });
         console.log('submit success');
         this.$router.push('/landing');
       } catch (e) {
diff --git a/frontend/src/views/FormUpper.vue b/frontend/src/views/FormUpper.vue
index ee5fa6b..8e130d4 100644
--- a/frontend/src/views/FormUpper.vue
+++ b/frontend/src/views/FormUpper.vue
@@ -35,7 +35,10 @@ export default {
   methods: {
     async submitUpper() {
       try {
-        await axios.post('/api/form/upperclassmen', this.formData);
+        await axios.post('/api/form/upperclassmen', this.formData)
+        .catch(function (error) {
+          console.log(error)
+        });
         console.log('submit success');
         this.$router.push('/landing');
       } catch (e) {
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..c512252
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,5 @@
+{
+  "name": "meeteng",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..23f1241
--- /dev/null
+++ b/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "meeteng",
+  "version": "1.0.0",
+  "description": "Prospective RPI students and freshmen meeting seniors of the same major.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.rpi.edu/goldsd3/meeteng"
+  },
+  "author": "",
+  "license": "ISC"
+}