10 Commits

Author SHA1 Message Date
9afe8c5391 Version bump v0.1.2
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-11-04 17:59:25 -04:00
e958080702 Fixed some linter issues
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-11-04 17:54:43 -04:00
6455f3ff10 Changed to Grunt.js for task running
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2022-11-04 17:53:42 -04:00
1536c0721d Added preliminary code for the express-flasher flash message integration - will uncomment code tomorrow when package can be published
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2022-11-04 17:30:17 -04:00
64e71f7f98 Fixed strip_components parameter for copy_deb_package CI step
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-11-04 09:33:48 -04:00
3b36d33d09 Fixed the path for uploading the .deb package to the repo
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-11-04 09:26:48 -04:00
50d83ea4b9 Removed NPM production install
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2022-11-04 09:22:23 -04:00
b24dab7b84 Version bump to v0.1.1
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2022-11-04 09:17:45 -04:00
7685d2acd0 Updated CI config for Debian packaging
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-11-04 09:17:13 -04:00
21b48b1f3c Added debian packaging process
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-11-04 09:07:31 -04:00
13 changed files with 2722 additions and 5948 deletions

View File

@ -3,12 +3,21 @@ pipeline:
image: node:18
commands:
- npm install
- npm run grunt
lint:
image: node:18
commands:
- npm run lint
linux_package:
group: packaging
image: node:18
commands:
- npm run grunt package
when:
event: tag
gitea_release:
image: plugins/gitea-release
settings:
@ -16,5 +25,38 @@ pipeline:
from_secret: gitea_api_key
base_url: https://git.metaunix.net
title: "${CI_COMMIT_TAG}"
files:
- "dist/*.deb"
when:
event: tag
copy_deb_package:
image: appleboy/drone-scp
settings:
host: "repo.int.metaunix.net"
username:
from_secret: repo_admin
password:
from_secret: repo_password
port: 22
target: /srv/repo/apt/overseer/
source: dist/*.deb
strip_components: 1
when:
event: tag
update_repos:
image: appleboy/drone-ssh
settings:
host:
- repo.int.metaunix.net
username:
from_secret: repo_admin
password:
from_secret: repo_password
port: 22
command_timeout: 2m
script:
- "sudo ~/scripts/update_repo.sh"
when:
event: tag

133
Gruntfile.js Normal file
View File

@ -0,0 +1,133 @@
module.exports = function(grunt) {
// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
sass: {
dist: {
options: {
style: 'compressed'
},
files: [{
expand: true,
cwd: 'assets/styles',
src: ['**/*.scss'],
dest: 'public/css',
ext: '.css'
}]
}
},
uglify: {
options: {
mangle: false
},
compile: {
files: {
'public/js/nechryael.min.js': ['assets/js/**/*.js']
}
}
},
watch: {
css: {
files: ['assets/styles/**/*.scss'],
tasks: ['sass'],
options: {
atBegin: true,
spawn: false
}
},
js: {
files: ['assets/js/**/*.js'],
tasks: ['uglify'],
options: {
atBegin: true,
spawn: false
}
}
},
deb_package: {
options: {
maintainer: 'Gregory Ballantine <gballantine@bitgoblin.tech>',
long_description: 'A simple web app to track inventory records.',
output: './dist/',
},
build: {
files: [
{
cwd: './',
src: 'index.js',
dest: '/opt/overseer'
},
{
cwd: './',
src: 'src/**/*',
dest: '/opt/overseer/'
},
{
cwd: './',
src: 'views/**/*',
dest: '/opt/overseer/'
},
{
cwd: './',
src: 'config/**/*',
dest: '/opt/overseer/'
},
{
cwd: './',
src: 'public/**/*',
dest: '/opt/overseer/'
},
{
cwd: './build/etc/',
src: 'production.json',
dest: '/etc/overseer/'
},
{
cwd: './build/etc/',
src: 'overseer.service',
dest: '/etc/systemd/system/'
},
{
cwd: './',
src: 'bin/**/*',
dest: '/opt/overseer/'
},
{
cwd: './',
src: 'node_modules/**/*',
dest: '/opt/overseer/'
},
{
cwd: './',
src: 'LICENSE',
dest: '/opt/overseer/',
},
],
links: {
'/usr/bin/overseer': '/opt/overseer/bin/start.sh'
},
scripts: {
postinst: {
src: './build/scripts/postinst.sh'
},
},
},
}
});
// Load plugins.
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-deb');
// CLI tasks.
grunt.registerTask('default', ['sass', 'uglify']);
grunt.registerTask('package', ['deb_package']);
};

3
assets/js/nechryael.js Normal file
View File

@ -0,0 +1,3 @@
$(document).ready(function() {
console.log('Document is ready!');
});

5
bin/start.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
cd /opt/overseer/
/usr/bin/env node index.js

View File

@ -0,0 +1,11 @@
[Unit]
Description=Overseer inventory tracking app
[Service]
User=overseer
Group=overseer
ExecStart=/usr/bin/overseer
SuccessExitStatus=143
[Install]
WantedBy=multi-user.target

View File

@ -0,0 +1,6 @@
{
"database": {
"driver": "sqlite",
"connection_string": "/opt/overseer/data/overseer.db"
}
}

41
build/scripts/postinst.sh Executable file
View File

@ -0,0 +1,41 @@
#!/bin/sh
GETENT_USER=$(getent passwd overseer)
GETENT_GROUP=$(getent group overseer)
# Create the overseer user if it doesn't already exist
if [ "$GETENT_USER" = "" ]; then
echo "Creating the 'overseer' user."
useradd -r overseer
else
echo "The 'overseer' user already exists, skipping creation."
fi
# Create the overseer group if it doesn't already exist
if [ "$GETENT_GROUP" = "" ]; then
echo "Creating the 'overseer' group."
groupadd overseer
usermod -aG overseer overseer
else
echo "The 'overseer' group already exists, skipping creation."
fi
# Change the directory ownership of /etc
chown -R overseer:overseer /etc/overseer
# Create the log directory under /var/log
if [ ! -d /var/log/overseer ]; then
echo "Creating /var/log/overseer to store log files."
mkdir /var/log/overseer
chown overseer:overseer /var/log/overseer
else
echo "/var/log/overseer already exists, skipping creation."
fi
# Make sure the app's source and configuration files are owned the new user and group
chown -R overseer:overseer /opt/overseer
chown -R overseer:overseer /etc/overseer
#DEBHELPER#
exit 0

View File

@ -1,17 +0,0 @@
const gulp = require('gulp');
const { watch } = require('gulp');
const sass = require('gulp-sass')(require('sass'));
// compile
function styles(cb) {
return gulp.src('./assets/styles/**/*.scss')
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
.pipe(gulp.dest('./public/css'));
cb();
}
// by default, watch files
exports.default = function() {
// compile sass stylesheets
watch('assets/styles/**/*.scss', styles);
};

View File

@ -1,4 +1,6 @@
const express = require('express');
const session = require('express-session');
// const flash = require('express-flasher');
// instantiate new express.js app
const app = express();
@ -12,6 +14,17 @@ const port = 3000;
});
})();
// initialize express.js session
app.use(session({
resave: false, // don't save session if unmodified
saveUninitialized: false, // don't create session until something stored
secret: 'lord of the rings',
}));
// setup flash messaging
// app.use(flash.flash());
// app.use(flash.flashRead());
// set up body POST parameters
app.use(express.json());
app.use(express.urlencoded({

8370
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,11 @@
{
"name": "overseer",
"version": "0.1.0",
"version": "0.1.2",
"description": "Self-hosted inventory tracker",
"main": "index.js",
"scripts": {
"start": "node index.js",
"gulp": "gulp",
"grunt": "grunt",
"nodemon": "nodemon index.js",
"lint": "eslint index.js src/**/*.js",
"test": "echo \"Error: no test specified\" && exit 1"
@ -19,18 +19,29 @@
"tracking"
],
"author": "Gregory Ballanine <gballantine@bitgoblin.tech>",
"uploaders": [
{
"name": "Gregory Ballantine",
"email": "gballantine@bitgoblin.tech"
}
],
"license": "BSD-2-Clause",
"devDependencies": {
"eslint": "^8.26.0",
"eslint-config-google": "^0.14.0",
"gulp": "^4.0.2",
"gulp-sass": "^5.1.0",
"grunt": "^1.5.3",
"grunt-cli": "^1.4.3",
"grunt-contrib-sass": "^2.0.0",
"grunt-contrib-uglify": "^5.2.2",
"grunt-contrib-watch": "^1.1.0",
"grunt-deb": "^0.2.5",
"nodemon": "^2.0.20",
"sass": "^1.55.0"
},
"dependencies": {
"config": "^3.3.8",
"express": "^4.18.2",
"express-session": "^1.17.3",
"sequelize": "^6.25.3",
"sqlite3": "^5.1.2",
"twig": "^1.15.4"

View File

@ -10,6 +10,8 @@ exports.getIndex = async function(req, res) {
],
});
// req.flash('info', 'This is a test flash message.');
res.render('index.twig', {
inventory: items,
});

View File

@ -9,7 +9,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/skeleton/2.0.4/skeleton.min.css">
<link rel="stylesheet" href="/css/gargoyle.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
<script src="/js/drake.js"></script>
<script src="/js/nechryael.min.js"></script>
</head>
<body>
<!-- global navigation -->
@ -24,6 +24,12 @@
</div>
</nav>
{% if flash != null %}
<div class="flash-message {{ flash.type }}">
<p>{{ flash.msg }}</p>
</div>
{% endif %}
<!-- main content -->
<div id="main-content" class="container fluid">
{% block content %}{% endblock %}