Merge branch 'feature/sam-pokemessenger' into dev

HappyBots · Aug 3, 2016 · 5d34524 · 5d34524
2 parents 010c92e + 4493aec
commit 5d34524
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 27 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
@@ -538,4 +538,5 @@ module.exports = function (grunt) {
     }
   });
 */
+
 };
diff --git a/app/images/sam.png b/app/images/sam.png
diff --git a/app/images/samBg.jpg b/app/images/samBg.jpg
diff --git a/app/images/samico.png b/app/images/samico.png
diff --git a/app/index.html b/app/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>HAPPYBOTS</title>
+    <title>HAPPYBOTS | The bot family</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width">
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
@@ -16,9 +16,18 @@
     <script src="https://use.fontawesome.com/b8df798ef0.js"></script>
 
     <meta property="og:title" content="HAPPYBOTS" />
+    <meta property="og:description" content="The bot family for Messenger" />
     <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" />
+    <meta property="og:image" content="http://happybots.io/images/hbIcoXL.png" />
+
+    <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');
+      ga('create', 'UA-80374030-1', 'auto');
+    </script>
 
   </head>
   <body ng-app="happybotsApp">
@@ -33,20 +42,6 @@
 
     <div ng-view=""></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');
-
-      ga('create', 'UA-80374030-1', 'auto');
-
-    </script>
-
-
     <script type="text/javascript">
     window.doorbellOptions = {
         appKey: 'YqIzK3YXyT4WO8ADjR0mkeaWqSbS53zez5BPAk9uKnbGRE95oPdp8PYA7EHZCDnY',

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -34,7 +34,7 @@ angular
         controllerAs: 'bot'
       })
       .otherwise({
-        redirectTo: '/alex'
+        redirectTo: '/sam'
       });
   }).run(function($rootScope, $location, analyticsService) {
     $rootScope.$on('$routeChangeSuccess', function() {

diff --git a/app/scripts/services/botsdata.js b/app/scripts/services/botsdata.js
@@ -17,6 +17,18 @@ angular.module('happybotsApp')
       imageBgSrc:"images/alexBg5.jpg",
       icoSrc:"images/alexIcoNoBorder.png",
       messengerUrl: "http://m.me/alex.wikimessenger",
-      githubUrl: "https://github.com/patriciamayo/Alex-wikiMessenger"
+      githubUrl: "https://github.com/HappyBots/Alex-wikiMessenger",
+      class: "dark",
+    },
+    "sam" : {
+      name: "Sam",
+      id: "sam",
+      description: "A Pokémon bot for messenger to help you win in Pokémon GO",
+      imageSrc:"images/sam.png",
+      imageBgSrc:"images/samBg.jpg",
+      icoSrc:"images/samico.png",
+      messengerUrl: "http://m.me/sam.pokemessenger",
+      githubUrl: "https://github.com/HappyBots/Sam-pokeMessenger",
+      class: "white-shadow",
     },
   });
diff --git a/app/styles/_bot.scss b/app/styles/_bot.scss
@@ -21,14 +21,20 @@
 
     min-height: 100vh;
 
+
+  .white-shadow {
+    color: #fff !important;
+    text-shadow: 2px 2px 20px rgba(0, 0, 0, 0.4);
+  }
+
 }
 
 
 @media (max-width: $screen-sm-min) {
 
   .bot {
 
-      padding-top: 35px;
+      padding-top: 65px;
 
       .btn {
         padding: 6px 12px;

diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
@@ -17,6 +17,7 @@ $gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
 $red:                   #ED5565;
 $accent: 					#06a8e1;
 $accent-secondary: #25c079;
+$accent-secondary-dark:   darken($accent-secondary, 20%);
 
 
 $brand-primary:         #0084ff !default; // #337ab7
@@ -381,7 +382,7 @@ $navbar-default-border:            $accent-secondary !default;
 
 // Navbar links
 $navbar-default-link-color:                #ffffff !default;
-$navbar-default-link-hover-color:          #333 !default;
+$navbar-default-link-hover-color:          $accent-secondary-dark !default;
 $navbar-default-link-hover-bg:             transparent !default;
 $navbar-default-link-active-color:         #555 !default;
 $navbar-default-link-active-bg:            darken($navbar-default-bg, 6.5%) !default;

diff --git a/app/styles/_wip.scss b/app/styles/_wip.scss
@@ -68,6 +68,8 @@
 
   .wip {
 
+			padding-top: 65px;
+
       h2 {
         font-size: 2rem;
       }

diff --git a/app/views/bot.html b/app/views/bot.html
@@ -1,13 +1,13 @@
 <section class="bot center" style="background: url({{ Bot.imageBgSrc }}) no-repeat center fixed; background-size: cover;">
   <div class="container">
     <div class="row">
-      <div class="col-sm-5 col-sm-offset-1 vcenter">
+      <div class="col-xs-8 col-xs-offset-2 col-sm-5 col-sm-offset-1 vcenter">
         <img src="{{ Bot.imageSrc }}" class="img-responsive" alt="" />
       </div>
-      <div class="col-sm-5 center-col vcenter">
-        <h1>Hello, <strong><typer words="['I\'m ' +  Bot.name ]" type-time='50' start-typing="true" repeat="false" backspace-time='200' start-delay='1500'></typer></strong></h1>
+      <div class="col-xs-12 col-sm-5 center-col vcenter">
+        <h1 class="{{ Bot.class }}">Hello, <strong><typer words="['I\'m ' +  Bot.name ]" type-time='50' start-typing="true" repeat="false" backspace-time='200' start-delay='1500'></typer></strong></h1>
 
-        <h2>{{ Bot.description }}</h2>
+        <h2 class="{{ Bot.class }}">{{ Bot.description }}</h2>
         <a target="_blank" href="{{ Bot.messengerUrl }}" class="btn btn-lg btn-primary"><img src="images/messenger.png" class="img-bg"> Message Me</a> <a target="_blank" class="btn btn-lg btn-default" href="{{ Bot.githubUrl }}"><i class="fa fa-github fa" aria-hidden="true"></i> Fork on github</a>
       </div>
     </div>

diff --git a/app/views/shared/navbar.html b/app/views/shared/navbar.html
@@ -17,6 +17,7 @@
       <ul class="nav navbar-nav navbar-right">
         <li><a href="#/about">About</a></li>
         <li><a class="cursor-link" onclick="showDoorbellModal()">Contact</a></li>
+        <li><a href="https://github.com/HappyBots" target="_blank">Github</a>
         <li><a href="https://paypal.me/happybots" target="_blank">Donate</a></li>
       </ul>
     </div><!-- /.navbar-collapse -->

diff --git a/app/views/wip.html b/app/views/wip.html
@@ -1,10 +1,10 @@
 <section class="wip center" style="background: url(images/wipBg2.png) no-repeat center fixed; background-size: cover;">
   <div class="container">
     <div class="row">
-      <div class="col-sm-5 col-sm-offset-1 vcenter">
+      <div class="col-xs-8 col-xs-offset-2 col-sm-5 col-sm-offset-1 vcenter">
         <img src="images/wip.png" class="img-responsive moving-animation" alt="" />
       </div>
-      <div class="col-sm-5 center-col vcenter">
+      <div class="col-xs-12 col-sm-5 center-col vcenter">
         <h2>Oh my god! {{ newBotName }} is hatching! It will grow up to be the best {{ feature }} bot!</h2>
 
         <div class="text-block">
-Original file line number
+Diff line change
@@ Expand Up / @@ -538,4 +538,5 @@ module.exports = function (grunt) { @@
         }
       });
     */
     };