mirror of
https://github.com/S2-/gitlit
synced 2025-08-02 20:30:05 +02:00
Compare commits
26 Commits
v2.0.4
...
dependabot
Author | SHA1 | Date | |
---|---|---|---|
![]() |
c383f5cb29 | ||
44b4183597
|
|||
cfce0edaa9
|
|||
5edd143318
|
|||
e576161518
|
|||
7a63056ef3
|
|||
efd9d13454
|
|||
9836f5c918
|
|||
6c9787fea1
|
|||
16138409f9
|
|||
f604749ce8
|
|||
a259bd3e14
|
|||
e3ed1c6e44
|
|||
5d60c8baac
|
|||
8afc7fdac1
|
|||
e934617a03
|
|||
9f696e12f9
|
|||
b326c45593
|
|||
c905040f0e
|
|||
a171760bd6
|
|||
ce50a38e35
|
|||
133f72df2a
|
|||
bebaf95f70
|
|||
e719261427
|
|||
1fe4d0d90c
|
|||
9873246826
|
@@ -2,6 +2,9 @@
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const remote = require('electron').remote;
|
||||
const electronFind = require('electron-find');
|
||||
const dialog = remote.require('electron').dialog;
|
||||
const shell = require('electron').shell;
|
||||
|
||||
let findInPage = new electronFind.FindInPage(remote.getCurrentWebContents());
|
||||
|
||||
let firstRun = true;
|
||||
@@ -11,15 +14,18 @@
|
||||
//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').text(`New version ${state.version} available. Click here to download.`);
|
||||
$('.js-updatenotice').show();
|
||||
$('.js-updatenotice').prop('disabled', false);
|
||||
$('.js-updatenotice').prop('state', 'ready-to-download');
|
||||
$('.js-updatenotice').data('asset', state.asset);
|
||||
}
|
||||
|
||||
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').prop('state', 'ready-to-install');
|
||||
$('.js-updatenotice').data('file', state.file);
|
||||
}
|
||||
});
|
||||
@@ -29,9 +35,16 @@
|
||||
if ($('.js-updatenotice').prop('disabled')) {
|
||||
return;
|
||||
}
|
||||
$('.js-updatenotice').prop('disabled', true);
|
||||
$('.js-updatenotice').text(`Launching installer...`);
|
||||
ipcRenderer.send('installUpdate', $('.js-updatenotice').data('file'));
|
||||
|
||||
if ($('.js-updatenotice').prop('state') === 'ready-to-download') {
|
||||
$('.js-updatenotice').prop('disabled', true);
|
||||
$('.js-updatenotice').text(`Downloading new version...`);
|
||||
ipcRenderer.send('downloadUpdate', $('.js-updatenotice').data('asset'));
|
||||
} else if ($('.js-updatenotice').prop('state') === 'ready-to-install') {
|
||||
$('.js-updatenotice').prop('disabled', true);
|
||||
$('.js-updatenotice').text(`Launching installer...`);
|
||||
ipcRenderer.send('installUpdate', $('.js-updatenotice').data('file'));
|
||||
}
|
||||
});
|
||||
//end update stuff
|
||||
|
||||
@@ -121,12 +134,20 @@
|
||||
|
||||
$(document).on('click', '.js-open-folder', (ev) => {
|
||||
ev.preventDefault();
|
||||
$('.js-open-folder-input').trigger('click');
|
||||
|
||||
dialog.showOpenDialog({
|
||||
properties: ['openDirectory']
|
||||
})
|
||||
.then((path) => {
|
||||
if (path && path.filePaths.length > 0) {
|
||||
ipcRenderer.send('restart', path.filePaths[0]);
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
$(document).on('change', '.js-open-folder-input', (ev) => {
|
||||
ev.preventDefault();
|
||||
ipcRenderer.send('restart', $('.js-open-folder-input')[0].files[0].path);
|
||||
$(document).on('click', 'a[href^="http"]', function(event) {
|
||||
event.preventDefault();
|
||||
shell.openExternal(this.href);
|
||||
});
|
||||
|
||||
$(document).on('keypress', (ev) => {
|
||||
|
73
app/main.js
73
app/main.js
@@ -15,35 +15,42 @@ 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
|
||||
if (process.platform === 'win32') {
|
||||
setTimeout(() => {
|
||||
gau.checkForUpdate({
|
||||
currentVersion: app.getVersion(),
|
||||
repo: 'https://api.github.com/repos/S2-/gitlit/releases/latest',
|
||||
assetMatch: /.+setup.+exe/i
|
||||
});
|
||||
gau.downloadNewVersion(asset);
|
||||
};
|
||||
|
||||
gau.onNewVersionReadyToInstall = (file) => {
|
||||
win.webContents.send('update', {
|
||||
event: 'updateReadyToInstall',
|
||||
file: file
|
||||
});
|
||||
};
|
||||
gau.onUpdateAvailable = (version, asset) => {
|
||||
win.webContents.send('update', {
|
||||
event: 'updateAvailable',
|
||||
version: version,
|
||||
asset: asset
|
||||
});
|
||||
};
|
||||
|
||||
ipcMain.on('installUpdate', (event, file) => {
|
||||
gau.executeUpdate(file);
|
||||
win.webContents.send('update', {
|
||||
event: 'updateInstalling'
|
||||
gau.onNewVersionReadyToInstall = (file) => {
|
||||
win.webContents.send('update', {
|
||||
event: 'updateReadyToInstall',
|
||||
file: file
|
||||
});
|
||||
};
|
||||
|
||||
ipcMain.on('downloadUpdate', (event, asset) => {
|
||||
gau.downloadNewVersion(asset);
|
||||
});
|
||||
});
|
||||
}, 5000);
|
||||
|
||||
ipcMain.on('installUpdate', (event, file) => {
|
||||
gau.executeUpdate(file);
|
||||
win.webContents.send('update', {
|
||||
event: 'updateInstalling'
|
||||
});
|
||||
app.quit();
|
||||
});
|
||||
}, 5000);
|
||||
}
|
||||
|
||||
//end update stuff
|
||||
|
||||
@@ -160,7 +167,15 @@ function loadRepoPage() {
|
||||
|
||||
function createWindow() {
|
||||
// Create the browser window.
|
||||
win = new BrowserWindow({title: 'gitlit v' + app.getVersion(), width: 800, height: 700});
|
||||
win = new BrowserWindow({
|
||||
title: 'gitlit v' + app.getVersion(),
|
||||
width: 800,
|
||||
height: 700,
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
enableRemoteModule: true
|
||||
}
|
||||
});
|
||||
win.setMenu(null);
|
||||
|
||||
// and load the index.html of the app.
|
||||
@@ -257,9 +272,3 @@ ipcMain.on('restart', (event, newRepoDir) => {
|
||||
app.on('ready', () => {
|
||||
startup(createWindow);
|
||||
});
|
||||
|
||||
app.on('window-all-closed', function() {
|
||||
if (process.platform != 'darwin') {
|
||||
app.quit();
|
||||
}
|
||||
});
|
||||
|
@@ -6,4 +6,7 @@
|
||||
<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>
|
||||
<p>
|
||||
<a href="https://github.com/S2-/gitlit">Homepage</a>
|
||||
</p>
|
||||
</div>
|
||||
|
@@ -1,4 +1,3 @@
|
||||
<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>
|
||||
|
3288
package-lock.json
generated
3288
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
16
package.json
16
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "gitlit",
|
||||
"version": "2.0.4",
|
||||
"version": "2.0.16",
|
||||
"description": "",
|
||||
"main": "app/main.js",
|
||||
"build": {
|
||||
@@ -27,14 +27,14 @@
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"animate.css": "^3.5.2",
|
||||
"bootstrap": "^4.5.0",
|
||||
"ejs": "^2.7.4",
|
||||
"animate.css": "^4.1.1",
|
||||
"bootstrap": "^4.6.0",
|
||||
"ejs": "^3.1.6",
|
||||
"ejs-render-remote": "^1.0.13",
|
||||
"electron-find": "^1.0.6",
|
||||
"electron-localshortcut": "^3.2.1",
|
||||
"github-app-updater": "^1.0.2",
|
||||
"jquery": "^3.5.1",
|
||||
"github-app-updater": "^1.0.5",
|
||||
"jquery": "^3.6.0",
|
||||
"material-design-icons": "^3.0.1",
|
||||
"minimist": "^1.2.5",
|
||||
"nonblockjs": "^1.0.8",
|
||||
@@ -42,8 +42,8 @@
|
||||
"popper.js": "^1.16.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron": "^3.1.13",
|
||||
"electron-builder": "^20.44.4"
|
||||
"electron": "^13.1.2",
|
||||
"electron-builder": "^22.11.7"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "electron .",
|
||||
|
Reference in New Issue
Block a user