Minor UI changes and reverter back to npm

CliClient/app/command-geoloc.js

@@ -22,6 +22,8 @@ class Command extends BaseCommand {
 		if (!item) throw new Error(_('Cannot find "%s".', title));
 		const url = Note.geolocationUrl(item);
 		this.stdout(url);
+
+		app().gui().showConsole();
 	}
 
 }

CliClient/app/command-import-enex.js

@@ -55,6 +55,8 @@ class Command extends BaseCommand {
 		}
 
 		folder = !folder ? await Folder.save({ title: folderTitle }) : folder;
+		
+		app().gui().showConsole();
 		this.stdout(_('Importing notes...'));
 		await importEnex(folder.id, filePath, options);
 		cliUtils.redrawDone();

CliClient/app/command-status.js

@@ -1,5 +1,6 @@
 import { BaseCommand } from './base-command.js';
 import { Database } from 'lib/database.js';
+import { app } from './app.js';
 import { Setting } from 'lib/models/setting.js';
 import { _ } from 'lib/locale.js';
 import { ReportService } from 'lib/services/report.js';
@@ -32,6 +33,9 @@ class Command extends BaseCommand {
 				this.stdout(line);
 			}
 		}
+
+		app().gui().showConsole();
+		app().gui().maximizeConsole();
 	}
 
 }

CliClient/app/gui/StatusBarWidget.js

@@ -78,7 +78,14 @@ class StatusBarWidget extends BaseWidget {
 
 		this.innerClear();
 
-		const textStyle = this.promptActive ? (s) => s : chalk.bgBlueBright.white;
+		// Note:
+		// On Ubuntu, bgBlueBright looks too bright which makes the white text illegible
+		// On Windows, bgBlueBright is fine and looks dark enough (Windows is probably in the wrong though)
+		// For now, just don't use any colour at all.
+
+		//const textStyle = this.promptActive ? (s) => s : chalk.bgBlueBright.white;
+		//const textStyle = (s) => s;
+		const textStyle = this.promptActive ? (s) => s : chalk.gray;
 
 		this.term.drawHLine(this.absoluteInnerX, this.absoluteInnerY, this.innerWidth, textStyle(' '));
 

CliClient/app/onedrive-api-node-utils.js

@@ -53,7 +53,15 @@ class OneDriveApiNodeUtils {
 			let errorMessage = null;
 
 			this.oauthServer_.on('request', (request, response) => {
-				const query = urlParser.parse(request.url, true).query;
+				const url = urlParser.parse(request.url, true);
+
+				if (url.pathname === '/auth') {
+					response.writeHead(302, { 'Location': authCodeUrl });
+					response.end();
+					return;
+				}
+
+				const query = url.query;
 
 				const writeResponse = (code, message) => {
 					response.writeHead(code, {"Content-Type": "text/html"});
@@ -98,9 +106,14 @@ class OneDriveApiNodeUtils {
 
 			enableServerDestroy(this.oauthServer_);
 
+			// Rather than displaying authCodeUrl directly, we go throught the local
+			// server. This is just so that the URL being displayed is shorter and
+			// doesn't get cut in terminals (especially those that don't handle multi
+			// lines URLs).
+
 			targetConsole.log(_('Please open the following URL in your browser to authenticate the application. The application will create a directory in "Apps/Joplin" and will only read and write files in this directory. It will have no access to any files outside this directory nor to any other personal data. No data will be shared with any third party.'));
 			targetConsole.log('');
-			targetConsole.log(authCodeUrl);
+			targetConsole.log('http://127.0.0.1:' + port + '/auth');
 		});
 	}
 

CliClient/package.json

@@ -18,7 +18,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "0.10.51",
+  "version": "0.10.53",
   "bin": {
     "joplin": "./main.js"
   },

CliClient/package.json.md5

@@ -1 +0,0 @@
-2b4b9827cb040eb8a6c5d9eaf792df3d