adding chart lib for bower, updating views

Madhuka · Jun 14, 2015 · 8de31a4 · 8de31a4
1 parent 20b895e
commit 8de31a4
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 69 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/app/index.html b/app/index.html
@@ -83,6 +83,9 @@
 
         <!-- build:js({.tmp,app}) scripts/scripts.js -->
         <script src="scripts/app.js"></script>
+		<script src="scripts/controllers/controllers.js"></script>
+        <script src="scripts/controllers/nav-controller.js"></script>
+        <script src="scripts/controllers/sample-charts.js"></script>
         <script src="scripts/controllers/main.js"></script>
         <script src="scripts/controllers/about.js"></script>
         <!-- endbuild -->

diff --git a/app/view/about.html b/app/view/about.html
diff --git a/app/views/about.html b/app/views/about.html
@@ -1 +1,7 @@
-<p>This is the about view.</p>
+<div class="inner cover">
+     <h1 class="cover-heading">Apache Zeppelin Gsoc 2015</h1>
+     <p class="lead">Zeppelin is a collaborative data analytics and visualization tool for distributed, general-purpose data processing systems such as Apache Spark and Apache Flink. It has two main features, the data analytic phase and the data visualization phase. This project is an improvement or a re-design of the Data Visualization Component.</p>
+     <p class="lead">
+       <a href="https://cwiki.apache.org/confluence/display/ZEPPELIN/GoogleSummerOfCode#GoogleSummerOfCode-COMDEV-119ZeppelinGSoCProject:addmoreD3visualization" class="btn btn-lg btn-default">Read more</a>
+     </p>
+</div>
diff --git a/app/view/contact.html → app/views/contact.html b/app/view/contact.html → app/views/contact.html
@@ -1,9 +1,9 @@
-<div class="inner cover">
-    <h1 class="cover-heading">Contact</h1>
-    <p class="lead">madhukaudantha@gmail.com</p>
-    <p>users@zeppelin.incubator.apache.org</p> 
-    <p>dev@zeppelin.incubator.apache.org</p>
-    <p class="lead">
-        <a href="https://zeppelin.incubator.apache.org/community.html" class="btn btn-lg btn-default">Community</a>
-    </p>
+<div class="inner cover">
+    <h1 class="cover-heading">Contact</h1>
+    <p class="lead">madhukaudantha@gmail.com</p>
+    <p>users@zeppelin.incubator.apache.org</p> 
+    <p>dev@zeppelin.incubator.apache.org</p>
+    <p class="lead">
+        <a href="https://zeppelin.incubator.apache.org/community.html" class="btn btn-lg btn-default">Community</a>
+    </p>
  </div>
diff --git a/app/view/milestone01.html → app/views/milestone01.html b/app/view/milestone01.html → app/views/milestone01.html
@@ -1,49 +1,49 @@
-<div class="inner cover">
-
-
-    <h3 class="cover-heading" >MileStone - 01</h3>
-
-
-    <!--sample data set is to pick from csv file-->
-    <div ng-controller="navCtrl">
-        <label>1. Select the Data set: </label>
-        <div class="btn-group">
-            <a class="btn btn-default" ng-class="{'active': isBActive('b1','car')}" ng-click="loadData('car')"><i class="fa fa-h-square"> Car</i></a>
-            <a class="btn btn-default" ng-class="{'active': isBActive('b1','bike')}" ng-click="loadData('bike')"><i class="fa fa-google"> Bike</i></a>
-        </div>
-    </div>
-    <br>
-
-    <div ng-show="a">
-        <label>2. Select the Chart Library</label>
-        <div class="btn-group">
-            <a class="btn btn-default" ng-class="{'active': isBActive('b2','highxChart')}" ng-click="loadChartLibrary(1)"><i class="fa fa-h-square"> HighChart</i></a>
-            <a class="btn btn-default" ng-class="{'active': isBActive('b2','googlexChart')}" ng-click="loadChartLibrary(2)"><i class="fa fa-google"> GooglrChart</i></a>
-            <a class="btn btn-default" ng-class="{'active': isBActive('b2','NVD3Chart')}" ng-click="loadChartLibrary(0)"><i class="fa fa-align-right"> NVD3 Chart</i></a>
-        </div>        
-    </div>
-
-    <!--chart type can be picked-->
-    <br>
-    <div ng-show="a && b">
-        <label>3. Selct the Chart Type</label>
-        <div class="btn-group">
-            <a class="btn btn-default" ng-class="{'active': isBActive('b3','line')}" ng-click="switchChartType('LineChart','line','lineChart')"><i class="fa fa-line-chart"> Line Chart</i></a>
-            <a class="btn btn-default" ng-class="{'active': isBActive('b3','bar')}" ng-click="switchChartType('BarChart','bar','discreteBarChart')"><i class="fa fa-bar-chart"> Bar Chart</i></a>
-        </div>
-    </div>
-
-    <!--charts-->
-    <div class="box" ng-show="highxChart">
-        <highchart id="chart1" config="chartConfig"></highchart>
-    </div>
-
-    <div class="box" ng-show="googlexChart">
-        <div google-chart chart="chart" style="{{chart.cssStyle}}" />
-    </div>
-
-    <div class="box" ng-show="NVD3Chart">
-        <nvd3 options='options' data='data'></nvd3>
-    </div>
-
+<div class="inner cover">
+
+
+    <h3 class="cover-heading" >MileStone - 01</h3>
+
+
+    <!--sample data set is to pick from csv file-->
+    <div ng-controller="navCtrl">
+        <label>1. Select the Data set: </label>
+        <div class="btn-group">
+            <a class="btn btn-default" ng-class="{'active': isBActive('b1','car')}" ng-click="loadData('car')"><i class="fa fa-h-square"> Car</i></a>
+            <a class="btn btn-default" ng-class="{'active': isBActive('b1','bike')}" ng-click="loadData('bike')"><i class="fa fa-google"> Bike</i></a>
+        </div>
+    </div>
+    <br>
+
+    <div ng-show="a">
+        <label>2. Select the Chart Library</label>
+        <div class="btn-group">
+            <a class="btn btn-default" ng-class="{'active': isBActive('b2','highxChart')}" ng-click="loadChartLibrary(1)"><i class="fa fa-h-square"> HighChart</i></a>
+            <a class="btn btn-default" ng-class="{'active': isBActive('b2','googlexChart')}" ng-click="loadChartLibrary(2)"><i class="fa fa-google"> GooglrChart</i></a>
+            <a class="btn btn-default" ng-class="{'active': isBActive('b2','NVD3Chart')}" ng-click="loadChartLibrary(0)"><i class="fa fa-align-right"> NVD3 Chart</i></a>
+        </div>        
+    </div>
+
+    <!--chart type can be picked-->
+    <br>
+    <div ng-show="a && b">
+        <label>3. Selct the Chart Type</label>
+        <div class="btn-group">
+            <a class="btn btn-default" ng-class="{'active': isBActive('b3','line')}" ng-click="switchChartType('LineChart','line','lineChart')"><i class="fa fa-line-chart"> Line Chart</i></a>
+            <a class="btn btn-default" ng-class="{'active': isBActive('b3','bar')}" ng-click="switchChartType('BarChart','bar','discreteBarChart')"><i class="fa fa-bar-chart"> Bar Chart</i></a>
+        </div>
+    </div>
+
+    <!--charts-->
+    <div class="box" ng-show="highxChart">
+        <highchart id="chart1" config="chartConfig"></highchart>
+    </div>
+
+    <div class="box" ng-show="googlexChart">
+        <div google-chart chart="chart" style="{{chart.cssStyle}}" />
+    </div>
+
+    <div class="box" ng-show="NVD3Chart">
+        <nvd3 options='options' data='data'></nvd3>
+    </div>
+
 </div>
diff --git a/bower.json b/bower.json
@@ -2,14 +2,14 @@
   "name": "apache-zeppelin-gsoc",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "^1.3.0",
+    "angular": "1.3.8",
     "bootstrap": "^3.2.0",
-    "angular-cookies": "^1.3.0",
-    "angular-resource": "^1.3.0",
-    "angular-route": "^1.3.0"
+    "angular-cookies": "1.3.8",
+    "angular-resource": "1.3.8",
+    "angular-route": "1.3.8"
   },
   "devDependencies": {
-    "angular-mocks": "^1.3.0"
+    "angular-mocks": "1.3.8"
   },
   "appPath": "app",
   "moduleName": "apacheZeppelinGsocApp"