diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-09-14 11:57:49 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-09-14 11:57:49 +0200 |
commit | d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb (patch) | |
tree | 549b14b842de296efed846a11b3681efe08cfa9e /client/src/app/shared/shared.module.ts | |
parent | 91f6f169b1110eeae6ebf5c387f4204b0d07703c (diff) | |
download | PeerTube-d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb.tar.gz PeerTube-d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb.tar.zst PeerTube-d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb.zip |
Move to HttpClient and PrimeNG data table
Diffstat (limited to 'client/src/app/shared/shared.module.ts')
-rw-r--r-- | client/src/app/shared/shared.module.ts | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index 99b51aa4e..118ce822d 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { HttpClientModule } from '@angular/common/http' | ||
2 | import { CommonModule } from '@angular/common' | 3 | import { CommonModule } from '@angular/common' |
3 | import { HttpModule } from '@angular/http' | ||
4 | import { FormsModule, ReactiveFormsModule } from '@angular/forms' | 4 | import { FormsModule, ReactiveFormsModule } from '@angular/forms' |
5 | import { RouterModule } from '@angular/router' | 5 | import { RouterModule } from '@angular/router' |
6 | 6 | ||
@@ -11,9 +11,9 @@ import { ProgressbarModule } from 'ngx-bootstrap/progressbar' | |||
11 | import { PaginationModule } from 'ngx-bootstrap/pagination' | 11 | import { PaginationModule } from 'ngx-bootstrap/pagination' |
12 | import { ModalModule } from 'ngx-bootstrap/modal' | 12 | import { ModalModule } from 'ngx-bootstrap/modal' |
13 | import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload' | 13 | import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload' |
14 | import { Ng2SmartTableModule } from 'ng2-smart-table' | 14 | import { DataTableModule, SharedModule as PrimeSharedModule } from 'primeng/primeng' |
15 | 15 | ||
16 | import { AUTH_HTTP_PROVIDERS } from './auth' | 16 | import { AUTH_INTERCEPTOR_PROVIDER } from './auth' |
17 | import { RestExtractor, RestService } from './rest' | 17 | import { RestExtractor, RestService } from './rest' |
18 | import { SearchComponent, SearchService } from './search' | 18 | import { SearchComponent, SearchService } from './search' |
19 | import { UserService } from './users' | 19 | import { UserService } from './users' |
@@ -24,8 +24,8 @@ import { VideoAbuseService } from './video-abuse' | |||
24 | CommonModule, | 24 | CommonModule, |
25 | FormsModule, | 25 | FormsModule, |
26 | ReactiveFormsModule, | 26 | ReactiveFormsModule, |
27 | HttpModule, | ||
28 | RouterModule, | 27 | RouterModule, |
28 | HttpClientModule, | ||
29 | 29 | ||
30 | BsDropdownModule.forRoot(), | 30 | BsDropdownModule.forRoot(), |
31 | ModalModule.forRoot(), | 31 | ModalModule.forRoot(), |
@@ -33,7 +33,9 @@ import { VideoAbuseService } from './video-abuse' | |||
33 | ProgressbarModule.forRoot(), | 33 | ProgressbarModule.forRoot(), |
34 | 34 | ||
35 | FileUploadModule, | 35 | FileUploadModule, |
36 | Ng2SmartTableModule | 36 | |
37 | DataTableModule, | ||
38 | PrimeSharedModule | ||
37 | ], | 39 | ], |
38 | 40 | ||
39 | declarations: [ | 41 | declarations: [ |
@@ -46,15 +48,16 @@ import { VideoAbuseService } from './video-abuse' | |||
46 | CommonModule, | 48 | CommonModule, |
47 | FormsModule, | 49 | FormsModule, |
48 | ReactiveFormsModule, | 50 | ReactiveFormsModule, |
49 | HttpModule, | ||
50 | RouterModule, | 51 | RouterModule, |
52 | HttpClientModule, | ||
51 | 53 | ||
52 | BsDropdownModule, | 54 | BsDropdownModule, |
53 | FileUploadModule, | 55 | FileUploadModule, |
54 | ModalModule, | 56 | ModalModule, |
55 | PaginationModule, | 57 | PaginationModule, |
56 | ProgressbarModule, | 58 | ProgressbarModule, |
57 | Ng2SmartTableModule, | 59 | DataTableModule, |
60 | PrimeSharedModule, | ||
58 | BytesPipe, | 61 | BytesPipe, |
59 | KeysPipe, | 62 | KeysPipe, |
60 | 63 | ||
@@ -62,7 +65,7 @@ import { VideoAbuseService } from './video-abuse' | |||
62 | ], | 65 | ], |
63 | 66 | ||
64 | providers: [ | 67 | providers: [ |
65 | AUTH_HTTP_PROVIDERS, | 68 | AUTH_INTERCEPTOR_PROVIDER, |
66 | RestExtractor, | 69 | RestExtractor, |
67 | RestService, | 70 | RestService, |
68 | SearchService, | 71 | SearchService, |