Skip to content

Commit

Permalink
last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@MeeraChandrasekaran
MeeraChandrasekaran committed Oct 4, 2015
2 parents 9a758c2 + dd66e34 commit 3b69200
Show file tree
Hide file tree
Showing 4 changed files with 172 additions and 142 deletions.
6 changes: 6 additions & 0 deletions client/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<script src="./js/homeController.js"></script>
<script src="./js/newKidController.js"></script>
<script src="./js/kidController.js"></script>
<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
<style>
body {
font-family: 'Open Sans', sans-serif;
}
</style>
</head>
<body>
<div ng-view="">
Expand Down
18 changes: 15 additions & 3 deletions client/js/homeController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ saburiKonnect.controller('homeController', function($scope, $location, NewOrgani
});

var msft = data.filter(function(d) {
return d.symbol == "MSFT";
return d.symbol == "IBM";
});

var ibm = data.filter(function(d) {
return d.symbol == 'IBM';
return d.symbol == 'MSFT';
});

// Compute the minimum and maximum date, and the maximum price.
Expand Down Expand Up @@ -272,7 +272,7 @@ saburiKonnect.controller('homeController', function($scope, $location, NewOrgani

/* Create a shared transition for anything we're animating */
var t = svg.transition()
.delay(750)
.delay(3000)
.duration(6000)
.ease('linear')
.each('end', function() {
Expand Down Expand Up @@ -321,6 +321,18 @@ saburiKonnect.controller('homeController', function($scope, $location, NewOrgani
NewOrganisationFactory.addSponsor($scope.sponsor);
};


$(window).on('scroll', function() {
var y_scroll_pos = window.pageYOffset;
var scroll_pos_test = 800; // set to whatever you want it to be

if(y_scroll_pos > scroll_pos_test) {
$("#chart").hide()
} else {
$("#chart").show()
}
});

})

saburiKonnect.factory('NewOrganisationFactory',function($http,$location){
Expand Down
26 changes: 19 additions & 7 deletions client/partials/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
.kids {
width: 100%;
margin-top: 40%;
margin-bottom: 40%;
/*margin-bottom: 40%;*/
height: 800px;
z-index: 3;
background: url(./assets/texture.gif) 50% 0 #fbf9f6
Expand Down Expand Up @@ -113,6 +113,9 @@
margin-right: 100px;
float: right;
}
.messageText {
margin-top: 150px;
}
</style>
<!-- <button class="randomize">randomize</button> -->
<nav class="navbar navbar-default">
Expand Down Expand Up @@ -164,19 +167,28 @@ <h5 class="kidsDescription">Lives in a poor community in India, where life is a
<div class="col-md-4">
<img src="./assets/19f9cefdfb07230a68581d617885a3af_XS.jpg">
<h3>Palani</h3>
<h5 class="kidsDescription">Lives with his father and 1 sister. His parents strugle to provide for the family. His father is a fisherman. Despite his efforts its difficult to meet the family's needs. He is growing up in a poor community in India. A typical home is constructed using wood wit ha thatch roof and dirt floor</h5>
</div>
<div class="col-md-4">
<img src="./assets/imageedit_2_2465428479.jpg">
<h3>Mala</h3>
<h5 class="kidsDescription">She lives with her parents and her parents struggle to provide for the family. His father is a daily wage earner and her mother is a daily wage earner. Your sponsor helps provide her with the education and tutoring that will help her excel in life.</h5>
</div>
</div>
<div class="row messageText">
<h4>Saburi is a sanskrit word that translates to 'patience and perseverance' the qualities needed throughout the path to reach our goal.</h4>
</div>
</div>
<label class="guideline">
Show Guideline & Curtain
<input type="checkbox" id="show_guideline" />
</label>
<svg id="lineChart"></svg>

<h1>Literacy rate in India</h1>
<div id="LineChartAbsolute">
<svg id="lineChart"></svg>
</div>
<nav class="navbar navbar-default navbar-bottom" role="navigation">
<div class="container">
<h6>"He who has spent has used; he who has collected has lost; but he who has given has saved his treasure forever"</h6>
<h5>- Hazrat Inayat Khan</h5>
</div>
</nav>
<!-- Modal login -->
<div class="modal fade" id="loginModalSponsor" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
Expand Down
264 changes: 132 additions & 132 deletions client/readme.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,138 +124,138 @@ S&P 500,Feb 2010,1104.49
S&P 500,Mar 2010,1140.45
MSFT,Jan 2000,68
MSFT,Jan 2001,67
MSFT,Jan 2002,
MSFT,Jan 2003,
MSFT,Dec 2004,
MSFT,Dec 2005,
MSFT,Dec 2006,
MSFT,Dec 2007,
MSFT,Jan 2008,
MSFT,Jan 2009,
MSFT,Jan 2010,
AMZN,Jan 2000,
AMZN,Feb 2000,
AMZN,Mar 2000,
AMZN,Apr 2000,
AMZN,May 2000,
AMZN,Jun 2000,
AMZN,Jul 2000,
AMZN,Aug 2000,
AMZN,Sep 2000,
AMZN,Oct 2000,
AMZN,Nov 2000,
AMZN,Dec 2000,
AMZN,Jan 2001,17.31
AMZN,Feb 2001,10.19
AMZN,Mar 2001,10.23
AMZN,Apr 2001,15.78
AMZN,May 2001,16.69
AMZN,Jun 2001,14.15
AMZN,Jul 2001,12.49
AMZN,Aug 2001,8.94
AMZN,Sep 2001,5.97
AMZN,Oct 2001,6.98
AMZN,Nov 2001,11.32
AMZN,Dec 2001,10.82
AMZN,Jan 2002,14.19
AMZN,Feb 2002,14.1
AMZN,Mar 2002,14.3
AMZN,Apr 2002,16.69
AMZN,May 2002,18.23
AMZN,Jun 2002,16.25
AMZN,Jul 2002,14.45
AMZN,Aug 2002,14.94
AMZN,Sep 2002,15.93
AMZN,Oct 2002,19.36
AMZN,Nov 2002,23.35
AMZN,Dec 2002,18.89
AMZN,Jan 2003,21.85
AMZN,Feb 2003,22.01
AMZN,Mar 2003,26.03
AMZN,Apr 2003,28.69
AMZN,May 2003,35.89
AMZN,Jun 2003,36.32
AMZN,Jul 2003,41.64
AMZN,Aug 2003,46.32
AMZN,Sep 2003,48.43
AMZN,Oct 2003,54.43
AMZN,Nov 2003,53.97
AMZN,Dec 2003,52.62
AMZN,Jan 2004,50.4
AMZN,Feb 2004,43.01
AMZN,Mar 2004,43.28
AMZN,Apr 2004,43.6
AMZN,May 2004,48.5
AMZN,Jun 2004,54.4
AMZN,Jul 2004,38.92
AMZN,Aug 2004,38.14
AMZN,Sep 2004,40.86
AMZN,Oct 2004,34.13
AMZN,Nov 2004,39.68
AMZN,Dec 2004,44.29
AMZN,Jan 2005,43.22
AMZN,Feb 2005,35.18
AMZN,Mar 2005,34.27
AMZN,Apr 2005,32.36
AMZN,May 2005,35.51
AMZN,Jun 2005,33.09
AMZN,Jul 2005,45.15
AMZN,Aug 2005,42.7
AMZN,Sep 2005,45.3
AMZN,Oct 2005,39.86
AMZN,Nov 2005,48.46
AMZN,Dec 2005,47.15
AMZN,Jan 2006,44.82
AMZN,Feb 2006,37.44
AMZN,Mar 2006,36.53
AMZN,Apr 2006,35.21
AMZN,May 2006,34.61
AMZN,Jun 2006,38.68
AMZN,Jul 2006,26.89
AMZN,Aug 2006,30.83
AMZN,Sep 2006,32.12
AMZN,Oct 2006,38.09
AMZN,Nov 2006,40.34
AMZN,Dec 2006,39.46
AMZN,Jan 2007,37.67
AMZN,Feb 2007,39.14
AMZN,Mar 2007,39.79
AMZN,Apr 2007,61.33
AMZN,May 2007,69.14
AMZN,Jun 2007,68.41
AMZN,Jul 2007,78.54
AMZN,Aug 2007,79.91
AMZN,Sep 2007,93.15
AMZN,Oct 2007,89.15
AMZN,Nov 2007,90.56
AMZN,Dec 2007,92.64
AMZN,Jan 2008,77.7
AMZN,Feb 2008,64.47
AMZN,Mar 2008,71.3
AMZN,Apr 2008,78.63
AMZN,May 2008,81.62
AMZN,Jun 2008,73.33
AMZN,Jul 2008,76.34
AMZN,Aug 2008,80.81
AMZN,Sep 2008,72.76
AMZN,Oct 2008,57.24
AMZN,Nov 2008,42.7
AMZN,Dec 2008,51.28
AMZN,Jan 2009,58.82
AMZN,Feb 2009,64.79
AMZN,Mar 2009,73.44
AMZN,Apr 2009,80.52
AMZN,May 2009,77.99
AMZN,Jun 2009,83.66
AMZN,Jul 2009,85.76
AMZN,Aug 2009,81.19
AMZN,Sep 2009,93.36
AMZN,Oct 2009,118.81
AMZN,Nov 2009,135.91
AMZN,Dec 2009,134.52
AMZN,Jan 2010,125.41
AMZN,Feb 2010,118.4
AMZN,Mar 2010,128.82
MSFT,Jan 2002,66
MSFT,Jan 2003,67
MSFT,Dec 2004,65
MSFT,Dec 2005,74
MSFT,Dec 2006,74
MSFT,Dec 2007,75
MSFT,Jan 2008,76
MSFT,Jan 2009,80
MSFT,Jan 2010,80
AMZN,Jan 2000,0
AMZN,Feb 2000,0
AMZN,Mar 2000,0
AMZN,Apr 2000,0
AMZN,May 2000,0
AMZN,Jun 2000,0
AMZN,Jul 2000,0
AMZN,Aug 2000,0
AMZN,Sep 2000,0
AMZN,Oct 2000,0
AMZN,Nov 2000,0
AMZN,Dec 2000,0
AMZN,Jan 2001,0
AMZN,Feb 2001,0
AMZN,Mar 2001,0
AMZN,Apr 2001,0
AMZN,May 2001,0
AMZN,Jun 2001,0
AMZN,Jul 2001,0
AMZN,Aug 2001,0
AMZN,Sep 2001,0
AMZN,Oct 2001,0
AMZN,Nov 2001,0
AMZN,Dec 2001,0
AMZN,Jan 2002,0
AMZN,Feb 2002,0
AMZN,Mar 2002,0
AMZN,Apr 2002,0
AMZN,May 2002,0
AMZN,Jun 2002,0
AMZN,Jul 2002,0
AMZN,Aug 2002,0
AMZN,Sep 2002,0
AMZN,Oct 2002,0
AMZN,Nov 2002,0
AMZN,Dec 2002,0
AMZN,Jan 2003,0
AMZN,Feb 2003,0
AMZN,Mar 2003,0
AMZN,Apr 2003,0
AMZN,May 2003,0
AMZN,Jun 2003,0
AMZN,Jul 2003,0
AMZN,Aug 2003,0
AMZN,Sep 2003,0
AMZN,Oct 2003,0
AMZN,Nov 2003,0
AMZN,Dec 2003,0
AMZN,Jan 2004,0
AMZN,Feb 2004,0
AMZN,Mar 2004,0
AMZN,Apr 2004,0
AMZN,May 2004,0
AMZN,Jun 2004,0
AMZN,Jul 2004,0
AMZN,Aug 2004,0
AMZN,Sep 2004,0
AMZN,Oct 2004,0
AMZN,Nov 2004,0
AMZN,Dec 2004,0
AMZN,Jan 2005,0
AMZN,Feb 2005,0
AMZN,Mar 2005,0
AMZN,Apr 2005,0
AMZN,May 2005,0
AMZN,Jun 2005,0
AMZN,Jul 2005,0
AMZN,Aug 2005,0
AMZN,Sep 2005,0
AMZN,Oct 2005,0
AMZN,Nov 2005,0
AMZN,Dec 2005,0
AMZN,Jan 2006,0
AMZN,Feb 2006,0
AMZN,Mar 2006,0
AMZN,Apr 2006,0
AMZN,May 2006,0
AMZN,Jun 2006,0
AMZN,Jul 2006,0
AMZN,Aug 2006,0
AMZN,Sep 2006,0
AMZN,Oct 2006,0
AMZN,Nov 2006,0
AMZN,Dec 2006,0
AMZN,Jan 2007,0
AMZN,Feb 2007,0
AMZN,Mar 2007,0
AMZN,Apr 2007,0
AMZN,May 2007,0
AMZN,Jun 2007,0
AMZN,Jul 2007,0
AMZN,Aug 2007,0
AMZN,Sep 2007,0
AMZN,Oct 2007,0
AMZN,Nov 2007,0
AMZN,Dec 2007,0
AMZN,Jan 2008,0
AMZN,Feb 2008,0
AMZN,Mar 2008,0
AMZN,Apr 2008,0
AMZN,May 2008,0
AMZN,Jun 2008,0
AMZN,Jul 2008,0
AMZN,Aug 2008,0
AMZN,Sep 2008,0
AMZN,Oct 2008,0
AMZN,Nov 2008,0
AMZN,Dec 2008,0
AMZN,Jan 2009,0
AMZN,Feb 2009,0
AMZN,Mar 2009,0
AMZN,Apr 2009,0
AMZN,May 2009,0
AMZN,Jun 2009,0
AMZN,Jul 2009,0
AMZN,Aug 2009,0
AMZN,Sep 2009,0
AMZN,Oct 2009,0
AMZN,Nov 2009,0
AMZN,Dec 2009,0
AMZN,Jan 2010,0
AMZN,Feb 2010,0
AMZN,Mar 2010,90
IBM,Jan 2000,0
IBM,Feb 2000,0
IBM,Mar 2000,0
Expand Down

0 comments on commit 3b69200

Please sign in to comment.