首页 发现 帮助
登录
tati
/
Autismify
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

creo servicios de audio y artists

Tati 11 年之前
父节点
d0f89f1eb2
当前提交
183472f170
共有 8 个文件被更改，包括 62 次插入 和 34 次删除
分列视图 显示文件统计
  1. 6 23
      frontend/app.js
  2. 二进制
      frontend/img/default_cover.png
  3. 5 0
      frontend/index.html
  4. 2 5
      frontend/modules/artists/artistListCtrl.js
  5. 14 3
      frontend/modules/artists/artists.html
  6. 10 0
      frontend/modules/artists/artistsService.js
  7. 22 0
      frontend/modules/player/audioService.js
  8. 3 3
      frontend/modules/player/playerCtrl.js

+ 6 - 23
frontend/app.js
查看文件 

@@ -9,7 +9,12 @@ app.config(['$routeProvider', '$locationProvider', function ($routeProvider, $lo
 
 	})
 
 	.when('/artists', {
 
 		templateUrl: 'modules/artists/artists.html',
 
-		controller: 'artistListCtrl'
 
+		controller: 'artistListCtrl',
 
+		resolve: {
 
+			artists: function(ArtistsService){
 
+				return ArtistsService.getAllArtists();
 
+			}
 
+		}
 
 	})
 
 	.when('/albums', {
 
 		templateUrl: 'modules/albums/albums.html',
 
@@ -20,25 +25,3 @@ app.config(['$routeProvider', '$locationProvider', function ($routeProvider, $lo
 
 	});
 
 }]);
 
 
-app.factory('audioService', function(){
 
-	var state;
 
-	var audio = new Audio();
 
-	audio.preload='auto';
 
-
 
-	return {
 
-		load: function(song) {
 
-			//var url = 'https://autismify.davidventura.com.ar/back/song/16452';
 
-			audio.addEventListener('canplaythrough',function() {
 
-				audio.play();
 
-			});
 
-			audio.src='https://autismify.davidventura.com.ar/back/song/'+song;
 
-			audio.load();
 
-		},
 
-		play: function(){
 
-			audio.play();
 
-		},
 
-		stop: function(){
 
-			audio.pause();
 
-		}
 
-	}
 
-});

二进制
frontend/img/default_cover.png
查看文件


+ 5 - 0
frontend/index.html
查看文件 

@@ -23,6 +23,11 @@
 
 		<script type="text/javascript" src="/modules/artists/artistListCtrl.js"></script>
 
 		<script type="text/javascript" src="/modules/albums/albumListCtrl.js"></script>
 
 		<script type="text/javascript" src="/modules/player/playerCtrl.js"></script>
 
+
 
+		<!--Services-->
 
+		<script type="text/javascript" src="/modules/artists/artistsService.js"></script>
 
+		<script type="text/javascript" src="/modules/player/audioService.js"></script>
 
+
 
 	</head>
 
 
 	<body>

+ 2 - 5
frontend/modules/artists/artistListCtrl.js
查看文件 

@@ -1,9 +1,6 @@
 
-app.controller('artistListCtrl', function($scope, $http, audioService){
 
+app.controller('artistListCtrl', function($scope, $http, AudioService, artists){
 
 	$scope.artists=[];
 
-	$http.get('https://autismify.davidventura.com.ar/back/artists/').success(function(data){
 
-		$scope.artists=data;
 
-		audioService.load(16666);
 
-	});
 
+	
 
 });

+ 14 - 3
frontend/modules/artists/artists.html
查看文件 

@@ -1,3 +1,14 @@
 
-<div ng-repeat="a in artists ">
 
-	{{a.artist}}
 
-</div>
 
+<div class="" ng-repeat="artist in artists">
 
+	<h3>{{artist.artist}}</h3>
 
+	<!-- <div class="media">
 
+		<div class="media-left">
 
+			<a href="#">
 
+				<img class="media-object" src="../../img/default_cover.png">
 
+			</a>
 
+		</div>
 
+		<div class="media-body">
 
+			<h4 class="media-heading">Album 1</h4>
 
+				...
 
+		</div>
 
+	</div> -->
 
+</div>

+ 10 - 0
frontend/modules/artists/artistsService.js
查看文件 

@@ -0,0 +1,10 @@
 
+app.factory("ArtistsService", function($http){
 
+    return {
 
+        getAllArtists: function(){
 
+            return $http.get('https://autismify.davidventura.com.ar/back/artists/')
 
+				.then(function(response){
 
+					return response.data;
 
+				});
 
+        }
 
+    };
 
+});

+ 22 - 0
frontend/modules/player/audioService.js
查看文件 

@@ -0,0 +1,22 @@
 
+app.factory('AudioService', function(){
 
+	var state;
 
+	var audio = new Audio();
 
+	audio.preload='auto';
 
+
 
+	return {
 
+		load: function(song) {
 
+			//var url = 'https://autismify.davidventura.com.ar/back/song/16452';
 
+			audio.addEventListener('canplaythrough',function() {
 
+				audio.play();
 
+			});
 
+			audio.src='https://autismify.davidventura.com.ar/back/song/'+song;
 
+			audio.load();
 
+		},
 
+		play: function(){
 
+			audio.play();
 
+		},
 
+		stop: function(){
 
+			audio.pause();
 
+		}
 
+	}
 
+});

+ 3 - 3
frontend/modules/player/playerCtrl.js
查看文件 

@@ -1,10 +1,10 @@
 
-app.controller('playerCtrl', function($scope, audioService){
 
+app.controller('playerCtrl', function($scope, AudioService){
 
 	$scope.playSong = function(){
 
-		audioService.load(16666);
 
+		AudioService.load(16666);
 
 	}
 
 
 	$scope.stopSong = function(){
 
-		audioService.stop();
 
+		AudioService.stop();
 
 	}
 
 });