16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Display version in app

This commit is contained in:
Matt McWilliams 2023-02-19 11:36:06 -05:00
parent b50704a6a8
commit 744f10c948
14 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/css/app.css
View File

@ -726,6 +726,17 @@ button:focus {
#settings .spacer { #settings .spacer {
margin-top: 10px; 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 { .cm-s-monokai.CodeMirror {
background: #272b30 !important; background: #272b30 !important;
} }

6
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.1", "version": "1.7.6",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -185,8 +185,8 @@
"camera_capper_projectors_identifier": "0", "camera_capper_projectors_identifier": "0",
"capper_on": "A", "capper_on": "A",
"capper_off": "B", "capper_off": "B",
"takeup_forward" : "D", "takeup_forward": "D",
"takeup_backward" : "E" "takeup_backward": "E"
} }
} }
} }

3
app/index.html
View File

@ -441,6 +441,9 @@
<input type="text" id="processing" name="processing" placeholder="PROCESSING URL" /> <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();" /> <input type="radio" id="camera_type_processing" name="camera_type" value="processing" onclick="devices.processing();" />
</div> </div>
<div>
<div id="version"></div>
</div>
<div> <div>
<h4>Light</h4> <h4>Light</h4>
<select id="light_device"> <select id="light_device">

1
app/js/app.js
View File

@ -2517,6 +2517,7 @@ async function init () {
log = await require('log')({}) log = await require('log')({})
nav.init(); nav.init();
gui.init();
grid.init(); grid.init();
mse.mscript.init(); mse.mscript.init();
mse.console.init(); mse.console.init();

11
app/less/settings.less
View File

@ -35,4 +35,15 @@
.spacer{ .spacer{
margin-top: 10px; 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;
}
} }

8
app/lib/ui/index.js
View File

@ -3,6 +3,10 @@
const gui = {}; const gui = {};
//GUI //GUI
gui.init = function () {
gui.version();
};
gui.fmtZero = function (val, len) { gui.fmtZero = function (val, len) {
'use strict'; 'use strict';
const raw = val; const raw = val;
@ -256,4 +260,8 @@ gui.warn = async function (title, message) {
}; };
gui.error = function () {}; gui.error = function () {};
gui.version = function () {
$('#version').text(PACKAGE.version);
}
module.exports = gui; module.exports = gui;

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.7.6", "version": "1.7.7",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.7.6", "version": "1.7.7",
"description": "GUI for the mcopy small gauge film optical printer platform", "description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

1
app/src/index.js
View File

@ -43,6 +43,7 @@ async function init () {
log = await require('log')({}) log = await require('log')({})
nav.init(); nav.init();
gui.init();
grid.init(); grid.init();
mse.mscript.init(); mse.mscript.init();
mse.console.init(); mse.console.init();

2
data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.6", "version": "1.7.7",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.7.6", "version": "1.7.7",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mcopy", "name": "mcopy",
"version": "1.7.6", "version": "1.7.7",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"arduino": "file:app/lib/arduino", "arduino": "file:app/lib/arduino",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.7.6", "version": "1.7.7",
"description": "Small gauge film optical printer platform", "description": "Small gauge film optical printer platform",
"main": "build.js", "main": "build.js",
"directories": { "directories": {

6
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.7.1", "version": "1.7.7",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -185,8 +185,8 @@
"camera_capper_projectors_identifier": "0", "camera_capper_projectors_identifier": "0",
"capper_on": "A", "capper_on": "A",
"capper_off": "B", "capper_off": "B",
"takeup_forward" : "D", "takeup_forward": "D",
"takeup_backward" : "E" "takeup_backward": "E"
} }
} }
} }

2
scripts/version.sh
View File

@ -8,7 +8,7 @@ echo "VERSION: $version"
git add ./package.json 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[@]}" for i in "${fileArr[@]}"
do do