merging of master into TT

Author: ttaylordev

main/assessment/assessmentService.js

@@ -3,6 +3,7 @@ angular.module('myApp')
 .service('assessmentService', function($q, $http) {
 
 
+
     this.getAssessment = () => {
         return $http({
             method: 'GET',
@@ -23,7 +24,6 @@ angular.module('myApp')
         console.log("tick count", tick);
     }
 
-
     this.submitAssessment = (length) => {
       var totalScore = (tick / length) * 100;
       totalScore = totalScore.toString();
@@ -40,4 +40,5 @@ angular.module('myApp')
         console.log(resp);
       })
     }
+
 })

main/assessment/assessmentStyles.scss

@@ -27,13 +27,18 @@
     outline: 0;
     transition: all 0.25s;
   }
+
   button:hover {
     background: #8FB9FF;
     box-shadow: 0 4px 7px rgba(0,0,0,0.1), 0 3px 6px rgba(0,0,0,0.1);
   }
   button:disabled {
     visibility: hidden;
   }
+  #submit-assessment {
+    float: right;
+    margin: 4em;
+  }
   .stuff {
     color: #406BB2;
     width: 90vw;

main/assessment/assessmentTemplate.html

@@ -9,5 +9,7 @@
   ANSWER: {{q.answer}}
     <button ng-click="eval(q, userCode); doSomeStuff(q);" ng-disabled="q.disabled" class="assessment-eval">eval</button>
 </div>
-<button type="button" ng-click="submitAssessment(questions.length)">Submit Assessment</button>
+
+<button id="submit-assessment" type="button" ng-click="submitAssessment(questions.length)">Submit Assessment</button>
+
 </section>

main/dashboard/dashboardStyles.scss

@@ -1,14 +1,14 @@
 $darkBlue: #406BB2;
+$lightBlue: #8FB9FF;
 
 @mixin colorSchemeSquares {
   width: 20px;
   height: 20px;
 }
 
 @mixin graphSizing {
-  width: 500px;
-  height: 400px;
-  border: 1px solid rgba(0,0,0,0.1);
+  width: 90%;
+  height: 90%;
   background: white;
 }
 
@@ -136,4 +136,27 @@ $darkBlue: #406BB2;
     }
 
   }
+
+  #js-graph-div {
+
+    #main {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 432px;
+    }
+
+    svg text {
+      pointer-events: none;
+    }
+    rect {
+      -moz-transition: all 0.3s;
+      -webkit-transition: all 0.3s;
+      transition: all 0.3s;
+    }
+    rect:hover {
+      fill: $lightBlue;
+    }
+  }
+
 }

main/dashboard/dashboardTemplate.html

@@ -21,7 +21,7 @@
 
 
     <div id="unit-subview">
-      <div id="js-graph-div"><span>Javascript</span></div>
+      <div id="js-graph-div" ><bars class="radarChart"></bars></div>
       <div id="html-graph-div"><span>HTML</span></div>
       <div id="css-graph-div"><span>CSS</span></div>
       <div id="git-graph-div"><span>Git</span></div>