diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-12-11 21:50:51 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-12-19 21:22:28 +0100 |
commit | feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c (patch) | |
tree | 2abc9fbc9569760e218fd52835850b757344b420 /client/src/app/videos | |
parent | 108626609eda75e4ecc0a83a650a4d53c46220e0 (diff) | |
download | PeerTube-feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c.tar.gz PeerTube-feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c.tar.zst PeerTube-feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c.zip |
First version with PostgreSQL
Diffstat (limited to 'client/src/app/videos')
7 files changed, 10 insertions, 10 deletions
diff --git a/client/src/app/videos/shared/sort-field.type.ts b/client/src/app/videos/shared/sort-field.type.ts index 6e8cc7936..74908e344 100644 --- a/client/src/app/videos/shared/sort-field.type.ts +++ b/client/src/app/videos/shared/sort-field.type.ts | |||
@@ -1,3 +1,3 @@ | |||
1 | export type SortField = "name" | "-name" | 1 | export type SortField = "name" | "-name" |
2 | | "duration" | "-duration" | 2 | | "duration" | "-duration" |
3 | | "createdDate" | "-createdDate"; | 3 | | "createdAt" | "-createdAt"; |
diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts index b51a0e9de..fae001d78 100644 --- a/client/src/app/videos/shared/video.model.ts +++ b/client/src/app/videos/shared/video.model.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | export class Video { | 1 | export class Video { |
2 | author: string; | 2 | author: string; |
3 | by: string; | 3 | by: string; |
4 | createdDate: Date; | 4 | createdAt: Date; |
5 | description: string; | 5 | description: string; |
6 | duration: string; | 6 | duration: string; |
7 | id: string; | 7 | id: string; |
@@ -27,7 +27,7 @@ export class Video { | |||
27 | 27 | ||
28 | constructor(hash: { | 28 | constructor(hash: { |
29 | author: string, | 29 | author: string, |
30 | createdDate: string, | 30 | createdAt: string, |
31 | description: string, | 31 | description: string, |
32 | duration: number; | 32 | duration: number; |
33 | id: string, | 33 | id: string, |
@@ -39,7 +39,7 @@ export class Video { | |||
39 | thumbnailPath: string | 39 | thumbnailPath: string |
40 | }) { | 40 | }) { |
41 | this.author = hash.author; | 41 | this.author = hash.author; |
42 | this.createdDate = new Date(hash.createdDate); | 42 | this.createdAt = new Date(hash.createdAt); |
43 | this.description = hash.description; | 43 | this.description = hash.description; |
44 | this.duration = Video.createDurationString(hash.duration); | 44 | this.duration = Video.createDurationString(hash.duration); |
45 | this.id = hash.id; | 45 | this.id = hash.id; |
diff --git a/client/src/app/videos/video-list/video-list.component.ts b/client/src/app/videos/video-list/video-list.component.ts index a8b92480b..6c42ba5be 100644 --- a/client/src/app/videos/video-list/video-list.component.ts +++ b/client/src/app/videos/video-list/video-list.component.ts | |||
@@ -145,7 +145,7 @@ export class VideoListComponent implements OnInit, OnDestroy { | |||
145 | }; | 145 | }; |
146 | } | 146 | } |
147 | 147 | ||
148 | this.sort = <SortField>routeParams['sort'] || '-createdDate'; | 148 | this.sort = <SortField>routeParams['sort'] || '-createdAt'; |
149 | 149 | ||
150 | if (routeParams['page'] !== undefined) { | 150 | if (routeParams['page'] !== undefined) { |
151 | this.pagination.currentPage = parseInt(routeParams['page']); | 151 | this.pagination.currentPage = parseInt(routeParams['page']); |
diff --git a/client/src/app/videos/video-list/video-miniature.component.html b/client/src/app/videos/video-list/video-miniature.component.html index 16513902b..f2f4a53a9 100644 --- a/client/src/app/videos/video-list/video-miniature.component.html +++ b/client/src/app/videos/video-list/video-miniature.component.html | |||
@@ -23,6 +23,6 @@ | |||
23 | </span> | 23 | </span> |
24 | 24 | ||
25 | <a [routerLink]="['/videos/list', { field: 'author', search: video.author, sort: currentSort }]" class="video-miniature-author">{{ video.by }}</a> | 25 | <a [routerLink]="['/videos/list', { field: 'author', search: video.author, sort: currentSort }]" class="video-miniature-author">{{ video.by }}</a> |
26 | <span class="video-miniature-created-date">{{ video.createdDate | date:'short' }}</span> | 26 | <span class="video-miniature-created-at">{{ video.createdAt | date:'short' }}</span> |
27 | </div> | 27 | </div> |
28 | </div> | 28 | </div> |
diff --git a/client/src/app/videos/video-list/video-miniature.component.scss b/client/src/app/videos/video-list/video-miniature.component.scss index 6b3fa3bf0..d70b1b50d 100644 --- a/client/src/app/videos/video-list/video-miniature.component.scss +++ b/client/src/app/videos/video-list/video-miniature.component.scss | |||
@@ -79,7 +79,7 @@ | |||
79 | } | 79 | } |
80 | } | 80 | } |
81 | 81 | ||
82 | .video-miniature-author, .video-miniature-created-date { | 82 | .video-miniature-author, .video-miniature-created-at { |
83 | display: block; | 83 | display: block; |
84 | margin-left: 1px; | 84 | margin-left: 1px; |
85 | font-size: 12px; | 85 | font-size: 12px; |
diff --git a/client/src/app/videos/video-list/video-sort.component.ts b/client/src/app/videos/video-list/video-sort.component.ts index ca94b07c2..53951deb4 100644 --- a/client/src/app/videos/video-list/video-sort.component.ts +++ b/client/src/app/videos/video-list/video-sort.component.ts | |||
@@ -17,8 +17,8 @@ export class VideoSortComponent { | |||
17 | '-name': 'Name - Desc', | 17 | '-name': 'Name - Desc', |
18 | 'duration': 'Duration - Asc', | 18 | 'duration': 'Duration - Asc', |
19 | '-duration': 'Duration - Desc', | 19 | '-duration': 'Duration - Desc', |
20 | 'createdDate': 'Created Date - Asc', | 20 | 'createdAt': 'Created Date - Asc', |
21 | '-createdDate': 'Created Date - Desc' | 21 | '-createdAt': 'Created Date - Desc' |
22 | }; | 22 | }; |
23 | 23 | ||
24 | get choiceKeys() { | 24 | get choiceKeys() { |
diff --git a/client/src/app/videos/video-watch/video-watch.component.html b/client/src/app/videos/video-watch/video-watch.component.html index 0f0fa68cc..a726ef3ff 100644 --- a/client/src/app/videos/video-watch/video-watch.component.html +++ b/client/src/app/videos/video-watch/video-watch.component.html | |||
@@ -47,7 +47,7 @@ | |||
47 | {{ video.by }} | 47 | {{ video.by }} |
48 | </a> | 48 | </a> |
49 | </span> | 49 | </span> |
50 | <span id="video-date">on {{ video.createdDate | date:'short' }}</span> | 50 | <span id="video-date">on {{ video.createdAt | date:'short' }}</span> |
51 | </div> | 51 | </div> |
52 | </div> | 52 | </div> |
53 | </div> | 53 | </div> |