s2/gitlit
1
0
Fork 0
mirror of https://github.com/S2-/gitlit synced 2025-08-02 20:30:05 +02:00
Code Issues Releases Wiki Activity

Compare commits

base: s2:v1.4.0
Branches Tags
s2:master s2:dependabot/npm_and_yarn/http-cache-semantics-4.1.1 s2:dependabot/npm_and_yarn/json5-2.2.3 s2:dependabot/npm_and_yarn/electron-18.3.7 s2:dependabot/npm_and_yarn/node-fetch-2.6.7 s2:dependabot/npm_and_yarn/minimist-1.2.6 s2:dependabot/npm_and_yarn/plist-3.0.4
s2:v2.0.16 s2:v2.0.15 s2:v2.0.14 s2:v2.0.13 s2:v2.0.12 s2:v2.0.11 s2:v2.0.10 s2:v2.0.9 s2:v2.0.8 s2:v2.0.7 s2:v2.0.6 s2:v2.0.5 s2:v2.0.4 s2:v2.0.3 s2:v2.0.2 s2:v2.0.1 s2:v2.0.0 s2:v1.5.2 s2:v1.5.1 s2:v1.5.0 s2:v1.4.4 s2:v1.4.3 s2:v1.4.2 s2:v1.4.1 s2:v1.4.0 s2:v1.3.1 s2:v1.3.0 s2:v1.2.0 s2:v1.1.1 s2:v1.1.0 s2:v1.0.9 s2:v1.0.8 s2:v1.0.7 s2:v1.0.6 s2:v1.0.5 s2:v1.0.4 s2:v1.0.3 s2:v1.0.1 s2:v1.0.0
...
compare: s2:v2.0.3
Branches Tags
s2:dependabot/npm_and_yarn/http-cache-semantics-4.1.1 s2:dependabot/npm_and_yarn/json5-2.2.3 s2:dependabot/npm_and_yarn/electron-18.3.7 s2:dependabot/npm_and_yarn/node-fetch-2.6.7 s2:dependabot/npm_and_yarn/minimist-1.2.6 s2:dependabot/npm_and_yarn/plist-3.0.4 s2:master
s2:v2.0.16 s2:v2.0.15 s2:v2.0.14 s2:v2.0.13 s2:v2.0.12 s2:v2.0.11 s2:v2.0.10 s2:v2.0.9 s2:v2.0.8 s2:v2.0.7 s2:v2.0.6 s2:v2.0.5 s2:v2.0.4 s2:v2.0.3 s2:v2.0.2 s2:v2.0.1 s2:v2.0.0 s2:v1.5.2 s2:v1.5.1 s2:v1.5.0 s2:v1.4.4 s2:v1.4.3 s2:v1.4.2 s2:v1.4.1 s2:v1.4.0 s2:v1.3.1 s2:v1.3.0 s2:v1.2.0 s2:v1.1.1 s2:v1.1.0 s2:v1.0.9 s2:v1.0.8 s2:v1.0.7 s2:v1.0.6 s2:v1.0.5 s2:v1.0.4 s2:v1.0.3 s2:v1.0.1 s2:v1.0.0

26 Commits
v1.4.0 ... v2.0.3

Author SHA1 Message Date
s2
3d020a3ddd 2.0.3 2020-06-07 20:22:57 +02:00
s2
8765f99f19 update node modules 2020-06-07 20:22:50 +02:00
s2
cee594fcd9 2.0.2 2020-06-07 20:16:05 +02:00
s2
3c4d33eb83 just a note 2020-06-07 20:15:56 +02:00
s2
48b5f33eb9 2.0.1 2020-06-07 20:04:45 +02:00
s2
64b500f414 update node modules 2020-06-07 20:04:45 +02:00
s2
caeaab14b8 remove console.log 2020-06-07 19:50:00 +02:00
s2
94e7c5ce71 don't publish by default in electron builder 2020-06-07 19:48:06 +02:00
s2
cdafb7a006 2.0.0 2020-06-07 19:38:18 +02:00
s2
6c2bc3397e auto update app 2020-06-07 19:37:56 +02:00
s2
a6666452d7 remove update-electron-app 2020-06-07 17:48:58 +02:00
s2
e9feebce51 1.5.2 2020-05-09 15:48:10 +02:00
s2
510e4786b7 create installer package 2020-05-09 15:45:01 +02:00
s2
b540eae1b9 1.5.1 2020-05-09 12:22:28 +02:00
s2
8f3705ba74 show gitlit version in window title 2020-05-09 12:22:21 +02:00
s2
e032eb2ab0 1.5.0 2020-05-09 12:10:34 +02:00
s2
519d719545 auto updater 2020-05-09 12:10:25 +02:00
s2
f8076499ba build windows portable binary 2020-05-09 12:09:23 +02:00
s2
edeadfd7fc 1.4.4 2020-05-06 20:23:03 +02:00
s2
9c26b8fb10 bump exec maxBuffer size to 10MB 2020-05-06 20:22:47 +02:00
s2
b0f3ba27b5 1.4.3 2020-05-06 20:08:09 +02:00
s2
99c858e5a7 update npm modules 2020-05-06 20:08:04 +02:00
s2
9f02f5f27c 1.4.2 2020-03-16 21:46:57 +01:00
s2
48ecb505d7 update node modules 2020-03-16 21:46:15 +01:00
s2
a04c84abb4 1.4.1 2019-06-21 14:15:57 +02:00
s2
31c19d5534 make jumbotron nicer 2019-06-21 09:31:36 +02:00
8 changed files with 477 additions and 436 deletions
Expand all files Collapse all files

3
README.md
View File

@@ -45,6 +45,9 @@ npm install
npm run dist npm run dist
``` ```
## notes
Since version 2.0.1 the app auto updates itself.
## license ## license
ISC ISC

15
app/css/app.css
View File

@@ -2,6 +2,11 @@ html {
margin-bottom: 10px; margin-bottom: 10px;
} }
.jumbotron {
height: 640px;
margin-bottom: 0px;
}
.js-container { .js-container {
margin: 5px; margin: 5px;
} }
@@ -44,3 +49,13 @@ table.sortable thead {
table.sortable .sorttable_nosort { table.sortable .sorttable_nosort {
cursor: default; cursor: default;
} }
/*
* updater
*/
.updatenotice {
position: fixed;
bottom: 5px;
right: 5px;
}

6
app/index.html
View File

@@ -3,7 +3,6 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <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> <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
@@ -21,8 +20,9 @@
<link href="css/app.css" rel="stylesheet"> <link href="css/app.css" rel="stylesheet">
</head> </head>
<body> <body>
<div class="js-container"> <div class="js-container"></div>
</div>
<script src="js/index.js"></script> <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> </body>
</html> </html>

29
app/js/index.js
View File

@@ -7,6 +7,35 @@
let firstRun = true; let firstRun = true;
//events //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) => { ipcRenderer.on('fileList', (event, files) => {
firstRun = false; firstRun = false;
if (files && files.length > 0) { if (files && files.length > 0) {

46
app/main.js
View File

@@ -3,6 +3,7 @@ const path = require('path');
const url = require('url'); const url = require('url');
const electronLocalshortcut = require('electron-localshortcut'); const electronLocalshortcut = require('electron-localshortcut');
const exec = require('child_process').exec; 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), { const args = require('minimist')(process.defaultApp ? process.argv.slice(3) : process.argv.slice(1), {
default: { default: {
_: process.cwd() _: process.cwd()
@@ -13,9 +14,42 @@ let win;
let repoDir = path.resolve(path.normalize(args._.join(' '))); let repoDir = path.resolve(path.normalize(args._.join(' ')));
let repoRootDir = repoDir; 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) { function getLfsFileList(dir, cb) {
exec('git ls-files | git check-attr --stdin lockable', { exec('git ls-files | git check-attr --stdin lockable', {
maxBuffer: 1024 * 1024, maxBuffer: (1024 * 1024) * 10, //10MB
cwd: dir cwd: dir
}, },
(error, stdout, stderr) => { (error, stdout, stderr) => {
@@ -47,7 +81,7 @@ function getLfsFileList(dir, cb) {
function getLfsLocks(dir, cb) { function getLfsLocks(dir, cb) {
exec('git lfs locks', { exec('git lfs locks', {
maxBuffer: 1024 * 1024, maxBuffer: (1024 * 1024) * 10, //10MB
cwd: dir cwd: dir
}, },
(error, stdout, stderr) => { (error, stdout, stderr) => {
@@ -126,7 +160,7 @@ function loadRepoPage() {
function createWindow() { function createWindow() {
// Create the browser window. // 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); win.setMenu(null);
// and load the index.html of the app. // and load the index.html of the app.
@@ -147,7 +181,7 @@ function createWindow() {
function startup(cb) { function startup(cb) {
exec('git rev-parse --show-toplevel', { exec('git rev-parse --show-toplevel', {
maxBuffer: 1024 * 1024, maxBuffer: (1024 * 1024) * 10, //10MB
cwd: repoDir cwd: repoDir
}, },
(error, stdout, stderr) => { (error, stdout, stderr) => {
@@ -170,7 +204,7 @@ function startup(cb) {
ipcMain.on('unlock', (event, file) => { ipcMain.on('unlock', (event, file) => {
exec('git lfs unlock "' + file + '"', { exec('git lfs unlock "' + file + '"', {
maxBuffer: 1024 * 1024, maxBuffer: (1024 * 1024) * 10, //10MB
cwd: repoDir cwd: repoDir
}, },
(error, stdout, stderr) => { (error, stdout, stderr) => {
@@ -193,7 +227,7 @@ ipcMain.on('unlock', (event, file) => {
ipcMain.on('lock', (event, file) => { ipcMain.on('lock', (event, file) => {
exec('git lfs lock --json "' + file + '"', { exec('git lfs lock --json "' + file + '"', {
maxBuffer: 1024 * 1024, maxBuffer: (1024 * 1024) * 10, //10MB
cwd: repoDir cwd: repoDir
}, },
(error, stdout, stderr) => { (error, stdout, stderr) => {

1
app/templates/firstRun.ejs
View File

@@ -1,4 +1,5 @@
<div class="jumbotron text-center"> <div class="jumbotron text-center">
<img src="../logo/logo.png">
<h1>gitlit</h1> <h1>gitlit</h1>
<p class="lead">Handle git lfs locks with ease</p> <p class="lead">Handle git lfs locks with ease</p>
<div class="text-center"> <div class="text-center">

786
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

27
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "gitlit", "name": "gitlit",
"version": "1.4.0", "version": "2.0.3",
"description": "", "description": "",
"main": "app/main.js", "main": "app/main.js",
"build": { "build": {
@@ -28,26 +28,27 @@
}, },
"dependencies": { "dependencies": {
"animate.css": "^3.5.2", "animate.css": "^3.5.2",
"bootstrap": "^4.1.3", "bootstrap": "^4.5.0",
"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-find": "^1.0.6",
"electron-localshortcut": "^3.1.0", "electron-localshortcut": "^3.2.1",
"jquery": "^3.3.1", "github-app-updater": "^1.0.2",
"jquery": "^3.5.1",
"material-design-icons": "^3.0.1", "material-design-icons": "^3.0.1",
"minimist": "^1.2.0", "minimist": "^1.2.5",
"nonblockjs": "^1.0.8", "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": { "devDependencies": {
"electron": "^3.0.3", "electron": "^3.1.13",
"electron-builder": "^20.43.0" "electron-builder": "^20.44.4"
}, },
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",
"pack": "electron-builder --linux --win --dir", "pack": "electron-builder --linux --win portable nsis --dir --publish=never",
"dist": "electron-builder --linux --win" "dist": "electron-builder --linux --win portable nsis --publish=never"
}, },
"repository": { "repository": {
"type": "git", "type": "git",