From 489290b8b16bede6ddfb773adad55dee6471ccfd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 21 Mar 2019 16:49:46 +0100 Subject: Restore videos list components --- .../my-account-history/my-account-history.component.html | 16 +++++++--------- .../my-account-history/my-account-history.component.ts | 9 ++------- 2 files changed, 9 insertions(+), 16 deletions(-) (limited to 'client/src/app/+my-account/my-account-history') diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.html b/client/src/app/+my-account/my-account-history/my-account-history.component.html index 2349f02f5..00ee5fbd1 100644 --- a/client/src/app/+my-account/my-account-history/my-account-history.component.html +++ b/client/src/app/+my-account/my-account-history/my-account-history.component.html @@ -13,16 +13,14 @@
You don't have videos history yet.
-
-
-
- +
+
+ -
- {{ video.name }} - {{ video.views | myNumberFormatter }} views - -
+
+ {{ video.name }} + {{ video.views | myNumberFormatter }} views +
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.ts b/client/src/app/+my-account/my-account-history/my-account-history.component.ts index 394091bad..73340d21a 100644 --- a/client/src/app/+my-account/my-account-history/my-account-history.component.ts +++ b/client/src/app/+my-account/my-account-history/my-account-history.component.ts @@ -1,6 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' -import { Location } from '@angular/common' import { immutableAssign } from '@app/shared/misc/utils' import { ComponentPagination } from '@app/shared/rest/component-pagination.model' import { AuthService } from '../../core/auth' @@ -11,7 +10,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' import { ScreenService } from '@app/shared/misc/screen.service' import { UserHistoryService } from '@app/shared/users/user-history.service' import { UserService } from '@app/shared' -import { Notifier } from '@app/core' +import { Notifier, ServerService } from '@app/core' @Component({ selector: 'my-account-history', @@ -20,7 +19,6 @@ import { Notifier } from '@app/core' }) export class MyAccountHistoryComponent extends AbstractVideoList implements OnInit, OnDestroy { titlePage: string - currentRoute = '/my-account/history/videos' pagination: ComponentPagination = { currentPage: 1, itemsPerPage: 5, @@ -28,16 +26,13 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn } videosHistoryEnabled: boolean - protected baseVideoWidth = -1 - protected baseVideoHeight = 155 - constructor ( protected router: Router, + protected serverService: ServerService, protected route: ActivatedRoute, protected authService: AuthService, protected userService: UserService, protected notifier: Notifier, - protected location: Location, protected screenService: ScreenService, protected i18n: I18n, private confirmService: ConfirmService, -- cgit v1.2.3