diff --git a/app/controllers/controllers.js b/app/controllers/controllers.js index 8e42301..ea2d8ff 100644 --- a/app/controllers/controllers.js +++ b/app/controllers/controllers.js @@ -1,7 +1,7 @@ var app = angular.module('janu'); -app.controller('januController', ['$scope','$http','$interval', function ($scope,$http,$interval){ +app.controller('januController', ['$scope','$http','$interval','$location', function ($scope,$http,$interval,$location){ var janu = $scope; @@ -212,6 +212,9 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope $('#album-cover').removeClass('correct'); $('#album-cover').removeClass('wrong'); $("#song-details").hide(); + if($scope.timelineSongs.length===10){ + $location.path('/win'); + } newSong = fetchNewSong(); playSong(newSong); $scope.markerSet = false; diff --git a/app/partials/end.html b/app/partials/end.html index 2ebdeab..33e1ceb 100644 --- a/app/partials/end.html +++ b/app/partials/end.html @@ -1 +1 @@ -

Game over

\ No newline at end of file +

Game over

diff --git a/app/partials/game.html b/app/partials/game.html index 85af09e..cb6c3c5 100644 --- a/app/partials/game.html +++ b/app/partials/game.html @@ -33,5 +33,9 @@

Which timespan?

COMBO

{{comboplyer}}

+
+

Game Over

+

Your score was: {{score.total}}

+
diff --git a/content/image/main-2.psd b/content/image/main-2.psd deleted file mode 100644 index 6c75665..0000000 Binary files a/content/image/main-2.psd and /dev/null differ diff --git a/content/image/splash-screen.psd b/content/image/splash-screen.psd deleted file mode 100644 index 51ba0b8..0000000 Binary files a/content/image/splash-screen.psd and /dev/null differ diff --git a/content/image/winning-screen.psd b/content/image/winning-screen.psd deleted file mode 100644 index 1f9b808..0000000 Binary files a/content/image/winning-screen.psd and /dev/null differ diff --git a/content/style.css b/content/style.css index 88703e1..bd3ebd5 100644 --- a/content/style.css +++ b/content/style.css @@ -425,3 +425,15 @@ button { 0% { color: #eee;} 100% { color: #c66;} } +#ending-screen{ + background-color: #eee; + border-radius: 10px; + position: fixed; + top:0; + width:80%; + height:80%; + margin: 10% 10%; +} +.hidden-element{ + display: none; +} diff --git a/index.html b/index.html index 60b0938..e6a8b99 100644 --- a/index.html +++ b/index.html @@ -9,9 +9,9 @@ - + - +