Skip to content

Commit 90318a0

Browse files
kimchouardkimchouard
committed
hg-include -> directive (bug fix magellan caused by $location with ng-include)
1 parent 091e7ea commit 90318a0

File tree

7 files changed

+154
-103
lines changed

7 files changed

+154
-103
lines changed

‎index.html‎

Lines changed: 63 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
<h4>Statistics</h4>
5050
</div>
5151
<div class="large-12 columns" ng-show="loading">
52-
<ng-include src="'views/loading.html'"/>
52+
<loading />
5353
</div>
5454
<div class="large-12 columns" ng-show="!loading">
55-
<ng-include src="'views/stats.html'"/>
55+
<stats projects="projects" orgs="orgs" stats="stats" langs="langs"/>
5656
</div>
5757
</div>
5858
<div class="large-6 columns" ng-click="posLabel()">
@@ -119,18 +119,69 @@ <h2 class="large-6 small-4 columns" data-magellan-destination="projects">Repos</
119119
</div>
120120

121121
<!-- ------- Filters -------- -->
122-
<div>
123-
<ng-include src="'views/filters.html'"/>
124-
</div>
122+
<div class="filters flat" ng-class="{flat: !toggleFilters}">
123+
<div class="row">
124+
<form class="custom large-12 columns mainFilters">
125+
<div class="large-4 columns">
126+
<input type="text" ng-model="searchName" placeholder="Search name, description...">
127+
</div>
128+
129+
<div class="large-3 columns">
130+
<input type="text" ng-model="searchLangInput" id="searchLang" placeholder="Languages">
131+
</div>
132+
133+
<div class="large-3 columns">
134+
<input type="text" ng-model="searchOrgInput" id="searchOrg" placeholder="Organisations">
135+
</div>
136+
137+
<div class="star large-2 columns">
138+
<a ng-show="filterStarIndex" ng-click="majFilterStar(0); majDisplayStar(0)" class="button tiny cancel">X</a>
139+
<div class="fitlerStar" ng-repeat="i in [1,2,3,4,5]" ng-class="{on: (i <= displayStarIndex)}" ng-click="majFilterStar(i)" ng-mouseenter="majDisplayStar(i)" ng-mouseleave="majDisplayStar(filterStarIndex)"></div>
140+
</div>
141+
</form>
142+
143+
<div ng-show="searchLang.length != 0 || searchOrg.length != 0 || searchName">
144+
<div class="large-12 columns activeFilter">
145+
<ul class="button-group filterLang" ng-repeat="lang in searchLang">
146+
<li><a class="button tiny"># {{lang}}</a></li>
147+
<li><a class="button tiny" ng-click="deleteFilter(searchLang, $index)">X</a></li>
148+
</ul>
149+
<ul class="button-group filterLang" ng-repeat="org in searchOrg">
150+
<li><a class="button tiny">{{org}}</a></li>
151+
<li><a class="button tiny" ng-click="deleteFilter(searchOrg, $index)">X</a></li>
152+
</ul>
153+
</div>
154+
</div>
155+
</div>
156+
</div>
125157

126158
<!-- ------- Items -------- -->
127159
<div class="row wrapProjects">
128160
<div ng-show="loading">
129-
<ng-include src="'views/loading.html'"/>
161+
<loading />
130162
</div>
131163

132164
<div ng-show="!loading">
133-
<ng-include src="'views/projects.html'"/>
165+
<div class="large-12 columns">
166+
<div class="row">
167+
<div class="large-6 columns" ng-repeat="actProject in projects | projectsFilter:this" ng-class-odd="'clear'">
168+
<project project="actProject" />
169+
</div>
170+
171+
<!-- Reseter -->
172+
<div class="large-6 columns clear"></div>
173+
</div>
174+
</div>
175+
176+
<div ng-class="{ buttonLess: projLast > 10, buttonMore : projLast == 10 }" ng-hide="(projects | projectsFilter:this).length < 10">
177+
<div class="row text-center">
178+
<button class="button" ng-click="showHideProj()">
179+
{{nbProj}}
180+
<span ng-show="nbProj == 10">Show more...</span>
181+
<span id="showLess" ng-show="nbProj > 10">Show less...</span>
182+
</button>
183+
</div>
184+
</div>
134185
</div>
135186

136187
<!-- Reseter -->
@@ -175,11 +226,13 @@ <h2 data-magellan-destination="organisations">Organisations</h2>
175226

176227
<div class="row">
177228
<div ng-show="loading">
178-
<ng-include src="'views/loading.html'"/>
229+
<loading />
179230
</div>
180231

181232
<div ng-show="!loading">
182-
<ng-include src="'views/orgs.html'"/>
233+
<div class="large-6 columns" ng-repeat="actOrg in orgs" ng-class-odd="'clear'">
234+
<org org="actOrg"/>
235+
</div>
183236
</div>
184237

185238
<!-- Reseter -->
@@ -209,7 +262,7 @@ <h5 class="details">and with <a target="_blank" href="http://angularjs.org/" tit
209262
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
210263
<script src="http://code.jquery.com/jquery-1.9.1.js"></script>
211264
<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
212-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.7/angular.min.js"></script>
265+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.12/angular.min.js"></script>
213266
<script src="js/vendor/angular-resource.js"></script>
214267
<script src="js/foundation/foundation.js"></script>
215268
<script src="js/foundation/foundation.magellan.js"></script>

‎js/script.js‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,59 @@ var isMobile = function(a) {
307307
};
308308

309309

310+
/* ----------------------------------------------------------------------------
311+
Modules */
312+
313+
app.directive('loading', function() {
314+
return {
315+
restrict: 'E',
316+
templateUrl: 'views/loading.html'
317+
};
318+
});
319+
320+
app.directive('stats', function() {
321+
return {
322+
restrict: 'E',
323+
scope: {
324+
projects: '=',
325+
orgs: '=',
326+
langs: '=',
327+
stats: '='
328+
},
329+
templateUrl: 'views/stats.html',
330+
replace: true
331+
};
332+
});
333+
334+
app.directive('project', function() {
335+
return {
336+
restrict: 'E',
337+
scope: {
338+
project: '='
339+
},
340+
templateUrl: 'views/project.html',
341+
replace: true,
342+
link: function(scope) {
343+
scope.Math = Math;
344+
}
345+
};
346+
});
347+
348+
app.directive('org', function() {
349+
return {
350+
restrict: 'E',
351+
scope: {
352+
org: '='
353+
},
354+
templateUrl: 'views/org.html',
355+
replace: true,
356+
link: function(scope) {
357+
scope.Math = Math;
358+
}
359+
};
360+
});
361+
362+
310363
/* ----------------------------------------------------------------------------
311364
Filters */
312365
app.filter('star', function() {

‎views/filters.html‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎views/org.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<a href="{{org | linkOrg}}" target="_blank">
2+
<section class="org">
3+
<div class="row">
4+
<div class="large-6 columns">
5+
<h1>{{org.name}}</h1>
6+
</div>
7+
<div class="large-6 columns">
8+
</div>
9+
</div>
10+
<p class="details">{{org.desc | shortenStr}}</p>
11+
<p class="more">Learn more...</p>
12+
</section>
13+
</a>

‎views/orgs.html‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎views/project.html‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<a href="{{project | linkProject}}" target="_blank">
2+
<section class="project">
3+
<div class="row">
4+
<div class="large-6 columns">
5+
<h1>{{project.name}}</h1>
6+
</div>
7+
<div class="large-6 columns">
8+
<div class="star right" ng-repeat="i in [0,1,2,3,4]">
9+
<img ng-src="img/star_{{ { id: 4-i, value: project.watchers_count} | star}}.svg" />
10+
</div>
11+
12+
<div class="watchCount">{{project.watchers_count | niceNum}}</div>
13+
</div>
14+
</div>
15+
<div class="row">
16+
<p class=" large-6 columns"><span ng-repeat="language in Object.keys(project.languages)" ng-hide="Math.floor( project.languages[language].value * 100 / project.languagesTotal ) < 10 ">{{project.languages[language].name}}<span ng-hide="$last">, </span></span><span ng-hide="project.languages.length != 0">Unknown</span></p>
17+
<p class=" large-6 columns text-right">{{project.org}}</p>
18+
</div>
19+
<p class="details">{{project.description | shortenStr}}</p>
20+
<div class="row more">
21+
<p class="details large-6 columns"><strong>Last pushed:</strong> {{project.pushed_at | timeDiff }}</p>
22+
<p class="link large-6 columns">View on github ></p>
23+
</div>
24+
</section>
25+
</a>

‎views/projects.html‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)