diff --git a/bower.json b/bower.json
index d19c5da..f3e855d 100644
--- a/bower.json
+++ b/bower.json
@@ -15,9 +15,12 @@
],
"dependencies": {
"angular-material": "~0.0.3",
+ "angular-animate": "~1.3.0-rc.4",
+ "hammerjs": "2.0.4",
"angular-ui-router": "~0.2.11",
"angular-pusher": "~0.0.13",
"angular-socket-io": "~0.6.0",
+ "angular-morph": "*",
"angular-mocks": "~1.2.26"
},
"resolutions": {
diff --git a/client/about.html b/client/about.html
index 85df971..2de90d7 100644
--- a/client/about.html
+++ b/client/about.html
@@ -1,4 +1,100 @@
-
-
{Graphics of project}
-
{Description of project}
-
+ Network Diagram
+
+
+
+
Front End
+
+
+
+
+
+
Angular
+
+
+
+
+
+
Material Design
+
+
+
+
+
+
Three.js
+
+
+
+
+
+
D3
+
+
+
+
+
+
Stylus
+
+
+
+
+
Drone
+
+
+
+
+
+
Node
+
+
+
+
+
+
Tessel
+
+
+
+
+
+
3D Printing
+
+
+
+
+
Back-End and Deployment
+
+
+
+
+
+
Express
+
+
+
+
+
+
Travis-CI
+
+
+
+
+
+
Coveralls
+
+
+
+
+
+
Azure
+
+
+
+
+
+
Gulp
+
+
+
+
+
\ No newline at end of file
diff --git a/client/assets/node-logo.png b/client/assets/node-logo.png
new file mode 100644
index 0000000..00afdd6
Binary files /dev/null and b/client/assets/node-logo.png differ
diff --git a/client/assets/stylus-logo.png b/client/assets/stylus-logo.png
new file mode 100644
index 0000000..88a72a5
Binary files /dev/null and b/client/assets/stylus-logo.png differ
diff --git a/client/assets/tessel-logo.png b/client/assets/tessel-logo.png
new file mode 100644
index 0000000..3666da0
Binary files /dev/null and b/client/assets/tessel-logo.png differ
diff --git a/client/assets/travis-logo.png b/client/assets/travis-logo.png
new file mode 100644
index 0000000..796deb5
Binary files /dev/null and b/client/assets/travis-logo.png differ
diff --git a/client/index.html b/client/index.html
index 1b8854f..0e59c75 100755
--- a/client/index.html
+++ b/client/index.html
@@ -13,6 +13,7 @@
+
@@ -41,9 +42,9 @@ Connected Machines: TesselDrone
-
-
-
+
+
+
diff --git a/client/main.css b/client/main.css
old mode 100755
new mode 100644
index 363a55b..1a9a20c
--- a/client/main.css
+++ b/client/main.css
@@ -1,103 +1,34 @@
.title {
padding-left: 8px;
- /*padding-bottom: 2px;*/
- color: #40BF5F;
+ color: #40bf5f;
margin-bottom: 0;
}
-
.index {
- background-color: #414B4B;
+ background-color: #414b4b;
}
-
.material-button-raised {
margin: 2em;
- height: 10%
+ height: 10%;
}
-/*
-.toolbar {
- position: fixed;
-}*/
-
.face {
border-radius: 30px;
border: 1px solid #ddd;
width: 5em;
margin: 16px;
}
-
-/***************************************************
-nav-bar styles
-***************************************************/
-
-/*#nav-bar{
- position: absolute;
+.card {
box-sizing: border-box;
- border-bottom: solid black 2px;
- width: 100vw;
+ box-shadow: 0px 5px 10px 0 rgba(0,0,0,0.26);
+ margin: 8px;
+ padding: 8px;
}
-
-#nav-bar h2{
- display: inline;
+.card:hover {
+ background-color: #808080;
}
-
-#logout-button{
- position: absolute;
- display: inline;
- border: solid black 1px;
- top: 5px;
- right: 10px;
-}*/
-
-/***************************************************
-generic container styles
-***************************************************/
-
-/*#main-container{
- position: absolute;
- box-sizing: border-box;
- top: 30px;
- width: 100vw;
- height: 750px;
-}
-
-.container{
- box-sizing: border-box;
- border: solid black 2px;
-}*/
-
-/***************************************************
-drone control styles
-***************************************************/
-
-/*.drone-control{
- position: absolute;
- width: 50%;
- height: 50%;
- left: 0;
-}*/
-
-/***************************************************
-visualizer styles
-***************************************************/
-
-/*.visualizer{
- position: absolute;
- width: 50%;
- height: 50%;
- right: 0;
-}*/
-
-/***************************************************
-log styles
-***************************************************/
-
-/*.drone-log{
- position: absolute;
+.networkdiagram {
width: 100%;
- height: 50%;
- bottom: 0;
-}*/
-
-
-
-
+ height: 100%;
+}
+.tabs {
+ border-style: none;
+}
diff --git a/client/main.styl b/client/main.styl
new file mode 100755
index 0000000..b3a4e4c
--- /dev/null
+++ b/client/main.styl
@@ -0,0 +1,33 @@
+.title
+ padding-left 8px
+ color #40BF5F
+ margin-bottom 0
+
+.index
+ background-color #414B4B
+
+.material-button-raised
+ margin 2em
+ height 10%
+
+.face
+ border-radius 30px
+ border 1px solid #ddd
+ width 5em
+ margin 16px
+
+.card
+ box-sizing border-box
+ box-shadow 0px 5px 10px 0 rgba(0, 0, 0, 0.26)
+ margin 8px
+ padding 8px
+
+.card:hover
+ background-color grey
+
+.networkdiagram
+ width 100%
+ height 100%
+
+.tabs
+ border-style none
diff --git a/karma.conf.js b/karma.conf.js
index e7e6eb1..0455576 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -6,6 +6,7 @@ module.exports = function(config) {
singleRun: true,
files: [
'bower_components/angular/angular.js',
+ 'bower_components/angular-morph/dist/angular-morph.js',
'bower_components/angular-animate/angular-animate.js',
'bower_components/angular-material/angular-material.js',
'bower_components/angular-ui-router/release/angular-ui-router.js',
diff --git a/package.json b/package.json
index 86920a7..0b464ba 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
"gulp-shell": "^0.2.9",
"gulp-stylus": "^1.3.3",
"nodejs-websocket": "^1.0.0",
- "socket.io": "^1.1.0"
+ "socket.io": "^1.1.0",
+ "stylus": "^0.49.1"
},
"devDependencies": {
"coveralls": "^2.11.2",