aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/admin/admin-routing.module.ts4
-rw-r--r--client/src/app/admin/admin.module.ts4
-rw-r--r--client/src/app/admin/menu-admin.component.html5
-rw-r--r--client/src/app/admin/video-abuses/index.ts3
-rw-r--r--client/src/app/admin/video-abuses/video-abuse-list/index.ts1
-rw-r--r--client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.html27
-rw-r--r--client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.scss7
-rw-r--r--client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.ts31
-rw-r--r--client/src/app/admin/video-abuses/video-abuses.component.ts8
-rw-r--r--client/src/app/admin/video-abuses/video-abuses.routes.ts28
-rw-r--r--client/src/app/shared/forms/form-validators/index.ts2
-rw-r--r--client/src/app/shared/forms/form-validators/video-abuse.ts (renamed from client/src/app/shared/forms/form-validators/video-report.ts)2
-rw-r--r--client/src/app/shared/index.ts1
-rw-r--r--client/src/app/shared/shared.module.ts4
-rw-r--r--client/src/app/shared/video-abuse/index.ts2
-rw-r--r--client/src/app/shared/video-abuse/video-abuse.model.ts8
-rw-r--r--client/src/app/shared/video-abuse/video-abuse.service.ts44
-rw-r--r--client/src/app/videos/video-watch/video-report.component.ts10
18 files changed, 182 insertions, 9 deletions
diff --git a/client/src/app/admin/admin-routing.module.ts b/client/src/app/admin/admin-routing.module.ts
index 6bff25033..cabc6df15 100644
--- a/client/src/app/admin/admin-routing.module.ts
+++ b/client/src/app/admin/admin-routing.module.ts
@@ -5,6 +5,7 @@ import { AdminComponent } from './admin.component';
5import { FriendsRoutes } from './friends'; 5import { FriendsRoutes } from './friends';
6import { RequestsRoutes } from './requests'; 6import { RequestsRoutes } from './requests';
7import { UsersRoutes } from './users'; 7import { UsersRoutes } from './users';
8import { VideoAbusesRoutes } from './video-abuses';
8 9
9const adminRoutes: Routes = [ 10const adminRoutes: Routes = [
10 { 11 {
@@ -18,7 +19,8 @@ const adminRoutes: Routes = [
18 }, 19 },
19 ...FriendsRoutes, 20 ...FriendsRoutes,
20 ...RequestsRoutes, 21 ...RequestsRoutes,
21 ...UsersRoutes 22 ...UsersRoutes,
23 ...VideoAbusesRoutes
22 ] 24 ]
23 } 25 }
24]; 26];
diff --git a/client/src/app/admin/admin.module.ts b/client/src/app/admin/admin.module.ts
index 63d99a3db..d3ada8ce8 100644
--- a/client/src/app/admin/admin.module.ts
+++ b/client/src/app/admin/admin.module.ts
@@ -5,6 +5,7 @@ import { AdminRoutingModule } from './admin-routing.module';
5import { FriendsComponent, FriendAddComponent, FriendListComponent, FriendService } from './friends'; 5import { FriendsComponent, FriendAddComponent, FriendListComponent, FriendService } from './friends';
6import { RequestsComponent, RequestStatsComponent, RequestService } from './requests'; 6import { RequestsComponent, RequestStatsComponent, RequestService } from './requests';
7import { UsersComponent, UserAddComponent, UserListComponent, UserService } from './users'; 7import { UsersComponent, UserAddComponent, UserListComponent, UserService } from './users';
8import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses';
8import { MenuAdminComponent } from './menu-admin.component'; 9import { MenuAdminComponent } from './menu-admin.component';
9import { SharedModule } from '../shared'; 10import { SharedModule } from '../shared';
10 11
@@ -28,6 +29,9 @@ import { SharedModule } from '../shared';
28 UserAddComponent, 29 UserAddComponent,
29 UserListComponent, 30 UserListComponent,
30 31
32 VideoAbusesComponent,
33 VideoAbuseListComponent,
34
31 MenuAdminComponent 35 MenuAdminComponent
32 ], 36 ],
33 37
diff --git a/client/src/app/admin/menu-admin.component.html b/client/src/app/admin/menu-admin.component.html
index e250615aa..ad7a7a1b4 100644
--- a/client/src/app/admin/menu-admin.component.html
+++ b/client/src/app/admin/menu-admin.component.html
@@ -15,6 +15,11 @@
15 <span class="hidden-xs glyphicon glyphicon-stats"></span> 15 <span class="hidden-xs glyphicon glyphicon-stats"></span>
16 <a [routerLink]="['/admin/requests/stats']">Request stats</a> 16 <a [routerLink]="['/admin/requests/stats']">Request stats</a>
17 </div> 17 </div>
18
19 <div id="panel-video-abuses" class="panel-button">
20 <span class="hidden-xs glyphicon glyphicon-alert"></span>
21 <a [routerLink]="['/admin/video-abuses/list']">Video abuses</a>
22 </div>
18 </div> 23 </div>
19 24
20 <div class="panel-block"> 25 <div class="panel-block">
diff --git a/client/src/app/admin/video-abuses/index.ts b/client/src/app/admin/video-abuses/index.ts
new file mode 100644
index 000000000..7f5e65f91
--- /dev/null
+++ b/client/src/app/admin/video-abuses/index.ts
@@ -0,0 +1,3 @@
1export * from './video-abuse-list';
2export * from './video-abuses.component';
3export * from './video-abuses.routes';
diff --git a/client/src/app/admin/video-abuses/video-abuse-list/index.ts b/client/src/app/admin/video-abuses/video-abuse-list/index.ts
new file mode 100644
index 000000000..3f2ed1714
--- /dev/null
+++ b/client/src/app/admin/video-abuses/video-abuse-list/index.ts
@@ -0,0 +1 @@
export * from './video-abuse-list.component';
diff --git a/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.html b/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.html
new file mode 100644
index 000000000..46043577c
--- /dev/null
+++ b/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.html
@@ -0,0 +1,27 @@
1<h3>Video abuses list</h3>
2
3<table class="table table-hover">
4 <thead>
5 <tr>
6 <th class="cell-id">ID</th>
7 <th class="cell-reason">Reason</th>
8 <th>Reporter pod host</th>
9 <th>Reporter username</th>
10 <th>Video</th>
11 <th>Created at</th>
12 </tr>
13 </thead>
14
15 <tbody>
16 <tr *ngFor="let videoAbuse of videoAbuses">
17 <td>{{ videoAbuse.id }}</td>
18 <td>{{ videoAbuse.reason }}</td>
19 <td>{{ videoAbuse.reporterPodHost }}</td>
20 <td>{{ videoAbuse.reporterUsername }}</td>
21 <td>
22 <a [routerLink]="buildVideoLink(videoAbuse)" title="Go to video">{{ videoAbuse.videoId }}</a>
23 </td>
24 <td>{{ videoAbuse.createdAt | date: 'medium' }}</td>
25 </tr>
26 </tbody>
27</table>
diff --git a/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.scss b/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.scss
new file mode 100644
index 000000000..a094f74b8
--- /dev/null
+++ b/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.scss
@@ -0,0 +1,7 @@
1.cell-id {
2 width: 40px;
3}
4
5.cell-reason {
6 width: 200px;
7}
diff --git a/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.ts b/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.ts
new file mode 100644
index 000000000..de58bba3d
--- /dev/null
+++ b/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.ts
@@ -0,0 +1,31 @@
1import { setInterval } from 'timers'
2import { Component, OnInit } from '@angular/core';
3
4import { VideoAbuseService, VideoAbuse} from '../../../shared';
5
6@Component({
7 selector: 'my-video-abuse-list',
8 templateUrl: './video-abuse-list.component.html',
9 styleUrls: [ './video-abuse-list.component.scss' ]
10})
11export class VideoAbuseListComponent implements OnInit {
12 videoAbuses: VideoAbuse[];
13
14 constructor(private videoAbuseService: VideoAbuseService) { }
15
16 ngOnInit() {
17 this.getVideoAbuses();
18 }
19
20 buildVideoLink(videoAbuse: VideoAbuse) {
21 return `/videos/${videoAbuse.videoId}`;
22 }
23
24 private getVideoAbuses() {
25 this.videoAbuseService.getVideoAbuses().subscribe(
26 res => this.videoAbuses = res.videoAbuses,
27
28 err => alert(err.text)
29 );
30 }
31}
diff --git a/client/src/app/admin/video-abuses/video-abuses.component.ts b/client/src/app/admin/video-abuses/video-abuses.component.ts
new file mode 100644
index 000000000..001f27e87
--- /dev/null
+++ b/client/src/app/admin/video-abuses/video-abuses.component.ts
@@ -0,0 +1,8 @@
1import { Component } from '@angular/core';
2
3@Component({
4 template: '<router-outlet></router-outlet>'
5})
6
7export class VideoAbusesComponent {
8}
diff --git a/client/src/app/admin/video-abuses/video-abuses.routes.ts b/client/src/app/admin/video-abuses/video-abuses.routes.ts
new file mode 100644
index 000000000..26a761887
--- /dev/null
+++ b/client/src/app/admin/video-abuses/video-abuses.routes.ts
@@ -0,0 +1,28 @@
1import { Routes } from '@angular/router';
2
3import { VideoAbusesComponent } from './video-abuses.component';
4import { VideoAbuseListComponent } from './video-abuse-list';
5
6export const VideoAbusesRoutes: Routes = [
7 {
8 path: 'video-abuses',
9 component: VideoAbusesComponent
10 ,
11 children: [
12 {
13 path: '',
14 redirectTo: 'list',
15 pathMatch: 'full'
16 },
17 {
18 path: 'list',
19 component: VideoAbuseListComponent,
20 data: {
21 meta: {
22 titleSuffix: ' - Video abuses list'
23 }
24 }
25 }
26 ]
27 }
28];
diff --git a/client/src/app/shared/forms/form-validators/index.ts b/client/src/app/shared/forms/form-validators/index.ts
index 119b5d9bf..ab7c2df31 100644
--- a/client/src/app/shared/forms/form-validators/index.ts
+++ b/client/src/app/shared/forms/form-validators/index.ts
@@ -1,4 +1,4 @@
1export * from './host.validator'; 1export * from './host.validator';
2export * from './user'; 2export * from './user';
3export * from './video-report'; 3export * from './video-abuse';
4export * from './video'; 4export * from './video';
diff --git a/client/src/app/shared/forms/form-validators/video-report.ts b/client/src/app/shared/forms/form-validators/video-abuse.ts
index 036ee1721..94a29a3b7 100644
--- a/client/src/app/shared/forms/form-validators/video-report.ts
+++ b/client/src/app/shared/forms/form-validators/video-abuse.ts
@@ -1,6 +1,6 @@
1import { Validators } from '@angular/forms'; 1import { Validators } from '@angular/forms';
2 2
3export const VIDEO_REPORT_REASON = { 3export const VIDEO_ABUSE_REASON = {
4 VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(300) ], 4 VALIDATORS: [ Validators.required, Validators.minLength(2), Validators.maxLength(300) ],
5 MESSAGES: { 5 MESSAGES: {
6 'required': 'Report reason name is required.', 6 'required': 'Report reason name is required.',
diff --git a/client/src/app/shared/index.ts b/client/src/app/shared/index.ts
index 52a647b83..7876e6f14 100644
--- a/client/src/app/shared/index.ts
+++ b/client/src/app/shared/index.ts
@@ -3,4 +3,5 @@ export * from './forms';
3export * from './rest'; 3export * from './rest';
4export * from './search'; 4export * from './search';
5export * from './users'; 5export * from './users';
6export * from './video-abuse';
6export * from './shared.module'; 7export * from './shared.module';
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 748c5d520..7b2386d6c 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -14,6 +14,7 @@ import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
14import { AUTH_HTTP_PROVIDERS } from './auth'; 14import { AUTH_HTTP_PROVIDERS } from './auth';
15import { RestExtractor, RestService } from './rest'; 15import { RestExtractor, RestService } from './rest';
16import { SearchComponent, SearchService } from './search'; 16import { SearchComponent, SearchService } from './search';
17import { VideoAbuseService } from './video-abuse';
17 18
18@NgModule({ 19@NgModule({
19 imports: [ 20 imports: [
@@ -57,7 +58,8 @@ import { SearchComponent, SearchService } from './search';
57 AUTH_HTTP_PROVIDERS, 58 AUTH_HTTP_PROVIDERS,
58 RestExtractor, 59 RestExtractor,
59 RestService, 60 RestService,
60 SearchService 61 SearchService,
62 VideoAbuseService
61 ] 63 ]
62}) 64})
63export class SharedModule { } 65export class SharedModule { }
diff --git a/client/src/app/shared/video-abuse/index.ts b/client/src/app/shared/video-abuse/index.ts
new file mode 100644
index 000000000..563533ba5
--- /dev/null
+++ b/client/src/app/shared/video-abuse/index.ts
@@ -0,0 +1,2 @@
1export * from './video-abuse.service';
2export * from './video-abuse.model';
diff --git a/client/src/app/shared/video-abuse/video-abuse.model.ts b/client/src/app/shared/video-abuse/video-abuse.model.ts
new file mode 100644
index 000000000..bb0373027
--- /dev/null
+++ b/client/src/app/shared/video-abuse/video-abuse.model.ts
@@ -0,0 +1,8 @@
1export interface VideoAbuse {
2 id: string;
3 reason: string;
4 reporterPodHost: string;
5 reporterUsername: string;
6 videoId: string;
7 createdAt: Date;
8}
diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts
new file mode 100644
index 000000000..2750a41c7
--- /dev/null
+++ b/client/src/app/shared/video-abuse/video-abuse.service.ts
@@ -0,0 +1,44 @@
1import { Injectable } from '@angular/core';
2import { Http } from '@angular/http';
3import { Observable } from 'rxjs/Observable';
4import 'rxjs/add/operator/catch';
5import 'rxjs/add/operator/map';
6
7import { AuthService } from '../core';
8import { AuthHttp } from '../auth';
9import { RestExtractor, ResultList } from '../rest';
10import { VideoAbuse } from './video-abuse.model';
11
12@Injectable()
13export class VideoAbuseService {
14 private static BASE_VIDEO_ABUSE_URL = '/api/v1/videos/';
15
16 constructor(
17 private authHttp: AuthHttp,
18 private restExtractor: RestExtractor
19 ) {}
20
21 getVideoAbuses() {
22 return this.authHttp.get(VideoAbuseService.BASE_VIDEO_ABUSE_URL + 'abuse')
23 .map(this.restExtractor.extractDataList)
24 .map(this.extractVideoAbuses)
25 }
26
27 reportVideo(id: string, reason: string) {
28 const body = {
29 reason
30 };
31 const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + id + '/abuse';
32
33 return this.authHttp.post(url, body)
34 .map(this.restExtractor.extractDataBool)
35 .catch((res) => this.restExtractor.handleError(res));
36 }
37
38 private extractVideoAbuses(result: ResultList) {
39 const videoAbuses: VideoAbuse[] = result.data;
40 const totalVideoAbuses = result.total;
41
42 return { videoAbuses, totalVideoAbuses };
43 }
44}
diff --git a/client/src/app/videos/video-watch/video-report.component.ts b/client/src/app/videos/video-watch/video-report.component.ts
index 7bc1677ab..7a125f53e 100644
--- a/client/src/app/videos/video-watch/video-report.component.ts
+++ b/client/src/app/videos/video-watch/video-report.component.ts
@@ -3,7 +3,7 @@ import { FormBuilder, FormGroup } from '@angular/forms';
3 3
4import { ModalDirective } from 'ng2-bootstrap/modal'; 4import { ModalDirective } from 'ng2-bootstrap/modal';
5 5
6import { FormReactive, VIDEO_REPORT_REASON } from '../../shared'; 6import { FormReactive, VideoAbuseService, VIDEO_ABUSE_REASON } from '../../shared';
7import { Video, VideoService } from '../shared'; 7import { Video, VideoService } from '../shared';
8 8
9@Component({ 9@Component({
@@ -21,12 +21,12 @@ export class VideoReportComponent extends FormReactive implements OnInit {
21 reason: '' 21 reason: ''
22 }; 22 };
23 validationMessages = { 23 validationMessages = {
24 reason: VIDEO_REPORT_REASON.MESSAGES 24 reason: VIDEO_ABUSE_REASON.MESSAGES
25 }; 25 };
26 26
27 constructor( 27 constructor(
28 private formBuilder: FormBuilder, 28 private formBuilder: FormBuilder,
29 private videoService: VideoService 29 private videoAbuseService: VideoAbuseService
30 ) { 30 ) {
31 super(); 31 super();
32 } 32 }
@@ -37,7 +37,7 @@ export class VideoReportComponent extends FormReactive implements OnInit {
37 37
38 buildForm() { 38 buildForm() {
39 this.form = this.formBuilder.group({ 39 this.form = this.formBuilder.group({
40 reason: [ '', VIDEO_REPORT_REASON.VALIDATORS ] 40 reason: [ '', VIDEO_ABUSE_REASON.VALIDATORS ]
41 }); 41 });
42 42
43 this.form.valueChanges.subscribe(data => this.onValueChanged(data)); 43 this.form.valueChanges.subscribe(data => this.onValueChanged(data));
@@ -54,7 +54,7 @@ export class VideoReportComponent extends FormReactive implements OnInit {
54 report() { 54 report() {
55 const reason = this.form.value['reason'] 55 const reason = this.form.value['reason']
56 56
57 this.videoService.reportVideo(this.video.id, reason) 57 this.videoAbuseService.reportVideo(this.video.id, reason)
58 .subscribe( 58 .subscribe(
59 // TODO: move alert to beautiful notifications 59 // TODO: move alert to beautiful notifications
60 ok => { 60 ok => {