1.4.2

.gitignore

@@ -1,2 +1,3 @@
 dist
 node_modules
+.vscode

.vscode/launch.json

@@ -1,16 +0,0 @@
-{
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Electron Main",
-			"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
-			//"program": "${workspaceFolder}/app/main.js",
-			"args": ["${workspaceFolder}/app/main.js", "C:\\Temp\\test"]
-		}
-	]
-}

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-	"git.ignoreLimitWarning": true
-}

README.md

@@ -1,4 +1,4 @@
-# ![gitlit](build/icon.png)
+# <img src="logo/logo.png" alt="gitlit">
 
 gitlit is a very simple desktop app that allows you to handle [git lfs file locks](https://github.com/git-lfs/git-lfs/wiki/File-Locking).
 
@@ -19,6 +19,8 @@ gitlit /home/s2/myApp
 
 If no folder is specified, gitlit looks at the current path.
 
+You can also drag&drop a folder inside the main window.
+
 ## contribute
 
 The code is very easy. Just clone the repo and have look!
@@ -33,7 +35,6 @@ There are just some js libraries:
 
 ### run the app
 ```
-cd app
 npm install
 npm start
 ```

app/css/app.css

@@ -1,3 +1,12 @@
+html {
+    margin-bottom: 10px;
+}
+
+.jumbotron {
+    height: 640px;
+    margin-bottom: 0px;
+}
+
 .js-container {
 	margin: 5px;
 }

app/index.html

@@ -14,7 +14,7 @@
 	<script type="text/javascript" src="../node_modules/pnotify/dist/iife/PNotifyButtons.js"></script>
 
 	<script type="text/javascript" src="../node_modules/ejs/ejs.js"></script>
-	<script type="text/javascript" src="js/templates.js"></script>
+	<script type="text/javascript" src="../node_modules/ejs-render-remote/ejs-render-remote.js"></script>
 	<script type="text/javascript" src="js/sorttable.js"></script>
 
 	<link href="../node_modules/bootstrap/dist/css/bootstrap.css" rel="stylesheet">

app/js/index.js

@@ -4,24 +4,39 @@
 	const electronFind = require('electron-find');
 	let findInPage = new electronFind.FindInPage(remote.getCurrentWebContents());
 
+	let firstRun = true;
+
 	//events
 	ipcRenderer.on('fileList', (event, files) => {
+		firstRun = false;
 		if (files && files.length > 0) {
-			$('.files-table-container').html(gitlit.templates.files({files: files}));
+			ejs.preloadTemplate('templates/files.ejs')
-			sorttable.makeSortable($('.js-filestable')[0]);
+			.then(t => {
-			var myTH = document.getElementsByTagName("th")[0];
+				$('.files-table-container').html(ejs.rr(t, {files: files}));
-			sorttable.innerSortFunction.apply(myTH, []);
+				sorttable.makeSortable($('.js-filestable')[0]);
+				var myTH = document.getElementsByTagName('th')[0];
+				sorttable.innerSortFunction.apply(myTH, []);
+			});
 		} else {
-			$('.files-table-container').html(gitlit.templates.noGitLfsFiles());
+			$('.files-table-container').html(ejs.rr('templates/noGitLfsFiles.ejs'));
 		}
 	});
 
 	ipcRenderer.on('repoDir', (event, repoDir) => {
-		$('.js-repo-dir').text('current repo dir: ' + repoDir).show();
+		ejs.preloadTemplate('templates/main.ejs')
+		.then(t => {
+			$('.js-container').html(ejs.rr(t));
+			$('.js-repo-dir').text('current repo dir: ' + repoDir).show();
+		});
 	});
 
 	ipcRenderer.on('isNoGitLfsRepo', (event, repoDir) => {
-		$('.js-container').html(gitlit.templates.isNoGitLfsRepo({repoDir: repoDir}));
+		if (firstRun) {
+			firstRun = false;
+			$('.js-container').html(ejs.rr('templates/firstRun.ejs', {repoDir: repoDir}));
+		} else {
+			$('.js-container').html(ejs.rr('templates/isNoGitLfsRepo.ejs', {repoDir: repoDir}));
+		}
 	});
 
 	ipcRenderer.on('notification', (event, notification) => {
@@ -75,6 +90,16 @@
 		window.location.reload(false);
 	});
 
+	$(document).on('click', '.js-open-folder', (ev) => {
+		ev.preventDefault();
+		$('.js-open-folder-input').trigger('click');
+	});
+
+	$(document).on('change', '.js-open-folder-input', (ev) => {
+		ev.preventDefault();
+		ipcRenderer.send('restart', $('.js-open-folder-input')[0].files[0].path);
+	});
+
 	$(document).on('keypress', (ev) => {
 		//ctrl + f
 		if (ev.ctrlKey && ev.charCode == 6) {
@@ -87,8 +112,21 @@
 		}
 	});
 
+	$(document).on('drop', (ev) => {
+		ev.preventDefault();
+		ev.stopPropagation();
+
+		if (ev.originalEvent.dataTransfer.files && ev.originalEvent.dataTransfer.files.length > 0) {
+			ipcRenderer.send('restart', ev.originalEvent.dataTransfer.files[0].path);
+		}
+	});
+
+	$(document).on('dragover', (ev) => {
+		ev.preventDefault();
+		ev.stopPropagation();
+	});
+
 	//startup
 	PNotify.defaults.styling = 'bootstrap4'; // Bootstrap version 4
-	$('.js-container').html(gitlit.templates.main());
 
 })(jQuery);

app/js/templates.js

@@ -1,63 +0,0 @@
-window.gitlit = window.gitlit || {};
-gitlit.templates = {
-	main: ejs.compile(`
-		<div class="alert alert-success js-repo-dir" style="display:none;"></div>
-		<div class="files-table-container">
-			<div class="alert alert-primary" role="alert">
-				Getting file list...
-			</div>
-		</div>
-	`),
-	files: ejs.compile(`
-		<table class="table table-striped sortable js-filestable">
-			<thead class="thead-light">
-				<tr>
-					<th>file</th>
-					<th>status</th>
-					<th class="sorttable_nosort">action</th>
-				</tr>
-			<thead>
-
-			<tbody>
-			<% files.forEach((file) => { %>
-				<tr>
-					<td><%= file.file %></td>
-					<td><%= file.lockedBy ? file.lockedBy + ' (id: ' + file.id + ')' : 'not locked' %></td>
-					<td>
-						<a class="btn btn-primary btn-sm js-lock"
-							href="javascript:///"
-							data-file="<%= file.file %>"
-							style="<%= file.lockedBy ? 'display: none;' : '' %>"
-						>
-							Lock
-						</a>
-						<a class="btn btn-danger btn-sm js-unlock"
-							href="javascript:///"
-							data-file="<%= file.file %>"
-							style="<%= file.lockedBy ? '' : 'display: none;' %>"
-						>
-							Unlock
-						</a>
-					</td>
-				</tr>
-			<% }); %>
-			</tbody>
-		</table>
-
-		<div class="float-right">
-			<a class="btn btn-secondary btn-sm js-refresh" href="javascript:///">
-				Refresh
-			</a>
-		</div>
-	`),
-	isNoGitLfsRepo: ejs.compile(`
-		<div class="alert alert-danger">
-			<%= repoDir %> is not a git lfs repo.
-		</div>
-	`),
-	noGitLfsFiles: ejs.compile(`
-		<div class="alert alert-info">
-			no files tracked with lfs here.
-		</div>
-	`)
-};

app/main.js

@@ -9,7 +9,8 @@ const args = require('minimist')(process.defaultApp ? process.argv.slice(3) : pr
 	}
 });
 
-const repoDir = path.resolve(path.normalize(args._.join(' ')));
+let win;
+let repoDir = path.resolve(path.normalize(args._.join(' ')));
 let repoRootDir = repoDir;
 
 function getLfsFileList(dir, cb) {
@@ -86,11 +87,46 @@ function getArrayObjectByKey(array, key, value, defaultKeyValue) {
 		return defaultKeyValue ? o[0][defaultKeyValue] : o[0];
 	}
 	return undefined;
-}
+};
+
+function loadRepoPage() {
+	win.webContents.send('repoDir', repoDir);
+
+	getLfsFileList(repoDir, (err, files) => {
+		if (err) {
+			console.error(err);
+
+			win.webContents.send('isNoGitLfsRepo', repoDir);
+			return;
+		}
+		getLfsLocks(repoDir, (err, lockedFiles) => {
+			if (err) {
+				console.error(err);
+
+				win.webContents.send('isNoGitLfsRepo', repoDir);
+				return;
+			}
+			let allFiles = [];
+			let repoDirWithoutRoot = repoDir === repoRootDir ? '' : repoDir.replace(path.normalize(repoRootDir + '/'), '');
+
+			files.forEach((file) => {
+				const t = {
+					file: file,
+					lockedBy: getArrayObjectByKey(lockedFiles, 'file', path.normalize(repoDirWithoutRoot ? repoDirWithoutRoot + '/' + file : file), 'lockedBy'),
+					id: getArrayObjectByKey(lockedFiles, 'file', path.normalize(repoDirWithoutRoot ? repoDirWithoutRoot + '/' + file : file), 'id')
+				};
+
+				allFiles.push(t);
+			});
+
+			win.webContents.send('fileList', allFiles);
+		});
+	});
+};
 
 function createWindow() {
 	// Create the browser window.
-	win = new BrowserWindow({width: 800, height: 600});
+	win = new BrowserWindow({width: 800, height: 700});
 	win.setMenu(null);
 
 	// and load the index.html of the app.
@@ -105,40 +141,32 @@ function createWindow() {
 	});
 
 	win.webContents.on('did-finish-load', () => {
-		win.webContents.send('repoDir', repoDir);
+		loadRepoPage();
-
-		getLfsFileList(repoDir, (err, files) => {
-			if (err) {
-				console.error(err);
-
-				win.webContents.send('isNoGitLfsRepo', repoDir);
-				return;
-			}
-			getLfsLocks(repoDir, (err, lockedFiles) => {
-				if (err) {
-					console.error(err);
-
-					win.webContents.send('isNoGitLfsRepo', repoDir);
-					return;
-				}
-				let allFiles = [];
-				let repoDirWithoutRoot = repoDir === repoRootDir ? '' : repoDir.replace(path.normalize(repoRootDir + '/'), '');
-
-				files.forEach((file) => {
-					const t = {
-						file: file,
-						lockedBy: getArrayObjectByKey(lockedFiles, 'file', path.normalize(repoDirWithoutRoot ? repoDirWithoutRoot + '/' + file : file), 'lockedBy'),
-						id: getArrayObjectByKey(lockedFiles, 'file', path.normalize(repoDirWithoutRoot ? repoDirWithoutRoot + '/' + file : file), 'id')
-					};
-
-					allFiles.push(t);
-				});
-
-				win.webContents.send('fileList', allFiles);
-			});
-		});
 	});
-}
+};
+
+function startup(cb) {
+	exec('git rev-parse --show-toplevel', {
+		maxBuffer: 1024 * 1024,
+		cwd: repoDir
+	},
+	(error, stdout, stderr) => {
+		if (error) {
+			if (win) {
+				win.webContents.send('isNoGitLfsRepo', repoDir);
+			}
+			console.error(error);
+		}
+
+		if (stdout) {
+			repoRootDir = path.normalize(stdout.replace(/\n/g, ''));
+		}
+
+		if (cb) {
+			cb();
+		}
+	});
+};
 
 ipcMain.on('unlock', (event, file) => {
 	exec('git lfs unlock "' + file + '"', {
@@ -187,22 +215,13 @@ ipcMain.on('lock', (event, file) => {
 	});
 });
 
+ipcMain.on('restart', (event, newRepoDir) => {
+	repoDir = newRepoDir;
+	startup(loadRepoPage);
+});
+
 app.on('ready', () => {
-	exec('git rev-parse --show-toplevel', {
+	startup(createWindow);
-		maxBuffer: 1024 * 1024,
-		cwd: repoDir
-	},
-	(error, stdout, stderr) => {
-		if (error) {
-			console.error(error);
-		}
-
-		if (stdout) {
-			repoRootDir = path.normalize(stdout.replace(/\n/g, ''));
-		}
-
-		createWindow();
-	});
 });
 
 app.on('window-all-closed', function() {

app/templates/files.ejs

@@ -0,0 +1,44 @@
+<table class="table table-striped sortable js-filestable">
+	<thead class="thead-light">
+		<tr>
+			<th>file</th>
+			<th>status</th>
+			<th class="sorttable_nosort">action</th>
+		</tr>
+	<thead>
+
+	<tbody>
+	<% files.forEach((file) => { %>
+		<tr>
+			<td><%= file.file %></td>
+			<td><%= file.lockedBy ? file.lockedBy + ' (id: ' + file.id + ')' : 'not locked' %></td>
+			<td>
+				<a class="btn btn-primary btn-sm js-lock"
+					href="javascript:///"
+					data-file="<%= file.file %>"
+					style="<%= file.lockedBy ? 'display: none;' : '' %>"
+				>
+					Lock
+				</a>
+				<a class="btn btn-danger btn-sm js-unlock"
+					href="javascript:///"
+					data-file="<%= file.file %>"
+					style="<%= file.lockedBy ? '' : 'display: none;' %>"
+				>
+					Unlock
+				</a>
+			</td>
+		</tr>
+	<% }); %>
+	</tbody>
+</table>
+
+<div class="float-right">
+	<div style="display: inline;">
+		<a class="btn btn-primary btn-sm js-open-folder" href="javascript:///">Open another folder</a>
+		<input type="file" style="display: none" class="js-open-folder-input" webkitdirectory />
+	</div>
+	<a class="btn btn-secondary btn-sm js-refresh" href="javascript:///">
+		Refresh
+	</a>
+</div>

app/templates/firstRun.ejs

@@ -0,0 +1,9 @@
+<div class="jumbotron text-center">
+	<img src="../logo/logo.png">
+	<h1>gitlit</h1>
+	<p class="lead">Handle git lfs locks with ease</p>
+	<div class="text-center">
+		<a class="btn btn-primary btn-lg js-open-folder" href="javascript:///">Open git repository folder</a>
+		<input type="file" style="display: none" class="js-open-folder-input" webkitdirectory />
+	</div>
+</div>

app/templates/isNoGitLfsRepo.ejs

@@ -0,0 +1,4 @@
+<div class="alert alert-danger">
+	<%= repoDir %> is not a git lfs repo.
+</div>
+<%- ejs.rr('templates/openFolder.ejs') %>

app/templates/main.ejs

@@ -0,0 +1,6 @@
+<div class="alert alert-success js-repo-dir" style="display:none;"></div>
+<div class="files-table-container">
+	<div class="alert alert-primary" role="alert">
+		Getting file list...
+	</div>
+</div>

app/templates/noGitLfsFiles.ejs

@@ -0,0 +1,4 @@
+<div class="alert alert-info">
+	no files tracked with lfs here.
+</div>
+<%- ejs.rr('templates/openFolder.ejs') %>

app/templates/openFolder.ejs

@@ -0,0 +1,4 @@
+<div class="text-center">
+	<a class="btn btn-primary js-open-folder" href="javascript:///">Open another folder</a>
+	<input type="file" style="display: none" class="js-open-folder-input" webkitdirectory />
+</div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlit",
-  "version": "1.1.0",
+  "version": "1.4.2",
   "description": "",
   "main": "app/main.js",
   "build": {
@@ -28,20 +28,21 @@
   },
   "dependencies": {
     "animate.css": "^3.5.2",
-    "bootstrap": "^4.1.3",
+    "bootstrap": "^4.4.1",
-    "ejs": "^2.6.1",
+    "ejs": "^2.7.4",
+    "ejs-render-remote": "^1.0.13",
     "electron-find": "^1.0.6",
-    "electron-localshortcut": "^3.1.0",
+    "electron-localshortcut": "^3.2.1",
     "jquery": "^3.3.1",
     "material-design-icons": "^3.0.1",
-    "minimist": "^1.2.0",
+    "minimist": "^1.2.5",
     "nonblockjs": "^1.0.8",
-    "pnotify": "^4.0.0-alpha.4",
+    "pnotify": "^4.0.1",
-    "popper.js": "^1.14.3"
+    "popper.js": "^1.16.1"
   },
   "devDependencies": {
-    "electron": "^3.0.3",
+    "electron": "^3.1.13",
-    "electron-builder": "^20.43.0"
+    "electron-builder": "^20.44.4"
   },
   "scripts": {
     "start": "electron .",