1.4.4

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

@@ -15,7 +15,6 @@
 
 	<script type="text/javascript" src="../node_modules/ejs/ejs.js"></script>
 	<script type="text/javascript" src="../node_modules/ejs-render-remote/ejs-render-remote.js"></script>
-	<script type="text/javascript" src="js/templates.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,25 +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(ejs.rr('templates/files.ejs', {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(ejs.rr('templates/noGitLfsFiles.ejs'));
 		}
 	});
 
 	ipcRenderer.on('repoDir', (event, repoDir) => {
-		$('.js-container').html(ejs.rr('templates/main.ejs'));
+		ejs.preloadTemplate('templates/main.ejs')
-		$('.js-repo-dir').text('current repo dir: ' + repoDir).show();
+		.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(ejs.rr('templates/isNoGitLfsRepo.ejs', {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) => {

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

@@ -15,7 +15,7 @@ let repoRootDir = repoDir;
 
 function getLfsFileList(dir, cb) {
 	exec('git ls-files | git check-attr --stdin lockable', {
-		maxBuffer: 1024 * 1024,
+		maxBuffer: (1024 * 1024) * 10, //10MB
 		cwd: dir
 	},
 	(error, stdout, stderr) => {
@@ -47,7 +47,7 @@ function getLfsFileList(dir, cb) {
 
 function getLfsLocks(dir, cb) {
 	exec('git lfs locks', {
-		maxBuffer: 1024 * 1024,
+		maxBuffer: (1024 * 1024) * 10, //10MB
 		cwd: dir
 	},
 	(error, stdout, stderr) => {
@@ -126,7 +126,7 @@ function loadRepoPage() {
 
 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.
@@ -147,7 +147,7 @@ function createWindow() {
 
 function startup(cb) {
 	exec('git rev-parse --show-toplevel', {
-		maxBuffer: 1024 * 1024,
+		maxBuffer: (1024 * 1024) * 10, //10MB
 		cwd: repoDir
 	},
 	(error, stdout, stderr) => {
@@ -170,7 +170,7 @@ function startup(cb) {
 
 ipcMain.on('unlock', (event, file) => {
 	exec('git lfs unlock "' + file + '"', {
-		maxBuffer: 1024 * 1024,
+		maxBuffer: (1024 * 1024) * 10, //10MB
 		cwd: repoDir
 	},
 	(error, stdout, stderr) => {
@@ -193,7 +193,7 @@ ipcMain.on('unlock', (event, file) => {
 
 ipcMain.on('lock', (event, file) => {
 	exec('git lfs lock --json "' + file + '"', {
-		maxBuffer: 1024 * 1024,
+		maxBuffer: (1024 * 1024) * 10, //10MB
 		cwd: repoDir
 	},
 	(error, stdout, stderr) => {

app/templates/files.ejs

@@ -34,6 +34,10 @@
 </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>

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

@@ -1,7 +1,4 @@
 <div class="alert alert-danger">
 	<%= repoDir %> is not a git lfs repo.
 </div>
-<div class="text-center">
+<%- ejs.rr('templates/openFolder.ejs') %>
-	<a class="btn btn-primary js-open-folder" href="javascript:///">Open an other folder</a>
-	<input type="file" style="display: none" class="js-open-folder-input" webkitdirectory />
-</div>

app/templates/noGitLfsFiles.ejs

@@ -1,3 +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.3.0",
+  "version": "1.4.4",
   "description": "",
   "main": "app/main.js",
   "build": {
@@ -28,21 +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.7",
+    "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",
+    "jquery": "^3.5.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 .",