added kk's changes as well

kkashiva · May 19, 2024 · ba7e280 · ba7e280
1 parent 9666b0b
commit ba7e280
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/controllers/appController.js b/controllers/appController.js
@@ -130,7 +130,11 @@ module.exports.postNewTask = async (req, res, next) => {
     }
     let swimlaneID = board.swimlanes.id(status);
     // board.swimlanes.push({ title });
+<<<<<<< HEAD
     swimlaneID.tasks.push({ title, description, creationDate: Date.now(), priority, dueDate});
+=======
+    swimlaneID.tasks.push({ title, description, creationDate: Date.now(), priority, dueDate });
+>>>>>>> 3e29aac (added kk's changes as well)
     user.totalTasks = Number(user.totalTasks) || 0;
     user.totalTasks += 1;
 

diff --git a/models/users.js b/models/users.js
@@ -1,3 +1,4 @@
+const e = require("express");
 const mongoose = require("mongoose");
 const { Schema } = mongoose;
 
@@ -17,7 +18,11 @@ const taskSchema = new Schema({
   },
   priority: {
     type: String,
+<<<<<<< HEAD
     enum: ["High", "Medium", "Low"],
+=======
+    enum: ["Low", "Medium", "High"],
+>>>>>>> 3e29aac (added kk's changes as well)
   },
   dueDate: {
     type: Date,