mirror of
https://github.com/S2-/gitlit
synced 2025-08-02 20:30:05 +02:00
Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
48b5f33eb9
|
|||
|
64b500f414
|
|||
|
caeaab14b8
|
|||
|
94e7c5ce71
|
|||
|
cdafb7a006
|
|||
|
6c2bc3397e
|
|||
|
a6666452d7
|
|||
|
e9feebce51
|
|||
|
510e4786b7
|
|||
|
b540eae1b9
|
|||
|
8f3705ba74
|
|||
|
e032eb2ab0
|
|||
|
519d719545
|
|||
|
f8076499ba
|
|||
|
edeadfd7fc
|
|||
|
9c26b8fb10
|
|||
| b0f3ba27b5 | |||
| 99c858e5a7 | |||
| 9f02f5f27c | |||
| 48ecb505d7 | |||
| a04c84abb4 | |||
| 31c19d5534 | |||
| 171b79e355 | |||
| 4178caa94a |
@@ -2,6 +2,11 @@ html {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.jumbotron {
|
||||
height: 640px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.js-container {
|
||||
margin: 5px;
|
||||
}
|
||||
@@ -44,3 +49,13 @@ table.sortable thead {
|
||||
table.sortable .sorttable_nosort {
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* updater
|
||||
*/
|
||||
.updatenotice {
|
||||
position: fixed;
|
||||
bottom: 5px;
|
||||
right: 5px;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>gitlit</title>
|
||||
|
||||
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
|
||||
|
||||
@@ -21,8 +20,9 @@
|
||||
<link href="css/app.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
<div class="js-container">
|
||||
</div>
|
||||
<div class="js-container"></div>
|
||||
<script src="js/index.js"></script>
|
||||
|
||||
<div class="js-updatenotice btn btn-warning btn-sm updatenotice" style="display:none" disabled>Update ready to install</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -4,8 +4,40 @@
|
||||
const electronFind = require('electron-find');
|
||||
let findInPage = new electronFind.FindInPage(remote.getCurrentWebContents());
|
||||
|
||||
let firstRun = true;
|
||||
|
||||
//events
|
||||
|
||||
//update stuff
|
||||
ipcRenderer.on('update', (event, state) => {
|
||||
if (state.event === 'updateAvailable') {
|
||||
$('.js-updatenotice').text(`New version ${state.version} available. Downloading...`);
|
||||
$('.js-updatenotice').prop('disabled', true);
|
||||
$('.js-updatenotice').show();
|
||||
}
|
||||
|
||||
if (state.event === 'updateReadyToInstall') {
|
||||
$('.js-updatenotice').text(`New version ready to install. Click here to start installer.`);
|
||||
$('.js-updatenotice').show();
|
||||
$('.js-updatenotice').prop('disabled', false);
|
||||
$('.js-updatenotice').data('file', state.file);
|
||||
}
|
||||
});
|
||||
|
||||
$(document).on('click', '.js-updatenotice', (ev) => {
|
||||
ev.preventDefault();
|
||||
if ($('.js-updatenotice').prop('disabled')) {
|
||||
return;
|
||||
}
|
||||
$('.js-updatenotice').prop('disabled', true);
|
||||
$('.js-updatenotice').text(`Launching installer...`);
|
||||
ipcRenderer.send('installUpdate', $('.js-updatenotice').data('file'));
|
||||
});
|
||||
//end update stuff
|
||||
|
||||
|
||||
ipcRenderer.on('fileList', (event, files) => {
|
||||
firstRun = false;
|
||||
if (files && files.length > 0) {
|
||||
ejs.preloadTemplate('templates/files.ejs')
|
||||
.then(t => {
|
||||
@@ -28,7 +60,12 @@
|
||||
});
|
||||
|
||||
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) => {
|
||||
|
||||
46
app/main.js
46
app/main.js
@@ -3,6 +3,7 @@ const path = require('path');
|
||||
const url = require('url');
|
||||
const electronLocalshortcut = require('electron-localshortcut');
|
||||
const exec = require('child_process').exec;
|
||||
const gau = require('github-app-updater');
|
||||
const args = require('minimist')(process.defaultApp ? process.argv.slice(3) : process.argv.slice(1), {
|
||||
default: {
|
||||
_: process.cwd()
|
||||
@@ -13,9 +14,42 @@ let win;
|
||||
let repoDir = path.resolve(path.normalize(args._.join(' ')));
|
||||
let repoRootDir = repoDir;
|
||||
|
||||
//auto update stuff
|
||||
setTimeout(() => {
|
||||
gau.checkForUpdate({
|
||||
currentVersion: app.getVersion(),
|
||||
repo: 'https://api.github.com/repos/S2-/gitlit/releases/latest',
|
||||
assetMatch: /.+setup.+exe/i
|
||||
});
|
||||
|
||||
gau.onUpdateAvailable = (version, asset) => {
|
||||
win.webContents.send('update', {
|
||||
event: 'updateAvailable',
|
||||
version: version
|
||||
});
|
||||
gau.downloadNewVersion(asset);
|
||||
};
|
||||
|
||||
gau.onNewVersionReadyToInstall = (file) => {
|
||||
win.webContents.send('update', {
|
||||
event: 'updateReadyToInstall',
|
||||
file: file
|
||||
});
|
||||
};
|
||||
|
||||
ipcMain.on('installUpdate', (event, file) => {
|
||||
gau.executeUpdate(file);
|
||||
win.webContents.send('update', {
|
||||
event: 'updateInstalling'
|
||||
});
|
||||
});
|
||||
}, 5000);
|
||||
|
||||
//end update stuff
|
||||
|
||||
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 +81,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 +160,7 @@ function loadRepoPage() {
|
||||
|
||||
function createWindow() {
|
||||
// Create the browser window.
|
||||
win = new BrowserWindow({width: 800, height: 600});
|
||||
win = new BrowserWindow({title: 'gitlit v' + app.getVersion(), width: 800, height: 700});
|
||||
win.setMenu(null);
|
||||
|
||||
// and load the index.html of the app.
|
||||
@@ -147,7 +181,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 +204,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 +227,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) => {
|
||||
|
||||
9
app/templates/firstRun.ejs
Normal file
9
app/templates/firstRun.ejs
Normal file
@@ -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>
|
||||
786
package-lock.json
generated
786
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
27
package.json
27
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "gitlit",
|
||||
"version": "1.3.1",
|
||||
"version": "2.0.1",
|
||||
"description": "",
|
||||
"main": "app/main.js",
|
||||
"build": {
|
||||
@@ -28,26 +28,27 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"animate.css": "^3.5.2",
|
||||
"bootstrap": "^4.1.3",
|
||||
"ejs": "^2.6.1",
|
||||
"ejs-render-remote": "^1.0.7",
|
||||
"bootstrap": "^4.5.0",
|
||||
"ejs": "^2.7.4",
|
||||
"ejs-render-remote": "^1.0.13",
|
||||
"electron-find": "^1.0.6",
|
||||
"electron-localshortcut": "^3.1.0",
|
||||
"jquery": "^3.3.1",
|
||||
"electron-localshortcut": "^3.2.1",
|
||||
"github-app-updater": "^1.0.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",
|
||||
"popper.js": "^1.14.3"
|
||||
"pnotify": "^4.0.1",
|
||||
"popper.js": "^1.16.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron": "^3.0.3",
|
||||
"electron-builder": "^20.43.0"
|
||||
"electron": "^3.1.13",
|
||||
"electron-builder": "^20.44.4"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "electron .",
|
||||
"pack": "electron-builder --linux --win --dir",
|
||||
"dist": "electron-builder --linux --win"
|
||||
"pack": "electron-builder --linux --win portable nsis --dir --publish=never",
|
||||
"dist": "electron-builder --linux --win portable nsis --publish=never"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
Reference in New Issue
Block a user