@beauraines/toggl-cli 0.10.11 → 0.10.13

package/.eslintrc.json

@@ -4,7 +4,7 @@
         "es2021": true,
         "node": true
     },
-    "extends": "standard",
+    "extends": "eslint:recommended",
     "overrides": [
     ],
     "parserOptions": {

package/.github/dependabot.yml

@@ -9,3 +9,8 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+      day: "friday"
+    commit-message:
+      prefix: fix
+      prefix-development: chore
+      include: scope

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.10.13](https://github.com/beauraines/toggl-cli/compare/v0.10.12...v0.10.13) (2023-04-01)
+
+
+### Features
+
+* Improve table layout ([4652fc3](https://github.com/beauraines/toggl-cli/commit/4652fc3f5e54ca6f0031dfcc035746147b028a5d)), closes [#56](https://github.com/beauraines/toggl-cli/issues/56)
+
+### [0.10.12](https://github.com/beauraines/toggl-cli/compare/v0.10.11...v0.10.12) (2023-03-23)
+
 ### [0.10.11](https://github.com/beauraines/toggl-cli/compare/v0.10.10...v0.10.11) (2023-03-19)
 
 

package/cmds/continue.mjs

@@ -24,12 +24,13 @@ export const handler = async function (argv) {
     }
   ) // Gets time entries for last 14 days, up to 1000 entries
 
-  timeEntries.sort((a, b) => dayjs(a.start).toDate() - dayjs(b.start).toDate())
+  // Sort to guarantee its most recent to oldest)
+  timeEntries.sort((a, b) => dayjs(b.start).toDate() - dayjs(a.start).toDate())
 
   let matchingTimeEntry
   switch (argv.description) {
     case undefined:
-      matchingTimeEntry = timeEntries.slice(-1)[0]
+      matchingTimeEntry = timeEntries[0]
       break
     default:
       { const searchName = argv.description.toLowerCase()

package/cmds/ls.mjs

@@ -40,11 +40,23 @@ export const handler = async function (argv) {
   })
 
   const table = new Table({
-    head: ['description', 'start', 'stop', 'duration']
+    head: ['Description', 'Start', 'Stop', 'Duration'],
+    chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' }
   })
-  for (const entry of report) {
-    table.push([entry.description, entry.start, entry.stop, entry.duration])
+  for (let i = 0; i < report.length; i++) {
+    // First row chars
+    const chars = {
+      midMid: '┼',
+      mid: '─',
+      leftMid: '├',
+      rightMid: '┤'
+    }
+    const entry = report[i]
+    if (i === 0) {
+      table.push([entry.description, entry.start, entry.stop, entry.duration].map((content) => ({ content, chars })))
+    } else {
+      table.push([entry.description, entry.start, entry.stop, entry.duration])
+    }
   }
   console.log(table.toString())
-  // console.table(report, ['description', 'start', 'stop', 'duration'])
 }

package/cmds/today.mjs

@@ -1,4 +1,5 @@
 import Client from '../client.js'
+import chalk from 'chalk'
 import dayjs from 'dayjs'
 import { getWorkspace, getProjects, formatDuration, formatDurationAsTime } from '../utils.js'
 import dur from 'dayjs/plugin/duration.js'
@@ -79,10 +80,25 @@ function displayDailyReport (report, format) {
     case 'table':
     default:
       const table = new Table({
-        head: ['Project', 'Duration']
+        head: ['Project', 'Duration'],
+        chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' }
       })
-      for (const project of report) {
-        table.push([project.project_name, project.duration_formatted])
+      for (let i = 0; i < report.length; i++) {
+        // First row chars
+        const chars = {
+          midMid: '┼',
+          mid: '─',
+          leftMid: '├',
+          rightMid: '┤'
+        }
+        const project = report[i]
+        if (i == 0) {
+          table.push([project.project_name, project.duration_formatted].map((content) => ({ content: chalk.grey(content), chars })))
+        } else if ( i == report.length - 1) {
+          table.push([project.project_name, project.duration_formatted].map((content) => ( {content: chalk.bold(content), chars })))
+        } else {
+          table.push([chalk.grey(project.project_name), chalk.grey(project.duration_formatted)])
+        }
       }
       console.log(table.toString())
       break

package/cmds/weekly.mjs

@@ -1,4 +1,5 @@
 import Client from '../client.js'
+import chalk from 'chalk'
 import { getWorkspace, formatDuration, getProjectById } from '../utils.js'
 import dayjs from 'dayjs'
 import dur from 'dayjs/plugin/duration.js'
@@ -58,10 +59,25 @@ export const handler = async function (argv) {
 
   const head = Object.keys(reportData[0])
   const table = new Table({
-    head
+    head,
+    chars: { mid: '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' }
   })
-  for (const project of reportData) {
-    table.push(Object.values(project))
+  for (let i = 0; i < reportData.length; i++) {
+    // First row chars
+    const chars = {
+      midMid: '┼',
+      mid: '─',
+      leftMid: '├',
+      rightMid: '┤'
+    }
+    const project = reportData[i]
+    if (i == 0 ) {
+      table.push(Object.values(project).map((content) => ({ content: chalk.grey(content), chars })))
+    } else if ( i == reportData.length - 1) {
+      table.push(Object.values(project).map((content) => ( {content: chalk.bold(content), chars })))
+    } else {
+      table.push(Object.values(project).map((content) => ({ content: chalk.grey(content) })))
+    }
   }
   console.log(table.toString())
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beauraines/toggl-cli",
-  "version": "0.10.11",
+  "version": "0.10.13",
   "description": "",
   "main": "cli.js",
   "bin": {
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "test": "jest",
-    "lint": "eslint . ./**/*.js ./**/*.js",
+    "lint": "eslint . ./**/*.js ./**/*.mjs",
     "lint:fix": "eslint . ./**/*.js ./**/*.mjs --fix",
     "release": "standard-version",
     "should-release": "should-release"
@@ -30,6 +30,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "chalk": "^4.0.0",
     "cli-table3": "^0.6.3",
     "dayjs": "^1.11.6",
     "debug": "^4.3.4",