fergalmoran/dss.web
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.web.git synced 2026-02-15 12:34:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Fergal Moran
2015-12-18 19:52:45 +00:00
parent e4978d7c5a b331beb407
commit bdb1eee9c8
14 changed files with 86 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bower.json
View File

@@ -5,10 +5,10 @@
"SoundManager2": "soundmanager#*",
"angular": "~1.4.3",
"angular-animate": "*",
"angular-bootstrap": "~0.13.3",
"angular-bootstrap": "~0.14.3",
"angular-cookies": ">=1.2.*",
"angular-deferred-bootstrap": "~0.1.7",
"angular-dialog-service": "~5.2.6",
"angular-dialog-service": "~5.2.8",
"angular-jwt": "~0.0.9",
"angular-loading-bar": "~0.8.0",
"angular-mocks": "~1.4.5",
@@ -44,8 +44,8 @@
"angular-scenario": ">=1.2.*"
},
"resolutions": {
"angular": "~1.4.3",
"angular-bootstrap": "~0.13.3",
"js-data-angular": "~3.1.0"
"js-data-angular": "~3.1.0",
"angular-bootstrap": "~0.14.3",
"angular": "1.4.8"
}
}

5
client/app/app.less
View File

@@ -79,8 +79,3 @@
width: 32px;
height: 32px;
}
ul.dropdown-menu{
left: -112px!important;
width: 480px!important;
}

49
client/app/components/navbar/navbar.html
View File

@@ -20,23 +20,22 @@
</a>
</li>
</ul>
<div class="col-sm-3 col-md-3">
<div class="col-sm-6 col-md-6">
<form class="navbar-form" role="search">
<div class="input-group">
<input type="text" ng-model="selected" placeholder="Search..."
typeahead="result for results in getSearchResults($viewValue)"
uib-typeahead="result for results in getSearchResults($viewValue)"
typeahead-template-url="app/views/templates/searchResult.html"
typeahead-loading="loadingSearchResults"
class="form-control"/>
class="form-control navbar-search"/>
<div class="input-group-btn">
<button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i>
<button class="btn btn-default" type="submit"><i class="fa fa-search"></i>
</button>
</div>
</div>
</form>
</div>
<ul class="nav navbar-nav navbar-right">
<!--
<li id="navbar-notification-dropdown" class="dropdown" ng-if="$root.currentUser">
<a href="#" class="dropdown-toggle " data-toggle="dropdown" id="notifications-button">
<i class="fa fa-envelope"></i>
@@ -46,42 +45,13 @@
<dss-notifications/>
</ul>
</li>
-->
<li id="LI_1" id="navbar-notification-dropdown" class="dropdown" ng-if="$root.currentUser">
<a href="#" class="dropdown-toggle " data-toggle="dropdown" id="notifications-button">
<i class="fa fa-envelope"></i>
<span class="label label-lightred notification-label">{{notificationCount}}</span>
</a>
<ul id="UL_5" class="dropdown-menu message-ul">
<li id="LI_6">
<span id="SPAN_7">You have 9 messages</span>
</li>
<li id="LI_8">
<a href="index.html#" id="A_9"> <span id="SPAN_10"><img src="assets/img/avatar.jpg" alt="Avatar" id="IMG_11" /></span> <span id="SPAN_12"> <span id="SPAN_13">Łukasz Holeczek</span> <span id="SPAN_14">6 min</span></span> <span id="SPAN_15">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
</li>
<li id="LI_16">
<a href="index.html#" id="A_17"> <span id="SPAN_18"><img src="assets/img/avatar2.jpg" alt="Avatar" id="IMG_19" /></span> <span id="SPAN_20"> <span id="SPAN_21">Megan Abott</span> <span id="SPAN_22">56 min</span></span> <span id="SPAN_23">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
</li>
<li id="LI_24">
<a href="index.html#" id="A_25"> <span id="SPAN_26"><img src="assets/img/avatar3.jpg" alt="Avatar" id="IMG_27" /></span> <span id="SPAN_28"> <span id="SPAN_29">Kate Ross</span> <span id="SPAN_30">3 hours</span></span> <span id="SPAN_31">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
</li>
<li id="LI_32">
<a href="index.html#" id="A_33"> <span id="SPAN_34"><img src="assets/img/avatar4.jpg" alt="Avatar" id="IMG_35" /></span> <span id="SPAN_36"> <span id="SPAN_37">Julie Blank</span> <span id="SPAN_38">yesterday</span></span> <span id="SPAN_39">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
</li>
<li id="LI_40">
<a href="index.html#" id="A_41"> <span id="SPAN_42"><img src="assets/img/avatar5.jpg" alt="Avatar" id="IMG_43" /></span> <span id="SPAN_44"> <span id="SPAN_45">Jane Sanders</span> <span id="SPAN_46">Jul 25, 2012</span></span> <span id="SPAN_47">Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore</span></a>
</li>
<li id="LI_48">
<a id="A_49">View all messages</a>
</li>
</ul>
</li>
<li id="navbar-profile-dropdown" class="dropdown" ng-if="$root.currentUser">
<a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{ $root.currentUser.display_name }}
<a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{
$root.currentUser.display_name }}
<b class="caret"></b>
<img class="navbar-profile-image img-circle" ng-src="{{$root.currentUser.profile_image_small}}" alt="">
<img class="navbar-profile-image img-circle" ng-src="{{$root.currentUser.profile_image_small}}"
alt="">
</a>
<ul class="dropdown-menu">
<li>
@@ -113,7 +83,8 @@
class="fa fa-twitter"></i> Twitter</a>
</li>
<li>
<a ng-click="doLogin('google')" class="btn btn-google"><i class="fa fa-google"></i>
<a ng-click="doLogin('google')" class="btn btn-google"><i
class="fa fa-google"></i>
Google</a>
</li>
</ul>

351
client/app/components/navbar/navbar.less
View File

@@ -52,11 +52,12 @@ nav > div.collapse.navbar-collapse > ul > li > a {
.notification-label {
position: absolute !important;
top: 5px !important;;
font-size: 11px !important;;
font-weight: 400 !important;;
padding: 0 3px !important;;
line-height: 14px !important;;
top: 5px !important;
left: 22px !important;
font-size: 11px !important;
font-weight: 400 !important;
padding: 0 3px !important;
line-height: 14px !important;
}
#notifications-button {
@@ -68,342 +69,10 @@ nav > div.collapse.navbar-collapse > ul > li > a {
position: relative;
}
#notifications-button i{
#notifications-button i {
font-size: 18px;
}
#LI_1 {
box-sizing: border-box;
color: rgb(255, 255, 255);
display: block;
float: left;
height: 40px;
position: relative;
width: 46px;
perspective-origin: 23px 20px;
transform-origin: 23px 20px;
border: 0px none rgb(255, 255, 255);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(255, 255, 255) none 0px;
}
/*#LI_1*/
#A_2 {
box-sizing: border-box;
color: rgb(255, 255, 255);
cursor: pointer;
display: inline-block;
height: 30px;
position: relative;
text-align: center;
text-decoration: none;
vertical-align: middle;
white-space: nowrap;
width: 40px;
perspective-origin: 20px 15px;
transform-origin: 20px 15px;
background: rgb(64, 69, 74) none repeat scroll 0% 0% / auto padding-box border-box;
border: 0px none rgb(255, 255, 255);
border-radius: 2px 2px 2px 2px;
font: normal normal normal normal 12px / 20px Lato, sans-serif;
list-style: none outside none;
margin: 5px 3px;
outline: rgb(255, 255, 255) none 0px;
padding: 5px 0px;
}
/*#A_2*/
#I_3 {
box-sizing: border-box;
color: rgb(255, 255, 255);
cursor: pointer;
display: inline-block;
height: 12px;
text-align: center;
white-space: nowrap;
width: 12.0156px;
perspective-origin: 6px 6px;
transform-origin: 6px 6px;
border: 0px none rgb(255, 255, 255);
font: normal normal normal normal 12px / 12px FontAwesome;
list-style: none outside none;
margin: 2px 0px 0px;
outline: rgb(255, 255, 255) none 0px;
}
/*#I_3*/
#I_3:before {
box-sizing: border-box;
color: rgb(255, 255, 255);
content: '""';
cursor: pointer;
text-align: center;
white-space: nowrap;
border: 0px none rgb(255, 255, 255);
font: normal normal normal normal 12px / 12px FontAwesome;
list-style: none outside none;
outline: rgb(255, 255, 255) none 0px;
}
/*#I_3:before*/
#SPAN_4 {
box-sizing: border-box;
color: rgb(255, 255, 255);
cursor: pointer;
display: block;
height: 20px;
position: absolute;
right: 3px;
text-align: center;
top: -3px;
white-space: nowrap;
width: 4.64062px;
perspective-origin: 2.3125px 10px;
transform-origin: 2.3125px 10px;
border: 0px none rgb(255, 255, 255);
font: normal normal normal normal 8px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(255, 255, 255) none 0px;
}
/*#SPAN_4*/
#UL_5 {
box-sizing: border-box;
color: rgb(255, 255, 255);
display: none;
float: left;
height: auto;
left: 0px;
max-width: 300px;
min-width: 166px;
position: absolute;
text-align: left;
top: 90%;
width: auto;
z-index: 1000;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
background: rgb(255, 255, 255) none repeat scroll 0% 0% / auto padding-box border-box;
border: 1px solid rgb(219, 222, 224);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
margin: 0px;
outline: rgb(255, 255, 255) none 0px;
padding: 0px;
}
/*#UL_5*/
#LI_6, #LI_8, #LI_16, #LI_24, #LI_32, #LI_40 {
box-sizing: border-box;
color: rgb(255, 255, 255);
height: auto;
min-width: 260px;
width: auto;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
border-top: 0px none rgb(255, 255, 255);
border-right: 0px none rgb(255, 255, 255);
border-bottom: 1px solid rgb(233, 235, 236);
border-left: 0px none rgb(255, 255, 255);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(255, 255, 255) none 0px;
}
/*#LI_6, #LI_8, #LI_16, #LI_24, #LI_32, #LI_40*/
#SPAN_7 {
box-sizing: border-box;
color: rgb(52, 56, 60);
display: block;
text-align: left;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
background: rgb(233, 235, 236) none repeat scroll 0% 0% / auto padding-box border-box;
border: 0px none rgb(52, 56, 60);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
padding: 5px 10px;
}
/*#SPAN_7*/
#A_9, #A_17, #A_25, #A_33, #A_41 {
background-position: 0px 0px;
box-sizing: border-box;
clear: both;
color: rgb(52, 56, 60);
cursor: pointer;
display: block;
text-align: left;
text-decoration: none;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
background: rgba(0, 0, 0, 0) none repeat scroll 0px 0px / auto padding-box border-box;
border: 0px none rgb(52, 56, 60);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
padding: 5px 10px;
}
/*#A_9, #A_17, #A_25, #A_33, #A_41*/
#SPAN_10, #SPAN_18, #SPAN_26, #SPAN_34, #SPAN_42 {
box-sizing: border-box;
color: rgb(52, 56, 60);
cursor: pointer;
text-align: left;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
border: 0px none rgb(52, 56, 60);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
}
/*#SPAN_10, #SPAN_18, #SPAN_26, #SPAN_34, #SPAN_42*/
#IMG_11, #IMG_19, #IMG_27, #IMG_35, #IMG_43 {
box-sizing: border-box;
color: rgb(52, 56, 60);
cursor: pointer;
display: block;
float: left;
height: 40px;
text-align: left;
vertical-align: middle;
width: 40px;
border: 0px none rgb(52, 56, 60);
border-radius: 2px 2px 2px 2px;
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
margin: 5px 10px 0px 0px;
outline: rgb(52, 56, 60) none 0px;
}
/*#IMG_11, #IMG_19, #IMG_27, #IMG_35, #IMG_43*/
#SPAN_12, #SPAN_20, #SPAN_28, #SPAN_36, #SPAN_44 {
box-sizing: border-box;
color: rgb(52, 56, 60);
cursor: pointer;
display: block;
text-align: left;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
border: 0px none rgb(52, 56, 60);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
}
/*#SPAN_12, #SPAN_20, #SPAN_28, #SPAN_36, #SPAN_44*/
#SPAN_13, #SPAN_21, #SPAN_29, #SPAN_37, #SPAN_45 {
box-sizing: border-box;
color: rgb(52, 56, 60);
cursor: pointer;
text-align: left;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
border: 0px none rgb(52, 56, 60);
font: normal normal bold normal 12px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
}
/*#SPAN_13, #SPAN_21, #SPAN_29, #SPAN_37, #SPAN_45*/
#SPAN_14, #SPAN_22, #SPAN_30, #SPAN_38, #SPAN_46 {
box-sizing: border-box;
color: rgb(52, 56, 60);
cursor: pointer;
display: block;
position: absolute;
right: 5px;
text-align: left;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
border: 0px none rgb(52, 56, 60);
font: italic normal bold normal 11px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
}
/*#SPAN_14, #SPAN_22, #SPAN_30, #SPAN_38, #SPAN_46*/
#SPAN_15, #SPAN_23, #SPAN_39 {
box-sizing: border-box;
color: rgb(52, 56, 60);
cursor: pointer;
text-align: left;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
border: 0px none rgb(52, 56, 60);
font: normal normal normal normal 11px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
}
/*#SPAN_15, #SPAN_23, #SPAN_39*/
#SPAN_31, #SPAN_47 {
box-sizing: border-box;
color: rgb(52, 56, 60);
cursor: pointer;
text-align: left;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
border: 0px none rgb(52, 56, 60);
font: normal normal normal normal 11px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
}
/*#SPAN_31, #SPAN_47*/
#LI_48 {
box-sizing: border-box;
color: rgb(255, 255, 255);
height: auto;
min-width: 260px;
width: auto;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
border: 0px none rgb(255, 255, 255);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(255, 255, 255) none 0px;
}
/*#LI_48*/
#A_49 {
box-sizing: border-box;
clear: both;
color: rgb(52, 56, 60);
cursor: pointer;
display: block;
text-align: center;
text-decoration: none;
perspective-origin: 50% 50%;
transform-origin: 50% 50%;
background: rgb(233, 235, 236) none repeat scroll 0% 0% / auto padding-box border-box;
border: 0px none rgb(52, 56, 60);
font: normal normal normal normal 14px / 20px Lato, sans-serif;
list-style: none outside none;
outline: rgb(52, 56, 60) none 0px;
padding: 5px 10px;
}
/*#A_49*/
.navbar-search {
width: 412px;
}

24
client/app/directives/audio/audio.player.directive.js
View File

@@ -95,18 +95,24 @@ angular.module('dssWebApp')
case PLAYSTATES.stopped:
default:
AudioService.stop();
$scope.mix.getStreamUrl().then(function (response) {
AudioService.play($scope.mix, response.data.url).then(function () {
$scope.playingId = $scope.mix.slug;
_addListeners($scope, AUDIO_EVENTS, PLAYSTATES);
var d = soundManager.createSound({
url: 'https://dsscdn2.blob.core.windows.net/assets/fuckyouchrome.mp3',
onfinish: function () {
$scope.mix.getStreamUrl().then(function (response) {
AudioService.play($scope.mix, response.data.url).then(function () {
$scope.playingId = $scope.mix.slug;
_addListeners($scope, AUDIO_EVENTS, PLAYSTATES);
$scope.mix.addPlay($rootScope.currentUser ? $rootScope.currentUser.slug : '')
.then(function (response) {
$scope.mix.plays.push(response);
$scope.mix.addPlay($rootScope.currentUser ? $rootScope.currentUser.slug : '')
.then(function (response) {
$scope.mix.plays.push(response);
});
});
});
$scope.playState = 1;
$scope.playState = 1;
});
}
});
d.play();
break;
}
};

19
client/app/directives/audio/audio.player.html
View File

@@ -43,13 +43,10 @@
{{mix.user.display_name}}
</a>
<a href="#" ng-click="toggleFollow()" ng-show="currentUser"
tooltip="tooltip" data-toggle="tooltip"
title="{{mix.user.is_following ? 'Unfollow' : 'Follow'}} {{mix.user.display_name}}"
data-placement="top">
uib-tooltip="{{mix.user.is_following ? 'Unfollow' : 'Follow'}} {{mix.user.display_name}}">
<i class="fa fa-user-plus"
ng-class="mix.user.is_following ? 'text-danger' : 'text-success'"></i>
</a>
<div class="meta-artist"><span class="the-name ng-binding">{{mix.title}}</span></div>
</div>
</div>
@@ -75,7 +72,7 @@
<div class="btn-group btn-group-xs hidden-xs block-options">
<ul class="list-nostyle list-horiz">
<li title="{{ mix.plays.length }} Plays" class="stats-item bordered-right">
<span tooltip="tooltip" data-toggle="tooltip" title="Plays"
<span uib-tooltip="Plays"
class="btn btn-alt btn-sm btn-default non-url-button">
<i class="fa fa-play-circle"></i>
{{ mix.plays.length }}
@@ -83,16 +80,16 @@
</li>
<li title="{{ mix.downloads.length }} Downloads" class="stats-item bordered-right">
<span ng-show="$root.currentUser">
<button ng-show="mix.is_downloadable" ng-click="downloadFile()" tooltip="tooltip"
data-toggle="tooltip" title="Download"
<button ng-show="mix.is_downloadable" ng-click="downloadFile()"
uib-tooltip="Download"
class="btn btn-alt btn-sm btn-default">
<i class="fa fa-download"></i>
{{ mix.downloads.length }}
</button>
</span>
<span ng-show="!$root.currentUser">
<span ng-show="mix.is_downloadable" tooltip="tooltip" data-toggle="tooltip"
ng-click="login()" title="Login to download" class="btn btn-alt btn-sm btn-default">
<span ng-show="mix.is_downloadable" uib-tooltip="Login to download"
ng-click="login()" class="btn btn-alt btn-sm btn-default">
<i class="fa fa-download"></i>
{{ mix.downloads.length }}
</span>
@@ -102,9 +99,7 @@
class="stats-item bordered-right">
<a ng-click="toggleLike()"
ng-class="mix.is_liked ? 'btn-danger' : 'btn-success'"
tooltip="tooltip" data-toggle="tooltip"
ng-attr-title="{{mix.is_liked ? 'Unlike' : 'Like'}}"
data-placement="top"
uib-tooltip="{{mix.is_liked ? 'Unlike' : 'Like'}}"
class="btn btn-alt btn-sm btn-default"><i
class="fa fa-heart"></i>{{ mix.likes.length }}
</a>

14
client/app/directives/notifications/notifications.less
View File

@@ -4,5 +4,17 @@
}
.notification-new {
font-weight: bold!important;
font-weight: bold !important;
}
.notification-details-profile-image {
float: left;
width: 40px;
}
.notification-details {
margin-left: 10px;
padding-left: 15px;
max-width: 210px;
overflow: hidden;
}

2
client/app/services/audio/audio.service.js
View File

@@ -17,7 +17,7 @@ angular.module('dssWebApp')
});
function _getStoredVolume() {
return Math.round(localStorage.getItem(AUDIO_CONSTANTS.volume) || 50);
return Math.round(localStorage.getItem(AUDIO_CONSTANTS.volume) || 50);
}
function _setStoredVolume(volume) {

7
client/app/views/mixes/mixes.directive.html
View File

@@ -29,18 +29,17 @@
<div class="row">
<div class="btn-group mix-tools" role="group" aria-label="Default button group">
<button ng-click="shareFacebook()" type="button" class="btn"
title="Share to facebook" data-toggle="tooltip">
uib-tooltip="Share to facebook">
<i class="fa fa-2x fa-facebook-square"></i></button>
<button ng-click="shareTwitter()" type="button" class="btn"
title="Share to twitter" data-toggle="tooltip">
uib-tooltip="Share to twitter">
<i class="fa fa-2x fa-twitter-square"></i></button>
<!--
<button type="button" class="btn" title="Add to" data-toggle="tooltip">
<i class="glyphicon glyphicon-plus"></i></button>
-->
<button ng-click="toggleLike()" type="button" class="btn"
tooltip="tooltip" data-toggle="tooltip"
ng-attr-title="{{mix.is_liked ? 'Unlike' : 'Like'}}">
uib-tooltip="{{mix.is_liked ? 'Unlike' : 'Like'}}">
<i class="fa fa-2x"
ng-class="mix.is_liked ? 'fa-heart' : 'fa-heart-o'"
ng-style="{'color': mix.is_liked ? 'red' : ''}">

21
client/app/views/mixes/mixes.directive.js
View File

@@ -31,12 +31,23 @@ angular.module('dssWebApp')
break;
case PLAYSTATES.stopped:
default:
AudioService.stop();
AudioService.play(mix).then(function () {
$scope.playingId = mix.slug;
_addListeners($scope, AUDIO_EVENTS, PLAYSTATES);
var d = soundManager.creindeateSound({
url: 'https://dsscdn2.blob.core.windows.net/assets/fuckyouchrome.mp3',
onfinish: function () {
$scope.mix.getStreamUrl().then(function (response) {
AudioService.play($scope.mix, response.data.url).then(function () {
$scope.playingId = $scope.mix.slug;
_addListeners($scope, AUDIO_EVENTS, PLAYSTATES);
$scope.mix.addPlay($rootScope.currentUser ? $rootScope.currentUser.slug : '')
.then(function (response) {
$scope.mix.plays.push(response);
});
});
$scope.playState = 1;
});
}
});
$scope.playState = 1;
d.play();
break;
}
event.stopPropagation();

2
client/app/views/mixes/upload/upload.controller.js
View File

@@ -105,7 +105,7 @@ angular.module('dssWebApp')
$scope.mix = result;
$timeout(function () {
$scope.waveformFooter = "Waveform processing is taking longer than expected.<br />" +
"Your mix should be available <a href='/mix/" + $scope.mix.slug + "'>Here</a>";
"Your mix should be available <a ui-sref='root.user.mix({user: currentUser.slug, mix: mix.slug})'>Here</a>";
$scope.$apply();
}, 120000);

2
client/app/views/templates/searchResult.html
View File

@@ -1,4 +1,4 @@
<a ui-sref="root.user.mix({user: match.model.user, mix: match.model.slug})">
<a ui-sref="root.user.mix({user: match.model.user, mix: match.model.slug})" class="navbar-search main-search-result">
<div class="widget">
<div class="widget-simple">
<div href="javascript:void(0)" class="widget-icon pull-left animation-fadeIn themed-background">

BIN
client/assets/fuckyouchrome.mp3 Normal file
View File

Binary file not shown.

6
client/index.html
View File

@@ -45,6 +45,7 @@
<!-- endbuild -->
</head>
<body class="theme-lightgrey" data-theme="theme-lightgrey" ng-controller="MainCtrl">
<div id="navigation" ui-view="navbar">
</div>
<div id="main">
@@ -58,10 +59,9 @@
style="position: fixed; bottom: 0px; top: auto;">
</div>
<div id="spoon-plugin-kncgbdglledmjmpnikebkagnchfdehbm-2" style="display:none"></div>
</body>
<script src="//connect.facebook.net/en_US/sdk.js"></script>
<!--[if lt IE 9]>
<script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/json3/lib/json3.min.js"></script>
@@ -77,7 +77,9 @@
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-translate/angular-translate.js"></script>
<script src="bower_components/angular-dialog-service/dist/dialogs.min.js"></script>
<script src="bower_components/angular-dialog-service/dist/dialogs.js"></script>
<script src="bower_components/angular-dialog-service/dist/dialogs-default-translations.min.js"></script>
<script src="bower_components/angular-dialog-service/dist/dialogs-default-translations.js"></script>
<script src="bower_components/angular-jwt/dist/angular-jwt.js"></script>
<script src="bower_components/angular-loading-bar/build/loading-bar.js"></script>
<script src="bower_components/angular-mocks/angular-mocks.js"></script>