Compare commits

..

No commits in common. "main" and "v0.1.4" have entirely different histories.
main ... v0.1.4

24 changed files with 238 additions and 2272 deletions

2
.gitignore vendored
View File

@ -8,5 +8,3 @@ public/js/
# Local data storage # Local data storage
data/ data/
# Local config
config/local.json

View File

@ -1,36 +1,3 @@
# overseer # overseer
Self-hosted inventory tracker Self-hosted inventory tracker
## Installation/Deployment
`git clone https://git.metaunix.net/BitGoblin/overseer`
`npm install --no-dev`
`npm run sequelize db:migrate`
`npm run grunt`
`npm run prod`
## Development
Feel free to clone this project and submit Merge Requests or just fork it and make it your own!
You will need the following tools/libraries to develop Overseer:
* node.js
* NPM
* Grunt.js
* Git (not strictly required but ideal)
Other than that, you should be good to go! You can start the development server with `nodemon` to auto-reload changes:
`npm run nodemon`
And to auto-compile asset changes (e.g. SASS and JS):
`npm run grunt watch`
If all went well, you should be able to visit http://localhost:3000/ in your browser and see the dashboard.

View File

@ -1,14 +1,3 @@
$(document).ready(function() { $(document).ready(function() {
$('#filter-limit').on('change', () => { console.log('Document is ready!');
$.cookie('filter_limit', $('#filter-limit').val());
$('#filter-form').submit();
});
// check state of limit filter
var cookie_limit = $.cookie('filter_limit');
// if limit is different than what's selected
var active_limit = $('#filter-limit').val();
if ((cookie_limit) && (cookie_limit != active_limit)) {
$('#filter-limit').val(cookie_limit).trigger('change');
}
}); });

View File

@ -34,10 +34,7 @@ input[type="submit"].button-primary{
} }
.container.fluid{ .container.fluid{
width: calc(100% - 60px);
max-width: 100%; max-width: 100%;
margin-left: 30px;
margin-right: 30px;
} }
#nav-bar{ #nav-bar{
@ -49,14 +46,10 @@ input[type="submit"].button-primary{
background: #212121; background: #212121;
box-shadow: $box-shadow-1; box-shadow: $box-shadow-1;
color: white; color: white;
z-index: 100;
.nav-bar-left{ .nav-bar-left{
float: left; float: left;
} }
.nav-bar-right{
float: right;
}
ul{ ul{
list-style: none; list-style: none;
@ -77,38 +70,6 @@ input[type="submit"].button-primary{
padding-left: 35px; padding-left: 35px;
font-weight: bold; font-weight: bold;
} }
#search-form{
display: inline-block;
padding: 10px 0;
li{
display: inline-block;
}
input{
display: inline-block;
width: 256px;
}
}
#search-button{
display: inline-block;
margin-left: 0;
margin-right: 35px;
padding: 0 10px;
background: $primary-color;
border: 1px solid white;
color: white;
font-size: 1.5rem;
font-weight: bold;
transition: all 200ms ease-in-out;
&:hover{
background: $primary-color-highlight;
color: #eee;
}
}
} }
#main-content{ #main-content{
@ -125,8 +86,7 @@ input[type="submit"].button-primary{
} }
} }
#item-header, #item-header{
#license-header{
margin-bottom: 25px; margin-bottom: 25px;
h1, h1,
@ -136,9 +96,7 @@ input[type="submit"].button-primary{
} }
.item-added-date, .item-added-date,
.item-updated-date, .item-updated-date{
.license-added-date,
.license-updated-date{
margin-bottom: 5px; margin-bottom: 5px;
color: #666; color: #666;
font-size: 1.6rem; font-size: 1.6rem;

View File

@ -36,9 +36,6 @@ fi
chown -R overseer:overseer /opt/overseer chown -R overseer:overseer /opt/overseer
chown -R overseer:overseer /etc/overseer chown -R overseer:overseer /etc/overseer
# Reload systemd unit files
systemctl daemon-reload
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

View File

@ -1,20 +0,0 @@
{
"development": {
"storage": "./data/overseer.db",
"dialect": "sqlite"
},
"test": {
"username": "root",
"password": null,
"database": "database_test",
"host": "127.0.0.1",
"dialect": "mysql"
},
"production": {
"username": "root",
"password": null,
"database": "database_production",
"host": "127.0.0.1",
"dialect": "mysql"
}
}

View File

@ -6,11 +6,5 @@
"database": { "database": {
"driver": "sqlite", "driver": "sqlite",
"connection_string": "data/overseer.db" "connection_string": "data/overseer.db"
},
"use_redis": false,
"redis": {
"host": "192.168.1.10",
"port": 6379,
"number": "0"
} }
} }

View File

@ -1,36 +1,25 @@
const express = require('express'); const express = require('express');
const session = require('express-session'); const session = require('express-session');
const RedisStore = require('connect-redis')(session); // const flash = require('express-flasher');
// const flash = require('@bitgoblin/express-flasher');
// instantiate new express.js app // instantiate new express.js app
const app = express(); const app = express();
const config = require('config'); const config = require('config');
// initialize database connection // initialize database connection
require('./src/models'); (async () => {
const db = require('./src/models');
await db.sequelize.sync({
alter: true,
});
})();
if (config.get('use_redis')) { // initialize express.js session
// initialize Redis store for session data app.use(session({
const redisClient = require('./src/redis'); resave: false, // don't save session if unmodified
saveUninitialized: false, // don't create session until something stored
// initialize express.js session w/ Redis datastore secret: 'lord of the rings',
app.use(session({ }));
store: new RedisStore({
client: redisClient,
}), // use Redis datastore
resave: false, // don't save session if unmodified
saveUninitialized: false, // don't create session until something stored
secret: 'lord of the rings',
}));
} else {
// initialize express.js session w/ Redis datastore
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 // setup flash messaging
// app.use(flash.flash()); // app.use(flash.flash());
@ -51,8 +40,6 @@ app.use(express.static('public'));
// load route handlers // load route handlers
const homeRoutes = require('./src/routes/home'); const homeRoutes = require('./src/routes/home');
const itemRoutes = require('./src/routes/item'); const itemRoutes = require('./src/routes/item');
const licenseRoutes = require('./src/routes/license');
const searchRoutes = require('./src/routes/search');
// register route handlers // register route handlers
app.get('/', homeRoutes.getIndex); app.get('/', homeRoutes.getIndex);
@ -61,12 +48,6 @@ app.post('/item/add', itemRoutes.postAdd);
app.get('/item/:id', itemRoutes.getItem); app.get('/item/:id', itemRoutes.getItem);
app.get('/item/:id/edit', itemRoutes.getItemEdit); app.get('/item/:id/edit', itemRoutes.getItemEdit);
app.post('/item/:id/edit', itemRoutes.postItemEdit); app.post('/item/:id/edit', itemRoutes.postItemEdit);
app.get('/license/add', licenseRoutes.getAdd);
app.post('/license/add', licenseRoutes.postAdd);
app.get('/license/:id', licenseRoutes.getLicense);
app.get('/license/:id/edit', licenseRoutes.getEdit);
app.post('/license/:id/edit', licenseRoutes.postEdit);
app.get('/search', searchRoutes.getSearch);
// start app // start app
app.listen(config.get('server.port'), config.get('server.address'), () => { app.listen(config.get('server.port'), config.get('server.address'), () => {

View File

@ -1,28 +0,0 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('items', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
name: {
type: Sequelize.DataTypes.STRING,
allowNull: false,
},
manufacturer: Sequelize.DataTypes.STRING,
serialNumber: Sequelize.DataTypes.STRING,
skuNumber: Sequelize.DataTypes.STRING,
type: Sequelize.DataTypes.STRING,
purchasedFrom: Sequelize.DataTypes.STRING,
purchasedAt: Sequelize.DataTypes.DATE,
createdAt: Sequelize.DataTypes.DATE,
updatedAt: Sequelize.DataTypes.DATE,
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('items');
}
};

View File

@ -1,37 +0,0 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('licenses', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
name: {
type: Sequelize.DataTypes.STRING,
allowNull: false,
},
key: {
type: Sequelize.DataTypes.STRING,
allowNull: false,
},
manufacturer: Sequelize.DataTypes.STRING,
seatsUsed: {
type: Sequelize.DataTypes.NUMBER,
defaultValue: 0,
},
seatsTotal: {
type: Sequelize.DataTypes.NUMBER,
defaultValue: 1,
},
purchasedFrom: Sequelize.DataTypes.STRING,
purchasedAt: Sequelize.DataTypes.DATE,
createdAt: Sequelize.DataTypes.DATE,
updatedAt: Sequelize.DataTypes.DATE,
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('licenses');
}
};

1678
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,12 @@
{ {
"name": "overseer", "name": "overseer",
"version": "0.3.0", "version": "0.1.4",
"description": "Self-hosted inventory tracker", "description": "Self-hosted inventory tracker",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"start": "node index.js", "start": "node index.js",
"grunt": "grunt", "grunt": "grunt",
"nodemon": "nodemon index.js", "nodemon": "nodemon index.js",
"sequelize": "sequelize-cli",
"lint": "eslint index.js src/**/*.js", "lint": "eslint index.js src/**/*.js",
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
@ -41,16 +40,9 @@
}, },
"dependencies": { "dependencies": {
"config": "^3.3.8", "config": "^3.3.8",
"connect-redis": "^6.1.3",
"express": "^4.18.2", "express": "^4.18.2",
"express-session": "^1.17.3", "express-session": "^1.17.3",
"mariadb": "^3.0.2",
"mysql2": "^2.3.3",
"pg": "^8.8.0",
"pg-hstore": "^2.3.4",
"redis": "^4.4.0",
"sequelize": "^6.25.3", "sequelize": "^6.25.3",
"sequelize-cli": "^6.5.2",
"sqlite3": "^5.1.2", "sqlite3": "^5.1.2",
"twig": "^1.15.4" "twig": "^1.15.4"
} }

View File

@ -1,7 +1,10 @@
const dbConfig = require('config').get('database'); const dbConfig = require('config').get('database');
const Sequelize = require('sequelize'); const Sequelize = require('sequelize');
const sequelize = initDatabase(); const sequelize = new Sequelize({
dialect: dbConfig.get('driver'),
storage: dbConfig.get('connection_string'),
});
const db = {}; const db = {};
@ -9,32 +12,5 @@ db.Sequelize = Sequelize;
db.sequelize = sequelize; db.sequelize = sequelize;
db.items = require('./item.js')(sequelize, Sequelize); db.items = require('./item.js')(sequelize, Sequelize);
db.licenses = require('./license.js')(sequelize, Sequelize);
module.exports = db; module.exports = db;
/**
* Initializes a sequelize database connection.
*
* @return {object} - sequelize connection
*/
function initDatabase() {
let sequelize = null;
if (dbConfig.get('driver') == 'sqlite') {
sequelize = new Sequelize({
dialect: dbConfig.get('driver'),
storage: dbConfig.get('connection_string'),
});
} else {
const dbName = dbConfig.get('name');
const dbUsername = dbConfig.get('username');
const dbPassword = dbConfig.get('password');
sequelize = new Sequelize(dbName, dbUsername, dbPassword, {
dialect: dbConfig.get('driver'),
host: dbConfig.get('address'),
});
}
return sequelize;
}

View File

@ -1,37 +0,0 @@
module.exports = (sequelize, Sequelize) => {
const License = sequelize.define('license', {
name: {
type: Sequelize.STRING,
},
key: {
type: Sequelize.STRING,
},
manufacturer: {
type: Sequelize.STRING,
},
seatsUsed: {
type: Sequelize.NUMBER,
default: 0,
},
seatsTotal: {
type: Sequelize.NUMBER,
default: 1,
},
purchasedFrom: {
type: Sequelize.STRING,
},
purchasedAt: {
type: Sequelize.DATE,
},
});
return License;
};

View File

@ -1,31 +0,0 @@
const redisConfig = require('config').get('redis');
exports.default = function() {
let redisUrl = 'redis://';
// add the redis username if defined
if (redisConfig.has('username')) {
redisUrl += redisConfig.get('username');
}
// add the user password if defined
if (redisConfig.has('password')) {
redisUrl += ':' + redisConfig.get('password') + '@';
}
// add redis host URL
redisUrl += redisConfig.get('host');
// add redis host port
redisUrl += ':' + redisConfig.get('port');
// add redis database number if defined
if (redisConfig.has('number')) {
redisUrl += redisConfig.get('number');
}
const { createClient } = require("redis");
let redisClient = createClient({
url: redisUrl,
legacyMode: true,
});
redisClient.connect().catch(console.error);
return redisClient;
};

View File

@ -1,26 +1,10 @@
const db = require('../models'); const db = require('../models');
const Item = db.items; const Item = db.items;
const License = db.licenses;
// GET - / // GET - /
exports.getIndex = async function(req, res) { exports.getIndex = async function(req, res) {
// check if there's a limit set
let limit = 10; // default to 10 results
if ('limit' in req.query) {
limit = req.query.limit;
}
// fetch inventory items from database
const items = await Item.findAll({ const items = await Item.findAll({
limit: limit, limit: 10,
order: [
['updatedAt', 'DESC'],
],
});
// fetch licenses from database
const licenses = await License.findAll({
limit: limit,
order: [ order: [
['updatedAt', 'DESC'], ['updatedAt', 'DESC'],
], ],
@ -30,9 +14,5 @@ exports.getIndex = async function(req, res) {
res.render('index.twig', { res.render('index.twig', {
inventory: items, inventory: items,
licenses: licenses,
filters: {
limit: limit,
},
}); });
}; };

View File

@ -1,78 +0,0 @@
const db = require('../models');
const License = db.licenses;
// GET - /license/add
exports.getAdd = async function(req, res) {
res.render('license/add.twig');
};
// POST - /license/add
exports.postAdd = async function(req, res) {
const license = await License.create({
name: req.body.license_name,
key: req.body.license_key,
manufacturer: req.body.license_manufacturer,
seatsUsed: req.body.license_seats_used,
seatsTotal: req.body.license_seats_total,
purchasedFrom: req.body.license_purchase_from,
purchasedAt: req.body.license_purchase_date,
});
console.log(`Saved license ${license.name} to the database.`);
res.redirect('/');
};
// GET - /license/{id}
exports.getLicense = async function(req, res) {
const license = await License.findAll({
where: {
id: req.params.id,
},
});
res.render('license/view.twig', {
license: license[0],
});
};
// GET - /license/{id}/edit
exports.getEdit = async function(req, res) {
const license = await License.findAll({
where: {
id: req.params.id,
},
});
res.render('license/edit.twig', {
license: license[0],
});
};
// POST - /license/{id}/edit
exports.postEdit = async function(req, res) {
// fetch license from DB
const licenseSearch = await License.findAll({
where: {
id: req.params.id,
},
});
// retrieve the license record from the array for ease of use
const license = licenseSearch[0];
// update license attributes
license.name = req.body.license_name;
license.key = req.body.license_key;
license.manufacturer = req.body.license_manufacturer;
license.seatsUsed = req.body.license_seats_used;
license.seatsTotal = req.body.license_seats_total;
license.purchasedFrom = req.body.license_purchase_from;
license.purchasedAt = req.body.license_purchase_date;
// save attribute changes
await license.save();
// redirect user to license page
res.redirect('/license/' + license.id);
};

View File

@ -1,42 +0,0 @@
const db = require('../models');
const Item = db.items;
const License = db.licenses;
const {Op} = require('sequelize');
// GET - /search
exports.getSearch = async function(req, res) {
// decode URL search query
const query = req.query.query;
// fetch inventory items from database based on search query
const itemResults = await Item.findAll({
where: {
name: {
[Op.like]: '%' + query + '%',
},
},
limit: 10,
order: [
['updatedAt', 'DESC'],
],
});
// fetch licenses from database based on search query
const licenseResults = await License.findAll({
where: {
name: {
[Op.like]: '%' + query + '%',
},
},
limit: 10,
order: [
['updatedAt', 'DESC'],
],
});
res.render('search.twig', {
query: query,
itemResults: itemResults,
licenseResults: licenseResults,
});
};

View File

@ -12,19 +12,13 @@
</header> </header>
<section id="record-actions" class="row"> <section id="record-actions" class="row">
<div class="columns four"> <div class="columns six">
<a href="/item/add"> <a href="/item/add">
<p><i class="fa-solid fa-plus"></i> Add Item</p> <p><i class="fa-solid fa-plus"></i> Add Item</p>
</a> </a>
</div> </div>
<div class="columns four"> <div class="columns six">
<a href="/license/add">
<p><i class="fa-solid fa-plus"></i> Add License</p>
</a>
</div>
<div class="columns four">
<a href="/item/search"> <a href="/item/search">
<p><i class="fa-solid fa-search"></i> Search</p> <p><i class="fa-solid fa-search"></i> Search</p>
</a> </a>
@ -35,66 +29,31 @@
<section class="row"> <section class="row">
<div class="columns twelve"> <div class="columns twelve">
<h3>Recently updated hardware:</h3> <h3>Recently updated records:</h3>
<table class="u-full-width">
<thead>
<tr>
<th>Name</th>
<th>Manufacturer</th>
<th>Type</th>
<th>Updated at</th>
</tr>
</thead>
<tbody>
{% for item in inventory %}
<tr>
<td><a href="/item/{{ item.id }}">{{ item.name }}</a></td>
<td>{{ item.manufacturer }}</td>
<td>{{ item.type }}</td>
<td>{{ item.updatedAt | date("m/d/Y h:i:s A") }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div> </div>
</section> </section>
<section class="row"> <section class="row">
<div class="columns twelve"> <table class="columns twelve">
<h3>Recently updated licenses:</h3> <thead>
<table class="u-full-width"> <tr>
<thead> <th>Name</th>
<th>Manufacturer</th>
<th>Type</th>
<th>Updated at</th>
</tr>
</thead>
<tbody>
{% for item in inventory %}
<tr> <tr>
<th>Name</th> <td><a href="/item/{{ item.id }}">{{ item.name }}</a></td>
<th>Manufacturer</th> <td>{{ item.manufacturer }}</td>
<th>Updated at</th> <td>{{ item.type }}</td>
<td>{{ item.updatedAt | date("m/d/Y h:i:s A") }}</td>
</tr> </tr>
</thead> {% endfor %}
<tbody> </tbody>
{% for license in licenses %} </table>
<tr>
<td><a href="/license/{{ license.id }}">{{ license.name }}</a></td>
<td>{{ license.manufacturer }}</td>
<td>{{ license.updatedAt | date("m/d/Y h:i:s A") }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</section>
<section class="row">
<div class="columns twelve">
<form id="filter-form" class="u-full-width" action="/" method="GET">
<select id="filter-limit" name="limit">
<option {% if filters['limit'] == 5 %}selected{% endif %} value="5">5</option>
<option {% if filters['limit'] == 10 %}selected{% endif %} value="10">10</option>
<option {% if filters['limit'] == 20 %}selected{% endif %} value="20">20</option>
<option {% if filters['limit'] == 35 %}selected{% endif %} value="35">35</option>
<option {% if filters['limit'] == 50 %}selected{% endif %} value="50">50</option>
</select>
</form>
</div>
</section> </section>
{% endblock %} {% endblock %}

View File

@ -8,8 +8,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/skeleton/2.0.4/skeleton.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/skeleton/2.0.4/skeleton.min.css">
<link rel="stylesheet" href="/css/gargoyle.css"> <link rel="stylesheet" href="/css/gargoyle.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js" charset="utf-8"></script>
<script src="/js/nechryael.min.js"></script> <script src="/js/nechryael.min.js"></script>
</head> </head>
<body> <body>
@ -19,20 +18,8 @@
<ul> <ul>
<li class="site-logo">Overseer</li> <li class="site-logo">Overseer</li>
<li class="nav-link"><a href="/">Home</a></li> <li class="nav-link"><a href="/">Home</a></li>
<li class="nav-link"><a href="/item/search">Search</a></li>
<li class="nav-link"><a href="/item/add">Add Item</a></li> <li class="nav-link"><a href="/item/add">Add Item</a></li>
<li class="nav-link"><a href="/license/add">Add License</a></li>
</ul>
</div>
<div class="nav-bar-right">
<ul>
<li>
<form id="search-form" action="/search" method="GET">
<input type="text" name="query" placeholder="enter a search query...">
</form>
<button id="search-button" type="submit" for="search-form"><i class="fa-solid fa-magnifying-glass"></i></button>
</li>
</ul> </ul>
</div> </div>
</nav> </nav>
@ -48,4 +35,4 @@
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
</body> </body>
</html> </html>

View File

@ -1,65 +0,0 @@
{% extends 'layout.twig' %}
{% block title %}Add New License{% endblock %}
{% block content %}
<!-- page header -->
<header class="row">
<div class="columns twelve">
<h1>Add new license</h1>
</div>
</header>
<section class="row">
<div class="columns twelve">
<form action="/license/add" method="POST">
<div class="row">
<div class="columns twelve">
<label for="license_name">License name:</label>
<input class="u-full-width" type="text" placeholder="My new license" id="license_name" name="license_name" required>
</div>
</div>
<div class="row">
<div class="six columns">
<label for="license_key">License key:</label>
<input class="u-full-width" type="text" placeholder="ABCD-EFGH-1234-5678" id="license_key" name="license_key" required>
</div>
<div class="six columns">
<label for="license_manufacturer">Manufacturer:</label>
<input class="u-full-width" type="text" placeholder="Manufacturer" id="license_manufacturer" name="license_manufacturer">
</div>
</div>
<div class="row">
<div class="six columns">
<label for="license_seats_used">Seats in use:</label>
<input class="u-full-width" type="number" placeholder="0" id="license_seats_used" name="license_seats_used" required value="0">
</div>
<div class="six columns">
<label for="license_seats_total">Seats total:</label>
<input class="u-full-width" type="number" placeholder="1" id="license_seats_total" name="license_seats_total" required value="1">
</div>
</div>
<div class="row">
<div class="six columns">
<label for="license_purchase_from">Purchased from:</label>
<input class="u-full-width" type="text" placeholder="Newegg" id="license_purchase_from" name="license_purchase_from">
</div>
<div class="six columns">
<label for="license_purchase_date">Purchased at:</label>
<input class="u-full-width" type="datetime-local" id="license_purchase_date" name="license_purchase_date">
</div>
</div>
<input class="button-primary u-full-width" type="submit" value="Submit">
</form>
</div>
</section>
{% endblock %}

View File

@ -1,65 +0,0 @@
{% extends 'layout.twig' %}
{% block title %}Edit License{% endblock %}
{% block content %}
<!-- page header -->
<header class="row">
<div class="columns twelve">
<h1>Editing "{{ license.name }}"</h1>
</div>
</header>
<section class="row">
<div class="columns twelve">
<form action="/license/{{ license.id }}/edit" method="POST">
<div class="row">
<div class="columns twelve">
<label for="license_name">License name:</label>
<input class="u-full-width" type="text" placeholder="My new license" id="license_name" name="license_name" value="{{ license.name }}" required>
</div>
</div>
<div class="row">
<div class="six columns">
<label for="license_key">License key:</label>
<input class="u-full-width" type="text" placeholder="ABCD-EFGH-1234-5678" id="license_key" name="license_key" value="{{ license.key }}" required>
</div>
<div class="six columns">
<label for="license_manufacturer">Manufacturer:</label>
<input class="u-full-width" type="text" placeholder="Manufacturer" id="license_manufacturer" name="license_manufacturer" value="{{ license.manufacturer }}">
</div>
</div>
<div class="row">
<div class="six columns">
<label for="license_seats_used">Seats in use:</label>
<input class="u-full-width" type="number" placeholder="0" id="license_seats_used" name="license_seats_used" required value="{{ license.seatsUsed }}">
</div>
<div class="six columns">
<label for="license_seats_total">Seats total:</label>
<input class="u-full-width" type="number" placeholder="1" id="license_seats_total" name="license_seats_total" required value="{{ license.seatsTotal }}">
</div>
</div>
<div class="row">
<div class="six columns">
<label for="license_purchase_from">Purchased from:</label>
<input class="u-full-width" type="text" placeholder="Newegg" id="license_purchase_from" name="license_purchase_from" value="{{ license.purchasedFrom }}">
</div>
<div class="six columns">
<label for="license_purchase_date">Purchased at:</label>
<input class="u-full-width" type="datetime-local" id="license_purchase_date" name="license_purchase_date" value="{{ license.purchasedAt }}">
</div>
</div>
<input class="button-primary u-full-width" type="submit" value="Submit">
</form>
</div>
</section>
{% endblock %}

View File

@ -1,47 +0,0 @@
{% extends 'layout.twig' %}
{% block title %}{{ license.name }}{% endblock %}
{% block content %}
<!-- page header -->
<header id="license-header" class="row">
<div class="columns twelve">
<span>
<h1>{{ license.name }}</h1>
<p><a href="/license/{{ license.id }}/edit"><i class="fa-solid fa-pen-to-square"></i> Edit</a></p>
</span>
<h4 class="license-added-date">license added at: {{ license.createdAt }}</h4>
<h4 class="license-updated-date">Last updated at: {{ license.updatedAt }}</h4>
</div>
</header>
<!-- license information -->
<section class="row">
<table class="columns twelve">
<thead>
<tr>
<th>Product name</th>
<th>License key</th>
<th>Manufacturer</th>
<th>Seats used</th>
<th>Total seats</th>
<th>Seller</th>
<th>Purchase date</th>
</tr>
</thead>
<tbody>
<tr>
<td>{{ license.name }}</td>
<td>{{ license.key ? license.key : 'N/a' }}</td>
<td>{{ license.manufacturer ? license.manufacturer : 'N/a' }}</td>
<td>{{ license.seatsUsed }}</td>
<td>{{ license.seatsTotal }}</td>
<td>{{ license.purchasedFrom ? license.purchasedFrom : 'N/a' }}</td>
<td>{{ license.purchasedAt | date("m/d/Y h:i:s A") }}</td>
</tr>
</tbody>
</table>
</section>
{% endblock %}

View File

@ -1,66 +0,0 @@
{% extends 'layout.twig' %}
{% block title %}Search{% endblock %}
{% block content %}
<!-- page header -->
<header class="row">
<div class="columns twelve">
<h1>Searching for "{{ query }}"</h1>
</div>
</header>
{% if itemResults|length > 0 %}
<section id="search-results" class="row">
<div class="columns twelve">
<h3>Hardware components:</h3>
<table class="u-full-width">
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Updated at</th>
</tr>
</thead>
<tbody>
{% for item in itemResults %}
<tr>
<td><a href="/item/{{ item.id }}">{{ item.name }}</a></td>
<td>{{ item.type }}</td>
<td>{{ item.updatedAt | date("m/d/Y h:i:s A") }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</section>
{% endif %}
{% if licenseResults|length > 0 %}
<section id="search-results" class="row">
<div class="columns twelve">
<h3>Software licenses:</h3>
<table class="u-full-width">
<thead>
<tr>
<th>Name</th>
<th>Vendor</th>
<th>Updated at</th>
</tr>
</thead>
<tbody>
{% for license in licenseResults %}
<tr>
<td><a href="/item/{{ license.id }}">{{ license.name }}</a></td>
<td>{{ license.manufacturer }}</td>
<td>{{ license.updatedAt | date("m/d/Y h:i:s A") }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</section>
{% endif %}
{% endblock %}