Feat/2024-improvements

.gitignore

@@ -1,11 +1,40 @@
-node_modules
-.idea
-.sass-cache
-.DS_Store
-coverage
-config.json
-.project
-public/components/**/
-public/components/**/*
-!public/components/
-.wireit
+*
+!.gitignore
+
+!bin/
+!bin/www
+
+!lib/
+!lib/*
+
+!public/
+!public/**/
+!public/**/*
+public/components/
+
+!routes/
+!routes/*
+
+!test/
+!test/**/
+!test/**/*
+
+!views/
+!views/*
+
+!.bowerrc
+!.editorconfig
+!.gitignore
+!.prettierignore
+!Dockerfile
+!README.md
+!bower.json
+!buildx-setup.sh
+!buildx.sh
+!config.sample.json
+!eslint.config.mjs
+!gulpfile.js
+!prettier.config.js
+
+!package.json
+!pnpm-lock.yaml

bin/www

@@ -3,7 +3,7 @@
 
 const debug = require('debug')('laser:web')
 
-const app = require('../app')
+const app = require('../lib/app')
 
 app.app()
 

buildx.sh

@@ -2,8 +2,8 @@
 
 TEMPLATE=$1
 
-if [ "${TEMPLATE}" = "" ] ; then
-	TEMPLATE=vanhack/vhs-laser-access:buildx-test
+if [ "${TEMPLATE}" = "" ]; then
+  TEMPLATE=vanhack/vhs-laser-access:buildx-test
 fi
 
 TEMPLATE_PATH=$(echo "${TEMPLATE}" | cut -f1 -d:)
@@ -12,19 +12,20 @@ TEMPLATE_TAG=$(echo "${TEMPLATE}" | cut -f2- -d: | sed 's:/:-:g')
 TEMPLATE="${TEMPLATE_PATH}:${TEMPLATE_TAG}"
 
 if [ -f .build.env ]; then
-        . .build.env
+  # shellcheck source=/dev/null
+  . .build.env
 fi
 
-jq '. += {"experimental": "enabled"}' ~/.docker/config.json >~/.docker/config.json.tmp
-cat ~/.docker/config.json.tmp >~/.docker/config.json
+jq '. += {"experimental": "enabled"}' ~/.docker/config.json > ~/.docker/config.json.tmp
+cat ~/.docker/config.json.tmp > ~/.docker/config.json
 rm ~/.docker/config.json.tmp
 
-XBUILDER=$(docker buildx ls | egrep xbuilder)
+XBUILDER=$(docker buildx ls | grep xbuilder)
 
 if [ "$XBUILDER" = "" ]; then
-        docker buildx create --name xbuilder --driver docker-container --use
+  docker buildx create --name xbuilder --driver docker-container --use
 else
-        docker buildx use xbuilder
+  docker buildx use xbuilder
 fi
 
-docker buildx build --platform linux/arm64,linux/arm/v7,linux/arm/v6 -t $TEMPLATE --push .
+docker buildx build --platform linux/arm64,linux/arm/v7,linux/arm/v6 -t "${TEMPLATE}" --push .

config.json.sample → config.sample.json

@@ -13,8 +13,8 @@
     "clientID": "<clientId>",
     "clientSecret": "<secret>"
   },
-  "mmpUrl": "https://membership.vanhack.ca/services/web/AuthService1.svc/CheckService",
-  "mmpApiKey": "<mmpKey>",
+  "nomosUrl": "https://membership.vanhack.ca/services/web/AuthService1.svc/CheckService",
+  "nomosApiKey": "<nomosKey>",
   "callbackHost": "http://localhost:3000 <callback for the api, cannot be an internal IP for google but it can be a dns name that is internal>",
   "api": {
     "baseUrl": "https://api.vanhack.ca",

app.js → lib/app.js

@@ -10,7 +10,7 @@ const debug = require('debug')('laser:web')
 const express = require('express')
 const session = require('express-session')
 
-const routes = require('./routes')
+const routes = require('../routes')
 
 const app = express()
 
@@ -21,8 +21,8 @@ require('./socket').init(server)
 let init = false
 
 // view engine setup
-app.set('views', path.join(__dirname, 'views'))
-app.set('view engine', 'jade')
+app.set('views', path.join(__dirname, '..', 'views'))
+app.set('view engine', 'pug')
 
 app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({ extended: false }))
@@ -46,7 +46,7 @@ module.exports.app = function () {
     app.use('/', routes.router)
     routes.addErrorHandlers(app)
 
-    app.use(express.static(path.join(__dirname, 'public')))
+    app.use(express.static(path.join(__dirname, '..', 'public')))
 
     // catch 404 and forward to error handler
     app.use(function (_req, _res, next) {

lib/constants.js

@@ -0,0 +1,18 @@
+const gpios = {
+  GPIO_LASER: 22,
+  GPIO_BLOWER: 27,
+  GPIO_CHILLER: 17,
+
+  GPIO_LED_GREEN: 23,
+  GPIO_LED_RED: 24,
+
+  GPIO_MAIN_SWITCH: 4
+}
+
+module.exports.gpios = gpios
+
+const ON = 1
+const OFF = 0
+
+module.exports.ON = ON
+module.exports.OFF = OFF