diff --git a/Python/app/ChameleonVisionApp.py b/Python/app/ChameleonVisionApp.py index 20f60cc36..90cb81ffa 100644 --- a/Python/app/ChameleonVisionApp.py +++ b/Python/app/ChameleonVisionApp.py @@ -14,7 +14,8 @@ class ChameleonApplication(tornado.web.Application): 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"/JS/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/JS")}), + (r"/assets/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/assets")})] settings = dict( template_path=os.path.join(os.path.dirname(__file__), "../../Site") diff --git a/Site/CSS/Main.css b/Site/CSS/Main.css index c1732c8ac..91480ca4f 100644 --- a/Site/CSS/Main.css +++ b/Site/CSS/Main.css @@ -1,16 +1,41 @@ -body{ +body { background: #212121; } -.nav{ + +.nav { background: #343334; - box-shadow: 0 8px 5px #383838; + box-shadow: 0 3px 5px #343334; } -.nav > a{ + +.nav > a, .sidenav a { color: whitesmoke; font-family:Verdana; font-weight: 500; } -.nav > a:hover{ + +.nav > a:hover, .sidenav a:hover { color: #17a2b8; } + +.sidenav { + height: 100%; + width: 80px; + position: fixed; + z-index: 1; + top: 0; + left: 0; + background-color: #111; + overflow-x: hidden; + padding-top: 20px; + box-shadow: 3px 0px 5px #111; +} + +.main { + margin-left: 80px; +} + +#logo { + width: 100%; + height: 80px; +} \ No newline at end of file diff --git a/Site/Index.html b/Site/Index.html index 653faa43e..72ee0980c 100644 --- a/Site/Index.html +++ b/Site/Index.html @@ -1,28 +1,23 @@ - - - Chameleon Vision - - - - -
- -
- - + + + Chameleon Vision + + + + +
+ +
+
+ +
+ + \ No newline at end of file diff --git a/Site/JS/main.js b/Site/JS/main.js new file mode 100644 index 000000000..b3c54a0cb --- /dev/null +++ b/Site/JS/main.js @@ -0,0 +1,7 @@ +let ws = new WebSocket("ws://localhost:8888/websocket"); +ws.onopen = function () { + ws.send("hello"); +} +ws.onmessage = function (ev) { + alert(ev.data); +} \ No newline at end of file diff --git a/Site/assets/logo.png b/Site/assets/logo.png new file mode 100644 index 000000000..8335e8580 Binary files /dev/null and b/Site/assets/logo.png differ