Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-23 01:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto stash before merge of "master" and "origin/master"

Browse Source
This commit is contained in:
Sagi Frimer
2019-03-23 21:18:30 +02:00
parent 2dd8140350
commit ec0b07db61
5 changed files with 6791 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/app/ChameleonVisionApp.py
View File

@@ -12,12 +12,7 @@ define("port", default=8888, help="run on the given port", type=int)
class ChameleonApplication(tornado.web.Application):
def __init__(self):
handlers = [(r"/", MainHandler),
(r"/websocket", ChameleonWebSocket),
(r"/css/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/css")}),
(r"/js/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/js")}),
(r"/templates/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/templates")}),
(r"/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site")}),
(r"/assets/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/assets")})]
(r"/websocket", ChameleonWebSocket)]
settings = dict(
template_path=os.path.join(os.path.dirname(__file__), "../../Site")

2
backend/app/handlers/SocketHandler.py
View File

@@ -1,6 +1,5 @@
import tornado.websocket
class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
def open(self):
print("WebSocket opened")
@@ -11,4 +10,3 @@ class ChameleonWebSocket(tornado.websocket.WebSocketHandler):
def on_close(self):
print("WebSocket closed")

6788
chameleon-client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
chameleon-client/package.json
View File

@@ -10,6 +10,7 @@
"dependencies": {
"iview": "^3.3.0",
"vue": "^2.6.6",
"vue-native-websocket": "^2.0.12",
"vue-router": "^3.0.2",
"webpack": "^4.29.6"
},

1
chameleon-client/src/App.vue
View File

@@ -70,6 +70,7 @@
methods: {
onOpenChange(data) {
this.isCollapsed = false;
console.info('App currentRoute:', this.$router.currentRoute);
},
onCollapse() {