Merge pull request #45 from Precourse-Tracker/backend

Backend, added video, dashboard controllers,services

Author: ttaylordev

gulpfile.js

@@ -6,7 +6,7 @@ var gulp = require('gulp'),
     uglifycss = require('gulp-uglifycss'),
     stripCode = require('gulp-strip-code'),
     ngAnnotate = require('gulp-ng-annotate'),
-    watcher = gulp.watch(['./main/**/*.js', './main/styles/*.scss', './main/**/*.html', './main/jquery.js', './main/ng-webworker.js', './main/worker_wrapper.js', './main/ui-ace.js'], ['default']);
+    watcher = gulp.watch(['./main/**/*.js', './test/**/*.js', './main/styles/*.scss', './main/**/*.html', './main/jquery.js', './main/ng-webworker.js', './main/worker_wrapper.js', './main/ui-ace.js', './main/angular-youtube-embed.js'], ['default']);
 
 gulp.watch(['./main/**/*.js', './main/styles/*.scss', './main/**/*.html', './main/jquery.js'], ['default']);
 watcher.on('change', function(event) {
@@ -24,7 +24,7 @@ gulp.task('styles', function() { // .scss is newer file version of .sass
 });
 
 gulp.task('javascript', function() {
-  gulp.src(['./main/**/*.js', '!./main/jquery.js', '!./main/ng-webworker.js', '!./main/worker_wrapper.js', '!./main/ui-ace.js'])
+  gulp.src(['./main/**/*.js', './test/**/*.js', '!./main/jquery.js', '!./main/ng-webworker.js', '!./main/worker_wrapper.js', '!./main/ui-ace.js', '!./main/angular-youtube-embed.js'])
     .pipe(ngAnnotate())
     // .pipe(uglify())
     .pipe(concat('all.js'))

main/app.js

@@ -1,4 +1,4 @@
-angular.module('myApp', ['ui.router', 'ui.ace', 'ngWebworker'])
+angular.module('myApp', ['ui.router', 'ui.ace', 'ngWebworker', 'youtube-embed'])
 
 .config(["$stateProvider", "$urlRouterProvider", function($stateProvider, $urlRouterProvider) {
 

main/assessment/assessmentController.js

@@ -15,7 +15,6 @@ angular.module('myApp')
 
 $scope.eval = function(q, userCode) {
 
-
   let qId = q._id;
   let answer = q.answer;
 

main/assessment/assessmentService.js

@@ -37,6 +37,7 @@ angular.module('myApp')
           }
         }
       }).success(function(resp) {
+        tick = 0;
         console.log(resp);
       })
     }

main/assessment/assessmentStyles.scss

@@ -6,6 +6,7 @@
   }
   .ace_editor  {
     height : 200px;
+    width: 600px;
   }
   .assessment-eval {
     color: #fff;
@@ -48,4 +49,8 @@
     width: 100vw;
     height: 20vh;
   }
+  .assessmentQ {
+    display: flex;
+    line-height: 40px;
+  }
 }

main/assessment/assessmentTemplate.html

@@ -1,12 +1,12 @@
 <navigation-directive></navigation-directive>
 <section ng-controller="assessmentController" id=assessment-view>
   <div ng-repeat="q in questions" class="stuff">
-    Q: {{q.question}}
+    Instructions: <span class="assessmentQ">{{q.question}}</span>
   <div ng-model="userCode" ui-ace="{
     mode: 'javascript',
     theme: 'crimson_editor'
   }"></div>
-  ANSWER: {{q.answer}}
+  <!-- ANSWER: {{q.answer}} -->
     <button ng-click="eval(q, userCode); doSomeStuff(q);" ng-disabled="q.disabled" class="assessment-eval">eval</button>
 </div>
 

main/assessment/workerService.js

@@ -3,7 +3,8 @@ angular.module('myApp').service('workerService', function(Webworker) {
   this.worker = (qId, answer, userCode) => {
 
     function isSame(userCode, answer) {
-      if (userCode === answer) {
+      var results = eval(userCode);
+      if (results.toString() === answer) {
         return true;
       } else {
         return false;

main/dashboard/dashboardController.js

@@ -0,0 +1,13 @@
+angular.module('myApp').controller('dashboardController', function($scope, dashboardService) {
+
+  getUserData = () => {
+    dashboardService.getUserData().then(function(response) {
+      console.log("controller", response.data.progress.lessons[0].score);
+      var total = response.data.progress.lessons[0].score;
+      $scope.radarChartData = total / 100;
+
+    })
+  }
+  getUserData();
+
+})

main/dashboard/dashboardService.js

@@ -0,0 +1,13 @@
+angular.module('myApp').service('dashboardService', function($q, $http) {
+
+  this.getUserData = () => {
+    return $http({
+      method: 'GET',
+      url: '/api/users/progress'
+    }).then(function(response) {
+      // console.log("service", response);
+      return response;
+    })
+  }
+
+})

main/dashboard/dashboardTemplate.html

@@ -1,7 +1,7 @@
 <navigation-directive></navigation-directive>
 
 <!-- <unit-test-menu-directive></unit-test-menu-directive> -->
-<section unit-test-menu-directive id="dashboard-wrapper">
+<section unit-test-menu-directive id="dashboard-wrapper" ng-controller="dashboardController">
 
   <div id="dashboard">
 
@@ -21,7 +21,7 @@
 
 
     <div id="unit-subview">
-      <div id="js-graph-div" ><bars class="radarChart"></bars></div>
+      <div id="js-graph-div" ><bars class="radarChart" data="radarChartData"></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>