diff options
Diffstat (limited to 'client/src')
28 files changed, 80 insertions, 84 deletions
diff --git a/client/src/app/account/account-settings/account-change-password/index.ts b/client/src/app/account/account-settings/account-change-password/index.ts deleted file mode 100644 index 44c330b66..000000000 --- a/client/src/app/account/account-settings/account-change-password/index.ts +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | export * from './account-change-password.component' | ||
diff --git a/client/src/app/account/account-settings/account-details/index.ts b/client/src/app/account/account-settings/account-details/index.ts deleted file mode 100644 index 4829f608a..000000000 --- a/client/src/app/account/account-settings/account-details/index.ts +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | export * from './account-details.component' | ||
diff --git a/client/src/app/account/account.component.html b/client/src/app/account/account.component.html deleted file mode 100644 index d82a4ca4d..000000000 --- a/client/src/app/account/account.component.html +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | <div class="row"> | ||
2 | <div class="sub-menu"> | ||
3 | <a routerLink="/account/settings" routerLinkActive="active" class="title-page">My account</a> | ||
4 | |||
5 | <a routerLink="/account/videos" routerLinkActive="active" class="title-page">My videos</a> | ||
6 | </div> | ||
7 | |||
8 | <div class="margin-content"> | ||
9 | <router-outlet></router-outlet> | ||
10 | </div> | ||
11 | </div> | ||
diff --git a/client/src/app/account/account.component.scss b/client/src/app/account/account.component.scss deleted file mode 100644 index e69de29bb..000000000 --- a/client/src/app/account/account.component.scss +++ /dev/null | |||
diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts deleted file mode 100644 index 3d3677ab0..000000000 --- a/client/src/app/account/account.component.ts +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | |||
3 | @Component({ | ||
4 | selector: 'my-account', | ||
5 | templateUrl: './account.component.html', | ||
6 | styleUrls: [ './account.component.scss' ] | ||
7 | }) | ||
8 | export class AccountComponent {} | ||
diff --git a/client/src/app/account/account.module.ts b/client/src/app/account/account.module.ts deleted file mode 100644 index 2299c1919..000000000 --- a/client/src/app/account/account.module.ts +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | import { NgModule } from '@angular/core' | ||
2 | import { SharedModule } from '../shared' | ||
3 | import { AccountRoutingModule } from './account-routing.module' | ||
4 | import { AccountChangePasswordComponent } from './account-settings/account-change-password/account-change-password.component' | ||
5 | import { AccountDetailsComponent } from './account-settings/account-details/account-details.component' | ||
6 | import { AccountSettingsComponent } from './account-settings/account-settings.component' | ||
7 | import { AccountComponent } from './account.component' | ||
8 | import { AccountVideosComponent } from './account-videos/account-videos.component' | ||
9 | |||
10 | @NgModule({ | ||
11 | imports: [ | ||
12 | AccountRoutingModule, | ||
13 | SharedModule | ||
14 | ], | ||
15 | |||
16 | declarations: [ | ||
17 | AccountComponent, | ||
18 | AccountSettingsComponent, | ||
19 | AccountChangePasswordComponent, | ||
20 | AccountDetailsComponent, | ||
21 | AccountVideosComponent | ||
22 | ], | ||
23 | |||
24 | exports: [ | ||
25 | AccountComponent | ||
26 | ], | ||
27 | |||
28 | providers: [] | ||
29 | }) | ||
30 | export class AccountModule { } | ||
diff --git a/client/src/app/account/index.ts b/client/src/app/account/index.ts deleted file mode 100644 index dc56ffdbd..000000000 --- a/client/src/app/account/index.ts +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | export * from './account-routing.module' | ||
2 | export * from './account.component' | ||
3 | export * from './account.module' | ||
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 77d68a4ec..c22632fb8 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts | |||
@@ -6,7 +6,7 @@ import { ResetPasswordModule } from '@app/reset-password' | |||
6 | 6 | ||
7 | import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' | 7 | import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' |
8 | 8 | ||
9 | import { AccountModule } from './account' | 9 | import { MyAccountModule } from './my-account' |
10 | 10 | ||
11 | import { AppRoutingModule } from './app-routing.module' | 11 | import { AppRoutingModule } from './app-routing.module' |
12 | import { AppComponent } from './app.component' | 12 | import { AppComponent } from './app.component' |
@@ -46,7 +46,7 @@ export function metaFactory (serverService: ServerService): MetaLoader { | |||
46 | 46 | ||
47 | AppRoutingModule, | 47 | AppRoutingModule, |
48 | 48 | ||
49 | AccountModule, | 49 | MyAccountModule, |
50 | CoreModule, | 50 | CoreModule, |
51 | LoginModule, | 51 | LoginModule, |
52 | ResetPasswordModule, | 52 | ResetPasswordModule, |
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index d827a4dd4..832cd9e78 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html | |||
@@ -5,7 +5,7 @@ | |||
5 | </a> | 5 | </a> |
6 | 6 | ||
7 | <div class="logged-in-info"> | 7 | <div class="logged-in-info"> |
8 | <a routerLink="/account/settings" class="logged-in-username">{{ user.username }}</a> | 8 | <a routerLink="/my-account/settings" class="logged-in-username">{{ user.username }}</a> |
9 | <div class="logged-in-email">{{ user.email }}</div> | 9 | <div class="logged-in-email">{{ user.email }}</div> |
10 | </div> | 10 | </div> |
11 | 11 | ||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | <ul *dropdownMenu class="dropdown-menu"> | 15 | <ul *dropdownMenu class="dropdown-menu"> |
16 | <li> | 16 | <li> |
17 | <a i18n routerLink="/account/settings" class="dropdown-item" title="My account"> | 17 | <a i18n routerLink="/my-account/settings" class="dropdown-item" title="My account"> |
18 | My account | 18 | My account |
19 | </a> | 19 | </a> |
20 | 20 | ||
diff --git a/client/src/app/my-account/index.ts b/client/src/app/my-account/index.ts new file mode 100644 index 000000000..3df96dd7a --- /dev/null +++ b/client/src/app/my-account/index.ts | |||
@@ -0,0 +1,3 @@ | |||
1 | export * from './my-account-routing.module' | ||
2 | export * from './my-account.component' | ||
3 | export * from './my-account.module' | ||
diff --git a/client/src/app/account/account-routing.module.ts b/client/src/app/my-account/my-account-routing.module.ts index 070b9b5c5..5a61db41f 100644 --- a/client/src/app/account/account-routing.module.ts +++ b/client/src/app/my-account/my-account-routing.module.ts | |||
@@ -1,22 +1,20 @@ | |||
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 | |||
4 | import { MetaGuard } from '@ngx-meta/core' | 3 | import { MetaGuard } from '@ngx-meta/core' |
5 | |||
6 | import { LoginGuard } from '../core' | 4 | import { LoginGuard } from '../core' |
7 | import { AccountComponent } from './account.component' | 5 | import { MyAccountComponent } from './my-account.component' |
8 | import { AccountSettingsComponent } from './account-settings/account-settings.component' | 6 | import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component' |
9 | import { AccountVideosComponent } from './account-videos/account-videos.component' | 7 | import { MyAccountVideosComponent } from './my-account-videos/my-account-videos.component' |
10 | 8 | ||
11 | const accountRoutes: Routes = [ | 9 | const myAccountRoutes: Routes = [ |
12 | { | 10 | { |
13 | path: 'account', | 11 | path: 'my-account', |
14 | component: AccountComponent, | 12 | component: MyAccountComponent, |
15 | canActivateChild: [ MetaGuard, LoginGuard ], | 13 | canActivateChild: [ MetaGuard, LoginGuard ], |
16 | children: [ | 14 | children: [ |
17 | { | 15 | { |
18 | path: 'settings', | 16 | path: 'settings', |
19 | component: AccountSettingsComponent, | 17 | component: MyAccountSettingsComponent, |
20 | data: { | 18 | data: { |
21 | meta: { | 19 | meta: { |
22 | title: 'Account settings' | 20 | title: 'Account settings' |
@@ -25,7 +23,7 @@ const accountRoutes: Routes = [ | |||
25 | }, | 23 | }, |
26 | { | 24 | { |
27 | path: 'videos', | 25 | path: 'videos', |
28 | component: AccountVideosComponent, | 26 | component: MyAccountVideosComponent, |
29 | data: { | 27 | data: { |
30 | meta: { | 28 | meta: { |
31 | title: 'Account videos' | 29 | title: 'Account videos' |
@@ -37,7 +35,7 @@ const accountRoutes: Routes = [ | |||
37 | ] | 35 | ] |
38 | 36 | ||
39 | @NgModule({ | 37 | @NgModule({ |
40 | imports: [ RouterModule.forChild(accountRoutes) ], | 38 | imports: [ RouterModule.forChild(myAccountRoutes) ], |
41 | exports: [ RouterModule ] | 39 | exports: [ RouterModule ] |
42 | }) | 40 | }) |
43 | export class AccountRoutingModule {} | 41 | export class MyAccountRoutingModule {} |
diff --git a/client/src/app/my-account/my-account-settings/my-account-change-password/index.ts b/client/src/app/my-account/my-account-settings/my-account-change-password/index.ts new file mode 100644 index 000000000..644047c5f --- /dev/null +++ b/client/src/app/my-account/my-account-settings/my-account-change-password/index.ts | |||
@@ -0,0 +1 @@ | |||
export * from './my-account-change-password.component' | |||
diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.html b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html index b0e3cada4..b0e3cada4 100644 --- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.html +++ b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html | |||
diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss index f8279ffd3..f8279ffd3 100644 --- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss +++ b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss | |||
diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.ts b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts index 8979e1734..80af668f9 100644 --- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.ts +++ b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts | |||
@@ -5,10 +5,10 @@ import { FormReactive, USER_PASSWORD, UserService } from '../../../shared' | |||
5 | 5 | ||
6 | @Component({ | 6 | @Component({ |
7 | selector: 'my-account-change-password', | 7 | selector: 'my-account-change-password', |
8 | templateUrl: './account-change-password.component.html', | 8 | templateUrl: './my-account-change-password.component.html', |
9 | styleUrls: [ './account-change-password.component.scss' ] | 9 | styleUrls: [ './my-account-change-password.component.scss' ] |
10 | }) | 10 | }) |
11 | export class AccountChangePasswordComponent extends FormReactive implements OnInit { | 11 | export class MyAccountChangePasswordComponent extends FormReactive implements OnInit { |
12 | error: string = null | 12 | error: string = null |
13 | 13 | ||
14 | form: FormGroup | 14 | form: FormGroup |
diff --git a/client/src/app/my-account/my-account-settings/my-account-details/index.ts b/client/src/app/my-account/my-account-settings/my-account-details/index.ts new file mode 100644 index 000000000..b7f58e329 --- /dev/null +++ b/client/src/app/my-account/my-account-settings/my-account-details/index.ts | |||
@@ -0,0 +1 @@ | |||
export * from './my-account-details.component' | |||
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.html b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.html index 0e8598e9e..0e8598e9e 100644 --- a/client/src/app/account/account-settings/account-details/account-details.component.html +++ b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.html | |||
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.scss b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.scss index ed59e4689..ed59e4689 100644 --- a/client/src/app/account/account-settings/account-details/account-details.component.scss +++ b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.scss | |||
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.ts b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.ts index de213717e..4c1456541 100644 --- a/client/src/app/account/account-settings/account-details/account-details.component.ts +++ b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.ts | |||
@@ -7,11 +7,10 @@ import { FormReactive, User, UserService } from '../../../shared' | |||
7 | 7 | ||
8 | @Component({ | 8 | @Component({ |
9 | selector: 'my-account-details', | 9 | selector: 'my-account-details', |
10 | templateUrl: './account-details.component.html', | 10 | templateUrl: './my-account-details.component.html', |
11 | styleUrls: [ './account-details.component.scss' ] | 11 | styleUrls: [ './my-account-details.component.scss' ] |
12 | }) | 12 | }) |
13 | 13 | export class MyAccountDetailsComponent extends FormReactive implements OnInit { | |
14 | export class AccountDetailsComponent extends FormReactive implements OnInit { | ||
15 | @Input() user: User = null | 14 | @Input() user: User = null |
16 | 15 | ||
17 | form: FormGroup | 16 | form: FormGroup |
diff --git a/client/src/app/account/account-settings/account-settings.component.html b/client/src/app/my-account/my-account-settings/my-account-settings.component.html index 7ae27dc75..7ae27dc75 100644 --- a/client/src/app/account/account-settings/account-settings.component.html +++ b/client/src/app/my-account/my-account-settings/my-account-settings.component.html | |||
diff --git a/client/src/app/account/account-settings/account-settings.component.scss b/client/src/app/my-account/my-account-settings/my-account-settings.component.scss index 1cc00ca49..1cc00ca49 100644 --- a/client/src/app/account/account-settings/account-settings.component.scss +++ b/client/src/app/my-account/my-account-settings/my-account-settings.component.scss | |||
diff --git a/client/src/app/account/account-settings/account-settings.component.ts b/client/src/app/my-account/my-account-settings/my-account-settings.component.ts index 524607817..91420cc6f 100644 --- a/client/src/app/account/account-settings/account-settings.component.ts +++ b/client/src/app/my-account/my-account-settings/my-account-settings.component.ts | |||
@@ -8,10 +8,10 @@ import { UserService } from '../../shared/users' | |||
8 | 8 | ||
9 | @Component({ | 9 | @Component({ |
10 | selector: 'my-account-settings', | 10 | selector: 'my-account-settings', |
11 | templateUrl: './account-settings.component.html', | 11 | templateUrl: './my-account-settings.component.html', |
12 | styleUrls: [ './account-settings.component.scss' ] | 12 | styleUrls: [ './my-account-settings.component.scss' ] |
13 | }) | 13 | }) |
14 | export class AccountSettingsComponent implements OnInit { | 14 | export class MyAccountSettingsComponent implements OnInit { |
15 | @ViewChild('avatarfileInput') avatarfileInput | 15 | @ViewChild('avatarfileInput') avatarfileInput |
16 | 16 | ||
17 | user: User = null | 17 | user: User = null |
diff --git a/client/src/app/account/account-videos/account-videos.component.html b/client/src/app/my-account/my-account-videos/my-account-videos.component.html index 66ce3a77b..66ce3a77b 100644 --- a/client/src/app/account/account-videos/account-videos.component.html +++ b/client/src/app/my-account/my-account-videos/my-account-videos.component.html | |||
diff --git a/client/src/app/account/account-videos/account-videos.component.scss b/client/src/app/my-account/my-account-videos/my-account-videos.component.scss index f276ea389..f276ea389 100644 --- a/client/src/app/account/account-videos/account-videos.component.scss +++ b/client/src/app/my-account/my-account-videos/my-account-videos.component.scss | |||
diff --git a/client/src/app/account/account-videos/account-videos.component.ts b/client/src/app/my-account/my-account-videos/my-account-videos.component.ts index 91bc1b695..a6cef361e 100644 --- a/client/src/app/account/account-videos/account-videos.component.ts +++ b/client/src/app/my-account/my-account-videos/my-account-videos.component.ts | |||
@@ -15,12 +15,12 @@ import { VideoService } from '../../shared/video/video.service' | |||
15 | 15 | ||
16 | @Component({ | 16 | @Component({ |
17 | selector: 'my-account-videos', | 17 | selector: 'my-account-videos', |
18 | templateUrl: './account-videos.component.html', | 18 | templateUrl: './my-account-videos.component.html', |
19 | styleUrls: [ './account-videos.component.scss' ] | 19 | styleUrls: [ './my-account-videos.component.scss' ] |
20 | }) | 20 | }) |
21 | export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { | 21 | export class MyAccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { |
22 | titlePage = 'My videos' | 22 | titlePage = 'My videos' |
23 | currentRoute = '/account/videos' | 23 | currentRoute = '/my-account/videos' |
24 | checkedVideos: { [ id: number ]: boolean } = {} | 24 | checkedVideos: { [ id: number ]: boolean } = {} |
25 | pagination: ComponentPagination = { | 25 | pagination: ComponentPagination = { |
26 | currentPage: 1, | 26 | currentPage: 1, |
diff --git a/client/src/app/my-account/my-account.component.html b/client/src/app/my-account/my-account.component.html new file mode 100644 index 000000000..637b2587c --- /dev/null +++ b/client/src/app/my-account/my-account.component.html | |||
@@ -0,0 +1,11 @@ | |||
1 | <div class="row"> | ||
2 | <div class="sub-menu"> | ||
3 | <a routerLink="/my-account/settings" routerLinkActive="active" class="title-page">My account</a> | ||
4 | |||
5 | <a routerLink="/my-account/videos" routerLinkActive="active" class="title-page">My videos</a> | ||
6 | </div> | ||
7 | |||
8 | <div class="margin-content"> | ||
9 | <router-outlet></router-outlet> | ||
10 | </div> | ||
11 | </div> | ||
diff --git a/client/src/app/my-account/my-account.component.ts b/client/src/app/my-account/my-account.component.ts new file mode 100644 index 000000000..0955e2b7b --- /dev/null +++ b/client/src/app/my-account/my-account.component.ts | |||
@@ -0,0 +1,7 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | |||
3 | @Component({ | ||
4 | selector: 'my-account', | ||
5 | templateUrl: './my-account.component.html' | ||
6 | }) | ||
7 | export class MyAccountComponent {} | ||
diff --git a/client/src/app/my-account/my-account.module.ts b/client/src/app/my-account/my-account.module.ts new file mode 100644 index 000000000..317277304 --- /dev/null +++ b/client/src/app/my-account/my-account.module.ts | |||
@@ -0,0 +1,30 @@ | |||
1 | import { NgModule } from '@angular/core' | ||
2 | import { SharedModule } from '../shared' | ||
3 | import { MyAccountRoutingModule } from './my-account-routing.module' | ||
4 | import { MyAccountChangePasswordComponent } from './my-account-settings/my-account-change-password/my-account-change-password.component' | ||
5 | import { MyAccountDetailsComponent } from './my-account-settings/my-account-details/my-account-details.component' | ||
6 | import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component' | ||
7 | import { MyAccountComponent } from './my-account.component' | ||
8 | import { MyAccountVideosComponent } from './my-account-videos/my-account-videos.component' | ||
9 | |||
10 | @NgModule({ | ||
11 | imports: [ | ||
12 | MyAccountRoutingModule, | ||
13 | SharedModule | ||
14 | ], | ||
15 | |||
16 | declarations: [ | ||
17 | MyAccountComponent, | ||
18 | MyAccountSettingsComponent, | ||
19 | MyAccountChangePasswordComponent, | ||
20 | MyAccountDetailsComponent, | ||
21 | MyAccountVideosComponent | ||
22 | ], | ||
23 | |||
24 | exports: [ | ||
25 | MyAccountComponent | ||
26 | ], | ||
27 | |||
28 | providers: [] | ||
29 | }) | ||
30 | export class MyAccountModule { } | ||