From b9832670ebc1fec88759afe3c60e1b5e45b495fd Mon Sep 17 00:00:00 2001
From: gabriel garcia seco <ggarciaseco@gmail.com>
Date: Sat, 4 Apr 2020 11:13:01 +0200
Subject: [PATCH 1/2] Add feature time

---
 CHANGELOG.md      |  4 ++++
 LICENSE           |  2 +-
 package-lock.json |  2 +-
 package.json      |  8 ++++----
 src/cli.ts        | 34 +++++++++++++++++++++++++++-------
 src/holded.ts     | 11 +++++++----
 src/puppetter.ts  | 12 ++++++------
 7 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81cc618..a1dcafb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 ### BREAKING CHANGES
 
+## [1.0.0-beta.4] - 2020-04-04
+### Added
+- Option --time for the commands so you can put the time you want in them
+
 ## [1.0.0-beta.3] - 2020-04-01
 ### Added
   - Option --debug so you can the puppeteer running in case you need to debug
diff --git a/LICENSE b/LICENSE
index 0c86a8a..3113439 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Khalid Zoabi
+Copyright (c) 2020 Gabriel García Seco
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/package-lock.json b/package-lock.json
index 873d19a..241921b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "holded-bot",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 62116e7..eeb86ad 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "holded-bot",
-  "version": "1.0.0-beta.3",
-  "description": "Holded bot from terminal",
+  "version": "1.0.0-beta.4",
+  "description": "Holded bot so you can fill your time from terminal",
   "author": "Gabriel García Seco <ggarciaseco@gmail.com>",
   "keywords": [
-    "typescript",
+    "holded",
     "cli",
-    "starter"
+    "lazydev"
   ],
   "license": "MIT",
   "main": "./dist/index.js",
diff --git a/src/cli.ts b/src/cli.ts
index 8a075ed..8df7f92 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -1,14 +1,20 @@
 #!/usr/bin/env node
 
+const packageJSON = require('../package.json'); // eslint-disable-line
 import program from 'commander';
 import input from '@inquirer/input';
 import password from '@inquirer/password';
 import keytar from 'keytar';
 import { startWork, stopWork } from './holded';
 import { Routes } from './routes';
-const packageJSON = require('../package.json'); // eslint-disable-line
 
-function executeCli({ email, company, password }) {
+interface ExecuteCliArgs {
+  email: string;
+  company: string;
+  password: string;
+}
+
+function executeCli({ email, company, password }: ExecuteCliArgs): void {
   const routes = Routes({ business: company });
 
   program.version(packageJSON.version);
@@ -18,21 +24,35 @@ function executeCli({ email, company, password }) {
   program
     .command('start')
     .description('writes into the holded the time')
-    .action(function () {
-      startWork({ email, password }, routes, { debug: program.debug });
+    .option('-t, --time <time>', 'You can add the exact time here')
+    .action(function (options) {
+      startWork({ email, password }, routes, {
+        debug: program.debug,
+        time: options.time
+      });
     });
 
   program
     .command('stop')
     .description('updates holded time with the time')
-    .action(function () {
-      stopWork({ email, password }, routes, { debug: program.debug });
+    .option('-t, --time <time>', 'You can add the exact time here')
+    .action(function (options) {
+      stopWork({ email, password }, routes, {
+        debug: program.debug,
+        time: options.time
+      });
     });
 
   program.parse(process.argv);
 }
 
-async function questions() {
+interface QuestionArgs {
+  companyQuestion: string;
+  emailQuestion: string;
+  passwordQuestion: string;
+}
+
+async function questions(): Promise<QuestionArgs> {
   const companyQuestion = await input({ message: 'Enter your company name' });
   const emailQuestion = await input({ message: 'Enter your email' });
   const passwordQuestion = await password({
diff --git a/src/holded.ts b/src/holded.ts
index b34d3ad..f4d13d8 100644
--- a/src/holded.ts
+++ b/src/holded.ts
@@ -14,7 +14,8 @@ interface AccountArgs {
 }
 
 interface CliArgs {
-  debug: boolean;
+  debug?: boolean;
+  time?: boolean;
 }
 
 export async function startWork(
@@ -27,8 +28,9 @@ export async function startWork(
     const { page, browser } = await startWithUrl(puppeteer, url, args);
     const dayOfTheWeek = DateTime.local().weekday;
 
-    const time = DateTime.local().toLocaleString(DateTime.TIME_SIMPLE);
-    const timeEnd = DateTime.local()
+    const time =
+      args.time || DateTime.local().toLocaleString(DateTime.TIME_SIMPLE);
+    const timeEnd = DateTime.fromISO(time)
       .plus({ minutes: 30 })
       .toLocaleString(DateTime.TIME_SIMPLE);
 
@@ -59,7 +61,8 @@ export async function startWork(
 export async function stopWork(account: AccountArgs, routes, args: CliArgs) {
   const url = routes.LOGIN;
   const { page, browser } = await startWithUrl(puppeteer, url, args);
-  const time = DateTime.local().toLocaleString(DateTime.TIME_SIMPLE);
+  const time =
+    args.time || DateTime.local().toLocaleString(DateTime.TIME_SIMPLE);
   const date = DateTime.local().toFormat('dd-MM-yyyy');
 
   login(page, {
diff --git a/src/puppetter.ts b/src/puppetter.ts
index d7b30df..933f17b 100644
--- a/src/puppetter.ts
+++ b/src/puppetter.ts
@@ -1,4 +1,4 @@
-export async function login(page, form) {
+export async function login(page, form): Promise<void> {
   try {
     await page.type('#tpemail', form.username);
     await page.type('#tppassword', form.password);
@@ -12,7 +12,7 @@ export async function login(page, form) {
 export async function startWithUrl(
   puppeteer,
   url: string,
-  options: { debug: boolean }
+  options: { debug?: boolean }
 ) {
   try {
     const browser = await puppeteer.launch({
@@ -31,7 +31,7 @@ export async function startWithUrl(
   }
 }
 
-export async function addTimeButton(page, dayOfTheWeek) {
+export async function addTimeButton(page, dayOfTheWeek: number): Promise<void> {
   try {
     const links = await page.$$('div.timeline-additem');
     const link = links[dayOfTheWeek - 1];
@@ -41,7 +41,7 @@ export async function addTimeButton(page, dayOfTheWeek) {
   }
 }
 
-async function fillInput(page, options) {
+async function fillInput(page, options): Promise<void> {
   try {
     await page.evaluate(
       (selector, time) => {
@@ -61,7 +61,7 @@ async function fillInput(page, options) {
   }
 }
 
-export async function fillInputs(page, options) {
+export async function fillInputs(page, options): Promise<void> {
   try {
     await fillInput(page, {
       selector: 'timerange-inputstart',
@@ -79,7 +79,7 @@ export async function fillInputs(page, options) {
   }
 }
 
-export async function editLastTimeline(page, options) {
+export async function editLastTimeline(page, options): Promise<void> {
   try {
     await page.evaluate(date => {
       const selector = `td[data-date="${date}"] .timeline-item`;

From 95857872d7bc8247577ed4d42950a5ecacbe7d93 Mon Sep 17 00:00:00 2001
From: gabriel garcia seco <ggarciaseco@gmail.com>
Date: Sat, 4 Apr 2020 11:20:28 +0200
Subject: [PATCH 2/2] Update Readme

---
 README.md  |  5 ++++-
 src/cli.ts | 13 ++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index d2b4e6b..069a682 100644
--- a/README.md
+++ b/README.md
@@ -45,4 +45,7 @@ Stop commands updates the time when you stop the task
 
 ### Options
 
-- --debug you can pass the option argument so you can see puppeteer running
+| Option | Alias | Description |
+| --- | --- | --- |
+| --debug | -d | Debug puppeteer so you what happens under the hood |
+| --time | -t | Give a time in hh:mm format so you can put the time you want for a day |
diff --git a/src/cli.ts b/src/cli.ts
index 8df7f92..877eef3 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -19,27 +19,26 @@ function executeCli({ email, company, password }: ExecuteCliArgs): void {
 
   program.version(packageJSON.version);
 
-  program.option('-debug, --debug', 'Debug puppeteer');
+  program.option('-d, --debug', 'Debug puppeteer');
+  program.option('-t, --time <time>', 'You can add the exact time here');
 
   program
     .command('start')
     .description('writes into the holded the time')
-    .option('-t, --time <time>', 'You can add the exact time here')
-    .action(function (options) {
+    .action(function () {
       startWork({ email, password }, routes, {
         debug: program.debug,
-        time: options.time
+        time: program.time
       });
     });
 
   program
     .command('stop')
     .description('updates holded time with the time')
-    .option('-t, --time <time>', 'You can add the exact time here')
-    .action(function (options) {
+    .action(function () {
       stopWork({ email, password }, routes, {
         debug: program.debug,
-        time: options.time
+        time: program.time
       });
     });