From 4bb6886d28cc5333bbe1523674bf5db141af456f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 23 Apr 2018 16:16:05 +0200 Subject: Rename account module to my-account --- client/src/app/account/account-routing.module.ts | 43 ------- .../account-change-password.component.html | 20 ---- .../account-change-password.component.scss | 19 --- .../account-change-password.component.ts | 62 ---------- .../account-change-password/index.ts | 1 - .../account-details/account-details.component.html | 25 ---- .../account-details/account-details.component.scss | 20 ---- .../account-details/account-details.component.ts | 61 ---------- .../account-settings/account-details/index.ts | 1 - .../account-settings.component.html | 24 ---- .../account-settings.component.scss | 56 --------- .../account-settings/account-settings.component.ts | 74 ------------ .../account-videos/account-videos.component.html | 45 ------- .../account-videos/account-videos.component.scss | 114 ------------------ .../account-videos/account-videos.component.ts | 133 --------------------- client/src/app/account/account.component.html | 11 -- client/src/app/account/account.component.scss | 0 client/src/app/account/account.component.ts | 8 -- client/src/app/account/account.module.ts | 30 ----- client/src/app/account/index.ts | 3 - client/src/app/app.module.ts | 4 +- client/src/app/menu/menu.component.html | 4 +- client/src/app/my-account/index.ts | 3 + .../app/my-account/my-account-routing.module.ts | 41 +++++++ .../my-account-change-password/index.ts | 1 + .../my-account-change-password.component.html | 20 ++++ .../my-account-change-password.component.scss | 19 +++ .../my-account-change-password.component.ts | 62 ++++++++++ .../my-account-details/index.ts | 1 + .../my-account-details.component.html | 25 ++++ .../my-account-details.component.scss | 20 ++++ .../my-account-details.component.ts | 60 ++++++++++ .../my-account-settings.component.html | 24 ++++ .../my-account-settings.component.scss | 56 +++++++++ .../my-account-settings.component.ts | 74 ++++++++++++ .../my-account-videos.component.html | 45 +++++++ .../my-account-videos.component.scss | 114 ++++++++++++++++++ .../my-account-videos.component.ts | 133 +++++++++++++++++++++ .../src/app/my-account/my-account.component.html | 11 ++ client/src/app/my-account/my-account.component.ts | 7 ++ client/src/app/my-account/my-account.module.ts | 30 +++++ 41 files changed, 750 insertions(+), 754 deletions(-) delete mode 100644 client/src/app/account/account-routing.module.ts delete mode 100644 client/src/app/account/account-settings/account-change-password/account-change-password.component.html delete mode 100644 client/src/app/account/account-settings/account-change-password/account-change-password.component.scss delete mode 100644 client/src/app/account/account-settings/account-change-password/account-change-password.component.ts delete mode 100644 client/src/app/account/account-settings/account-change-password/index.ts delete mode 100644 client/src/app/account/account-settings/account-details/account-details.component.html delete mode 100644 client/src/app/account/account-settings/account-details/account-details.component.scss delete mode 100644 client/src/app/account/account-settings/account-details/account-details.component.ts delete mode 100644 client/src/app/account/account-settings/account-details/index.ts delete mode 100644 client/src/app/account/account-settings/account-settings.component.html delete mode 100644 client/src/app/account/account-settings/account-settings.component.scss delete mode 100644 client/src/app/account/account-settings/account-settings.component.ts delete mode 100644 client/src/app/account/account-videos/account-videos.component.html delete mode 100644 client/src/app/account/account-videos/account-videos.component.scss delete mode 100644 client/src/app/account/account-videos/account-videos.component.ts delete mode 100644 client/src/app/account/account.component.html delete mode 100644 client/src/app/account/account.component.scss delete mode 100644 client/src/app/account/account.component.ts delete mode 100644 client/src/app/account/account.module.ts delete mode 100644 client/src/app/account/index.ts create mode 100644 client/src/app/my-account/index.ts create mode 100644 client/src/app/my-account/my-account-routing.module.ts create mode 100644 client/src/app/my-account/my-account-settings/my-account-change-password/index.ts create mode 100644 client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html create mode 100644 client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss create mode 100644 client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts create mode 100644 client/src/app/my-account/my-account-settings/my-account-details/index.ts create mode 100644 client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.html create mode 100644 client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.scss create mode 100644 client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.ts create mode 100644 client/src/app/my-account/my-account-settings/my-account-settings.component.html create mode 100644 client/src/app/my-account/my-account-settings/my-account-settings.component.scss create mode 100644 client/src/app/my-account/my-account-settings/my-account-settings.component.ts create mode 100644 client/src/app/my-account/my-account-videos/my-account-videos.component.html create mode 100644 client/src/app/my-account/my-account-videos/my-account-videos.component.scss create mode 100644 client/src/app/my-account/my-account-videos/my-account-videos.component.ts create mode 100644 client/src/app/my-account/my-account.component.html create mode 100644 client/src/app/my-account/my-account.component.ts create mode 100644 client/src/app/my-account/my-account.module.ts (limited to 'client/src') diff --git a/client/src/app/account/account-routing.module.ts b/client/src/app/account/account-routing.module.ts deleted file mode 100644 index 070b9b5c5..000000000 --- a/client/src/app/account/account-routing.module.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { NgModule } from '@angular/core' -import { RouterModule, Routes } from '@angular/router' - -import { MetaGuard } from '@ngx-meta/core' - -import { LoginGuard } from '../core' -import { AccountComponent } from './account.component' -import { AccountSettingsComponent } from './account-settings/account-settings.component' -import { AccountVideosComponent } from './account-videos/account-videos.component' - -const accountRoutes: Routes = [ - { - path: 'account', - component: AccountComponent, - canActivateChild: [ MetaGuard, LoginGuard ], - children: [ - { - path: 'settings', - component: AccountSettingsComponent, - data: { - meta: { - title: 'Account settings' - } - } - }, - { - path: 'videos', - component: AccountVideosComponent, - data: { - meta: { - title: 'Account videos' - } - } - } - ] - } -] - -@NgModule({ - imports: [ RouterModule.forChild(accountRoutes) ], - exports: [ RouterModule ] -}) -export class AccountRoutingModule {} diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.html b/client/src/app/account/account-settings/account-change-password/account-change-password.component.html deleted file mode 100644 index b0e3cada4..000000000 --- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.html +++ /dev/null @@ -1,20 +0,0 @@ -
{{ error }}
- -
- - - -
- {{ formErrors['new-password'] }} -
- - - - -
diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss b/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss deleted file mode 100644 index f8279ffd3..000000000 --- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss +++ /dev/null @@ -1,19 +0,0 @@ -@import '_variables'; -@import '_mixins'; - -input[type=password] { - @include peertube-input-text(340px); - display: block; - - &#new-confirmed-password { - margin-top: 15px; - } -} - -input[type=submit] { - @include peertube-button; - @include orange-button; - - margin-top: 15px; -} - diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.ts b/client/src/app/account/account-settings/account-change-password/account-change-password.component.ts deleted file mode 100644 index 8979e1734..000000000 --- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { Component, OnInit } from '@angular/core' -import { FormBuilder, FormGroup } from '@angular/forms' -import { NotificationsService } from 'angular2-notifications' -import { FormReactive, USER_PASSWORD, UserService } from '../../../shared' - -@Component({ - selector: 'my-account-change-password', - templateUrl: './account-change-password.component.html', - styleUrls: [ './account-change-password.component.scss' ] -}) -export class AccountChangePasswordComponent extends FormReactive implements OnInit { - error: string = null - - form: FormGroup - formErrors = { - 'new-password': '', - 'new-confirmed-password': '' - } - validationMessages = { - 'new-password': USER_PASSWORD.MESSAGES, - 'new-confirmed-password': USER_PASSWORD.MESSAGES - } - - constructor ( - private formBuilder: FormBuilder, - private notificationsService: NotificationsService, - private userService: UserService - ) { - super() - } - - buildForm () { - this.form = this.formBuilder.group({ - 'new-password': [ '', USER_PASSWORD.VALIDATORS ], - 'new-confirmed-password': [ '', USER_PASSWORD.VALIDATORS ] - }) - - this.form.valueChanges.subscribe(data => this.onValueChanged(data)) - } - - ngOnInit () { - this.buildForm() - } - - changePassword () { - const newPassword = this.form.value['new-password'] - const newConfirmedPassword = this.form.value['new-confirmed-password'] - - this.error = null - - if (newPassword !== newConfirmedPassword) { - this.error = 'The new password and the confirmed password do not correspond.' - return - } - - this.userService.changePassword(newPassword).subscribe( - () => this.notificationsService.success('Success', 'Password updated.'), - - err => this.error = err.message - ) - } -} 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 @@ -export * from './account-change-password.component' diff --git a/client/src/app/account/account-settings/account-details/account-details.component.html b/client/src/app/account/account-settings/account-details/account-details.component.html deleted file mode 100644 index 0e8598e9e..000000000 --- a/client/src/app/account/account-settings/account-details/account-details.component.html +++ /dev/null @@ -1,25 +0,0 @@ -
-
- - - -
- -
-
- -
- - - -
- - -
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.scss b/client/src/app/account/account-settings/account-details/account-details.component.scss deleted file mode 100644 index ed59e4689..000000000 --- a/client/src/app/account/account-settings/account-details/account-details.component.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import '_variables'; -@import '_mixins'; - -input[type=checkbox] { - @include peertube-checkbox(1px); -} - -input[type=submit] { - @include peertube-button; - @include orange-button; - - display: block; - margin-top: 15px; -} - -.peertube-select-container { - @include peertube-select-container(340px); - - margin-bottom: 30px; -} \ No newline at end of file diff --git a/client/src/app/account/account-settings/account-details/account-details.component.ts b/client/src/app/account/account-settings/account-details/account-details.component.ts deleted file mode 100644 index de213717e..000000000 --- a/client/src/app/account/account-settings/account-details/account-details.component.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core' -import { FormBuilder, FormGroup } from '@angular/forms' -import { NotificationsService } from 'angular2-notifications' -import { UserUpdateMe } from '../../../../../../shared' -import { AuthService } from '../../../core' -import { FormReactive, User, UserService } from '../../../shared' - -@Component({ - selector: 'my-account-details', - templateUrl: './account-details.component.html', - styleUrls: [ './account-details.component.scss' ] -}) - -export class AccountDetailsComponent extends FormReactive implements OnInit { - @Input() user: User = null - - form: FormGroup - formErrors = {} - validationMessages = {} - - constructor ( - private authService: AuthService, - private formBuilder: FormBuilder, - private notificationsService: NotificationsService, - private userService: UserService - ) { - super() - } - - buildForm () { - this.form = this.formBuilder.group({ - nsfwPolicy: [ this.user.nsfwPolicy ], - autoPlayVideo: [ this.user.autoPlayVideo ] - }) - - this.form.valueChanges.subscribe(data => this.onValueChanged(data)) - } - - ngOnInit () { - this.buildForm() - } - - updateDetails () { - const nsfwPolicy = this.form.value['nsfwPolicy'] - const autoPlayVideo = this.form.value['autoPlayVideo'] - const details: UserUpdateMe = { - nsfwPolicy, - autoPlayVideo - } - - this.userService.updateMyDetails(details).subscribe( - () => { - this.notificationsService.success('Success', 'Information updated.') - - this.authService.refreshUserInformation() - }, - - err => this.notificationsService.error('Error', err.message) - ) - } -} 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 @@ -export * from './account-details.component' diff --git a/client/src/app/account/account-settings/account-settings.component.html b/client/src/app/account/account-settings/account-settings.component.html deleted file mode 100644 index 7ae27dc75..000000000 --- a/client/src/app/account/account-settings/account-settings.component.html +++ /dev/null @@ -1,24 +0,0 @@ -
- Avatar - - -
- -
- Change your avatar - -
-
(extensions: {{ avatarExtensions }}, max size: {{ maxAvatarSize | bytes }})
- -
- Video quota: {{ userVideoQuotaUsed | bytes: 0 }} / {{ userVideoQuota }} -
- -
Account settings
- - -
Video settings
- diff --git a/client/src/app/account/account-settings/account-settings.component.scss b/client/src/app/account/account-settings/account-settings.component.scss deleted file mode 100644 index 1cc00ca49..000000000 --- a/client/src/app/account/account-settings/account-settings.component.scss +++ /dev/null @@ -1,56 +0,0 @@ -@import '_variables'; -@import '_mixins'; - -.user { - display: flex; - - img { - @include avatar(50px); - - margin-right: 15px; - } - - .user-info { - .user-info-username { - font-size: 20px; - font-weight: $font-bold; - } - - .user-info-followers { - font-size: 15px; - } - } -} - -.button-file { - @include peertube-button-file(160px); - - margin-top: 10px; - margin-bottom: 5px; -} - -.file-max-size { - display: inline-block; - font-size: 13px; - - position: relative; - top: -10px; -} - -.user-quota { - font-size: 15px; - margin-top: 20px; - - .user-quota-label { - font-weight: $font-semibold; - } -} - -.account-title { - text-transform: uppercase; - color: $orange-color; - font-weight: $font-bold; - font-size: 13px; - margin-top: 55px; - margin-bottom: 30px; -} diff --git a/client/src/app/account/account-settings/account-settings.component.ts b/client/src/app/account/account-settings/account-settings.component.ts deleted file mode 100644 index 524607817..000000000 --- a/client/src/app/account/account-settings/account-settings.component.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core' -import { NotificationsService } from 'angular2-notifications' -import { BytesPipe } from 'ngx-pipes' -import { AuthService } from '../../core' -import { ServerService } from '../../core/server' -import { User } from '../../shared' -import { UserService } from '../../shared/users' - -@Component({ - selector: 'my-account-settings', - templateUrl: './account-settings.component.html', - styleUrls: [ './account-settings.component.scss' ] -}) -export class AccountSettingsComponent implements OnInit { - @ViewChild('avatarfileInput') avatarfileInput - - user: User = null - userVideoQuota = '0' - userVideoQuotaUsed = 0 - - constructor ( - private userService: UserService, - private authService: AuthService, - private serverService: ServerService, - private notificationsService: NotificationsService - ) {} - - ngOnInit () { - this.user = this.authService.getUser() - - this.authService.userInformationLoaded.subscribe( - () => { - if (this.user.videoQuota !== -1) { - this.userVideoQuota = new BytesPipe().transform(this.user.videoQuota, 0).toString() - } else { - this.userVideoQuota = 'Unlimited' - } - } - ) - - this.userService.getMyVideoQuotaUsed() - .subscribe(data => this.userVideoQuotaUsed = data.videoQuotaUsed) - } - - getAvatarUrl () { - return this.user.getAvatarUrl() - } - - changeAvatar () { - const avatarfile = this.avatarfileInput.nativeElement.files[ 0 ] - - const formData = new FormData() - formData.append('avatarfile', avatarfile) - - this.userService.changeAvatar(formData) - .subscribe( - data => { - this.notificationsService.success('Success', 'Avatar changed.') - - this.user.account.avatar = data.avatar - }, - - err => this.notificationsService.error('Error', err.message) - ) - } - - get maxAvatarSize () { - return this.serverService.getConfig().avatar.file.size.max - } - - get avatarExtensions () { - return this.serverService.getConfig().avatar.file.extensions.join(',') - } -} diff --git a/client/src/app/account/account-videos/account-videos.component.html b/client/src/app/account/account-videos/account-videos.component.html deleted file mode 100644 index 66ce3a77b..000000000 --- a/client/src/app/account/account-videos/account-videos.component.html +++ /dev/null @@ -1,45 +0,0 @@ -
No results.
- -
-
-
-
- - -
- - - -
- {{ video.name }} - {{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views -
{{ video.privacy.label }}
-
- - -
-
- - Cancel - - - - - Delete - -
-
- -
- - - -
-
-
-
diff --git a/client/src/app/account/account-videos/account-videos.component.scss b/client/src/app/account/account-videos/account-videos.component.scss deleted file mode 100644 index f276ea389..000000000 --- a/client/src/app/account/account-videos/account-videos.component.scss +++ /dev/null @@ -1,114 +0,0 @@ -@import '_variables'; -@import '_mixins'; - -.action-selection-mode { - width: 174px; - display: flex; - justify-content: flex-end; - - .action-selection-mode-child { - position: fixed; - - .action-button { - display: inline-block; - } - - .action-button-cancel-selection { - @include peertube-button; - @include grey-button; - - margin-right: 10px; - } - - .action-button-delete-selection { - @include peertube-button; - @include orange-button; - } - - .icon.icon-delete-white { - @include icon(21px); - - position: relative; - top: -2px; - background-image: url('../../../assets/images/global/delete-white.svg'); - } - } -} - -/deep/ .action-button { - &.action-button-delete { - margin-right: 10px; - } -} - -.video { - display: flex; - min-height: 130px; - padding-bottom: 20px; - margin-bottom: 20px; - border-bottom: 1px solid #C6C6C6; - - &:first-child { - margin-top: 47px; - } - - .checkbox-container { - display: flex; - align-items: center; - margin-right: 20px; - margin-left: 12px; - - input[type=checkbox] { - @include peertube-checkbox(2px); - } - } - - my-video-thumbnail { - margin-right: 10px; - } - - .video-info { - flex-grow: 1; - - .video-info-name { - @include disable-default-a-behaviour; - - color: #000; - display: block; - font-size: 16px; - font-weight: $font-semibold; - } - - .video-info-date-views, .video-info-private { - font-size: 13px; - - &.video-info-private { - font-weight: $font-semibold; - } - } - } - - .video-buttons { - min-width: 190px; - } -} - -@media screen and (max-width: 800px) { - .video { - flex-direction: column; - height: auto; - text-align: center; - - input[type=checkbox] { - display: none; - } - - my-video-thumbnail { - margin-right: 0; - } - - .video-buttons { - margin-top: 10px; - } - } -} diff --git a/client/src/app/account/account-videos/account-videos.component.ts b/client/src/app/account/account-videos/account-videos.component.ts deleted file mode 100644 index 91bc1b695..000000000 --- a/client/src/app/account/account-videos/account-videos.component.ts +++ /dev/null @@ -1,133 +0,0 @@ -import { Component, OnInit, OnDestroy } from '@angular/core' -import { ActivatedRoute, Router } from '@angular/router' -import { Location } from '@angular/common' -import { immutableAssign } from '@app/shared/misc/utils' -import { ComponentPagination } from '@app/shared/rest/component-pagination.model' -import { NotificationsService } from 'angular2-notifications' -import 'rxjs/add/observable/from' -import 'rxjs/add/operator/concatAll' -import { Observable } from 'rxjs/Observable' -import { AuthService } from '../../core/auth' -import { ConfirmService } from '../../core/confirm' -import { AbstractVideoList } from '../../shared/video/abstract-video-list' -import { Video } from '../../shared/video/video.model' -import { VideoService } from '../../shared/video/video.service' - -@Component({ - selector: 'my-account-videos', - templateUrl: './account-videos.component.html', - styleUrls: [ './account-videos.component.scss' ] -}) -export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { - titlePage = 'My videos' - currentRoute = '/account/videos' - checkedVideos: { [ id: number ]: boolean } = {} - pagination: ComponentPagination = { - currentPage: 1, - itemsPerPage: 5, - totalItems: null - } - - protected baseVideoWidth = -1 - protected baseVideoHeight = 155 - - constructor (protected router: Router, - protected route: ActivatedRoute, - protected authService: AuthService, - protected notificationsService: NotificationsService, - protected confirmService: ConfirmService, - protected location: Location, - private videoService: VideoService) { - super() - } - - ngOnInit () { - super.ngOnInit() - - // this.generateSyndicationList() - } - - ngOnDestroy () { - super.ngOnDestroy() - } - - abortSelectionMode () { - this.checkedVideos = {} - } - - isInSelectionMode () { - return Object.keys(this.checkedVideos).some(k => this.checkedVideos[k] === true) - } - - getVideosObservable (page: number) { - const newPagination = immutableAssign(this.pagination, { currentPage: page }) - - return this.videoService.getMyVideos(newPagination, this.sort) - } - - generateSyndicationList () { - throw new Error('Method not implemented.') - } - - async deleteSelectedVideos () { - const toDeleteVideosIds = Object.keys(this.checkedVideos) - .filter(k => this.checkedVideos[k] === true) - .map(k => parseInt(k, 10)) - - const res = await this.confirmService.confirm(`Do you really want to delete ${toDeleteVideosIds.length} videos?`, 'Delete') - if (res === false) return - - const observables: Observable[] = [] - for (const videoId of toDeleteVideosIds) { - const o = this.videoService - .removeVideo(videoId) - .do(() => this.spliceVideosById(videoId)) - - observables.push(o) - } - - Observable.from(observables) - .concatAll() - .subscribe( - res => { - this.notificationsService.success('Success', `${toDeleteVideosIds.length} videos deleted.`) - this.buildVideoPages() - }, - - err => this.notificationsService.error('Error', err.message) - ) - } - - async deleteVideo (video: Video) { - const res = await this.confirmService.confirm(`Do you really want to delete ${video.name}?`, 'Delete') - if (res === false) return - - this.videoService.removeVideo(video.id) - .subscribe( - status => { - this.notificationsService.success('Success', `Video ${video.name} deleted.`) - this.spliceVideosById(video.id) - this.buildVideoPages() - }, - - error => this.notificationsService.error('Error', error.message) - ) - } - - protected buildVideoHeight () { - // In account videos, the video height is fixed - return this.baseVideoHeight - } - - private spliceVideosById (id: number) { - for (const key of Object.keys(this.loadedPages)) { - const videos = this.loadedPages[key] - const index = videos.findIndex(v => v.id === id) - - if (index !== -1) { - videos.splice(index, 1) - return - } - } - } -} 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 @@ -
-
- My account - - My videos -
- -
- -
-
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 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 @@ -import { Component } from '@angular/core' - -@Component({ - selector: 'my-account', - templateUrl: './account.component.html', - styleUrls: [ './account.component.scss' ] -}) -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 @@ -import { NgModule } from '@angular/core' -import { SharedModule } from '../shared' -import { AccountRoutingModule } from './account-routing.module' -import { AccountChangePasswordComponent } from './account-settings/account-change-password/account-change-password.component' -import { AccountDetailsComponent } from './account-settings/account-details/account-details.component' -import { AccountSettingsComponent } from './account-settings/account-settings.component' -import { AccountComponent } from './account.component' -import { AccountVideosComponent } from './account-videos/account-videos.component' - -@NgModule({ - imports: [ - AccountRoutingModule, - SharedModule - ], - - declarations: [ - AccountComponent, - AccountSettingsComponent, - AccountChangePasswordComponent, - AccountDetailsComponent, - AccountVideosComponent - ], - - exports: [ - AccountComponent - ], - - providers: [] -}) -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 @@ -export * from './account-routing.module' -export * from './account.component' -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' import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' -import { AccountModule } from './account' +import { MyAccountModule } from './my-account' import { AppRoutingModule } from './app-routing.module' import { AppComponent } from './app.component' @@ -46,7 +46,7 @@ export function metaFactory (serverService: ServerService): MetaLoader { AppRoutingModule, - AccountModule, + MyAccountModule, CoreModule, LoginModule, 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 @@
- {{ user.username }} + {{ user.username }}
{{ user.email }}
@@ -14,7 +14,7 @@