Skip to content

Commit

Permalink
adding grunt serve/test/build
Browse files Browse the repository at this point in the history
  • Loading branch information
Madhuka committed Jun 15, 2015
1 parent 8de31a4 commit c18de5b
Show file tree
Hide file tree
Showing 24 changed files with 686 additions and 19,078 deletions.
3 changes: 1 addition & 2 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"directory": "bower_components",
"json": "bower.json"
"directory": "bower_components"
}
63 changes: 62 additions & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
@@ -1 +1,62 @@
{}
{
"generator-gulp-angular": {
"version": "0.11.0",
"props": {
"angularVersion": "~1.3.4",
"angularModules": [
{
"key": "animate",
"module": "ngAnimate"
},
{
"key": "touch",
"module": "ngTouch"
}
],
"jQuery": {
"key": "jquery1"
},
"resource": {
"key": "none",
"module": null
},
"router": {
"key": "ui-router",
"module": "ui.router"
},
"ui": {
"key": "bootstrap",
"module": null
},
"bootstrapComponents": {
"key": "ui-bootstrap",
"module": "ui.bootstrap"
},
"cssPreprocessor": {
"key": "ruby-sass",
"extension": "scss"
},
"jsPreprocessor": {
"key": "traceur",
"extension": "js",
"srcExtension": "es6"
},
"htmlPreprocessor": {
"key": "none",
"extension": "html"
},
"foundationComponents": {
"name": null,
"version": null,
"key": null,
"module": null
},
"paths": {
"src": "src",
"dist": "dist",
"e2e": "e2e",
"tmp": ".tmp"
}
}
}
}
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2015-06-13 using generator-angular 0.11.1
// Generated on 2015-06-15 using generator-angular 0.11.1
'use strict';

// # Globbing
Expand Down
34 changes: 12 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
# Apache Zeppelin
Zeppelin is a collaborative data analytic 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. It successfully eliminates all the limitations and drawbacks of the existing charting visualization component.

###How to start the samples

```sh
npm start
```


###Running the samples
[localhost:8082](http://localhost:8082/)

### Version

0.0.1
milestone-01
milestone-02

### Author
[Madhuka](http://madhukaudantha.blogspot.com/)
[Blog](http://madhukaudantha.blogspot.com)
# gotest

This project is generated with [yo angular generator](https://github.com/yeoman/generator-angular)
version 0.11.1.

## Build & development

Run `grunt` for building and `grunt serve` for preview.

## Testing

Running `grunt test` will run the unit tests with karma.
10 changes: 5 additions & 5 deletions app/data/bike.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
No,Year,Make,Model,Length
0,2015,Daelim,VR13,101
1,2008,Honda,CBS,120
2,2015,Harley-Davidson,Breakout,190
3,2013,BMW,R1200RT-P,150
No,Year,Make,Model,Length
0,2015,Daelim,VR13,101
1,2008,Honda,CBS,120
2,2015,Harley-Davidson,Breakout,190
3,2013,BMW,R1200RT-P,150
4,2010,BMW,R1150R,220
8 changes: 4 additions & 4 deletions app/data/car.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
No,Year,Make,Model,Length
0,1996,Ford,E350,234
1,2000,Mercury,Cougar,248
2,2010,Toyota,Yaris,200
No,Year,Make,Model,Length
0,1996,Ford,E350,234
1,2000,Mercury,Cougar,248
2,2010,Toyota,Yaris,200
3,2011,Nissian,March,168
Binary file modified app/favicon.ico
Binary file not shown.
94 changes: 41 additions & 53 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,92 +2,80 @@
<html class="no-js">
<head>
<meta charset="utf-8">
<title></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="author" content="Madhuka Udantha">
<meta http-equiv="Access-Control-Allow-Origin" content="*"/>

<link rel="icon" href="favicon.ico" />

<title>Apache Zeppelin GSOC15</title>

<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<!-- build:css(.) styles/vendor.css -->
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
<!--link rel="stylesheet" href="styles/main.css"-->
<link href="styles/chart.css" rel="stylesheet">
<link href="styles/cover.css" rel="stylesheet">
<!-- endbuild -->
</head>
<body ng-app="apacheZeppelinGsocApp">
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<div class="site-wrapper">

<!-- Add your site or application content here -->
<div class="header">
<div class="navbar navbar-default" role="navigation">
<div class="container">
<div class="navbar-header">
<div class="site-wrapper-inner">

<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 class="cover-container">

<a class="navbar-brand" href="#/">apacheZeppelinGsoc</a>
</div>
<div class="masthead clearfix">
<div class="inner" ng-controller="NavCtrl as navbar">
<!--h3 class="masthead-brand">Apache Zeppelin - GSoC 2015</h3-->
<nav>
<ul class="nav masthead-nav">
<li ng-class="{ active: navbar.isActive('/')}"><a href="#/home">Home</a></li>
<li ng-class="{ active: navbar.isActive('#/milestone01')}"><a href="#/milestone01">Milestone-01</a></li>
<li ng-class="{ active: navbar.isActive('#/contact')}"><a href="#/contact">Contact</a></li>
</ul>
</nav>
</div>
</div>

<div class="collapse navbar-collapse" id="js-navbar-collapse">
<div ng-view></div>

<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>
<div class="mastfoot">
<div class="inner">
<p>Source code in <a href="https://github.com/Madhuka/apache-zeppelin-gsoc">github</a>, by <a href="twitter.com/madhukaudantha">udantha</a>.</p>
</div>
</div>

<div class="container">
<div ng-view=""></div>
</div>
</div>

<div class="footer">
<div class="container">
<p><span class="glyphicon glyphicon-heart"></span> from the Yeoman team</p>
</div>
</div>


<!-- 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','//www.google-analytics.com/analytics.js','ga');
</div>

ga('create', 'UA-XXXXX-X');
ga('send', 'pageview');
</script>
</div>

<!-- build:js(.) scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/angular-google-chart/ng-google-chart.js"></script>
<!-- endbower -->
<!-- endbuild -->

<!-- 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>
<script src="scripts/controllers/chart.js"></script>
<script src="scripts/controllers/nav-controller.js"></script>
<script src="scripts/controllers/chart-controllers.js"></script>
<!-- endbuild -->
</body>
</html>
20 changes: 15 additions & 5 deletions app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,29 @@
*/
angular
.module('apacheZeppelinGsocApp', [
'ngCookies',
'ngResource',
'ngRoute'
'ngRoute',
'googlechart'
])
.config(function ($routeProvider) {
$routeProvider
.when('/', {
templateUrl: 'views/main.html',
controller: 'MainCtrl'
.when('/home', {
templateUrl: 'views/about.html'
})
.when('/chart', {
templateUrl: 'views/chart.html',
controller: 'ChartCtrl'
})
.when('/milestone01', {
templateUrl: 'views/milestone01.html',
controller: 'ChartCtrl'
})
.when('/about', {
templateUrl: 'views/about.html',
controller: 'AboutCtrl'
})
.when('/contact', {
templateUrl: 'views/contact.html'
})
.otherwise({
redirectTo: '/'
Expand Down
47 changes: 47 additions & 0 deletions app/scripts/controllers/chart-controllers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@

//new move.
'use strict';

/**
* @ngdoc function
* @name apacheZeppelinGsocApp.controller:ChartCtrl
* @description
* # ChartCtrl
* Controller of the top navigation, mainly use for the dropdown menu
*
* @author madhuka udantha
*/

angular.module('apacheZeppelinGsocApp').controller('ChartCtrl', function($scope) {

var vm = this;


function loadData(fileName) {
console.log('loading data '+fileName);
setButtonActive('dataButton',fileName);
/* data = getData(fileName);
setActive('b1',fileName);
//$scope.Datax = Datax;
console.log(Datax)
loadYAxisLabel(fileName);
$scope.a = true;
drawChart();*/
}

//deafult button picker
var active={'dataButton':false,'b2':false,'b3':'bar'};

function setButtonActive(set,type) {
active[set] = type;
}

function isButtonActive(set,type) {
return active[set] === type;
}

vm.loadData = loadData;
vm.isButtonActive = isButtonActive;


});
Loading

0 comments on commit c18de5b

Please sign in to comment.