Merge branch 'dev'

HappyBots · Jul 15, 2016 · be350fd · be350fd
2 parents 05babfe + 73706dd
commit be350fd
Show file tree

Hide file tree

Showing 60 changed files with 1,704 additions and 179 deletions.
diff --git a/.grunt/grunt-gh-pages/gh-pages/src b/.grunt/grunt-gh-pages/gh-pages/src
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -11,6 +11,7 @@ module.exports = function (grunt) {
 
   // Time how long tasks take. Can help when optimizing build times
   require('time-grunt')(grunt);
+  grunt.loadNpmTasks('grunt-gh-pages');
 
   // Automatically load required Grunt tasks
   require('jit-grunt')(grunt, {
@@ -224,7 +225,7 @@ module.exports = function (grunt) {
         src: ['<%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
         ignorePath: /(\.\.\/){1,2}bower_components\//
       }
-    }, 
+    },
 
     // Compiles Sass to CSS and generates necessary files if requested
     compass: {
@@ -413,7 +414,8 @@ module.exports = function (grunt) {
             '*.{ico,png,txt}',
             '*.html',
             'images/{,*/}*.{webp}',
-            'styles/fonts/{,*/}*.*'
+            'styles/fonts/{,*/}*.*',
+            'CNAME',
           ]
         }, {
           expand: true,
@@ -456,7 +458,15 @@ module.exports = function (grunt) {
         configFile: 'test/karma.conf.js',
         singleRun: true
       }
-    }
+    },
+
+    ghpages: {
+      options: {
+        base: 'dist'
+      },
+      src: ['**']
+    },
+
   });
 
 
@@ -513,4 +523,19 @@ module.exports = function (grunt) {
     'test',
     'build'
   ]);
+
+  grunt.registerTask('deploy', [
+    'ghpages',
+  ]);
+
+/*
+  grunt.initConfig({
+    'gh-pages': {
+      options: {
+        base: 'dist'
+      },
+      src: ['**']
+    }
+  });
+*/
 };
diff --git a/app/CNAME b/app/CNAME
@@ -0,0 +1 @@
+happybots.io
diff --git a/app/favicon.ico b/app/favicon.ico
diff --git a/app/images/alex.png b/app/images/alex.png
diff --git a/app/images/alexBg.jpg b/app/images/alexBg.jpg
diff --git a/app/images/alexBg5.jpg b/app/images/alexBg5.jpg
diff --git a/app/images/alexIco.png b/app/images/alexIco.png
diff --git a/app/images/alexIcoNoBorder.png b/app/images/alexIcoNoBorder.png
diff --git a/app/images/happybotsIco.png b/app/images/happybotsIco.png
diff --git a/app/images/hbIcoL.png b/app/images/hbIcoL.png
diff --git a/app/images/hbIcoM.png b/app/images/hbIcoM.png
diff --git a/app/images/hbIcoS.png b/app/images/hbIcoS.png
diff --git a/app/images/hbIcoWhite.png b/app/images/hbIcoWhite.png
diff --git a/app/images/hbIcoXL.png b/app/images/hbIcoXL.png
diff --git a/app/images/hbIcoXS.png b/app/images/hbIcoXS.png
diff --git a/app/images/hbIcoXXL.png b/app/images/hbIcoXXL.png
diff --git a/app/images/hbIcoXXS.png b/app/images/hbIcoXXS.png
diff --git a/app/images/messenger.png b/app/images/messenger.png
diff --git a/app/images/modelo-expediente-academico.xls b/app/images/modelo-expediente-academico.xls
diff --git a/app/images/patricia.jpeg b/app/images/patricia.jpeg
diff --git a/app/images/sandoche.jpeg b/app/images/sandoche.jpeg
diff --git a/app/images/wip.png b/app/images/wip.png
diff --git a/app/images/wipBg2.png b/app/images/wipBg2.png
diff --git a/app/images/wipIco.png b/app/images/wipIco.png
diff --git a/app/images/wipIco3.png b/app/images/wipIco3.png
diff --git a/app/index.html b/app/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title></title>
+    <title>HAPPYBOTS</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width">
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
@@ -13,6 +13,13 @@
     <!-- build:css(.tmp) styles/main.css -->
     <link rel="stylesheet" href="styles/main.css">
     <!-- endbuild -->
+    <script src="https://use.fontawesome.com/b8df798ef0.js"></script>
+
+    <meta property="og:title" content="HAPPYBOTS" />
+    <meta property="og:type" content="website" />
+    <meta property="og:url" content="http://happybots.io" />
+    <meta property="og:image" content="http://happybots.io/images/hbIcoXXL.png" />
+
   </head>
   <body ng-app="happybotsApp">
     <!--[if lte IE 8]>
@@ -21,52 +28,41 @@
 
     <!-- Add your site or application content here -->
     <div class="header">
-      <div class="navbar navbar-default" role="navigation">
-        <div class="container">
-          <div class="navbar-header">
+      <ng-include src="'views/shared/navbar.html'"></ng-include>
+    </div>
 
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#js-navbar-collapse">
-              <span class="sr-only">Toggle navigation</span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </button>
+    <div ng-view=""></div>
 
-            <a class="navbar-brand" href="#/">happybots</a>
-          </div>
 
-          <div class="collapse navbar-collapse" id="js-navbar-collapse">
 
-            <ul class="nav navbar-nav">
-              <li class="active"><a href="#/">Home</a></li>
-              <li><a ng-href="#/about">About</a></li>
-              <li><a ng-href="#/">Contact</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
+    <!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-    <div class="container">
-    <div ng-view=""></div>
-    </div>
+      ga('create', 'UA-80374030-1', 'auto');
 
-    <div class="footer">
-      <div class="container">
-        <p><span class="glyphicon glyphicon-heart"></span> from the Yeoman team</p>
-      </div>
-    </div>
+    </script>
 
 
-    <!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
-     <script>
-       !function(A,n,g,u,l,a,r){A.GoogleAnalyticsObject=l,A[l]=A[l]||function(){
-       (A[l].q=A[l].q||[]).push(arguments)},A[l].l=+new Date,a=n.createElement(g),
-       r=n.getElementsByTagName(g)[0],a.src=u,r.parentNode.insertBefore(a,r)
-       }(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+    <script type="text/javascript">
+    window.doorbellOptions = {
+        appKey: 'YqIzK3YXyT4WO8ADjR0mkeaWqSbS53zez5BPAk9uKnbGRE95oPdp8PYA7EHZCDnY',
+        hideButton: true,
+    };
+    (function(w, d, t) {
+        var hasLoaded = false;
+        function l() { if (hasLoaded) { return; } hasLoaded = true; window.doorbellOptions.windowLoaded = true; var g = d.createElement(t);g.id = 'doorbellScript';g.type = 'text/javascript';g.async = true;g.src = 'https://embed.doorbell.io/button/3973?t='+(new Date().getTime());(d.getElementsByTagName('head')[0]||d.getElementsByTagName('body')[0]).appendChild(g); }
+        if (w.attachEvent) { w.attachEvent('onload', l); } else if (w.addEventListener) { w.addEventListener('load', l, false); } else { l(); }
+        if (d.readyState == 'complete') { l(); }
+    }(window, document, 'script'));
 
-       ga('create', 'UA-XXXXX-X');
-       ga('send', 'pageview');
+    function showDoorbellModal() {
+        doorbell.show();
+        return false;
+    }
     </script>
 
     <!-- build:js(.) scripts/vendor.js -->
@@ -78,13 +74,18 @@
     <script src="bower_components/angular-route/angular-route.js"></script>
     <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
     <script src="bower_components/angular-touch/angular-touch.js"></script>
+    <script src="bower_components/angular-typer/dist/typer.min.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 
         <!-- build:js({.tmp,app}) scripts/scripts.js -->
         <script src="scripts/app.js"></script>
-        <script src="scripts/controllers/main.js"></script>
         <script src="scripts/controllers/about.js"></script>
+        <script src="scripts/controllers/wip.js"></script>
+        <script src="scripts/controllers/bot.js"></script>
+        <script src="scripts/controllers/contact.js"></script>
+        <script src="scripts/services/botsdata.js"></script>
+        <script src="scripts/directives/botbar.js"></script>
         <!-- endbuild -->
 </body>
 </html>
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -13,21 +13,35 @@ angular
     'ngAnimate',
     'ngRoute',
     'ngSanitize',
-    'ngTouch'
+    'ngTouch',
+    'typer',
   ])
   .config(function ($routeProvider) {
     $routeProvider
-      .when('/', {
-        templateUrl: 'views/main.html',
-        controller: 'MainCtrl',
-        controllerAs: 'main'
+      .when('/wip', {
+        templateUrl: 'views/wip.html',
+        controller: 'WipCtrl',
+        controllerAs: 'wip'
       })
       .when('/about', {
         templateUrl: 'views/about.html',
         controller: 'AboutCtrl',
         controllerAs: 'about'
       })
+      .when('/:name', {
+        templateUrl: 'views/bot.html',
+        controller: 'BotCtrl',
+        controllerAs: 'bot'
+      })
       .otherwise({
-        redirectTo: '/'
+        redirectTo: '/alex'
+      });
+  }).run(['$rootScope', '$location', '$window', function($rootScope, $location, $window){
+   $rootScope
+      .$on('$stateChangeSuccess',
+          function(event){
+              if (!$window.ga)
+                  return;
+              $window.ga('send', 'pageview', { page: $location.path() });
       });
-  });
+}]);
diff --git a/app/scripts/controllers/bot.js b/app/scripts/controllers/bot.js
@@ -0,0 +1,21 @@
+'use strict';
+
+/**
+ * @ngdoc function
+ * @name happybotsApp.controller:BotCtrl
+ * @description
+ * # BotCtrl
+ * Controller of the happybotsApp
+ */
+angular.module('happybotsApp')
+  .controller('BotCtrl', ['$scope', '$routeParams', '$location', 'botsData', function ($scope, $routeParams, $location, botsData) {
+
+    var botName = $routeParams.name;
+    $scope.Bot = botsData[botName];
+
+    // Redirect if no bot found
+    if(angular.isUndefined(botsData[botName])) {
+      $location.path('/')
+    }
+
+  }]);
diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
diff --git a/app/scripts/controllers/wip.js b/app/scripts/controllers/wip.js
@@ -0,0 +1,16 @@
+'use strict';
+
+/**
+ * @ngdoc function
+ * @name happybotsApp.controller:WipCtrl
+ * @description
+ * # WipCtrl
+ * Controller of the happybotsApp
+ */
+angular.module('happybotsApp')
+  .controller('WipCtrl', ['$scope', function ($scope) {
+
+  	$scope.feature = "Image Face Recognition";
+  	$scope.newBotName = "Eeve";
+
+  }]);
diff --git a/app/scripts/directives/botbar.js b/app/scripts/directives/botbar.js
@@ -0,0 +1,18 @@
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name happybotsApp.directive:botBar
+ * @description
+ * # botBar
+ */
+angular.module('happybotsApp')
+  .directive('botBar', ['botsData', function (botsData) {
+    return {
+      templateUrl: 'views/shared/botbar.html',
+      restrict: 'E',
+      link: function postLink(scope, element, attrs) {
+        scope.Bots = botsData;
+      }
+    };
+  }]);
diff --git a/app/scripts/services/botsdata.js b/app/scripts/services/botsdata.js
@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * @ngdoc service
+ * @name happybotsApp.botsData
+ * @description
+ * # botsData
+ * Value in the happybotsApp.
+ */
+angular.module('happybotsApp')
+  .value('botsData', {
+    "alex" : {
+      name: "Alex",
+      id: "alex",
+      description: "A Wikipedia bot for messenger",
+      imageSrc:"images/alex.png",
+      imageBgSrc:"images/alexBg5.jpg",
+      icoSrc:"images/alexIcoNoBorder.png",
+      messengerUrl: "http://m.me/alex.wikimessenger",
+      githubUrl: "https://github.com/patriciamayo/Alex-wikiMessenger"
+    },
+  });