From 744f10c9480fcf58f871d0a60d1a6618de7de87c Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Sun, 19 Feb 2023 11:36:06 -0500
Subject: [PATCH] Display version in app

---
 app/css/app.css           | 11 +++++++++++
 app/data/cfg.json         |  6 +++---
 app/index.html            |  3 +++
 app/js/app.js             |  1 +
 app/less/settings.less    | 11 +++++++++++
 app/lib/ui/index.js       |  8 ++++++++
 app/package-lock.json     |  2 +-
 app/package.json          |  2 +-
 app/src/index.js          |  1 +
 data/cfg.json             |  2 +-
 package-lock.json         |  4 ++--
 package.json              |  2 +-
 processing/mcopy/cfg.json |  6 +++---
 scripts/version.sh        |  2 +-
 14 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/app/css/app.css b/app/css/app.css
index 34994f5..7315af8 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -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;
 }
diff --git a/app/data/cfg.json b/app/data/cfg.json
index 69aeaa4..743d1b6 100644
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@@ -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"
     }
   }
 }
diff --git a/app/index.html b/app/index.html
index 150c118..752b534 100644
--- a/app/index.html
+++ b/app/index.html
@@ -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">
diff --git a/app/js/app.js b/app/js/app.js
index c014b66..752de0a 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -2517,6 +2517,7 @@ async function init () {
 	log = await require('log')({})
 
 	nav.init();
+	gui.init();
 	grid.init();
 	mse.mscript.init();
 	mse.console.init();
diff --git a/app/less/settings.less b/app/less/settings.less
index 8ed0b3b..95a3573 100644
--- a/app/less/settings.less
+++ b/app/less/settings.less
@@ -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;
+	}
 }
\ No newline at end of file
diff --git a/app/lib/ui/index.js b/app/lib/ui/index.js
index 7e781d6..44ba172 100644
--- a/app/lib/ui/index.js
+++ b/app/lib/ui/index.js
@@ -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;
\ No newline at end of file
diff --git a/app/package-lock.json b/app/package-lock.json
index 641fd8b..060d27a 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/app/package.json b/app/package.json
index 43ac13c..2efc5c4 100644
--- a/app/package.json
+++ b/app/package.json
@@ -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": {
diff --git a/app/src/index.js b/app/src/index.js
index d4e58af..cb52140 100644
--- a/app/src/index.js
+++ b/app/src/index.js
@@ -43,6 +43,7 @@ async function init () {
 	log = await require('log')({})
 
 	nav.init();
+	gui.init();
 	grid.init();
 	mse.mscript.init();
 	mse.console.init();
diff --git a/data/cfg.json b/data/cfg.json
index 743d1b6..de49d0d 100644
--- a/data/cfg.json
+++ b/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.7.6",
+  "version": "1.7.7",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/package-lock.json b/package-lock.json
index 1377d3a..eb218f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -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",
diff --git a/package.json b/package.json
index 498b92e..e89fc14 100644
--- a/package.json
+++ b/package.json
@@ -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": {
diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json
index 69aeaa4..de49d0d 100644
--- a/processing/mcopy/cfg.json
+++ b/processing/mcopy/cfg.json
@@ -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"
     }
   }
 }
diff --git a/scripts/version.sh b/scripts/version.sh
index d74745d..25ac831 100644
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -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