Merge 461f9f3 into 77ad92d

andela · Apr 9, 2018 · 8327ddc · 8327ddc
2 parents 77ad92d + 461f9f3
commit 8327ddc
Show file tree

Hide file tree

Showing 87 changed files with 21,393 additions and 26,477 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ bower_components
 dist
 .env
 coverage/
-.nyc_output
+.nyc_output
+.idea
diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade
@@ -3,11 +3,39 @@ script.
       (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
       g.src='//www.google-analytics.com/ga.js';
       s.parentNode.insertBefore(g,s)}(document,'script'));
-script(type='text/javascript', src='/lib/jquery/jquery.js')
-script(type='text/javascript', src='/lib/underscore/underscore-min.js')
 
-//Bootstrap
-script(type='text/javascript', src='/lib/bootstrap/js/bootstrap.js')
+script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js')
+script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js')
+script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js')
+
+script.
+      $(document).ready(function(){
+            new WOW().init();
+            $("a").on('click', function(event) {
+                  // Make sure this.hash has a value before overriding default behavior
+                  if (this.hash !== "") {
+                        // Prevent default anchor click behavior
+                        event.preventDefault();
+                        // Store hash
+                        var hash = this.hash;
+                        // Using jQuery's animate() method to add smooth page scroll
+                        // The optional number (800) specifies the number of milliseconds it takes to scroll to the specified area
+                        $('html, body').animate({
+                              scrollTop: $(hash).offset().top
+                        }, 800, function(){
+                              // Add hash (#) to URL when done scrolling (default click behavior)
+                              window.location.hash = hash;
+                        });
+                  } // End if
+            });
+      });
+      (function ($) {
+            $(() => {
+                  $('.button-collapse').sideNav();
+                  $('.parallax').parallax();
+            }); // end of document ready
+      }(jQuery)); // end of jQuery name space
+script(type='text/javascript', src='/lib/underscore/underscore-min.js')
 
 //AngularJS
 script(type='text/javascript', src='https://code.angularjs.org/1.1.5/angular.js')
@@ -39,4 +67,4 @@ script(type='text/javascript', src='/js/init.js')
 script(type='text/javascript', src='/socket.io/socket.io.js')
 
 //Livereload script rendered
-//script(type='text/javascript', src='http://localhost:35729/livereload.js')
+//script(type='text/javascript', src='http://localhost:35729/livereload.js')
diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade
@@ -22,12 +22,12 @@ head
   meta(property='og:image', content='http://cfh.io/img/screenshot-small.png')
   meta(property='og:site_name', content='Cards for Humanity')
   meta(property='fb:admins', content='APP_ADMIN')
-
-  link(rel='stylesheet', href='/lib/bootstrap/css/bootstrap.css')
-  link(rel='stylesheet', href='/css/common.css')
-  link(rel='stylesheet', href='/css/animate.css')
+
+  link(rel='stylesheet', href='https://fonts.googleapis.com/icon?family=Material+Icons')
+  link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css')
+  link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css')
+  link(rel='stylesheet', href='/css/hover-min.css')
   link(rel='stylesheet', href='/css/style.css')
 
-
   //if lt IE 9
     script(src='http://html5shim.googlecode.com/svn/trunk/html5.js')
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,39 +1,52 @@
 // Karma configuration
 // Generated on Tue Mar 20 2018 17:14:43 GMT+0100 (WAT)
 
-module.exports = function(config) {
+module.exports = function (config) {
   config.set({
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: '',
 
-
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
     frameworks: ['jasmine'],
 
-
     // list of files / patterns to load in the browser
     files: [
-      './unit-tests/frontend.spec.js'
+      './dist/public/lib/jquery/dist/jquery.min.js',
+      './dist/public/lib/angular/angular.min.js',
+      'bower_components/angular-route/angular-route.min.js',
+      'bower_components/angular-resource/angular-resource.min.js',
+      'node_modules/angular-mocks/angular-mocks.js',
+      'node_modules/ng-midway-tester/src/ngMidwayTester.js',
+      './dist/public/lib/angular-bootstrap/ui-bootstrap.min.js',
+      './dist/public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js',
+      './dist/public/lib/angular-ui-utils/modules/route.js',
+      './dist/public/js/init.js',
+      './dist/public/js/app.js',
+      './dist/public/js/controllers/*.js',
+      './dist/public/js/services/*.js',
+      './dist/public/js/directives.js',
+      './dist/public/js/filters.js',
+      './unit-tests/frontend.spec.js',
+      './public/views/*.html'
     ],
 
 
     // list of files / patterns to exclude
     exclude: [
     ],
 
-
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
+      './public/views/*.html': ['ng-html2js']
     },
 
-
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['kjhtml','progress'],
+    reporters: ['kjhtml', 'progress'],
 
 
     // web server port
@@ -57,13 +70,12 @@ module.exports = function(config) {
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     browsers: ['Chrome'],
 
-
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: false,
 
     // Concurrency level
     // how many browser should be started simultaneous
     concurrency: Infinity
-  })
-}
+  });
+};