aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r--client/src/app/+admin/friends/friends.component.ts2
-rw-r--r--client/src/app/+admin/users/shared/user.service.ts1
-rw-r--r--client/src/app/+admin/users/user-list/user-list.component.scss4
-rw-r--r--client/src/app/+admin/users/users.component.ts2
-rw-r--r--client/src/app/+admin/users/users.routes.ts50
-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.ts3
-rw-r--r--client/src/app/+admin/video-abuses/video-abuses.routes.ts36
8 files changed, 46 insertions, 59 deletions
diff --git a/client/src/app/+admin/friends/friends.component.ts b/client/src/app/+admin/friends/friends.component.ts
index bc3f54158..5ca29111c 100644
--- a/client/src/app/+admin/friends/friends.component.ts
+++ b/client/src/app/+admin/friends/friends.component.ts
@@ -1,7 +1,7 @@
1import { Component } from '@angular/core'; 1import { Component } from '@angular/core';
2 2
3@Component({ 3@Component({
4 template: '<router-outlet></router-outlet>' 4 template: '<router-outlet></router-outlet>'
5}) 5})
6 6
7export class FriendsComponent { 7export class FriendsComponent {
diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index a92f9c231..da540bf9f 100644
--- a/client/src/app/+admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
@@ -6,7 +6,6 @@ import { AuthHttp, RestExtractor, RestDataSource, User } from '../../../shared';
6 6
7@Injectable() 7@Injectable()
8export class UserService { 8export class UserService {
9 // TODO: merge this constant with account
10 private static BASE_USERS_URL = '/api/v1/users/'; 9 private static BASE_USERS_URL = '/api/v1/users/';
11 10
12 constructor( 11 constructor(
diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss
index e9f61e900..71adef653 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.scss
+++ b/client/src/app/+admin/users/user-list/user-list.component.scss
@@ -1,7 +1,3 @@
1.glyphicon-remove {
2 cursor: pointer;
3}
4
5.add-user { 1.add-user {
6 margin-top: 10px; 2 margin-top: 10px;
7} 3}
diff --git a/client/src/app/+admin/users/users.component.ts b/client/src/app/+admin/users/users.component.ts
index 37e3b158d..91af6c320 100644
--- a/client/src/app/+admin/users/users.component.ts
+++ b/client/src/app/+admin/users/users.component.ts
@@ -1,7 +1,7 @@
1import { Component } from '@angular/core'; 1import { Component } from '@angular/core';
2 2
3@Component({ 3@Component({
4 template: '<router-outlet></router-outlet>' 4 template: '<router-outlet></router-outlet>'
5}) 5})
6 6
7export class UsersComponent { 7export class UsersComponent {
diff --git a/client/src/app/+admin/users/users.routes.ts b/client/src/app/+admin/users/users.routes.ts
index ac64c891f..21fb192e0 100644
--- a/client/src/app/+admin/users/users.routes.ts
+++ b/client/src/app/+admin/users/users.routes.ts
@@ -6,32 +6,32 @@ import { UserListComponent } from './user-list';
6 6
7export const UsersRoutes: Routes = [ 7export const UsersRoutes: Routes = [
8 { 8 {
9 path: 'users', 9 path: 'users',
10 component: UsersComponent, 10 component: UsersComponent,
11 children: [ 11 children: [
12 { 12 {
13 path: '', 13 path: '',
14 redirectTo: 'list', 14 redirectTo: 'list',
15 pathMatch: 'full' 15 pathMatch: 'full'
16 }, 16 },
17 { 17 {
18 path: 'list', 18 path: 'list',
19 component: UserListComponent, 19 component: UserListComponent,
20 data: { 20 data: {
21 meta: { 21 meta: {
22 title: 'Users list' 22 title: 'Users list'
23 }
24 } 23 }
25 }, 24 }
26 { 25 },
27 path: 'add', 26 {
28 component: UserAddComponent, 27 path: 'add',
29 data: { 28 component: UserAddComponent,
30 meta: { 29 data: {
31 title: 'Add a user' 30 meta: {
32 } 31 title: 'Add a user'
33 } 32 }
34 } 33 }
35 ] 34 }
36 } 35 ]
36 }
37]; 37];
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
deleted file mode 100644
index a094f74b8..000000000
--- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.scss
+++ /dev/null
@@ -1,7 +0,0 @@
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
index f59c4fffb..55d82f790 100644
--- 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
@@ -6,8 +6,7 @@ import { Utils, VideoAbuseService, VideoAbuse } from '../../../shared';
6 6
7@Component({ 7@Component({
8 selector: 'my-video-abuse-list', 8 selector: 'my-video-abuse-list',
9 templateUrl: './video-abuse-list.component.html', 9 templateUrl: './video-abuse-list.component.html'
10 styleUrls: [ './video-abuse-list.component.scss' ]
11}) 10})
12export class VideoAbuseListComponent { 11export class VideoAbuseListComponent {
13 videoAbusesSource = null; 12 videoAbusesSource = null;
diff --git a/client/src/app/+admin/video-abuses/video-abuses.routes.ts b/client/src/app/+admin/video-abuses/video-abuses.routes.ts
index c99e162be..1f19d7885 100644
--- a/client/src/app/+admin/video-abuses/video-abuses.routes.ts
+++ b/client/src/app/+admin/video-abuses/video-abuses.routes.ts
@@ -5,24 +5,24 @@ import { VideoAbuseListComponent } from './video-abuse-list';
5 5
6export const VideoAbusesRoutes: Routes = [ 6export const VideoAbusesRoutes: Routes = [
7 { 7 {
8 path: 'video-abuses', 8 path: 'video-abuses',
9 component: VideoAbusesComponent 9 component: VideoAbusesComponent
10 , 10 ,
11 children: [ 11 children: [
12 { 12 {
13 path: '', 13 path: '',
14 redirectTo: 'list', 14 redirectTo: 'list',
15 pathMatch: 'full' 15 pathMatch: 'full'
16 }, 16 },
17 { 17 {
18 path: 'list', 18 path: 'list',
19 component: VideoAbuseListComponent, 19 component: VideoAbuseListComponent,
20 data: { 20 data: {
21 meta: { 21 meta: {
22 title: 'Video abuses list' 22 title: 'Video abuses list'
23 }
24 } 23 }
25 } 24 }
26 ] 25 }
27 } 26 ]
27 }
28]; 28];