idkreact-test

1 files changed, 16 insertions, 6 deletions

diff --git a/server.js b/server.js
index 32f5864..fb68113 100644
--- a/server.js
+++ b/server.js
@@ -151,11 +151,16 @@ app.get('/signup', (req, res) => {
     res.render('signup');
 });
 
-app.get('/api/v1/', async (req, res) => {
+app.get('/api/v1/entries', async (req, res) => {
     let resAlt = 12 + await EntryItem.countDocuments();
     res.json({ entries: resAlt });
 });
 
+app.get('/api/v1/users', async (req, res) => {
+    let resAlt = 29 + await User.countDocuments();
+    res.json({ entries: resAlt });
+});
+
 // create new db entry on post
 app.post('/submitEntry', async (req, res) => {
     User.findById(req.session.userId)
@@ -191,7 +196,7 @@ app.post('/login', async (req, res) => {
                 })
                 .exec((err, user) => {
                     if (err) {
-                        res.redirect('/');
+                        return res.render('error');
                     } else if (!user) {
                        return res.render('error');
                     }
@@ -209,7 +214,7 @@ app.post('/login', async (req, res) => {
         authenticate(req.body.userLogin, req.body.passLogin, (error, user) => {
             if (error || !user) {
                 //let err = new Error('Wrong username or password.');
-                err.status = 401;
+                //err.status = 401;
                 return res.render('error');
             } else {
                 req.session.userId = user._id;
@@ -232,7 +237,8 @@ app.post('/signup', async (req, res) => {
             if (err) {
                 return res.render('error');
             } else {
-                return res.redirect('/');
+                req.session.userId = user._id;
+                return res.redirect('/login');
             }
         });
     }
@@ -299,5 +305,9 @@ app.get('/error', (req, res) => {
     res.render('error');
 });
 
-app.listen(process.env.PORT || 1337);
-console.log(`Listening on port ${process.env.PORT}.`); // honestly have no idea why it says port as undefined fix this when u feel like it )
\ No newline at end of file
+app.get('/terms', (req, res) => {
+    res.render('terms');
+});
+
+app.listen(80);
+console.log(`Listening on port 80.`); // honestly have no idea why it says port as undefined fix this when u feel like it )
\ No newline at end of file