Skip to content

Commit

Permalink
Merge pull request #5 from Madhuka/milestone-03
Browse files Browse the repository at this point in the history 
Adding milestone 03
  • Loading branch information
@Madhuka
Madhuka committed Jun 24, 2015
2 parents 75d01ab + 330580f commit 5db77b1
Show file tree
Hide file tree
Showing 26 changed files with 382 additions and 879 deletions.
1 change: 1 addition & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ root = true
# Change these settings to your own preference
indent_style = space
indent_size = 2
draw_white_space = all

# We recommend you to keep these unchanged
end_of_line = lf
Expand Down
30 changes: 23 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,28 @@
# gotest
# 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.

This project is generated with [yo angular generator](https://github.com/yeoman/generator-angular)
version 0.11.1.
##Pre-request
1. NodeJS with npm
2. Bower

## Build & development
You can used
* bower install
* npm install
This will Download all the dependencies including node js and npm

Run `grunt` for building and `grunt serve` for preview.
### Build the application

## Testing
`./grunt build`

Run `grunt build` for building

### Preview Web application

`./grunt serve`

This will launch a WebApplication on port **9000** and update on code changes.

### Testing

`./grunt test`

Running `grunt test` will run the unit tests with karma.
180 changes: 92 additions & 88 deletions app/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,96 +1,100 @@
<!doctype html>
<html class="no-js">
<head>
<meta charset="utf-8">
<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" />
<link rel="stylesheet" href="bower_components/nvd3/src/nv.d3.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) 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">
<div class="site-wrapper">

<div class="site-wrapper-inner">

<div class="cover-container">

<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 ng-view></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>

<head>
<meta charset="utf-8">
<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" />
<link rel="stylesheet" href="bower_components/nvd3/src/nv.d3.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) 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">
<div class="site-wrapper">

<div class="site-wrapper-inner">

<div class="cover-container">

<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 ng-view></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>

</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-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>
<script src="bower_components/d3/d3.js"></script>
<script src="bower_components/nvd3/nv.d3.js"></script>
<script src="bower_components/highcharts-release/highcharts.js"></script>
<script src="bower_components/highcharts-release/highcharts-more.js"></script>
<script src="bower_components/highcharts-release/modules/exporting.js"></script>
<script src="bower_components/highcharts-ng/dist/highcharts-ng.js"></script>
<script src="bower_components/angular-nvd3/dist/angular-nvd3.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/chart.js"></script>
<script src="scripts/controllers/sample-charts.js"></script>
<script src="scripts/controllers/nav-controller.js"></script>
<script src="scripts/controllers/chart-controllers.js"></script>
<script src="scripts/chart-factory/chart-factory.js"></script>
<script src="scripts/chart-factory/google-chart-factory.js"></script>
<script src="scripts/chart-factory/high-chart-factory.js"></script>
<script src="scripts/chart-factory/nvd3-chart-factory.js"></script>
<script src="scripts/services/chart-service.js"></script>
<script src="scripts/services/chart-meta-service.js"></script>
<!-- endbuild -->
</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-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>
<script src="bower_components/d3/d3.js"></script>
<script src="bower_components/nvd3/nv.d3.js"></script>
<script src="bower_components/highcharts-release/highcharts.js"></script>
<script src="bower_components/highcharts-release/highcharts-more.js"></script>
<script src="bower_components/highcharts-release/modules/exporting.js"></script>
<script src="bower_components/highcharts-ng/dist/highcharts-ng.js"></script>
<script src="bower_components/angular-nvd3/dist/angular-nvd3.min.js"></script>
<!-- endbower -->
<!-- endbuild -->

<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/app.js"></script>
<script src="scripts/services/chart-meta-service.js"></script>
<script src="scripts/controllers/nav-controller.js"></script>
<script src="scripts/controllers/chart-controllers.js"></script>
<script src="scripts/config/chart-config.js"></script>
<script src="scripts/services/chart-meta-service.js"></script>
<script src="scripts/chart-factory/chart-factory.js"></script>
<script src="scripts/chart-factory/google-chart-factory.js"></script>
<script src="scripts/chart-factory/high-chart-factory.js"></script>
<script src="scripts/chart-factory/nvd3-chart-factory.js"></script>
<script src="scripts/services/chart-service.js"></script>
<script src="scripts/services/chart-meta-service.js"></script>
<!-- endbuild -->
</body>
</html>

</html>
14 changes: 3 additions & 11 deletions app/scripts/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ angular
.module('apacheZeppelinGsocApp', [
'ngResource',
'ngRoute',
'googlechart',
'googlechart',
'highcharts-ng',
'nvd3'
])
Expand All @@ -22,19 +22,11 @@ angular
.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'
controller:'ChartCtrl'
})
.when('/contact', {
.when('/contact', {
templateUrl: 'views/contact.html'
})
.when('/', {
Expand Down
Loading

0 comments on commit 5db77b1

Please sign in to comment.