sei-24-jarryl-chia

controllers/tweeds.js

@@ -0,0 +1,33 @@
+module.exports = (db) =>{
+
+    let seeAllTweeds = (req, res) => {
+        if (req.cookies['loggedIn']) {
+            db.tweeds.getAll((err, result) => {
+                res.send(result.rows)
+            })
+        } else {
+            res.render('login')
+        }
+    }
+
+    let newTweed = (req, res) => {
+        if (!req.cookies['loggedIn']) {
+            res.render('login')
+        } else {
+            res.render('new')
+        }
+    }
+
+    let postTweed = (req, res) => {
+        let values = [req.body.tweed, req.cookies["userID"]]
+        db.tweeds.addTweed(values, (err, result) => {
+            res.redirect("/")
+        })
+    }
+
+    return {
+        seeAllTweeds,
+        newTweed,
+        postTweed
+    }
+}

controllers/users.js

@@ -0,0 +1,23 @@
+module.exports = (db) =>{
+
+    let userCheck = (req, res) => {
+        let values = [req.body['username'], req.body['password']];
+        db.users.authenticateUser(values, (err, result) => {
+            if (err) {
+                res.send(err.stack)
+            } else {
+                if (result) {
+                    res.cookie('loggedIn', true)
+                    res.cookie('userID', result.rows[0]["id"])
+                    res.redirect("/")
+                } else {
+                    res.send("Invalid username or password")
+                }
+            }
+        })
+    }
+
+    return {
+        userCheck
+    }
+}

db.js

@@ -33,7 +33,7 @@ if( process.env.DATABASE_URL ){
 
 }else{
   configs = {
-    user: 'akira',
+    user: 'jarryl',
     host: '127.0.0.1',
     database: 'testdb',
     port: 5432
@@ -62,10 +62,11 @@ pool.on('error', function (err) {
  */
 
 
-const allPokemonModelsFunction = require('./models/pokemon');
-
-const pokemonModelsObject = allPokemonModelsFunction( pool );
+const usersModels = require('./models/users');
+const tweedsModels = require('./models/tweeds');
 
+const usersModelsObj = usersModels(pool);
+const tweedsModelsObj = tweedsModels(pool);
 
 
 /*
@@ -95,5 +96,6 @@ module.exports = {
    */
 
   // users: userModelsObject,
-  pokemon: pokemonModelsObject
-};
+  users: usersModelsObj,
+  tweeds: tweedsModelsObj
+};

models/tweeds.js

@@ -0,0 +1,23 @@
+module.exports = (dbPoolInstance) => {
+
+    let getAll = (callback) => {
+        dbPoolInstance
+            .query('SELECT tweeds.tweed, users.username FROM tweeds INNER JOIN users ON tweeds.user_id = users.id;')
+            .then(result => callback(null, result))
+            .catch(err => callback(err, null))
+        }
+
+    let addTweed = (values, callback) => {
+        dbPoolInstance.query('INSERT INTO tweeds (tweed, user_id) VALUES ($1, $2);', values, (err, result) => {
+            if (err) {
+                console.log(err)
+            } else {
+                callback(null, null)
+            }
+        })
+    }
+    return {
+        getAll,
+        addTweed
+    }
+}

models/users.js

@@ -0,0 +1,20 @@
+module.exports = (dbPoolInstance) => {
+    console.log("users models accessed");
+
+    let authenticateUser = (values, callback) => {
+        dbPoolInstance.query("SELECT * FROM users WHERE username = $1 AND password = $2;", values, (err, result) => {
+            if (err) {
+                callback(err, null)
+            } else {
+                if (result.rowCount > 0) {
+                    callback(null, result)
+                } else {
+                    callback(null, null)
+                }
+            }
+        })
+    }
+    return {
+        authenticateUser
+    }
+}