diff --git a/Makefile b/Makefile index 06b28de..2332eef 100644 --- a/Makefile +++ b/Makefile @@ -30,3 +30,4 @@ stage: # Prepares dist/ for deployment make build cp entrypoint.sh $(STAGEDIR) cp run.bat $(STAGEDIR) + find dist/ -type f -exec sed -i 's/%baked_ver%/${shell git describe --always}/g' {} + diff --git a/src/index.html b/src/index.html index cadbea8..31cd0e3 100644 --- a/src/index.html +++ b/src/index.html @@ -31,6 +31,7 @@ + Dashboard version %baked_ver%
@@ -56,6 +57,7 @@
+
diff --git a/src/main.js b/src/main.js index 8603917..e99541c 100644 --- a/src/main.js +++ b/src/main.js @@ -146,6 +146,11 @@ function onValueChanged(key, value, isNew) { if (key === "/SmartDashboard/BuildData/git-branch") { $("#git-branch").text(value); } + + if (key === "/SmartDashboard/BuildData/git-desc") { + $("#git-hash").text(value); + } + if (key === "/SmartDashboard/BuildData/deploy-user") { $("#git-user").text(value); var color = ""; @@ -153,7 +158,7 @@ function onValueChanged(key, value, isNew) { case "SimUser": color = "#d3869b"; break; - case "joe": + case "KenwoodFox": color = "#831598"; break; case "dublu": @@ -165,7 +170,7 @@ function onValueChanged(key, value, isNew) { case _: color = "#282828"; } - $("#git-user").css("border-right", "6px solid " + color); + $("#git-user").css("border-right", "20px solid " + color); } if (key === "/SmartDashboard/Auto/Angle") {