Skip to content

Commit 993e5e8

Browse files
author
Prashanth Batchu
committed
added commented cdn js/css (just for testing). Added ids to sample json of payers, groups, friends.
1 parent 827f298 commit 993e5e8

File tree

4 files changed

+155
-121
lines changed

4 files changed

+155
-121
lines changed

‎billrive-client/app/index.html‎

Lines changed: 136 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,145 @@
11
<!doctype html>
22
<html lang="en" ng-app="billRive">
3-
<head>
4-
<meta charset="utf-8">
5-
<title>BillRive</title>
6-
<link rel="stylesheet" href="css/app.css"/>
7-
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.css"/>
8-
<link rel="stylesheet" href="lib/bootstrap-datepicker/css/datepicker.css"/>
9-
10-
</head>
11-
<body>
12-
<!-- <ul class="menu">
13-
<li><a href="#/bills">bills</a></li>
14-
<li><a href="#/view2">view2</a></li>
15-
</ul>-->
16-
17-
<!--</div>-->
18-
3+
<head>
4+
<meta charset="utf-8">
5+
<title>BillRive</title>
6+
<link rel="stylesheet" href="css/app.css"/>
7+
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.css"/>
8+
<link rel="stylesheet" href="lib/bootstrap-datepicker/css/datepicker.css"/>
9+
10+
11+
<!-- <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
12+
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
13+
<link href="//mgcrea.github.com/angular-strap/css/prettify.css" rel="stylesheet">
14+
<link href="//mgcrea.github.com/angular-strap/vendor/bootstrap-datepicker.css" rel="stylesheet">
15+
16+
required libraries
17+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
19+
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
20+
<script src="//mgcrea.github.com/angular-strap/js/angular-strap.js"></script>
21+
<script src="//mgcrea.github.com/angular-strap/vendor/bootstrap-datepicker.js"></script>
22+
23+
optional libraries
24+
<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min.js"></script>
25+
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.0.0/moment.min.js"></script>
26+
<script src="//cdnjs.cloudflare.com/ajax/libs/fastclick/0.6.0/fastclick.min.js"></script>
27+
<script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r224/prettify.js"></script>
28+
29+
30+
<script src="js/app.js"></script>
31+
<script src="js/services.js"></script>
32+
<script src="js/controllers.js"></script>
33+
<script src="js/filters.js"></script>
34+
<script src="js/directives.js"></script>
35+
<script src="js/routes.js"></script>-->
36+
37+
</head>
38+
<body>
39+
<!-- <ul class="menu">
40+
<li><a href="#/bills">bills</a></li>
41+
<li><a href="#/view2">view2</a></li>
42+
</ul>-->
43+
44+
<!--</div>-->
45+
1946
<div class="navbar navbar-fixed-top">
20-
<div class="navbar-inner">
21-
<div class="container">
22-
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
23-
<span class="icon-bar"></span>
24-
<span class="icon-bar"></span>
25-
<span class="icon-bar"></span>
26-
</a>
27-
<a class="brand" href="#"><i class="icon-home"></i> BillRive</a>
28-
29-
30-
<ul class="nav nav-pills">
31-
<li class="dropdown">
32-
<a class="dropdown-toggle active"
33-
data-toggle="dropdown">
34-
<i class="icon-th-list"></i>&nbsp;Bills
35-
<b class="caret"></b>
36-
</a>
37-
<ul class="dropdown-menu">
38-
<!-- links -->
39-
<li><a tabindex="-1" href="#/addBill">Add</a></li>
40-
<li><a tabindex="-1" href="#/listBills">List</a></li>
41-
<li><a tabindex="-1" href="#">Another action</a></li>
42-
<li class="divider"></li>
43-
<li><a tabindex="-1" href="#">Separated link</a></li>
44-
</ul>
45-
</li>
46-
<li><a href="#/listFriends"><i class="icon-heart"></i>&nbsp;Friends</a></li>
47-
<li><a href="#"><i class="icon-tags"></i>&nbsp;Groups</a></li>
48-
49-
</ul>
50-
51-
<ul class="nav nav-pills pull-right">
52-
53-
<li><a href="#"><i class="icon-user"></i> John Doe</a></li>
54-
<li><a href="#"><i class="icon-wrench"></i> Settings</a></li>
55-
<li><a href="#"><i class="icon-info-sign"></i> Help</a></li>
56-
</ul>
57-
58-
59-
</div>
60-
</div>
61-
</div>
62-
63-
64-
<div class="container">
65-
<div class="row clearfix">
66-
<div class="span8">
67-
<div class="clearfix">
68-
<div ng-view>
47+
<div class="navbar-inner">
48+
<div class="container">
49+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
50+
<span class="icon-bar"></span>
51+
<span class="icon-bar"></span>
52+
<span class="icon-bar"></span>
53+
</a>
54+
<a class="brand" href="#"><i class="icon-home"></i> BillRive</a>
55+
56+
57+
<ul class="nav nav-pills">
58+
<li class="dropdown">
59+
<a class="dropdown-toggle active"
60+
data-toggle="dropdown">
61+
<i class="icon-th-list"></i>&nbsp;Bills
62+
<b class="caret"></b>
63+
</a>
64+
<ul class="dropdown-menu">
65+
<!-- links -->
66+
<li><a tabindex="-1" href="#/addBill">Add</a></li>
67+
<li><a tabindex="-1" href="#/listBills">List</a></li>
68+
<li><a tabindex="-1" href="#">Another action</a></li>
69+
<li class="divider"></li>
70+
<li><a tabindex="-1" href="#">Separated link</a></li>
71+
</ul>
72+
</li>
73+
<li><a href="#/listFriends"><i class="icon-heart"></i>&nbsp;Friends</a></li>
74+
<li><a href="#"><i class="icon-tags"></i>&nbsp;Groups</a></li>
75+
76+
</ul>
77+
78+
<ul class="nav nav-pills pull-right">
79+
80+
<li><a href="#"><i class="icon-user"></i> John Doe</a></li>
81+
<li><a href="#"><i class="icon-wrench"></i> Settings</a></li>
82+
<li><a href="#"><i class="icon-info-sign"></i> Help</a></li>
83+
</ul>
84+
85+
86+
</div>
6987
</div>
7088
</div>
71-
</div>
72-
73-
<!-- <div class="span6">
74-
<div class="clearfix">
75-
<div ng-include="'partials/addBill.html'">
76-
89+
90+
91+
<div class="container">
92+
<div class="row clearfix">
93+
<div class="span8">
94+
<div class="clearfix">
95+
<div ng-view>
96+
</div>
97+
</div>
98+
</div>
99+
100+
<!-- <div class="span6">
101+
<div class="clearfix">
102+
<div ng-include="'partials/addBill.html'">
103+
104+
105+
</div>
106+
</div>
107+
</div>-->
108+
77109

78110
</div>
79111
</div>
80-
</div>-->
81-
82-
83-
</div>
84-
</div>
85-
86-
87-
<!-- In production use:
88-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.6/angular.min.js"></script>
89-
-->
90-
91-
<script src="lib/angular/angular.js"></script>
92-
93-
<script src="js/app.js"></script>
94-
<script src="js/services.js"></script>
95-
<script src="js/controllers.js"></script>
96-
<script src="js/filters.js"></script>
97-
<script src="js/directives.js"></script>
98-
<script src="js/routes.js"></script>
99-
<script src="lib/jquery-2.0.0.js"></script>
100-
<script src="lib/angular-strap.js"></script>
101-
<script src="lib/bootstrap/js/bootstrap.js"></script>
102-
<!--underscore is for additional collection manipulation etc-->
103-
<script src="lib/underscore-1.4.4-min.js"></script>
104-
<!--Moment is for parsing dates-->
105-
<script src="lib/moment-2.0.js"></script>
106-
<!--FastClick is a simple, easy-to-use library for eliminating the 300ms delay between a physical tap and the firing of a click event on mobile browsers.-->
107-
<script src="lib/fastclick-0.6.0-min.js"></script>
108-
<!--Bootstrap Datepicker-->
109-
<script src="lib/bootstrap-datepicker/js/bootstrap-datepicker.js"> </script>
110-
</body>
112+
113+
114+
<!-- In production use:
115+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.6/angular.min.js"></script>
116+
-->
117+
118+
<script src="lib/jquery-2.0.0.js"></script>
119+
<script src="lib/angular/angular.js"></script>
120+
121+
<script src="js/app.js"></script>
122+
<script src="js/services.js"></script>
123+
<script src="js/controllers.js"></script>
124+
<script src="js/filters.js"></script>
125+
<script src="js/directives.js"></script>
126+
<script src="js/routes.js"></script>
127+
128+
<script src="lib/bootstrap/js/bootstrap.js"></script>
129+
<script src="lib/angular-strap.js"></script>
130+
<!--underscore is for additional collection manipulation etc-->
131+
<script src="lib/underscore-1.4.4-min.js"></script>
132+
<!--Moment is for parsing dates-->
133+
<script src="lib/moment-2.0.js"></script>
134+
<!--FastClick is a simple, easy-to-use library for eliminating the 300ms delay between a physical tap and the firing of a click event on mobile browsers.-->
135+
<script src="lib/fastclick-0.6.0-min.js"></script>
136+
<!--Bootstrap Datepicker-->
137+
<script src="lib/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
138+
<!-- <script>
139+
$(document).ready(function() {
140+
$('#dp5').datepicker();
141+
});
142+
143+
</script>-->
144+
</body>
111145
</html>

‎billrive-client/app/js/services.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ billRive.factory('billService',function(){
2222
// ];
2323

2424

25-
var bills = [{
25+
var bills = {
2626
"data": [
2727
{
2828
"id": 1,
@@ -166,31 +166,31 @@ var bills = [{
166166
"groupId": 2
167167
}
168168
]
169-
}];
169+
};
170170

171171
var payers= [
172-
{name:'John Doe'},
173-
{name:'Kristen Stewart'},
174-
{name:'Trevor Pott'},
175-
{name:'Hilda Hess'},
176-
{name:'Gavin Mays'}
172+
{id:'1',name:'John Doe'},
173+
{id:'2',name:'Kristen Stewart'},
174+
{id:'3',name:'Trevor Pott'},
175+
{id:'4',name:'Hilda Hess'},
176+
{id:'5',name:'Gavin Mays'}
177177
];
178178

179179
var friends= [
180-
{name:'John Doe'},
181-
{name:'Kristen Stewart'},
182-
{name:'Trevor Pott'},
183-
{name:'Hilda Hess'},
184-
{name:'Gavin Mays'}
180+
{id:'1',name:'John Doe'},
181+
{id:'2',name:'Kristen Stewart'},
182+
{id:'3',name:'Trevor Pott'},
183+
{id:'4',name:'Hilda Hess'},
184+
{id:'5',name:'Gavin Mays'}
185185
];
186186

187187

188188
var groups= [
189-
{name:'SLC Roommates'},
190-
{name:'Denver Old Buddies'},
191-
{name:'Ski Club'},
192-
{name:'Family'},
193-
{name:'India'}
189+
{id:'1',name:'SLC Roommates'},
190+
{id:'2',name:'Denver Old Buddies'},
191+
{id:'3',name:'Ski Club'},
192+
{id:'4',name:'Family'},
193+
{id:'5',name:'India'}
194194
];
195195

196196
factory.getBills=function(){

‎billrive-client/app/partials/addBill.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<label>Date</label>
1414
<div class="control-group input-append">
15-
<input class="span8" type="text" ng-model="datepicker.date" data-date-format="dd/mm/yyyy" bs-datepicker placeholder="Pick a Date">
15+
<input id="dp5" class="span8" type="text" ng-model="datepicker.date" data-date-format="dd/mm/yyyy" bs-datepicker placeholder="Pick a Date">
1616
<button type="button" class="btn" data-toggle="datepicker"><i class="icon-calendar"></i></button>
1717
</div>
1818

‎billrive-client/app/partials/listBills.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</button>
3131
</td>
3232
</tr>-->
33-
<tr ng-repeat="bill in bills[0].data | filter:query">
33+
<tr ng-repeat="bill in bills.data | filter:query">
3434
<td>{{ bill.date.monthOfYear }}/{{ bill.date.dayOfMonth}}/{{ bill.date.yearOfCentury}}</td>
3535
<td>{{ bill.title }}</td>
3636
<td>${{ bill.billFinances.billTotal }}</td>

0 commit comments

Comments
 (0)