Skip to content

Commit 8141d94

Browse files
nicholasfnicholasf
committed
Merge pull request polyhack#16 from pomke/master
refactored to use angular, users come from users.json, details are deman...
2 parents 832606b + c669b65 commit 8141d94

4 files changed

Lines changed: 57 additions & 99 deletions

File tree

‎css/style.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,10 @@ table.plain tbody > tr:nth-child(odd) > th {
252252
background: transparent;
253253
}
254254

255+
table img.avatar {
256+
height: 30px;
257+
}
258+
255259
/* ======================================================
256260
1 - Header
257261
====================================================== */

‎index.html‎

Lines changed: 13 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@
2222
================================================== -->
2323
<link rel="shortcut icon" href="./img/favicon.png">
2424

25+
<!-- script
26+
================================================== -->
27+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.14/angular.min.js"></script>
28+
<script src="./js/polyhack.js"></script>
2529

2630
</head>
27-
<body>
31+
<body ng-app='poly'>
2832

2933
<header>
3034
<div class="container">
@@ -62,109 +66,19 @@
6266
<div class="row">
6367
<div class="col-md-12">
6468
<h6>Members</h6>
65-
<table>
69+
<table ng-controller='UserListController'>
6670
<tr>
71+
<th> - </th>
6772
<th>Name</th>
6873
<th>Location</th>
6974
<th>Language Focus</th>
7075
</tr>
71-
<tr>
72-
<td><a href='http://github.com/markmandel'>[Neurotic]</a></td>
73-
<td>Melbourne, Australia</td>
74-
<td>Go, Clojure, J/Ruby</td>
75-
</tr>
76-
<tr>
77-
<td><a href='http://github.com/andrebuchanan'>andrebuchanan</a></td>
78-
<td>Melbourne, Australia</td>
79-
<td>Node.js</td>
80-
</tr>
81-
<tr>
82-
<td><a href='https://github.com/aussiegeek'>aussiegeek</a></td>
83-
<td>Melbourne, Australia</td>
84-
<td>Ruby, Go</td>
85-
</tr>
86-
<tr>
87-
<td><a href='http://github.com/mwotton'>blackdog</a></td>
88-
<td>Vietnam</td>
89-
<td>Haskell, Ansible, not-Javascript, not-Go.</td>
90-
</tr>
91-
<tr>
92-
<td><a href='http://github.com/bulkan'>bulkan</a></td>
93-
<td>Melbourne, Australia</td>
94-
<td>Node.js</td>
95-
</tr>
96-
<tr>
97-
<td><a href='http://github.com/cgiffard'>cgiffard</a></td>
98-
<td>Sydney/Canberra, Australia</td>
99-
<td>Node.js, Erlang</td>
100-
</tr>
101-
<tr>
102-
<td><a href='http://github.com/deoxxa'>deoxxa</a></td>
103-
<td>Melbourne, Australia</td>
104-
<td>Node.js, C</td>
105-
</tr>
106-
<tr>
107-
<td><a href='http://github.com/eugeneware'>eugeneware</a></td>
108-
<td>Melbourne, Australia</td>
109-
<td>Node.js</td>
110-
</tr>
111-
<tr>
112-
<td><a href='http://github.com/joshwnj'>joshwnj</a></td>
113-
<td>Melbourne, Australia</td>
114-
<td>Node.js, PHP</td>
115-
</tr>
116-
<tr>
117-
<td><a href='https://github.com/michaelneale'>michaelneale</a></td>
118-
<td>Blue Mountains, Australia</td>
119-
<td>Erlang, Clojure, Scala, Bash, Haskell, Bash, Go, Javascript.</td>
120-
</tr>
121-
<tr>
122-
<td><a href='http://github.com/nicholasf'>nicholasf</a></td>
123-
<td>Melbourne, Australia</td>
124-
<td>Elixir, Javascript, post Ruby, post Java.</td>
125-
</tr>
126-
<tr>
127-
<td><a href='http://github.com/ocke'>ocke</a></td>
128-
<td>Melbourne, Australia</td>
129-
<td>Javascript, PHP</td>
130-
</tr>
131-
<tr>
132-
<td><a href='https://github.com/pomke'>Pomke</a></td>
133-
<td>Melbourne, Australia</td>
134-
<td>Javascript, Python</td>
135-
</tr>
136-
<tr>
137-
<td><a href='https://github.com/rkstedman'>rkstedman</a></td>
138-
<td>Cambridge, MA</td>
139-
<td>Node.js</td>
140-
</tr>
141-
<tr>
142-
<td><a href='http://github.com/robzolkos'>robzolkos</a></td>
143-
<td>Melbourne, Australia</td>
144-
<td>Ruby, Node.js, Javascript, Go</td>
145-
<td>
146-
</tr>
147-
<tr>
148-
<td><a href='http://github.com/rvagg'>rvagg</a></td>
149-
<td>NSW, Australia</td>
150-
<td>Node.js</td>
151-
</tr>
152-
<tr>
153-
<td><a href='http://github.com/SomeoneWeird'>SomeoneWeird</a></td>
154-
<td>Melbourne, Australia</td>
155-
<td>Javascript, Go</td>
156-
</tr>
157-
<tr>
158-
<td><a href='http://github.com/timoxley'>timoxley</a></td>
159-
<td>Singapore</td>
160-
<td>Node.js</td>
161-
</tr>
162-
<tr>
163-
<td><a href='https://github.com/yangwao'>wao-ender</a></td>
164-
<td>Bratislava, Slovakia</td>
165-
<td>Node.js</td>
166-
</tr>
167-
76+
<tr ng-repeat='user in users'>
77+
<td><img class='avatar' ng-src='{{details[user.github].avatar_url}}'></td>
78+
<td><a ng-href='https://github.com/{{user.github}}'>{{user.nick}}</a></td>
79+
<td>{{details[user.github].location}}</td>
80+
<td>{{user.lang}}</td>
81+
</tr>
16882
</table>
16983
</div>
17084

‎js/polyhack.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
var Poly = angular.module('poly', []);
2+
3+
Poly.controller('UserListController', function($scope, $http, $q) {
4+
5+
$http.get('./js/users.json').then(function(res) {
6+
$scope.details = {};
7+
$scope.users = res.data;
8+
var git = [];
9+
angular.forEach($scope.users, function(u) {
10+
git.push($http.get('https://api.github.com/users/'+u.github));
11+
});
12+
$q.all(git).then(function(res) {
13+
angular.forEach(res, function(item) {
14+
$scope.details[item.data.login] = item.data;
15+
});
16+
});
17+
});
18+
});

‎js/users.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[
2+
{ "github" : "markmandel", "nick" : "[Neurotic]", "lang" : "Go, Clojure, J/Ruby" },
3+
{ "github" : "andrebuchanan", "nick" : "andrebuchanan", "lang" : "Node.js" },
4+
{ "github" : "aussiegeek", "nick" : "aussiegeek", "lang" : "Ruby, Go" },
5+
{ "github" : "mwotton", "nick" : "blackdog", "lang" : "Haskell, Ansible, not-Javascript, not-Go." },
6+
{ "github" : "bulkan", "nick" : "bulkan", "lang" : "Node.js" },
7+
{ "github" : "cgiffard", "nick" : "cgiffard", "lang" : "Node.js, Erlang" },
8+
{ "github" : "deoxxa", "nick" : "deoxxa", "lang" : "Node.js, C" },
9+
{ "github" : "eugeneware", "nick" : "eugeneware", "lang" : "Node.js" },
10+
{ "github" : "joshwnj", "nick" : "joshwnj", "lang" : "Node.js, PHP" },
11+
{ "github" : "michaelneale", "nick" : "michaelneale", "lang" : "Erlang, Clojure, Scala, Bash, Haskell, Bash, Go, Javascript." },
12+
{ "github" : "nicholasf", "nick" : "nicholasf", "lang" : "Elixir, Javascript, post Ruby, post Java." },
13+
{ "github" : "ocke", "nick" : "ocke", "lang" : "Javascript, PHP" },
14+
{ "github" : "pomke", "nick" : "pomke", "lang" : "Javascript, Python" },
15+
{ "github" : "rkstedman", "nick" : "rkstedman", "lang" : "Node.js" },
16+
{ "github" : "robzolkos", "nick" : "robzolkos", "lang" : "Ruby, Node.js, Javascript, Go" },
17+
{ "github" : "rvagg", "nick" : "rvagg", "lang" : "Node.js" },
18+
{ "github" : "SomeoneWeird", "nick" : "SomeoneWeird", "lang" : "Javascript, Go" },
19+
{ "github" : "timoxley", "nick" : "timoxley", "lang" : "Node.js" },
20+
{ "github" : "yangwao", "nick" : "wao-ender", "lang" : "Node.js" }
21+
]
22+

0 commit comments

Comments
 (0)