diff --git a/Brocfile.js b/Brocfile.js
index 3612f91ab39cb102ec0068f3daec191de4591e18..9b8ba9a7194d76e7dea90e8654e2d94fc3cbe941 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -22,6 +22,7 @@ var app = new EmberApp();
app.import('bower_components/cheet.js/cheet.min.js');
app.import('bower_components/pace/pace.min.js');
app.import('bower_components/datedropper/datedropper.min.js');
+app.import('bower_components/spin.js/spin.min.js');
app.import('vendor/boombox.js');
app.import('vendor/turntables.js');
diff --git a/app/controllers/channelfilter.js b/app/controllers/channelfilter.js
index 7eb6e892c33a18dc83409041839dc36dfcf854c5..db68e0c268c8e9bca71463fccfa1228ae46825c4 100644
--- a/app/controllers/channelfilter.js
+++ b/app/controllers/channelfilter.js
@@ -1,6 +1,9 @@
import Ember from 'ember';
var ChannelfilterController = Ember.Controller.extend({
+ sortProperties: ['quantity'],
+ sortAscending: true,
+
needs: 'tracks',
channelSelected: Ember.computed.alias('controllers.tracks.channel'),
});
diff --git a/app/controllers/tagfilter.js b/app/controllers/tagfilter.js
index aca46b32c1631783b3e814ce8d755888f3e3788e..df3869dec886ac00a5132b9ea2d779a39453be64 100644
--- a/app/controllers/tagfilter.js
+++ b/app/controllers/tagfilter.js
@@ -1,8 +1,8 @@
import Ember from 'ember';
var TagfilterController = Ember.ArrayController.extend({
- //sortProperties: ['quantity:desc'],
- //sortedModel: Ember.computed.sort("model", "sortProperties"),
+ sortProperties: ['quantity'],
+ sortAscending: true,
needs: 'tracks',
tagSelected: Ember.computed.alias('controllers.tracks.tag'),
diff --git a/app/controllers/tracks.js b/app/controllers/tracks.js
index 8ea7af55c588011aa6dea189bc07a8655a53db9f..51701b4de5b5139cd5dfb6529020ad721984f006 100644
--- a/app/controllers/tracks.js
+++ b/app/controllers/tracks.js
@@ -1,6 +1,9 @@
import Ember from 'ember';
var TracksController = Ember.Controller.extend({
+ sortProperties: ['quantity'],
+ sortAscending: true,
+
queryParams: ['tag','user','channel','date','page','design'],
tag: null,
date: '',
@@ -51,14 +54,6 @@ var TracksController = Ember.Controller.extend({
return (this.get('page') < this.get('totalPages'));
}.property('page', 'totalPages'),
- dotsBefore: function() {
- return (this.get('page') - 2 > 1);
- }.property('page'),
-
- dotsAfter: function() {
- return (this.get('page') + 2 < this.get('totalPages'));
- }.property('page','totalPages'),
-
pagesRange: function () {
var pagesList = Ember.A();
var minPage = Math.max(1, this.get('page') - 2);
diff --git a/app/controllers/userfilter.js b/app/controllers/userfilter.js
index 573adcf04b8aaf9bec7d0c6218cf850bdfb5fd71..39c036a671447fd51bf864bb36b057fad08a972c 100644
--- a/app/controllers/userfilter.js
+++ b/app/controllers/userfilter.js
@@ -1,6 +1,9 @@
import Ember from 'ember';
var UserfilterController = Ember.Controller.extend({
+ sortProperties: ['quantity'],
+ sortAscending: true,
+
needs: 'tracks',
userSelected: Ember.computed.alias('controllers.tracks.user'),
});
diff --git a/app/styles/app.sass b/app/styles/app.sass
index 1849d4fa2184790bac1558820abd0eafc95dcac3..a653a1cd020881fa74ddc37c0a1a7f404aae55b8 100644
--- a/app/styles/app.sass
+++ b/app/styles/app.sass
@@ -105,6 +105,7 @@ html
overflow: hidden
//text-overflow: ellipsis
white-space: nowrap
+ font-weight: 600
@media screen and (max-device-width: 640px), screen and (max-width: 800px)
@include span-columns(2.6)
//span
@@ -273,12 +274,11 @@ html
border-collapse: collapse//separate //collapse
border-spacing: 0
- tbody
- //background-color: $table-background
+ tbody
+ tr.active > td.track_name
+ font-weight: 600
tr:hover > td, tr.active > td
background-color: $table-hover-background
- //border-color: $standard_secondary_color
- //border-bottom: 1px solid $standard_secondary_color
color: $standard_secondary_color
//tr:last-child td
@@ -437,8 +437,8 @@ html
@include flex-grow(1)
@include flex-basis(200px)
-
- background: url('/assets/images/vinyl_prog.jpg')
+ //@include background-image(linear-gradient(rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.9)), url("/assets/images/vinyl_prog.jpg"))
+ background: black url(/assets/images/vinyl_prog_2.jpg)
background-size: cover
background-position: bottom
@@ -449,7 +449,7 @@ html
text-align: center
a
font-family: wire
- text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black
+ //text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black
@include filter(drop-shadow(1px 1px 1px rgba(0,0,0,0.9)))
font-size: 7em
font-weight: bold
@@ -459,7 +459,8 @@ html
margin-bottom: 1em
p
text-align: center
- font-size: 1em
+ font-size: 1.6em //1.5em
+ color: white //#bdc3c7
margin-bottom: 0.5em
@@ -507,6 +508,10 @@ html
min-width: 150px
color: black
+.loader
+ width: 100vw
+ height: 100vh
+
// -------------------------------------------------------------
// Design for pace plugin
@@ -541,7 +546,7 @@ html
// ---------------------------------------------------------------------------
// Cassette design
.cassette
- background-image: url("/assets/images/cassette/mixtable_bw.jpg")
+ background: url("/assets/images/cassette/mixtable_bw.jpg")
background-size: cover
background-position: center
height: 100vh
diff --git a/app/templates/about.hbs b/app/templates/about.hbs
index a738e5d16c5dd3a8630560eb78c2fbe49a693a44..6a45a0a84a82d55b4df50221a2b02a29d7f743b7 100644
--- a/app/templates/about.hbs
+++ b/app/templates/about.hbs
@@ -12,12 +12,12 @@
<a href="https://git.iiens.net/morignot2011/playbot/tree/master" class="flex-box">
<i class="icon fa fa-git"/>
<h1 class="flex-title">Playbot</h1>
- <p>Playbot is an irc tool designed to share music or videos. Users can give away youtube or soundcloud links : Playbot saves and manages them.</p>
+ <p>Playbot is a facebook and irc tool designed to share music or videos. Users can give away youtube or soundcloud links : Playbot saves and manages them.</p>
</a>
<a href="https://soundcloud.com/nightiies" class="flex-box">
<i class="icon fa fa-soundcloud"/>
<h1 class="flex-title">Nightiies</h1>
- <p>Nightiies regroups electro lovers (from dub to gabber) and DJs from ENSIIE, a french high school. Almost all the tracks shared here have been discovered through endless quest for quality and hipsterism.</p>
+ <p>Nightiies regroups electro lovers (from dub to schranz) and DJs. Almost all the tracks shared here have been discovered through endless quest for quality and hipsterism.</p>
</a>
<a href="https://github.com/Sybil/PlayBotAPI" class="flex-box">
diff --git a/app/templates/channels.hbs b/app/templates/channels.hbs
index 16f08331d22e341fb1d49d6f9dcba7ee74eebb19..55fbf69183674c9d361f058655c85ebfc6876bed 100644
--- a/app/templates/channels.hbs
+++ b/app/templates/channels.hbs
@@ -1,6 +1,6 @@
<div class="channels">
{{#each channel in controller}}
- {{#link-to 'tracks' (query-params channel=channel.model.name) tagName='div' style=channel.style class=channel.category title=channel.info}}
+ {{#link-to 'tracks' (query-params channel=channel.model.name page=1) tagName='div' style=channel.style class=channel.category title=channel.info}}
{{channel.model.name}}
{{/link-to}}
{{/each}}
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index ce3878003be1e628950e50953bbe74c3dc940c8d..4bbf261dc0444616310fcbf4998aaf64308b935f 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -1,6 +1,6 @@
<div class="presentation">
<div class="abstract">
{{#link-to 'tracks' }}NIGHTIIES{{/link-to}}
- <p>Welcome to PlayBot unofficial website. Listen to handpicked tracks.</p>
+ <p>Listen to electronic music, enjoy thousands of hipster's tracks.</p>
</div>
</div>
diff --git a/app/templates/loading.hbs b/app/templates/loading.hbs
new file mode 100644
index 0000000000000000000000000000000000000000..3764beb66ad58b496e714263e0d4340fc02f8e75
--- /dev/null
+++ b/app/templates/loading.hbs
@@ -0,0 +1,2 @@
+<div class="loader">
+</div>
diff --git a/app/templates/pagination.hbs b/app/templates/pagination.hbs
index 21b2eb7099507c097d5f36a950acab67126cbde4..6dfd4bfc8b815faaf4ccf406fe232164112207e0 100644
--- a/app/templates/pagination.hbs
+++ b/app/templates/pagination.hbs
@@ -1,13 +1,10 @@
<div class="pagination">
<ul>
{{#if notFirstPage}}
- <li class="page-prev">{{#link-to (query-params page=1)}}First{{/link-to}}</li>
- <li class="page-prev">{{#link-to (query-params page=prevPage)}}Previous{{/link-to}}</li>
+ <li class="page-prev">{{#link-to (query-params page=1)}}<i class="fa fa-angle-double-left"></i>{{/link-to}}</li>
+ <li class="page-prev">{{#link-to (query-params page=prevPage)}}<i class="fa fa-angle-left"></i>{{/link-to}}</li>
{{/if}}
<li>
- {{#if dotsBefore}}
- <li> ... </li>
- {{/if}}
<ul>
{{#each page in pagesRange}}
<li>{{#link-to (query-params page=page)}}{{page}}{{/link-to}}</li>
@@ -15,12 +12,9 @@
{{!-- <li><a class="current">{{currentPage}}</a></li> --}}
</ul>
</li>
- {{#if dotsAfter}}
- <li> ... </li>
- {{/if}}
{{#if notLastPage}}
- <li class="page-next">{{#link-to (query-params page=nextPage)}}Next{{/link-to}}</li>
- <li class="page-next">{{#link-to (query-params page=totalPages)}}Last ({{totalPages}}){{/link-to}}</li>
+ <li class="page-next">{{#link-to (query-params page=nextPage)}}<i class="fa fa-angle-right"></i>{{/link-to}}</li>
+ <li class="page-next">{{#link-to (query-params page=totalPages)}}{{totalPages}}{{/link-to}}</li>
{{/if}}
</ul>
</div>
diff --git a/app/templates/users.hbs b/app/templates/users.hbs
index 2283e6d00fd4de313bca8e044fda3ca881ba2afe..efb3d38a444402e273529a84ea6b2185d8bda47a 100644
--- a/app/templates/users.hbs
+++ b/app/templates/users.hbs
@@ -1,5 +1,5 @@
<div class="users">
{{#each user in controller}} {{!itemController='user'}}
- {{#link-to 'tracks' (query-params user=user.model.name) tagName='div' title=user.info style=user.style class=user.category}} {{user.model.name}} {{/link-to}}
+ {{#link-to 'tracks' (query-params user=user.model.name page=1) tagName='div' title=user.info style=user.style class=user.category}} {{user.model.name}} {{/link-to}}
{{/each}}
</div>
diff --git a/app/views/application.js b/app/views/application.js
index cefd6a7d588f23940c1c333240e73bd98c303120..2f6c37b3562c2ebb9b59f21a651914f63b4df473 100644
--- a/app/views/application.js
+++ b/app/views/application.js
@@ -2,7 +2,9 @@ import Ember from 'ember';
var ApplicationView = Ember.View.extend({
didInsertElement: function() {
- $('body').removeClass('preload');
+ $(window).load(function() {
+ $('body').removeClass('preload');
+ });
}
});
diff --git a/app/views/loading.js b/app/views/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..20b750ac82324b0831b906519b69780bb137caaa
--- /dev/null
+++ b/app/views/loading.js
@@ -0,0 +1,10 @@
+import Ember from 'ember';
+
+var LoadingView = Ember.View.extend({
+ didInsertElement: function() {
+ var target = document.getElementsByClassName('loader');
+ new Spinner().spin(target[0]);
+ }
+});
+
+export default LoadingView;
diff --git a/bower.json b/bower.json
index ae8a8cebb1d92f42ff6c0c4468f2a489fcc69b90..f322c9a406f731dcde6704d2a0874fbb90bba9ba 100644
--- a/bower.json
+++ b/bower.json
@@ -17,6 +17,7 @@
"datedropper": "*",
"pace": "~1.0.2",
"cheet.js": "~0.3.3",
- "normalize.css": "~3.0.3"
+ "normalize.css": "~3.0.3",
+ "spin.js": "~2.3.1"
}
}
diff --git a/public/assets/images/vinyl_prog_2.jpg b/public/assets/images/vinyl_prog_2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d020e02a90c0f9d42bfdeaffcb1a01a32118117d
Binary files /dev/null and b/public/assets/images/vinyl_prog_2.jpg differ