'test' pages connected to controllers

Author: laarniastrid

gulpfile.js

@@ -22,7 +22,7 @@ gulp.task('styles', function() { // .scss is newer file version of .sass
 });
 
 gulp.task('javascript', function() {
-  gulp.src(['./main/**/**/*.js', '!./main/jquery.js'])
+  gulp.src(['./main/**/*.js', '!./main/jquery.js'])
     .pipe(ngAnnotate())
     // .pipe(uglify())
     .pipe(concat('all.js'))

main/app.js

@@ -20,7 +20,6 @@ angular.module('myApp', ['ui.router'])
   .state('lessonTests', {
     url: '/lessonTests',
     templateUrl: './html/lessonTests/lessonTestsTemplate.html'
-    // controller: 'lessonTestsController'
   })
   .state('assessment', {
     url: '/assessment',

main/lessonTests/lessonFiles/js-lesson-arrays.js

@@ -0,0 +1,9 @@
+angular.module('myApp')
+
+.directive('jsArraysDirectives', function() {
+  return {
+    restrict: 'A',
+    controller: 'lessonTestsController',
+    templateUrl: './html/lessonTests/lessonFiles/js-lesson-arrays.html'
+  }
+}) // end jsArraysDirectives

main/lessonTests/lessonFiles/js-lesson-conditional.js

@@ -0,0 +1,9 @@
+angular.module('myApp')
+
+.directive('jsConditionalDirective', function() {
+  return {
+    restrict: 'A',
+    controller: 'lessonTestsController',
+    templateUrl: './html/lessonTests/lessonFiles/js-lesson-conditional.html'
+  }
+}) // end jsConditionalDirective

…Tests/lessonFiles/js-lesson-numbers.html …ts/lessonFiles/js-lesson-data-types.htmlmain/lessonTests/lessonFiles/js-lesson-numbers.html renamed to main/lessonTests/lessonFiles/js-lesson-data-types.html main/lessonTests/lessonFiles/js-lesson-numbers.html renamed to main/lessonTests/lessonFiles/js-lesson-data-types.html

@@ -1,7 +1,7 @@
 <div class="lesson-tests-wrapper">
 
-  <section class="lessonTests" ng-controller="lessonTestsController">
-    <h2>JavaScript<br>Numbers<br>Test</h2>
+  <section class="lessonTests">
+    <h2>JavaScript<br>Data Types<br>Test</h2>
     <div class="multiple-choice-wrapper">
       <div class="quiz-options"><span class="test-question">1. Here's where we will put a question:</span><br>
         <button>one</button>

main/lessonTests/lessonFiles/js-lesson-data-types.js

@@ -0,0 +1,9 @@
+angular.module('myApp')
+
+.directive('jsDatatypesDirective', function() {
+  return {
+    restrict: 'A',
+    controller: 'lessonTestsController',
+    templateUrl: './html/lessonTests/lessonFiles/js-lesson-data-types.html'
+  }
+}) // end dataTypesDirective

main/lessonTests/lessonFiles/js-lesson-functions.js

@@ -0,0 +1,9 @@
+angular.module('myApp')
+
+.directive('jsFunctionsDirective', function() {
+  return {
+    restrict: 'A',
+    controller: 'lessonTestsController',
+    templateUrl: './html/lessonTests/lessonFiles/js-lesson-functions.html'
+  }
+}) // end varsTestDirective

main/lessonTests/lessonFiles/js-lesson-iterators.js

@@ -0,0 +1,9 @@
+angular.module('myApp')
+
+.directive('jsIteratorsDirective', function() {
+  return {
+    restrict: 'A',
+    controller: 'lessonTestsController',
+    templateUrl: './html/lessonTests/lessonFiles/js-lesson-iterators.html'
+  }
+}) // end varsTestDirective

…essonTests/lessonFiles/js-lesson-vars.js …onTests/lessonFiles/js-lesson-logical.jsmain/lessonTests/lessonFiles/js-lesson-vars.js renamed to main/lessonTests/lessonFiles/js-lesson-logical.js main/lessonTests/lessonFiles/js-lesson-vars.js renamed to main/lessonTests/lessonFiles/js-lesson-logical.js

@@ -1,9 +1,9 @@
 angular.module('myApp')
 
-.directive('varsTestDirective', function() {
+.directive('jsLogicalDirective', function() {
   return {
     restrict: 'A',
     controller: 'lessonTestsController',
-    templateUrl: './html/lessonTests/lessonFiles/js-lesson-vars.html'
+    templateUrl: './html/lessonTests/lessonFiles/js-lesson-logical.html'
   }
 }) // end varsTestDirective

main/lessonTests/lessonFiles/js-lesson-objects.js

@@ -0,0 +1,9 @@
+angular.module('myApp')
+
+.directive('jsObjectsDirective', function() {
+  return {
+    restrict: 'A',
+    controller: 'lessonTestsController',
+    templateUrl: './html/lessonTests/lessonFiles/js-lesson-objects.html'
+  }
+}) // end varsTestDirective