pull before merge with master

Author: blb509

.env

@@ -2,4 +2,4 @@ PORT=9001
 
 DB_ENV=development
 
-DB_PASSWORD=thisisabadpassword
+DB_PASSWORD=matt123!

forms/forms-routes.js

@@ -1,6 +1,8 @@
-const router = require('express').Router()
+const router = require('express').Router();
 
-const Forms = require('./forms-models.js')
+const Forms = require('./forms-models.js');
+const Users = require('../user/user-model.js');
+const Fields = require('../form_fields/form-fields-model.js');
 
 // add a new form
 router.post('/:userId', async (req, res) => {
@@ -20,7 +22,7 @@ router.post('/:userId', async (req, res) => {
     console.log(error)
     res.status(500).json({ message: 'Server error creating new form' })
   }
-})
+});
 
 // get all forms
 router.get('/:userId', async (req, res) => {
@@ -36,7 +38,18 @@ router.get('/:userId', async (req, res) => {
   // } else {
   // return res.status(401).json({ message: 'Unauthorized' })
   // }
-})
+});
+
+// get form by id
+router.get('/:userId/:formId', async (req, res) => {
+  try {
+    const form = await Forms.getByFormId(req.params.formId);
+    res.status(200).json(form)
+  } catch (error) {
+      console.log(error)
+      res.status(500).json({ message: 'Server error retrieving form' })
+  }
+});
 
 // delete a form
 router.delete('/:userId/:formId', async (req, res) => {
@@ -55,7 +68,7 @@ router.delete('/:userId/:formId', async (req, res) => {
   // } else {
   //     return res.status(401).json({ message: 'Unauthorized' })
   // }
-})
+});
 
 // update a form
 router.put('/:userId/:formId', async (req, res) => {
@@ -71,6 +84,6 @@ router.put('/:userId/:formId', async (req, res) => {
   // } else {
   //     return res.status(401).json({ message: 'Unauthorized' })
   // }
-})
+});
 
-module.exports = router
+module.exports = router;