Before first deployment

techinika · Apr 27, 2023 · b054b86 · b054b86
1 parent 58f3fd8
commit b054b86
Show file tree

Hide file tree

Showing 10 changed files with 7,310 additions and 1,761 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,13 @@
+# ACCESS_TOKEN_SECRET = access_token_secret_key
+# LOCAL_HOST = db4free.net
+# ROOT = bruce123
+# PASSWORD = 12345678
+# DATABASE = app_db
+# PORT = 5000
+
+ACCESS_TOKEN_SECRET = access_token_secret_key
+LOCAL_HOST = db4free.net
+ROOT = bruce123
+PASSWORD = 12345678
+DATABASE = app_db
+PORT = 5000
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 node_modules
-.env
 public
 views
 package-lock.json
diff --git a/controllers/admin.js b/controllers/admin.js
@@ -1,3 +1,4 @@
+const { json } = require("body-parser");
 const mysql = require("mysql");
 
 //Creating connection
@@ -24,11 +25,97 @@ const reports = (req,res) => {
     res.send("Welcome to reports");
 }
 const tasks = (req,res) => {
-    res.send("Welcome to tasks");
+    let tasks = `SELECT * FROM tasks`
+    conn.query(tasks, (err, result) => {
+        if (err){
+            console.log(err)
+        }else{
+            res.status(200).json({
+                user_details: req.user,
+                all_tasks: result
+            });
+        }
+    })
+}
+const update = (req, res) => {
+    var id = req.params.id
+    var {title, description, deadline, status} = req.body
+    if(!status){
+        res.status(400).json({ error: "All fields must be filled"})
+    }
+    conn.query(`SELECT id FROM status WHERE name = '${status}'`, async (err, result) => {
+        const returned = await result[0].id
+        console.log(returned)
+        if(err){
+            console.log(err)
+        }else if(!title || !description || !deadline || !status){
+            res.status(400).json({ error: "All fields must be filled"})
+        }else if(result.length === 0){
+            res.status(400).json({ error: "Status not found"})
+        }else{
+            let update = `UPDATE tasks SET title ='${title}', description='${description}', deadline='${deadline}', status_id='${returned}' WHERE task_id='${id}'`
+            conn.query(update, (err, results) => {
+                if(err){
+                    throw err
+                }else{
+                    res.status(200).json({ message: "Task updated"})
+                }
+            })
+        }
+    })
 }
 const settings = (req,res) => {
     res.send("Welcome to settings");
 }
+const departments = (req, res) => {
+    let sql = `SELECT name FROM department`
+    conn.query(sql, (err, result) => {
+        const all_departments = result
+        if (err){
+            console.log(err)
+        }else{
+            res.status(200).json({
+                all_departments: all_departments
+            });
+        }
+    })
+}
+
+const all_users = (req, res) => {
+    // console.log("You are here")
+    // let sql = `SELECT username FROM users`
+    conn.query(`SELECT username FROM users`, (err, result) => {
+        console.log(result)
+    //     const returned = result
+    //     if(err){
+    //         console.log(err)
+    //     }
+        res.status(200).json({all: result})
+    })
+}
+
+const dep_users = (req, res) => {
+    const department_name = req.params.dep
+    let sql = `SELECT id FROM department WHERE name = '${department_name}'`
+    conn.query(sql, (err, result) => {
+        const returned_id = result[0].id
+
+        if(err){
+            console.log(err)
+        }else{
+            conn.query(`SELECT username FROM users WHERE dep_id = '${returned_id}'`, (err, results) => {
+                console.log(results)
+                if(err){
+                    console.log(err)
+                }else{
+                    res.status(200).json({
+                        all_users: results
+                    })
+                }
+            })
+        }
+    })
+}
 
 const add_task = (req, res) => {
     let title = req.body.title;
@@ -39,20 +126,17 @@ const add_task = (req, res) => {
     conn.query(`SELECT id FROM users WHERE username= '${assignee}'`, (err, result) => {
         if(err){
             console.log(err)
-            res.render("admin/adm_home")
         }else if(result < 1){
             console.log("User not found");
-            res.render("admin/adm_home", {
-                message: "user not found"
+            res.status(400).json({
+                error: "user not found"
             })
         }else{
             let user_id = result[0]
-            console.log(user_id.id);
             let sql = `INSERT INTO tasks (title, description, deadline, status, user_id) values ('${title}', '${description}', '${deadline}', '${status}', '${dep_id.id}')`
             conn.query(sql, (err, result) => {
                 if(err){
                     console.log(err);
-                    console.log(req.body);
                 }else{
                     res.send("Task added");
                 }
@@ -66,6 +150,10 @@ module.exports = {
     projects,
     reports,
     tasks,
+    update,
+    departments,
+    dep_users,
+    all_users,
     settings,
     add_task
 }
diff --git a/controllers/auth.js b/controllers/auth.js
@@ -63,10 +63,19 @@ const login = (req, res) => {
                         expiresIn: "200m"
                     });
                     // console.log(req.user)
-                    res.status(200).json({ 
-                        token: access_token,
-                        id: dep_id,
-                        user_id: id
+                    conn.query(`SELECT name FROM department WHERE id = ${dep_id}`, (err, results) => {
+                        const returned = results[0]
+                        const returned_department = returned.name
+                        if(err){
+                            console.log(err)
+                        }else{
+                            res.status(200).json({ 
+                                token: access_token,
+                                id: dep_id,
+                                user_id: id,
+                                department: returned_department 
+                            })
+                        }
                     })
                 } else {
                     console.log("Invalid password");
@@ -116,8 +125,9 @@ const register = async (req, res) => {
         if(err){
             console.log(err)
         }else if(result){
-            console.log(result[0].id)
-            const dep_id = result[0].id
+            console.log(result[0])
+            const returned = result[0]
+            const dep_id = returned.id
             conn.query(`INSERT INTO users (firstname, lastname, username, email, password, dep_id) VALUES ('${firstname}', '${lastname}', '${username}', '${email}', '${hashed_password}', '${dep_id}')`, (err, result) => {
                 if(err){
                     console.log(err)

diff --git a/controllers/employee.js b/controllers/employee.js
@@ -93,12 +93,39 @@ const update = (req,res) => {
             if (err){
                 res.status(200).json({ error: err})
             }else{
-                res.status(200).json({ new_id: '1'})
+                res.status(200).json({ 
+                    message: "Task updated",
+                    new_id: '1'})
             }
         })
     }
 }
 
+const remove_task = (req, res) => {
+    const id = req.params.id
+    conn.query(`SELECT task_id FROM tasks WHERE task_id = ${id}`, (err, result) => {
+        if(err){
+            res.status(200).json({
+                error: "Error occured"
+            })
+        }else if(result.length < 1){
+            res.status(400).json({
+                error: "Task not found"
+            })
+        }else{
+            conn.query(`DELETE FROM tasks WHERE task_id = ${id}`, (err, result) => {
+                if(err){
+                    console.log(err)
+                }else{
+                    res.status(200).json({
+                        message: "Task deleted"
+                    })
+                }
+            })
+        }
+    })
+}
+
 const notifications = (req, res) => {
     res.status(200).json({
         user_details: req.user,
@@ -142,5 +169,5 @@ const settings = (req, res) => {
 
 // Exporting the function variables
 module.exports = {
-    unfinished, finished, add_task, update, notifications, all_participants, dep_participants, settings
+    unfinished, finished, add_task, update, remove_task, notifications, all_participants, dep_participants, settings
 };