Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions controller/node-js/client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<script src="buttons.js" type="module"></script>
</head>

<body>
<body style="position: relative">
<!-- Top Bar -->
<div style="display:flex; flex-direction: row; justify-content: space-between; align-items: center; background: #0071C5; padding: 0 4rem; height: 5rem;">
<!-- Logo -->
Expand All @@ -35,7 +35,7 @@
<div class="video-container">
<!-- "muted" attributed is needed, otherwise most browsers will not auto-stream the video. -->
<div style="width: 100%; height: 100%; position: relative;">
<video id='video' muted autoplay playsinline"></video>
<video id='video' muted autoplay playsinline></video>
<div id="buttons" style="display:flex; flex-direction: row; justify-content: left; align-items: start; gap: 1em; margin: 1em 0; position: absolute; left: 50%; bottom: 5%; transform: translateX(-50%); background: white; border-radius: 4px; box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15); padding: 5px;">
<img id="sound_button" class="button" src="icons/volume_off_black_24dp.svg" width="30" />
<img id="mirror_button" class="button" src="icons/flip_black_24dp.svg" width="30" />
Expand Down
3 changes: 1 addition & 2 deletions controller/node-js/client/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ import { BotMessageHandler } from './bot-message-handler'
const botMessageHandler = new BotMessageHandler(connection)

const onData = data => {
console.log()
botMessageHandler.handle((data).status, connection)
botMessageHandler.handle(JSON.parse(data).status, connection)
}

const onQuit = () => {
Expand Down
27 changes: 12 additions & 15 deletions controller/node-js/package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
{
"name": "controller-js",
"version": "1.0.0",
"version": "2.0.0",
"description": "",
"main": "index.js",
"scripts": {
"prestart": "cd server && npm install",
"start": "run-p dev:server dev:start-server",
"postinstall": "cd server && npm install",
"start": "npx run-p dev:server dev:start-client",
"start-nohup": "nohup npm run start",
"dev:server": "npm run start --prefix server",
"dev:start-server-headless": "NODE_ENV=development snowpack build --watch",
"dev:start-server": "npx snowpack dev --port 8081",
"build": "snowpack build",
"lint": "npx eslint server/*.js --fix && npx eslint client/*.js --fix"
"dev:start-client": "vite --port 8081 --host",
"build": "vite build",
"lint": "eslint server/*.js --fix && eslint client/*.js --fix"
},
"author": "Ivo Zivkov",
"devDependencies": {
"eslint": "^7.32.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.2.0",
"http2-proxy": "^5.0.53",
"npm-run-all": "^4.1.5",
"snowpack": "^3.8.8"
"vite": "^5.2.0",
"npm-run-all2": "^6.0.0",
"eslint": "^9.0.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-n": "^17.0.0",
"eslint-plugin-promise": "^6.0.0"
}
}
29 changes: 13 additions & 16 deletions controller/node-js/server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "server",
"version": "1.0.0",
"version": "2.0.0",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -9,24 +9,21 @@
},
"author": "Ivo Zivkov",
"dependencies": {
"cookie-parser": "~1.4.4",
"debug": "~2.6.9",
"cookie-parser": "^1.4.7",
"debug": "^4.3.4",
"dnssd2": "^1.0.0",
"ejs": "^3.1.6",
"express": "^4.17.1",
"http-errors": "~1.6.3",
"morgan": "~1.9.1",
"ejs": "^3.1.10",
"express": "^4.19.2",
"http-errors": "^2.0.0",
"morgan": "^1.10.0",
"net": "^1.0.2",
"ws": "^7.5.0"
"ws": "^8.17.0"
},
"devDependencies": {
"@types/express": "^4.17.11",
"eslint": "^7.32.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.2.0",
"nodemon": "^2.0.7",
"npm-run-all": "^4.1.5"
"eslint": "^9.0.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-n": "^17.0.0",
"eslint-plugin-promise": "^6.0.0",
"nodemon": "^3.1.0"
}
}
39 changes: 0 additions & 39 deletions controller/node-js/snowpack.config.js

This file was deleted.

8 changes: 8 additions & 0 deletions controller/node-js/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { defineConfig } from 'vite'

export default defineConfig({
root: 'client',
server: {
allowedHosts: true
}
})
Loading