Display version in app
This commit is contained in:
parent
b50704a6a8
commit
744f10c948
|
@ -726,6 +726,17 @@ button:focus {
|
|||
#settings .spacer {
|
||||
margin-top: 10px;
|
||||
}
|
||||
#settings #version {
|
||||
position: absolute;
|
||||
right: 20px;
|
||||
bottom: 10px;
|
||||
z-index: 1000;
|
||||
height: 14px;
|
||||
width: auto;
|
||||
font-size: 14px;
|
||||
line-height: 14px;
|
||||
color: #999;
|
||||
}
|
||||
.cm-s-monokai.CodeMirror {
|
||||
background: #272b30 !important;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "1.7.1",
|
||||
"version": "1.7.6",
|
||||
"ext_port": 1111,
|
||||
"profiles": {
|
||||
"mcopy": {
|
||||
|
@ -185,8 +185,8 @@
|
|||
"camera_capper_projectors_identifier": "0",
|
||||
"capper_on": "A",
|
||||
"capper_off": "B",
|
||||
"takeup_forward" : "D",
|
||||
"takeup_backward" : "E"
|
||||
"takeup_forward": "D",
|
||||
"takeup_backward": "E"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -441,6 +441,9 @@
|
|||
<input type="text" id="processing" name="processing" placeholder="PROCESSING URL" />
|
||||
<input type="radio" id="camera_type_processing" name="camera_type" value="processing" onclick="devices.processing();" />
|
||||
</div>
|
||||
<div>
|
||||
<div id="version"></div>
|
||||
</div>
|
||||
<div>
|
||||
<h4>Light</h4>
|
||||
<select id="light_device">
|
||||
|
|
|
@ -2517,6 +2517,7 @@ async function init () {
|
|||
log = await require('log')({})
|
||||
|
||||
nav.init();
|
||||
gui.init();
|
||||
grid.init();
|
||||
mse.mscript.init();
|
||||
mse.console.init();
|
||||
|
|
|
@ -35,4 +35,15 @@
|
|||
.spacer{
|
||||
margin-top: 10px;
|
||||
}
|
||||
#version{
|
||||
position: absolute;
|
||||
right: 20px;
|
||||
bottom: 10px;
|
||||
z-index: 1000;
|
||||
height: 14px;
|
||||
width: auto;
|
||||
font-size: 14px;
|
||||
line-height: 14px;
|
||||
color: #999;
|
||||
}
|
||||
}
|
|
@ -3,6 +3,10 @@
|
|||
const gui = {};
|
||||
|
||||
//GUI
|
||||
gui.init = function () {
|
||||
gui.version();
|
||||
};
|
||||
|
||||
gui.fmtZero = function (val, len) {
|
||||
'use strict';
|
||||
const raw = val;
|
||||
|
@ -256,4 +260,8 @@ gui.warn = async function (title, message) {
|
|||
};
|
||||
gui.error = function () {};
|
||||
|
||||
gui.version = function () {
|
||||
$('#version').text(PACKAGE.version);
|
||||
}
|
||||
|
||||
module.exports = gui;
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "mcopy-app",
|
||||
"version": "1.7.6",
|
||||
"version": "1.7.7",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "mcopy-app",
|
||||
"version": "1.7.6",
|
||||
"version": "1.7.7",
|
||||
"description": "GUI for the mcopy small gauge film optical printer platform",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
|
|
|
@ -43,6 +43,7 @@ async function init () {
|
|||
log = await require('log')({})
|
||||
|
||||
nav.init();
|
||||
gui.init();
|
||||
grid.init();
|
||||
mse.mscript.init();
|
||||
mse.console.init();
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "1.7.6",
|
||||
"version": "1.7.7",
|
||||
"ext_port": 1111,
|
||||
"profiles": {
|
||||
"mcopy": {
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "mcopy",
|
||||
"version": "1.7.6",
|
||||
"version": "1.7.7",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "mcopy",
|
||||
"version": "1.7.6",
|
||||
"version": "1.7.7",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"arduino": "file:app/lib/arduino",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "mcopy",
|
||||
"version": "1.7.6",
|
||||
"version": "1.7.7",
|
||||
"description": "Small gauge film optical printer platform",
|
||||
"main": "build.js",
|
||||
"directories": {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "1.7.1",
|
||||
"version": "1.7.7",
|
||||
"ext_port": 1111,
|
||||
"profiles": {
|
||||
"mcopy": {
|
||||
|
@ -185,8 +185,8 @@
|
|||
"camera_capper_projectors_identifier": "0",
|
||||
"capper_on": "A",
|
||||
"capper_off": "B",
|
||||
"takeup_forward" : "D",
|
||||
"takeup_backward" : "E"
|
||||
"takeup_forward": "D",
|
||||
"takeup_backward": "E"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ echo "VERSION: $version"
|
|||
|
||||
git add ./package.json
|
||||
|
||||
declare -a fileArr=("./package-lock.json" "./data/cfg.json" "./app/package.json" "./app/package-lock.json")
|
||||
declare -a fileArr=("./package-lock.json" "./data/cfg.json" "./app/package.json" "./app/package-lock.json" "./processing/mcopy/cfg.json")
|
||||
|
||||
for i in "${fileArr[@]}"
|
||||
do
|
||||
|
|
Loading…
Reference in New Issue