diff options
Diffstat (limited to 'client')
-rw-r--r-- | client/src/app/menu/menu.component.html | 5 | ||||
-rw-r--r-- | client/src/app/menu/menu.component.scss | 8 | ||||
-rw-r--r-- | client/src/app/shared/video/video.service.ts | 11 | ||||
-rw-r--r-- | client/src/app/videos/video-list/video-local.component.ts | 37 | ||||
-rw-r--r-- | client/src/app/videos/videos-routing.module.ts | 10 | ||||
-rw-r--r-- | client/src/app/videos/videos.module.ts | 2 | ||||
-rw-r--r-- | client/src/assets/images/menu/home.svg | 15 |
7 files changed, 87 insertions, 1 deletions
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index d174c76ba..d827a4dd4 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html | |||
@@ -43,6 +43,11 @@ | |||
43 | <span class="icon icon-videos-recently-added"></span> | 43 | <span class="icon icon-videos-recently-added"></span> |
44 | Recently added | 44 | Recently added |
45 | </a> | 45 | </a> |
46 | |||
47 | <a routerLink="/videos/local" routerLinkActive="active"> | ||
48 | <span class="icon icon-videos-local"></span> | ||
49 | Local | ||
50 | </a> | ||
46 | </div> | 51 | </div> |
47 | 52 | ||
48 | <div class="panel-block"> | 53 | <div class="panel-block"> |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 1f3c889cf..da5a581a1 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -126,6 +126,14 @@ menu { | |||
126 | background-image: url('../../assets/images/menu/recently-added.svg'); | 126 | background-image: url('../../assets/images/menu/recently-added.svg'); |
127 | } | 127 | } |
128 | 128 | ||
129 | &.icon-videos-local { | ||
130 | width: 23px; | ||
131 | height: 23px; | ||
132 | position: relative; | ||
133 | top: -1px; | ||
134 | background-image: url('../../assets/images/menu/home.svg'); | ||
135 | } | ||
136 | |||
129 | &.icon-administration { | 137 | &.icon-administration { |
130 | width: 23px; | 138 | width: 23px; |
131 | height: 23px; | 139 | height: 23px; |
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index a151a2983..0a8894fd9 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts | |||
@@ -7,6 +7,7 @@ import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } fr | |||
7 | import { ResultList } from '../../../../../shared/models/result-list.model' | 7 | import { ResultList } from '../../../../../shared/models/result-list.model' |
8 | import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-video-rate-update.model' | 8 | import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-video-rate-update.model' |
9 | import { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model' | 9 | import { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model' |
10 | import { VideoFilter } from '../../../../../shared/models/videos/video-query.type' | ||
10 | import { VideoRateType } from '../../../../../shared/models/videos/video-rate.type' | 11 | import { VideoRateType } from '../../../../../shared/models/videos/video-rate.type' |
11 | import { VideoUpdate } from '../../../../../shared/models/videos/video-update.model' | 12 | import { VideoUpdate } from '../../../../../shared/models/videos/video-update.model' |
12 | import { environment } from '../../../environments/environment' | 13 | import { environment } from '../../../environments/environment' |
@@ -94,12 +95,20 @@ export class VideoService { | |||
94 | .catch((res) => this.restExtractor.handleError(res)) | 95 | .catch((res) => this.restExtractor.handleError(res)) |
95 | } | 96 | } |
96 | 97 | ||
97 | getVideos (videoPagination: ComponentPagination, sort: SortField): Observable<{ videos: Video[], totalVideos: number}> { | 98 | getVideos ( |
99 | videoPagination: ComponentPagination, | ||
100 | sort: SortField, | ||
101 | filter?: VideoFilter | ||
102 | ): Observable<{ videos: Video[], totalVideos: number}> { | ||
98 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | 103 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) |
99 | 104 | ||
100 | let params = new HttpParams() | 105 | let params = new HttpParams() |
101 | params = this.restService.addRestGetParams(params, pagination, sort) | 106 | params = this.restService.addRestGetParams(params, pagination, sort) |
102 | 107 | ||
108 | if (filter) { | ||
109 | params = params.set('filter', filter) | ||
110 | } | ||
111 | |||
103 | return this.authHttp | 112 | return this.authHttp |
104 | .get(VideoService.BASE_VIDEO_URL, { params }) | 113 | .get(VideoService.BASE_VIDEO_URL, { params }) |
105 | .map(this.extractVideos) | 114 | .map(this.extractVideos) |
diff --git a/client/src/app/videos/video-list/video-local.component.ts b/client/src/app/videos/video-list/video-local.component.ts new file mode 100644 index 000000000..8cac2c12c --- /dev/null +++ b/client/src/app/videos/video-list/video-local.component.ts | |||
@@ -0,0 +1,37 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | ||
2 | import { ActivatedRoute, Router } from '@angular/router' | ||
3 | import { immutableAssign } from '@app/shared/misc/utils' | ||
4 | import { NotificationsService } from 'angular2-notifications' | ||
5 | import { AuthService } from '../../core/auth' | ||
6 | import { AbstractVideoList } from '../../shared/video/abstract-video-list' | ||
7 | import { SortField } from '../../shared/video/sort-field.type' | ||
8 | import { VideoService } from '../../shared/video/video.service' | ||
9 | |||
10 | @Component({ | ||
11 | selector: 'my-videos-local', | ||
12 | styleUrls: [ '../../shared/video/abstract-video-list.scss' ], | ||
13 | templateUrl: '../../shared/video/abstract-video-list.html' | ||
14 | }) | ||
15 | export class VideoLocalComponent extends AbstractVideoList implements OnInit { | ||
16 | titlePage = 'Local videos' | ||
17 | currentRoute = '/videos/local' | ||
18 | sort = '-createdAt' as SortField | ||
19 | |||
20 | constructor (protected router: Router, | ||
21 | protected route: ActivatedRoute, | ||
22 | protected notificationsService: NotificationsService, | ||
23 | protected authService: AuthService, | ||
24 | private videoService: VideoService) { | ||
25 | super() | ||
26 | } | ||
27 | |||
28 | ngOnInit () { | ||
29 | super.ngOnInit() | ||
30 | } | ||
31 | |||
32 | getVideosObservable (page: number) { | ||
33 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) | ||
34 | |||
35 | return this.videoService.getVideos(newPagination, this.sort, 'local') | ||
36 | } | ||
37 | } | ||
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/videos/videos-routing.module.ts index 29ec5fd4f..561137b70 100644 --- a/client/src/app/videos/videos-routing.module.ts +++ b/client/src/app/videos/videos-routing.module.ts | |||
@@ -1,5 +1,6 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | import { VideoLocalComponent } from '@app/videos/video-list/video-local.component' | ||
3 | import { MetaGuard } from '@ngx-meta/core' | 4 | import { MetaGuard } from '@ngx-meta/core' |
4 | import { VideoSearchComponent } from './video-list' | 5 | import { VideoSearchComponent } from './video-list' |
5 | import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component' | 6 | import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component' |
@@ -36,6 +37,15 @@ const videosRoutes: Routes = [ | |||
36 | } | 37 | } |
37 | }, | 38 | }, |
38 | { | 39 | { |
40 | path: 'local', | ||
41 | component: VideoLocalComponent, | ||
42 | data: { | ||
43 | meta: { | ||
44 | title: 'Local videos' | ||
45 | } | ||
46 | } | ||
47 | }, | ||
48 | { | ||
39 | path: 'search', | 49 | path: 'search', |
40 | component: VideoSearchComponent, | 50 | component: VideoSearchComponent, |
41 | data: { | 51 | data: { |
diff --git a/client/src/app/videos/videos.module.ts b/client/src/app/videos/videos.module.ts index 4b14d1da8..7c3d457b3 100644 --- a/client/src/app/videos/videos.module.ts +++ b/client/src/app/videos/videos.module.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { VideoLocalComponent } from '@app/videos/video-list/video-local.component' | ||
2 | import { SharedModule } from '../shared' | 3 | import { SharedModule } from '../shared' |
3 | import { VideoSearchComponent } from './video-list' | 4 | import { VideoSearchComponent } from './video-list' |
4 | import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component' | 5 | import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component' |
@@ -17,6 +18,7 @@ import { VideosComponent } from './videos.component' | |||
17 | 18 | ||
18 | VideoTrendingComponent, | 19 | VideoTrendingComponent, |
19 | VideoRecentlyAddedComponent, | 20 | VideoRecentlyAddedComponent, |
21 | VideoLocalComponent, | ||
20 | VideoSearchComponent | 22 | VideoSearchComponent |
21 | ], | 23 | ], |
22 | 24 | ||
diff --git a/client/src/assets/images/menu/home.svg b/client/src/assets/images/menu/home.svg new file mode 100644 index 000000000..bb95e949a --- /dev/null +++ b/client/src/assets/images/menu/home.svg | |||
@@ -0,0 +1,15 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2 | <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | ||
3 | <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch --> | ||
4 | <title>home</title> | ||
5 | <desc>Created with Sketch.</desc> | ||
6 | <defs></defs> | ||
7 | <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"> | ||
8 | <g id="Artboard-4" transform="translate(-620.000000, -159.000000)" stroke="#808080" stroke-width="2"> | ||
9 | <g id="34" transform="translate(620.000000, 159.000000)"> | ||
10 | <path d="M1,11 L12,2 C12,2 22.9999989,11.0000005 23,11" id="Path-50"></path> | ||
11 | <path d="M3,10 C3,10 3,10.4453982 3,10.9968336 L3,20.0170446 C3,20.5675806 3.43788135,21.0138782 4.00292933,21.0138781 L8.99707067,21.0138779 C9.55097324,21.0138779 10,20.5751284 10,20.0089602 L10,15.0049177 C10,14.449917 10.4433532,14 11.0093689,14 L12.9906311,14 C13.5480902,14 14,14.4387495 14,15.0049177 L14,20.0089602 C14,20.5639609 14.4378817,21.0138779 15.0029302,21.0138779 L19.9970758,21.0138781 C20.5509789,21.0138782 21.000006,20.56848 21.000006,20.0170446 L21.0000057,10" id="Path-51"></path> | ||
12 | </g> | ||
13 | </g> | ||
14 | </g> | ||
15 | </svg> | ||