6 Commits

Author SHA1 Message Date
139568415e Updated woodpecker config to not install SASS
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-04-12 16:01:39 -04:00
b74bf3be3c Changed from using grunt-contrib-sass to grunt-dart-sass so that building the SASS stylesheets don't rely on having a system installation of ruby and sass 2023-04-12 16:01:09 -04:00
07fbd43cbe Fixed some styles on the tab bar
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-04-07 10:32:41 -04:00
ac9696f38a Version bump to v0.3.2
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-04-07 00:13:01 -04:00
582a54617e Edited some styles
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-04-07 00:12:29 -04:00
4a59b8b1d3 Added code to open external links in the user's default browser
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-04-06 09:49:59 -04:00
8 changed files with 604 additions and 270 deletions

View File

@ -6,7 +6,6 @@ pipeline:
build: build:
image: node:16 image: node:16
commands: commands:
- apt update && apt install -y ruby ruby-dev && gem install sass
- npm install - npm install
- npm run grunt - npm run grunt

View File

@ -4,7 +4,7 @@ module.exports = function(grunt) {
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
sass: { 'dart-sass': {
dist: { dist: {
options: { options: {
style: 'compressed' style: 'compressed'
@ -69,7 +69,7 @@ module.exports = function(grunt) {
}, },
css: { css: {
files: ['assets/sass/*.sass'], files: ['assets/sass/*.sass'],
tasks: ['sass'], tasks: ['dart-sass'],
options: { options: {
atBegin: true, atBegin: true,
spawn: false spawn: false
@ -96,12 +96,12 @@ module.exports = function(grunt) {
// Load task plugins // Load task plugins
grunt.loadNpmTasks('grunt-twig-render'); grunt.loadNpmTasks('grunt-twig-render');
grunt.loadNpmTasks('grunt-contrib-sass'); grunt.loadNpmTasks('grunt-dart-sass');
grunt.loadNpmTasks('grunt-contrib-coffee'); grunt.loadNpmTasks('grunt-contrib-coffee');
grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
// Default task(s). // Default task(s).
grunt.registerTask('default', ['twigRender', 'sass', 'coffee', 'copy']); grunt.registerTask('default', ['twigRender', 'dart-sass', 'coffee', 'copy']);
}; };

View File

@ -1,3 +1,16 @@
shell = require('electron').shell
document.addEventListener('DOMContentLoaded', () ->
links = document.querySelectorAll('a[href^="http"]')
i = 0
while i < links.length
links[i].addEventListener('click', (event) ->
event.preventDefault()
shell.openExternal(this.href)
)
i++
)
@openTab = (tab) -> @openTab = (tab) ->
# show the component info that's selected # show the component info that's selected
tabs = document.querySelectorAll('.tab-button') tabs = document.querySelectorAll('.tab-button')

View File

@ -1,5 +1,11 @@
$tab-bar-height: 50px $tab-bar-height: 50px
$primary-color: #009688
$primary-color-light: lighten($primary-color, 10%)
$primary-color-dark: darken($primary-color, 10%)
$default-transition: all 230ms ease-in-out
body body
margin: 0 margin: 0
padding: $tab-bar-height 0 90px padding: $tab-bar-height 0 90px
@ -7,20 +13,20 @@ body
font-size: 18px font-size: 18px
a a
color: cornflowerblue color: $primary-color
transition: all 200ms ease-in-out transition: $default-transition
&:hover &:hover
color: darken(cornflowerblue, 10%) color: $primary-color-light
input input
transition: all 200ms ease-in-out transition: $default-transition
input[type=submit], input[type=submit],
button button
background-color: cornflowerblue background-color: cornflowerblue
color: #f0f0f0 color: #f0f0f0
transition: all 200ms ease-in-out transition: $default-transition
&:hover &:hover
background-color: darken(cornflowerblue, 10%) background-color: darken(cornflowerblue, 10%)
@ -55,6 +61,10 @@ button
border-bottom: 1px solid #bbb border-bottom: 1px solid #bbb
box-shadow: 0 1px 2px rgba(0, 0, 0, .25) box-shadow: 0 1px 2px rgba(0, 0, 0, .25)
.container.fluid
width: 100%
margin-right: 0
.row .row
display: relative display: relative
@ -69,9 +79,10 @@ button
color: #212121 color: #212121
font-size: 2rem font-size: 2rem
font-weight: bold font-weight: bold
transition: all 230ms ease-in-out transition: $default-transition
&.active &.active,
&:hover
background-color: white background-color: white
.component-display .component-display
@ -142,6 +153,9 @@ table.hardware-info
p.no-margin p.no-margin
margin-bottom: 0 margin-bottom: 0
p#version-info
text-decoration: underline
#systemPages #systemPages
> div:nth-child(2n + 3) > div:nth-child(2n + 3)
margin-left: 0 margin-left: 0

View File

@ -19,7 +19,8 @@
<div class="container fluid"> <div class="container fluid">
<div class="row"> <div class="row">
<div class="columns twelve"> <div class="columns twelve">
<button class="tab-button active" onclick="openTab('cpu')">CPU</button> <button class="tab-button active" onclick="openTab('overview')">Overview</button>
<button class="tab-button" onclick="openTab('cpu')">CPU</button>
<button class="tab-button" onclick="openTab('memory')">Memory</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('storage')">Storage</button>
<button class="tab-button" onclick="openTab('gpu')">GPU</button> <button class="tab-button" onclick="openTab('gpu')">GPU</button>
@ -29,7 +30,10 @@
</div> </div>
<div id="wrapper" class="container"> <div id="wrapper" class="container">
<div class="component-display active" data-component="cpu"> <div class="component-display active" data-component="overview">
{% include 'overview.twig' %}
</div>
<div class="component-display" data-component="cpu">
{% include 'cpu.twig' %} {% include 'cpu.twig' %}
</div> </div>
<div class="component-display" data-component="memory"> <div class="component-display" data-component="memory">
@ -47,7 +51,7 @@
<div class="container fluid"> <div class="container fluid">
<div class="row"> <div class="row">
<div class="columns three"> <div class="columns three">
<p class="faded-text no-margin u-text-center">Sentry v<span id="app-version"></span></p> <p id="version-info" class="no-margin u-text-center">Sentry v<span id="app-version"></span></p>
</div> </div>
<div class="columns six"> <div class="columns six">
<p class="no-margin u-text-center">Developed by Bit Goblin free of charge.</p> <p class="no-margin u-text-center">Developed by Bit Goblin free of charge.</p>

View File

@ -0,0 +1,5 @@
<header class="row">
<div class="columns twelve u-text-center">
<h1>Sentry Overview</h1>
</div>
</header>

805
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "sentry", "name": "sentry",
"version": "0.3.1", "version": "0.3.2",
"description": "Desktop app to view system information and sensors", "description": "Desktop app to view system information and sensors",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
@ -25,8 +25,8 @@
"grunt": "^1.5.3", "grunt": "^1.5.3",
"grunt-contrib-coffee": "^2.1.0", "grunt-contrib-coffee": "^2.1.0",
"grunt-contrib-copy": "^1.0.0", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-sass": "^2.0.0",
"grunt-contrib-watch": "^1.1.0", "grunt-contrib-watch": "^1.1.0",
"grunt-dart-sass": "^2.0.1",
"grunt-twig-render": "^1.8.3" "grunt-twig-render": "^1.8.3"
}, },
"dependencies": { "dependencies": {