thinkncollab-cli 0.0.89 → 0.0.91

package/commands/task.js

@@ -7,7 +7,9 @@ import inquirer from "inquirer";
 import chalk from "chalk";
 
 const CWD = process.cwd();
+const BASE_URL = "https://thinkncollab.cm/cli";
 const tncrcPath = path.join(os.homedir(), ".tncrc");
+const tncMetaPath = path.join(CWD, ".tnc", ".tncmeta.json");
 const taskFilePath = path.join(CWD, ".tnc", "tasks.json");
 
 async function task() {
@@ -19,11 +21,20 @@ async function task() {
         }
 
         // Validate project init
-        if (!fs.existsSync(taskFilePath)) {
+        if (!fs.existsSync(tncMetaPath)) {
             console.error("❌ This directory is not initialized. Run 'tnc init' first.");
             return;
         }
 
+        // Read credentials
+        const tncrcData = fs.readFileSync(tncrcPath, "utf-8");
+        const { email, token } = JSON.parse(tncrcData);
+        const machineId = machine.machineIdSync();
+
+        // Read project metadata
+        const tncMetaData = fs.readFileSync(tncMetaPath, "utf-8");
+        const { projectId, projectName } = JSON.parse(tncMetaData);
+
         // Ask Task ID
         const { taskId } = await inquirer.prompt([
             {
@@ -38,153 +49,197 @@ async function task() {
             return;
         }
 
-        const { email, token } = JSON.parse(fs.readFileSync(tncrcPath, "utf-8"));
-        const localData = JSON.parse(fs.readFileSync(taskFilePath, "utf-8"));
-        const localTasks = localData.tasks || [];
-
-        // API call (correct way using headers)
-        const response = await axios.get(
-            `https://thinkncollab.com/cli/task/${taskId.trim()}`,
-            {
-                headers: {
-                    email,
-                    token,
-                    machineId: machine.machineIdSync(),
-                },
+        console.log(`📋 Fetching task ${taskId.trim()} from project: ${projectName}`);
+
+        // API call with headers for authentication
+        const response = await axios({
+            method: 'get',
+            url: `${BASE_URL}/task/${taskId.trim()}`,
+            headers: {
+                'x-user-email': email,
+                'x-user-token': token,
+                'x-machine-id': machineId,
+                'x-project-id': projectId // Optional: for project context
             }
-        );
+        });
 
+        // Handle response data
         const serverTasks = Array.isArray(response.data.task)
             ? response.data.task
             : [response.data.task];
 
+        // Read or initialize local tasks file
+        let localData = { tasks: [] };
+        if (fs.existsSync(taskFilePath)) {
+            try {
+                localData = JSON.parse(fs.readFileSync(taskFilePath, "utf-8"));
+            } catch (e) {
+                console.log("⚠️ Corrupted tasks file, creating new one");
+            }
+        }
+        
+        const localTasks = localData.tasks || [];
+
         // Sync with local file
         serverTasks.forEach((serverTask) => {
-            const index = localTasks.findIndex((t) => t.id === serverTask.id);
+            const index = localTasks.findIndex((t) => t._id === serverTask._id);
 
             if (index !== -1) {
                 localTasks[index] = {
                     ...localTasks[index],
                     ...serverTask,
+                    lastSynced: new Date().toISOString()
                 };
             } else {
-                localTasks.push(serverTask);
+                localTasks.push({
+                    ...serverTask,
+                    lastSynced: new Date().toISOString()
+                });
             }
         });
 
+        // Ensure .tnc folder exists
+        const tncFolder = path.join(CWD, ".tnc");
+        if (!fs.existsSync(tncFolder)) {
+            fs.mkdirSync(tncFolder, { recursive: true });
+        }
+
+        // Write updated tasks
         fs.writeFileSync(
             taskFilePath,
-            JSON.stringify({ tasks: localTasks }, null, 2)
+            JSON.stringify({ 
+                tasks: localTasks,
+                lastUpdated: new Date().toISOString(),
+                projectId 
+            }, null, 2)
         );
 
-        console.log("✅ Task synced successfully");
+        console.log("✅ Task synced successfully\n");
 
+        // Display task information
         serverTasks.forEach(task => {
-            console.log(chalk.gray("\n------------------------------------------"));
+            console.log(chalk.gray("────────────────────────────────────"));
 
             const statusColor =
                 task.status === "completed"
                     ? chalk.green
                     : task.status === "in-progress"
                         ? chalk.yellow
-                        : chalk.red;
+                        : task.status === "todo"
+                            ? chalk.blue
+                            : chalk.red;
+            
             const priorityColor =
                 task.priority === "high"
                     ? chalk.red
                     : task.priority === "medium"
                         ? chalk.yellow
-                        : chalk.green;
-
+                        : task.priority === "low"
+                            ? chalk.green
+                            : chalk.gray;
 
+            // Print task details
             printField("Task ID", task._id, chalk.cyan.bold, chalk.white);
             printField("Title", task.title, chalk.green.bold, chalk.white);
-            printField("Description", task.description || "N/A", chalk.yellow.bold, chalk.white);
+            printField("Description", task.description || "No description", chalk.yellow.bold, chalk.white);
             printField("Status", task.status, chalk.blue.bold, statusColor);
-            printField("Priority", task.priority, chalk.magenta.bold, priorityColor);
+            printField("Priority", task.priority || "Not set", chalk.magenta.bold, priorityColor);
+            printField("Created At", task.createdAt ? new Date(task.createdAt).toLocaleString() : "N/A", chalk.cyan.bold, chalk.white);
+            printField("Updated At", task.updatedAt ? new Date(task.updatedAt).toLocaleString() : "N/A", chalk.cyan.bold, chalk.white);
             printField(
                 "Due Date",
-                task.dueDate ? new Date(task.dueDate).toDateString() : "N/A",
+                task.dueDate ? new Date(task.dueDate).toLocaleDateString() : "Not set",
                 chalk.cyan.bold,
                 chalk.white
             );
 
-            if (task.attachments?.length > 0) {
-                printField("Attachments", `${task.attachments.length}`, chalk.blue.bold, chalk.white);
-
-                task.attachments.forEach((att, index) => {
+            // Show assigned users if any
+            if (task.assignedTo && task.assignedTo.length > 0) {
+                printField("Assigned To", `${task.assignedTo.length} user(s)`, chalk.blue.bold, chalk.white);
+                task.assignedTo.forEach((user, index) => {
                     console.log(
-                        chalk.gray(`                 ${index + 1}. ID: ${att._id}`)
+                        chalk.gray(`                 ${index + 1}. ${ user.userId.name} ,  ${(user.userId.email)} [Status: ${user.status}]`)
                     );
+                });
+            }
+
+            // Show attachments if any
+            if (task.attachments?.length > 0) {
+                printField("Attachments", `${task.attachments.length} file(s)`, chalk.blue.bold, chalk.white);
+                task.attachments.forEach((att, index) => {
                     console.log(
-                        chalk.gray(`                    Name: ${att.name}`)
+                        chalk.gray(`                 ${index + 1}. ${att.name || att.filename || 'Attachment'}`)
                     );
+                    if (att.url) {
+                        console.log(chalk.gray(`                    URL: ${att.url}`));
+                    }
                 });
             } else {
                 printField("Attachments", "None", chalk.blue.bold, chalk.gray);
             }
 
-            console.log(chalk.gray("------------------------------------------\n"));
+            console.log(chalk.gray("────────────────────────────────────\n"));
         });
 
-
-
-
     } catch (err) {
-        console.error(
-            "❌ Error:",
-            err.response?.data?.error || err.message
-        );
+        if (err.response) {
+            console.error("❌ Server Error:", err.response.data.message || err.response.data.error);
+            if (err.response.status === 401) {
+                console.error("   Unauthorized. Please login again.");
+            } else if (err.response.status === 404) {
+                console.error("   Task not found. Please check the Task ID.");
+            } else if (err.response.status === 403) {
+                console.error("   You don't have permission to access this task.");
+            }
+        } else if (err.request) {
+            console.error("❌ No response from server. Check your internet connection.");
+        } else {
+            console.error("❌ Error:", err.message);
+        }
     }
 }
 
 function printField(label, value, labelColor, valueColor, width = 15) {
-  const terminalWidth = process.stdout.columns || 80;
-
-  const plainLabel = label.padEnd(width);
-  const labelPart = `${plainLabel} : `;
-  const indent = " ".repeat(labelPart.length);
-
-  const availableWidth = terminalWidth - indent.length;
-
-  // Normalize multiline input
-  const rawLines = String(value).replace(/\r/g, "").split("\n");
-
-  rawLines.forEach((rawLine, lineIndex) => {
-    let words = rawLine.split(" ");
-    let currentLine = "";
+    const terminalWidth = process.stdout.columns || 80;
+    const plainLabel = label.padEnd(width);
+    const labelPart = `${plainLabel} : `;
+    const indent = " ".repeat(labelPart.length);
+    const availableWidth = terminalWidth - indent.length;
+
+    // Normalize multiline input
+    const rawLines = String(value).replace(/\r/g, "").split("\n");
+
+    rawLines.forEach((rawLine, lineIndex) => {
+        let words = rawLine.split(" ");
+        let currentLine = "";
+
+        words.forEach(word => {
+            if ((currentLine + word).length > availableWidth) {
+                if (lineIndex === 0 && currentLine === "") {
+                    console.log(
+                        labelColor(plainLabel) + " : " + valueColor(word)
+                    );
+                } else {
+                    console.log(indent + valueColor(currentLine.trim()));
+                    currentLine = word + " ";
+                }
+            } else {
+                currentLine += word + " ";
+            }
+        });
 
-    words.forEach(word => {
-      if ((currentLine + word).length > availableWidth) {
-        if (lineIndex === 0 && currentLine === "") {
-          console.log(
-            labelColor(plainLabel) + " : " + valueColor(word)
-          );
-        } else {
-          console.log(indent + valueColor(currentLine.trim()));
-          currentLine = word + " ";
+        if (currentLine.trim()) {
+            if (lineIndex === 0) {
+                console.log(
+                    labelColor(plainLabel) +
+                        " : " +
+                        valueColor(currentLine.trim())
+                );
+            } else {
+                console.log(indent + valueColor(currentLine.trim()));
+            }
         }
-      } else {
-        currentLine += word + " ";
-      }
     });
-
-    if (currentLine.trim()) {
-      if (lineIndex === 0) {
-        console.log(
-          labelColor(plainLabel) +
-            " : " +
-            valueColor(currentLine.trim())
-        );
-      } else {
-        console.log(indent + valueColor(currentLine.trim()));
-      }
-    }
-
-    // After first printed line, ensure next raw lines are indented
-    lineIndex = 1;
-  });
 }
 
-
-
-export default task;
+export default task;

package/commands/taskCompletion.js

@@ -5,31 +5,35 @@ import path from 'path';
 import machine from 'node-machine-id';
 import inquirer from "inquirer";
 
-
-
 const CWD = process.cwd();
-
+const BASE_URL = "https://thinkncollab.com/cli"; // Use your actual base URL
 const tncrcPath = path.join(os.homedir(), '.tncrc');
 const tncMetaPath = path.join(CWD, '.tnc', '.tncmeta.json');
 
 async function taskCompletion() {
   try {
+    // Check login status
     if (!fs.existsSync(tncrcPath)) {
       console.error("❌ You are not logged in. Run 'tnc login' first.");
       process.exit(1);
     }
 
+    // Check project initialization
     if (!fs.existsSync(tncMetaPath)) {
       console.error("❌ This directory is not initialized. Run 'tnc init' first.");
       process.exit(1);
     }
 
+    // Read credentials
     const tncrcData = fs.readFileSync(tncrcPath, "utf-8");
     const { email, token } = JSON.parse(tncrcData);
+    const machineId = machine.machineIdSync();
 
+    // Read project metadata
     const tncMetaData = fs.readFileSync(tncMetaPath, "utf-8");
-    const { projectId } = JSON.parse(tncMetaData);
+    const { projectId, projectName } = JSON.parse(tncMetaData);
 
+    // Get task ID from user
     const { taskId } = await inquirer.prompt([
       {
         type: "input",
@@ -45,23 +49,42 @@ async function taskCompletion() {
       process.exit(1);
     }
 
-    const response = await axios.post(
-      `https://thinkncollab.com/cli/taskcomplete/${trimmedTaskId}`,
-      {
-        email,
-        token,
-        machineId: machine.machineIdSync(),
+    console.log(`📋 Marking task ${trimmedTaskId} as completed...`);
+
+    // USING HEADERS FOR AUTHENTICATION
+    const response = await axios({
+      method: 'post',
+      url: `${BASE_URL}/taskcomplete/${trimmedTaskId}`,
+      headers: {
+        'x-user-email': email,
+        'x-user-token': token,
+        'x-machine-id': machineId,
+        'x-project-id': projectId // Optional: send project context
       }
-    );
+      // NO REQUEST BODY - all auth in headers
+    });
+
+    console.log("✅", response.data.message);
+    
+    // Optional: Update local metadata if needed
+    console.log(`📌 Project: ${projectName}`);
+    console.log(`🔗 Task ID: ${trimmedTaskId}`);
 
-    console.log("✅ Task marked as complete:", response.data.message);
   } catch (err) {
     if (err.response) {
-      console.error("❌ Error:", err.response.data.error);
+      console.error("❌ Error:", err.response.data.message || err.response.data.error);
+      if (err.response.status === 401) {
+        console.error("   Please login again - invalid or expired token.");
+      } else if (err.response.status === 404) {
+        console.error("   Task not found. Please check the Task ID.");
+      }
+    } else if (err.request) {
+      console.error("❌ No response from server. Check your internet connection.");
     } else {
       console.error("❌ An unexpected error occurred:", err.message);
     }
     process.exit(1);
   }
 }
+
 export default taskCompletion;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thinkncollab-cli",
   "author": "Raman Singh",
-  "version": "0.0.89",
+  "version": "0.0.91",
   "description": "CLI tool for ThinkNCollab",
   "main": "index.js",
   "bin": {

package/commands/send.js

@@ -1,16 +0,0 @@
-import axios from "axios"
-
-let data = {
-    
-}
-
-function sendData() {
-    const res = axios.post('http://172.16.44.215:5001/senddata', 
-        {
-            "name": "Raman Singh",
-            "email": "admin@thinkncollab.com"
-        }
-    );
-
-}
-sendData();