applest · filiphanes · Jul 22, 2018 · Jul 22, 2018 · Jul 23, 2018 · Jul 23, 2018
diff --git a/.bowerrc b/.bowerrc
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
+.DS_Store
 config.json
 node_modules/
 public/js/
-public/css/
-public/bower_components/
+public/bundle.js
+public/bundle.js.map
+.vscode/
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Applest
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,46 +1,70 @@
-live-controller
-========
+# ATEM Live Controller
 The customizable video switchers web controller.
 
-Installation
---------
+# Features
+- Switching program/preview inputs
+- keyboard shortcuts as in original ATEM switchers app: 1-8 changes preview, Ctrl+1-8 changes program, Spacebar for CUT transition and Enter for AUTO transition.
+- websocket communication with server for more efficient and faster reactions
+- Svelte reactive frontend for simpler development
+- HTTP API for integration with other apps
+
+# Installation
 - Copy `config.json.sample` to `config.json`
-- Install dependency components with bower
-- Compile front app sources with gulp
+- Install dependencies with npm `npm install` or `pnpm install` or `yarn install`
 
 ```sh
-$ cp config.json.sample config.json
-$ bower install
-$ gulp
+cp config.json.sample config.json
+npm install
 ```
 
-Run
---------
+# Run
 - Run the app server
 
 ```sh
-$ coffee server.coffee
+npm start
+```
+or 
+```sh
+node ./src/server.js
+```
+or run with [PM2](http://pm2.keymetrics.io/)
+```sh
+pm2 start process.yml
 ```
-You will be able to see soon: `http://<your host>:8080/`
+or when in development mode
+```sh
+npm start dev
+```
+Then go to this address in your browser: `http://localhost:8080/` or `http://host:port/` which is set in config.json.
 
-Example
---------
-![](docs/ipad-mini-demo.png)
+# Screenshots
+<img src="docs/screen-desktop.png" width="800">
+<img src="docs/screen-mobile.png" width="200">
 
-Contributing
---------
-1. Fork it ( https://github.com/applest/live-controller )
+# Contributing
+1. Fork it ( https://github.com/filiphanes/atem-live-controller )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Add your feature
+3. Implement your feature
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request
 
-License
---------
+# TODO
+- media uploads
+- settings tab
+- audio control tab
+- camera control tab
+- support more atem functionality
+
+# Thanks
+- Font made by "とろ庵" http://www.trojanbear.net/s/category/font
+- svelte framework
+- applest-atem library for communication with atem hardware
+
+# License
 The MIT License (MIT)
 
-Copyright (c) 2015 Yusei Yamanaka (miyukki)
+Copyright (c) 2019 Filip Hanes
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -59,8 +83,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-Thanks
---------
-This program is using the font made by "とろ庵"  
-http://www.trojanbear.net/s/category/font
diff --git a/bower.json b/bower.json
diff --git a/config.json.sample b/config.json.sample
@@ -1,19 +1,9 @@
 {
+  "server": {
+    "host": "0.0.0.0",
+    "port": 8080
+  },
   "switchers": [
-    { "type": "atem", "addr": "172.16.0.101" }
-  ],
-  "channels": [
-    { "device": 0, "input": 1 },
-    { "device": 0, "input": 2 },
-    { "device": 0, "input": 3 },
-    { "device": 0, "input": 4 },
-    { "device": 0, "input": 5 },
-    { "device": 0, "input": 6 },
-    { "device": 0, "input": 7 },
-    { "device": 0, "input": 8 },
-    { "device": 0, "input": 9 },
-    { "device": 0, "input": 10 },
-    { "device": 0, "input": 3010 },
-    { "device": 0, "input": 3020 }
+    { "type": "atem", "addr": "192.168.88.240" }
   ]
 }
diff --git a/docs/ipad-mini-demo.png b/docs/ipad-mini-demo.png
diff --git a/docs/screen-desktop.png b/docs/screen-desktop.png
diff --git a/docs/screen-mobile.png b/docs/screen-mobile.png
diff --git a/gulpfile.coffee b/gulpfile.coffee
diff --git a/package.json b/package.json
@@ -1,25 +1,32 @@
 {
-  "name": "live-controller",
+  "name": "atem-live-controller",
   "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
+  "description": "HTML5 client-server controller for Blackmagic Design ATEM switchers",
+  "main": "src/server.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "rollup -c",
+    "autobuild": "rollup -c -w",
+    "dev": "run-p start autobuild",
+    "start": "node src/server.js"
   },
-  "author": "",
-  "license": "ISC",
+  "author": "Filip Hanes <filip.hanes@protonmail.com>",
+  "license": "MIT",
   "dependencies": {
-    "applest-atem": "^0.1.2",
-    "body-parser": "^1.13.2",
-    "express": "^4.13.1"
+    "applest-atem": "^0.2.4",
+    "express": "^4.17.1",
+    "express-fileupload": "^1.1.7-alpha.3",
+    "express-ws": "^4.0.0",
+    "feather-icons": "^4.28.0",
+    "ws": "^7.3.0"
   },
   "devDependencies": {
-    "coffee-script": "^1.9.3",
-    "gulp": "^3.9.0",
-    "gulp-coffee": "^2.3.1",
-    "gulp-notify": "^2.2.0",
-    "gulp-plumber": "^1.0.1",
-    "gulp-sass": "^2.0.4",
-    "gulp-watch": "^4.3.3"
+    "@rollup/plugin-commonjs": "^13.0.0",
+    "@rollup/plugin-node-resolve": "^8.1.0",
+    "npm-run-all": "^4.1.5",
+    "rollup": "^2.18.2",
+    "rollup-plugin-livereload": "^1.3.0",
+    "rollup-plugin-svelte": "^5.2.3",
+    "rollup-plugin-terser": "^6.1.0",
+    "svelte": "^3.23.2"
   }
 }