merging angular, adding .editorconfig

watson-developer-cloud · Aug 26, 2015 · d5ff707 · d5ff707
2 parents 1897f82 + 9643317
commit d5ff707
Show file tree

Hide file tree

Showing 27 changed files with 170 additions and 119 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+# http://editorconfig.org/
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+charset = utf-8
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ bower_components/
 dist/
 .DS_Store
 .env
+*.log
diff --git a/app.js b/app.js
@@ -56,6 +56,3 @@ app.get('/news/:id', function(req, res) {
 var server = app.listen(config.port, function() {
   console.log("%s v%s listening on port %s", packageJson.name, packageJson.version, server.address().port);
 });
-
-
-
diff --git a/bower.json b/bower.json
@@ -2,16 +2,17 @@
   "name": "company-insights",
   "version": "0.0.0",
   "dependencies": {
+    "angular": "~1.4.0",
     "angular-animate": "~1.4.0",
+    "angular-chart.js": "~0.7.6",
     "angular-cookies": "~1.4.0",
-    "angular-touch": "~1.4.0",
+    "angular-material": "~0.9.7",
     "angular-sanitize": "~1.4.0",
-    "restangular": "~1.5.1",
+    "angular-touch": "~1.4.0",
     "angular-ui-router": "~0.2.15",
-    "angular-material": "~0.9.7",
     "animate.css": "~3.3.0",
-    "angular": "~1.4.0",
-    "angular-chart.js": "~0.7.6"
+    "d3": "~3.5.6",
+    "restangular": "~1.5.1"
   },
   "devDependencies": {
     "angular-mocks": "~1.4.0",

diff --git a/config.js b/config.js
@@ -31,7 +31,7 @@ var services = {
 function getBluemixServiceConfig(name) {
     var services = JSON.parse(process.env.VCAP_SERVICES);
     for (var service_name in services) {
-        if (service_name.indexOf(name) === 0 ) {
+        if (service_name.indexOf(name) === 0) {
             var service = services[service_name][0];
             return {
                 url: service.credentials.url,

diff --git a/src/app/components/navbar/navbar.directive.js b/src/app/components/navbar/navbar.directive.js
diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html
@@ -2,9 +2,10 @@
 
   <section  flex layout="row" layout-align="left center">
   <div class="row" flex="100">
-    <md-button ui-sref="root.home" class="md-raised">circle</md-button>
+    <img ui-sref="root.home" src="assets/images/watson-world.png" width="80px" />
     <md-button ui-sref="root.watson" class="md-raised">IBM Watson</md-button>
-    <span flex-offset="33">IBM.com</span>
+    <div flex layout-align="end">IBM.com</div>
+    </div>
 
   </section>
 

diff --git a/src/app/components/navbar/navbar.scss b/src/app/components/navbar/navbar.scss
diff --git a/src/app/home/home.controller.js b/src/app/home/home.controller.js
@@ -5,11 +5,9 @@
     .module('company-insights')
     .controller('HomeController', HomeController);
 
-  /** @ngInject */
-  function HomeController($state, $log) {
 
-    this.goWatsonAPI = function(){
-      $state.go('root.watson');
-    };
+  /** @ngInject */
+  function HomeController($log) {
+    this.data = [10,20,30,40,60, 80, 20, 50];
   }
 })();
diff --git a/src/app/home/home.html b/src/app/home/home.html
@@ -1,71 +1,139 @@
-<div layout="vertical" layout-fill>
-    <md-content layout-fill>
-        <navbar>
+
+
+
+<!--
+<div layout="row">
+  <div flex>
+    [flex]
+  </div>
+  <div flex>
+    [flex]
+  </div>
+  <div flex hide-sm>
+    [flex]
+  </div>
+</div>
+
+-->
+
+
+
+        <navbar class="md-padding" style="background: white;">
+
+
+  <div  flex="100" >
+    <img ui-sref="root.home" src="assets/images/watson-world.png" width="70px" />
+    <img ui-sref="root.home" src="assets/images/watson.png" width="200px" />
+    <!--
+    <md-button ui-sref="root.watson" class="md-raised"  ng-click="homeCtrl.goWatsonAPI()">IBM Watson</md-button>
+    -->
+  <!--  <div flex="10" layout="column" layout-align="end">IBM.com</div>
+  -->
+    </div>
+
+
+
+
         </navbar>
-        <div class="row" flex layout="row" layout-align="center end">
-            <md-button ui-sref="root.home" class="md-raised">Fork on Github</md-button>
-            <md-button ui-sref="root.watson" class="md-raised">Join the Ecosystem</md-button>
-        </div>
-        <div>
+
+
+
+        <md-content class="md-padding hero">
+        <div class="container">
+                <div class="row" flex layout="row" layout-align="end">
+            <md-button ui-sref="root.home" class="md-flat">Fork on Github</md-button>
+            <md-button ui-sref="root.watson" class="md-flat">Join the Ecosystem</md-button>
+            </div>
+
             <h1>What's your brand's personality?</h1>
             <h4>Test drive the Watson APIs using the Brand Personality App.</h4>
-            <md-button ng-click="homeCtrl.goWatsonAPI()">Watson API</md-button>
-        </div>
-        <md-content md-theme="docs-dark" layout-padding layout="row" layout-sm="column">
-            <h3>Enter your Twitter handle</h3>
-            <md-input-container>
+            </div>
+
+       </md-content>
+
+
+        <section layout-padding>
+        <div class="container">
+        <h3 layout-padding>Enter your Twitter handle</h3>
+
+        <md-content md-theme="docs-dark" layout-padding layout-sm="column">
+
+
+            <div flex layout="row" class="inputs">
+            <md-input-container flex>
                 <label>@Dropbox</label>
                 <input ng-model="user.title">
             </md-input-container>
-            <md-input-container>
+            <md-button >Analyze</md-button>
+            </div>
+
+             <div flex layout="row" class="inputs">
+            <md-input-container flex>
                 <label>Enter and add handle to compare</label>
                 <input ng-model="user.email" type="email">
             </md-input-container>
+            <md-button >Add</md-button>
+            </div>
+
         </md-content>
-        <section>
-            <h3>Personality Insights</h3>
-            <md-content class="md-padding">
+
+</div>
+        </section>
+        <md-content class="md-padding">
+        <div class="container">
+            <h3 >Personality Insights</h3>
+
+            <md-content>
+
                 <md-card>
+
+                 <bars-chart chart-data="homeCtrl.data"></bars-chart>
+
+
                 </md-card>
             </md-content>
-        </section>
-        <section>
+            </div>
+            </md-content>
+
+
+
+        <md-content class="md-padding" flex layout="vertical">
+        <div class="container">
             <h3>News</h3>
-            <md-content class="md-padding">
-                <md-card>
-                    <img ng-src="{{imagePath}}" class="md-card-image" alt="Washed Out">
+
+                <div flex layout-md="vertical" layout-lg="vertical" >
+                <md-card  flex="32">
+                    <img ng-src="{{imagePath}}" class="md-card-image" >
                     <md-card-content>
                         <h2 class="md-title">Paracosm</h2>
                         <p>
                             The titles of Washed Out's breakthrough song and the first single from Paracosm share the two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
                         </p>
                     </md-card-content>
-                    <div class="md-actions" layout="row" layout-align="end center">
-                        <md-button>Action 1</md-button>
-                        <md-button>Action 2</md-button>
-                    </div>
+
                 </md-card>
-                <br/>
-                <md-card>
-                    <img ng-src="{{imagePath}}" class="md-card-image" alt="Washed Out">
+
+                <md-card flex="32">
+                    <img ng-src="{{imagePath}}" class="md-card-image" >
                     <md-card-content>
                         <h2 class="md-title">Paracosm</h2>
                         <p>
                             The titles of Washed Out's breakthrough song and the first single from Paracosm share the two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
                         </p>
                     </md-card-content>
                 </md-card>
-                <br/>
-                <md-card>
-                    <img ng-src="{{imagePath}}" class="md-card-image" alt="Washed Out">
+
+                <md-card flex="32">
+                    <img ng-src="{{imagePath}}" class="md-card-image" >
                     <md-card-content>
                         <h2 class="md-title">Paracosm</h2>
                         <p>
                             The titles of Washed Out's breakthrough song and the first single from Paracosm share the two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
                         </p>
                     </md-card-content>
                 </md-card>
-            </md-content>
-        </section>
-    </md-content>
+                </div>
+            </div>
+        </md-content>
+
 </div>
diff --git a/src/app/index.module.js b/src/app/index.module.js
@@ -2,6 +2,6 @@
   'use strict';
 
   angular
-    .module('company-insights', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'restangular', 'ui.router', 'ngMaterial']);
+    .module('company-insights', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'restangular', 'ui.router', 'ngMaterial', 'chart.js']);
 
 })();
diff --git a/src/app/index.route.js b/src/app/index.route.js
@@ -19,12 +19,6 @@
         templateUrl: 'app/home/home.html',
         controller: 'HomeController',
         controllerAs: 'homeCtrl'
-      })
-      .state('root.watson', {
-        url: '/watson',
-        templateUrl: 'app/watson/watson.html',
-        controller: 'WatsonController',
-        controllerAs: 'watsonCtrl'
       });
 
     $urlRouterProvider.otherwise('/root/home');

diff --git a/src/app/index.run.js b/src/app/index.run.js
@@ -8,7 +8,6 @@
   /** @ngInject */
   function runBlock($log) {
 
-    $log.debug('runBlock end');
   }
 
 })();
diff --git a/src/app/index.scss b/src/app/index.scss
@@ -8,9 +8,11 @@
 @import url(http://fonts.googleapis.com/css?family=Roboto+Slab:400,700|Roboto:400,700,700italic,400italic);
 
 html {
-  font-family: 'Roboto Slab', serif;
+  font-family: 'Helvetica Neue', sans-serif;
+
 }
 
+
 [layout=row] {
   flex-direction: row;
 }
@@ -31,17 +33,12 @@ html {
 }
 
 md-toolbar.md-default-theme {
-  background-color: black;
+  background-color: white;
 }
 
 section.jumbotron {
   margin-bottom: 30px;
   padding: 1px 30px;
-  background-color: #5aadbb;
-  text-align: center;
-
-  color: white;
-
   h1 {
     font-size: 3em;
   }
@@ -61,6 +58,46 @@ section.jumbotron {
   }
 }
 
+navbar {
+  background: white;
+}
+
+.flat {
+  box-shadow: none;
+}
+
+  h1, h2, h3, h4, h5, h6 {
+    font-weight: normal;
+  }
+
+.chart {
+  div {
+    box-shadow: 0;
+  }
+}
+
+
+.md-padding {
+  background: #eeeeee;
+}
+
+.container {
+  max-width: 900px;
+  margin: 0 auto;
+}
+
+.hero {
+  background: #27c4f3;
+  color: white;
+  background-image: url(../assets/images/globe.png);
+  background-size: 50% auto;
+  background-repeat: no-repeat;
+  background-position: top right;
+
+
+}
+
+
 /**
  *  Do not remove this comments bellow. It's the markers used by gulp-inject to inject
  *  all your sass files automatically