David 10 роки тому
батько
коміт
ddffd2d9aa
5 змінених файлів з 46 додано та 2 видалено
  1. 2 2
      back/web.py
  2. 4 0
      front/app.js
  3. 10 0
      front/controllers/uploadListCtrl.js
  4. 6 0
      front/index.html
  5. 24 0
      front/views/uploadList.html

+ 2 - 2
back/web.py

@@ -15,8 +15,8 @@ d=db()
 def index():
     return "Hello world"
 
-@app.route(BASE_PATH + '/list/yt/')
-@app.route(BASE_PATH + '/list/yt')
+@app.route(BASE_PATH + '/list/uploaded/')
+@app.route(BASE_PATH + '/list/uploaded')
 def uploaded_list():
     ret={'list': d.uploaded()}
     return jsonify(ret)

+ 4 - 0
front/app.js

@@ -15,6 +15,10 @@ app.config(['$routeProvider', '$locationProvider', function ($routeProvider, $lo
 		templateUrl: 'views/processed.html',
 		controller: 'processedCtrl'
 	})
+	.when('/uploaded', {
+		templateUrl: 'views/uploadList.html',
+		controller: 'uploadListCtrl'
+	})
 	.when('/cut/:id', {
 		templateUrl: 'views/cut.html',
 		controller: 'cutCtrl',

+ 10 - 0
front/controllers/uploadListCtrl.js

@@ -0,0 +1,10 @@
+app.controller('uploadListCtrl', ['$scope', '$http', function ($scope, $http) {
+	$scope.update = function() {
+		$http.get('back/list/uploaded').success(function(data) {
+	   		$scope.videolist = data.list;
+		});
+	};
+
+	$scope.update();
+
+}]);

+ 6 - 0
front/index.html

@@ -19,6 +19,7 @@
 	<script type="text/javascript" src="/controllers/jobsCtrl.js"></script>
 	<script type="text/javascript" src="/controllers/cutCtrl.js"></script>
 	<script type="text/javascript" src="/controllers/uploadCtrl.js"></script>
+	<script type="text/javascript" src="/controllers/uploadListCtrl.js"></script>
     <base href="/" />
 </head>
 <body>
@@ -40,6 +41,11 @@
 					Cortados
 				</a>
 			</li>
+			<li>
+				<a href="/uploaded" ng-class="{'active-tab':activeTab==='uploaded'}" ng-click="changeTab('uploaded')">
+					Subidos
+				</a>
+			</li>
 			<li>
 				<a href="/jobs" ng-class="{'active-tab':activeTab==='jobs'}" ng-click="changeTab('jobs')">
 					Estado

+ 24 - 0
front/views/uploadList.html

@@ -0,0 +1,24 @@
+<div>
+<table class="table table-striped">
+	<tr>
+		<th>Inicio</th>
+		<th>Fin</th>
+		<th>Archivo</th>
+		<th>Link</th>
+	</tr>
+	<tr ng-repeat="v in videolist">
+		<td>
+			{{v.enqueued_at}}
+		</td>
+		<td>
+			{{v.finished_at}}
+		</td>
+		<td>
+			{{v.video}}
+		</td>
+		<td>
+			<a ng-href="http://youtube.com/watch?v={{v.yt}}" target="_blank">{{v.yt}}</a>
+		</td>
+	</tr>
+</table>
+</div>