Commit 9291bde1 authored by Tristan A Spakes's avatar Tristan A Spakes

ver 1.0.12, attempting to test logging

parent 625cf73a
Pipeline #23208 passed with stages
in 1 minute and 19 seconds
......@@ -6,7 +6,7 @@ if [[ ${CI_COMMIT_REF_NAME} == 'master' ]]; then
else
BRANCH="-${CI_COMMIT_REF_NAME}"
fi
VERSION_NUMBER='1.0.11'
VERSION_NUMBER='1.0.12'
wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
sudo rpm -ivh epel-release-latest-7.noarch.rpm
sudo yum -y install nodejs npm ruby-devel gcc make rpm-build rubygems
......
......@@ -47,7 +47,7 @@ function createWindow() {
app.quit()
})
//Keyboard shortcuts
//Keyboard shortcuts, mostly for reference, but currently work
globalShortcut.register('CommandOrControl+1', () => {
mainWindow.minimize()
})
......@@ -56,6 +56,7 @@ function createWindow() {
})
// Creates custom menu template
// This is for the quick menus at the top of the app
const menuTemplate = [
{
label: 'ORNL Toolbox',
......@@ -367,6 +368,17 @@ ipcMain.on('close minor window', () => {
if(addWindow != null) addWindow.destroy()
})
ipcMain.on('log', (event, message, level) => {
try {
execSync(`ls`)
//execSync(`echo "${message}" | logger -p local0.${level}`)
} catch(error) {
alert(error)
console.error(error)
return
}
})
ipcMain.on('close app', () => {
app.quit()
exit()
......
......@@ -4,7 +4,7 @@
"description": "Applications Suite of Linux functions for ORNL Linux systems",
"main": "main.js",
"scripts": {
"start": "electron . &>/dev/null",
"start": "electron .",
"build": "electron-packager . ornltoolbox --overwrite --prune=true --out=Releases"
},
"keywords": [
......
......@@ -2,6 +2,7 @@ let addWin = remote.getGlobal('addWindow')
//Change to User Management page after closing the minor window
function userManWin() {
ipcRenderer.send('log', 'ORNL Toolbox: Clicked \"User & Group Management\"', 'info')
//Destroying any minor windows that were opened from the main window
ipcRenderer.send('close minor window')
// Change main window to user management window
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment