David 10 роки тому
батько
коміт
a67dddee93
3 змінених файлів з 20 додано та 31 видалено
  1. 15 1
      front/js/app.js
  2. 0 11
      front/main.html
  3. 5 19
      front/sources.html

+ 15 - 1
front/js/app.js

@@ -11,10 +11,24 @@ app.config(function($routeProvider, $locationProvider) {
 		})
 		.when("/sources", {
 			templateUrl: 'sources.html',
-			controller: 'main'
+			controller: 'sources'
+		})
+		.otherwise({
+			redirectTo: "/"
 		})
 });
 
+app.controller('sources', function($scope,$http) {
+	$scope.sources=[];
+		$http.get("/pymnts/sources").then(
+			function(data){
+				$scope.sources=data.data.sources;
+			},
+			function(data){
+			}
+		);
+	
+});
 app.controller('main', function($scope,$http,$sce) {
 	$scope.news=[];
 	$scope.newsArticle="";

+ 0 - 11
front/main.html

@@ -42,17 +42,6 @@
 					</li>
 				</ul>
 			</form>
-	<div class="row">
-		<div class="col-md-12">
-			Parse source:
-			<input type="text" ng-model="source" class="form-control" placeholder="url">
-			<input type="text" ng-model="sourceName" class="form-control" placeholder="name">
-			<input type="text" ng-model="sourceSelector" class="form-control" placeholder="selector">
-			<input type="number" ng-model="sourceRSS" class="form-control" value=0>
-			<button class="btn btn-default" ng-click="parseSource(source,sourceName,sourceSelector,sourceRSS,0)">Test</button>
-			<button class="btn btn-default" ng-click="parseSource(source,sourceName,sourceSelector,sourceRSS,1)">Add</button>
-		</div>
-	</div>
 
 		</aside>
 		<div class="content-wrapper">

+ 5 - 19
front/sources.html

@@ -15,32 +15,18 @@
 		</aside>
 		<div class="content-wrapper">
 			<div class="news-wrapper">
-				<section ng-repeat="n in news" ng-class-odd="'odd-news'" ng-class-even="'even-news'">
+				<section ng-repeat="s in sources" ng-class-odd="'odd-news'" ng-class-even="'even-news'">
 					<div class="title">
-						<h4>{{n.title}}</h4>
-						<a href="#" ng-click="delete_article(n._id)"><i class="fa fa-times"></i></a>
+						<h4>{{s.name}}</h4>
 					</div>
 					<ul class="news-meta">
-						<li><i class="fa fa-calendar-o"></i> {{n.scrap_date | date:'short'}}</li>
-						<li>Weight: {{n.weight}}</li>
-						<li><i class="fa fa-globe"></i> {{n.source_name}}</li>
+						<li><i class="fa fa-globe"></i>&nbsp; Category: {{s.category}} </li>
+						<li><i class="fa fa-globe"></i>&nbsp; RSS: {{s.rss==true}} </li>
 					</ul>
-					<div class="summary">
-						{{n.summary}}
-					</div>
 					<div class="navigation">
-						<div><a ng-href="{{n.url}}" target="_blank"><i class="fa fa-external-link"></i> Visit site</a></div>
-						<div class="read-more"><a ng-click="getArticle(n)"><i class="fa fa-share"></i> Read complete article</a></div>
-					</div>
-					<div class="labels">
-						<i class="fa fa-tags"></i> <div ng-repeat="k in n.kw">{{k}}</div>
+						<div><a ng-href="{{s.link}}" target="_blank"><i class="fa fa-external-link"></i> Visit site</a></div>
 					</div>
 				</section>
-				<div class="pagination">
-					<div class="center">
-						Page: <input type="number" ng-model="curPage" ng-change="changePage(curPage)" ng-model-options='{ debounce: 500 }' ng-blur="changePage(curPage)"> / {{totPages}}
-					</div>
-				</div>
 			</div>
 			<div class="article-wrapper">
 				<div id="news" ng-bind-html="newsArticle"></div>