Compare commits
No commits in common. "master" and "v0.3.2" have entirely different histories.
@ -6,6 +6,7 @@ pipeline:
|
||||
build:
|
||||
image: node:16
|
||||
commands:
|
||||
- apt update && apt install -y ruby ruby-dev && gem install sass
|
||||
- npm install
|
||||
- npm run grunt
|
||||
|
||||
|
@ -4,7 +4,7 @@ module.exports = function(grunt) {
|
||||
|
||||
// Project configuration.
|
||||
grunt.initConfig({
|
||||
'dart-sass': {
|
||||
sass: {
|
||||
dist: {
|
||||
options: {
|
||||
style: 'compressed'
|
||||
@ -69,7 +69,7 @@ module.exports = function(grunt) {
|
||||
},
|
||||
css: {
|
||||
files: ['assets/sass/*.sass'],
|
||||
tasks: ['dart-sass'],
|
||||
tasks: ['sass'],
|
||||
options: {
|
||||
atBegin: true,
|
||||
spawn: false
|
||||
@ -96,12 +96,12 @@ module.exports = function(grunt) {
|
||||
|
||||
// Load task plugins
|
||||
grunt.loadNpmTasks('grunt-twig-render');
|
||||
grunt.loadNpmTasks('grunt-dart-sass');
|
||||
grunt.loadNpmTasks('grunt-contrib-sass');
|
||||
grunt.loadNpmTasks('grunt-contrib-coffee');
|
||||
grunt.loadNpmTasks('grunt-contrib-copy');
|
||||
grunt.loadNpmTasks('grunt-contrib-watch');
|
||||
|
||||
// Default task(s).
|
||||
grunt.registerTask('default', ['twigRender', 'dart-sass', 'coffee', 'copy']);
|
||||
grunt.registerTask('default', ['twigRender', 'sass', 'coffee', 'copy']);
|
||||
|
||||
};
|
||||
|
@ -42,7 +42,6 @@ button
|
||||
max-width: 1024px
|
||||
|
||||
.container.fluid
|
||||
width: 100%
|
||||
max-width: 100%
|
||||
margin: 0
|
||||
|
||||
@ -62,10 +61,6 @@ button
|
||||
border-bottom: 1px solid #bbb
|
||||
box-shadow: 0 1px 2px rgba(0, 0, 0, .25)
|
||||
|
||||
.container.fluid
|
||||
width: 100%
|
||||
margin-right: 0
|
||||
|
||||
.row
|
||||
display: relative
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge">
|
||||
<title>About Sentry</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>This is a test.</p>
|
||||
</body>
|
||||
</html>
|
@ -19,8 +19,7 @@
|
||||
<div class="container fluid">
|
||||
<div class="row">
|
||||
<div class="columns twelve">
|
||||
<button class="tab-button active" onclick="openTab('overview')">Overview</button>
|
||||
<button class="tab-button" onclick="openTab('cpu')">CPU</button>
|
||||
<button class="tab-button active" onclick="openTab('cpu')">CPU</button>
|
||||
<button class="tab-button" onclick="openTab('memory')">Memory</button>
|
||||
<button class="tab-button" onclick="openTab('storage')">Storage</button>
|
||||
<button class="tab-button" onclick="openTab('gpu')">GPU</button>
|
||||
@ -30,10 +29,7 @@
|
||||
</div>
|
||||
|
||||
<div id="wrapper" class="container">
|
||||
<div class="component-display active" data-component="overview">
|
||||
{% include 'overview.twig' %}
|
||||
</div>
|
||||
<div class="component-display" data-component="cpu">
|
||||
<div class="component-display active" data-component="cpu">
|
||||
{% include 'cpu.twig' %}
|
||||
</div>
|
||||
<div class="component-display" data-component="memory">
|
||||
|
@ -1,5 +0,0 @@
|
||||
<header class="row">
|
||||
<div class="columns twelve u-text-center">
|
||||
<h1>Sentry Overview</h1>
|
||||
</div>
|
||||
</header>
|
8
main.js
8
main.js
@ -1,5 +1,5 @@
|
||||
// Modules to control application life and create native browser window
|
||||
const { app, BrowserWindow, Menu } = require('electron');
|
||||
const {app, BrowserWindow} = require('electron');
|
||||
const path = require('path');
|
||||
|
||||
function createWindow () {
|
||||
@ -7,8 +7,6 @@ function createWindow () {
|
||||
const mainWindow = new BrowserWindow({
|
||||
width: 800,
|
||||
height: 700,
|
||||
minWidth: 735,
|
||||
minHeight: 600,
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
contextIsolation: false,
|
||||
@ -23,10 +21,6 @@ function createWindow () {
|
||||
// mainWindow.webContents.openDevTools()
|
||||
}
|
||||
|
||||
// Set the application menu
|
||||
const menu = require('./src/menu').createMenu(app);
|
||||
Menu.setApplicationMenu(menu);
|
||||
|
||||
// This method will be called when Electron has finished
|
||||
// initialization and is ready to create browser windows.
|
||||
// Some APIs can only be used after this event occurs.
|
||||
|
709
package-lock.json
generated
709
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "sentry",
|
||||
"version": "0.3.3",
|
||||
"version": "0.3.2",
|
||||
"description": "Desktop app to view system information and sensors",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
@ -25,12 +25,12 @@
|
||||
"grunt": "^1.5.3",
|
||||
"grunt-contrib-coffee": "^2.1.0",
|
||||
"grunt-contrib-copy": "^1.0.0",
|
||||
"grunt-contrib-sass": "^2.0.0",
|
||||
"grunt-contrib-watch": "^1.1.0",
|
||||
"grunt-dart-sass": "^2.0.1",
|
||||
"grunt-twig-render": "^1.8.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"systeminformation": "^5.17.12"
|
||||
"systeminformation": "^5.11.15"
|
||||
},
|
||||
"build": {
|
||||
"appId": "tech.bitgoblin.sentry",
|
||||
|
@ -1,15 +0,0 @@
|
||||
const { BrowserWindow } = require('electron');
|
||||
|
||||
exports.about = function() {
|
||||
const aboutWindow = new BrowserWindow({
|
||||
width: 600,
|
||||
height: 400,
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
contextIsolation: false
|
||||
}
|
||||
});
|
||||
|
||||
// and load the about.html of the app.
|
||||
aboutWindow.loadFile('public/about.html');
|
||||
};
|
@ -1,30 +0,0 @@
|
||||
const electron = require('electron');
|
||||
|
||||
// load event handlers
|
||||
const helpHandlers = require('./help');
|
||||
|
||||
exports.createMenu = function(app) {
|
||||
return electron.Menu.buildFromTemplate([
|
||||
{
|
||||
label: 'File',
|
||||
submenu: [
|
||||
{
|
||||
label: 'Close',
|
||||
click: function() {
|
||||
app.quit();
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
label: 'Help',
|
||||
submenu: [
|
||||
{
|
||||
label: 'About',
|
||||
click: helpHandlers.about
|
||||
}
|
||||
]
|
||||
}
|
||||
]);
|
||||
};
|
Loading…
Reference in New Issue
Block a user