+
++ Developed with ❤ by Framasoft +
+ +
+
+
+
+
Client
@@ -123,7 +133,7 @@ You can also join the cheerful bunch that makes our community:
* Chat:
* IRC : **[#peertube on chat.freenode.net:6697](https://kiwiirc.com/client/irc.freenode.net/#peertube)**
- * Matrix (bridged on the IRC channel) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)**
+ * Matrix (bridged on IRC and [Discord](https://discord.gg/wj8DDUT)) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)**
* Forum:
* Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube)
diff --git a/client/package.json b/client/package.json
index 3761a641a..31fc77887 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "peertube-client",
- "version": "1.1.0",
+ "version": "1.2.0",
"private": true,
"licence": "GPLv3",
"author": {
@@ -63,26 +63,26 @@
"setupTestFrameworkScriptFile": "
- About {{ instanceName }} instance
-
+
+
+
+
-About {{ instanceName }} instance
-
-
+ {{ shortDescription }}
-Contact administrator
+
-
+ Description
+
+
-
-{{ shortDescription }}
+
+
+ Description
-
-
-
-Terms
+
+
+
+
+Terms
-
-
- Signup
+
+
-
-
+
Signup
-
+
+
+
+ User registration is currently not allowed.
+
+
- User registration is currently not allowed.
+
\ No newline at end of file
+
+
+
-
+
+
+ Contact {{ instanceName }} administrator
+
+
+
+
+
+Instance
-
-
-
-
- {{ formErrors.instanceName }}
+
-
+
+
+
- {{ formErrors.instance.name }}
-
-
-
- {{ formErrors.instanceShortDescription }}
+
-
+
+
+
- {{ formErrors.instance.shortDescription }}
-
- {{ formErrors.instanceDescription }}
+
-
+
- {{ formErrors.instance.description }}
-
- {{ formErrors.instanceTerms }}
+
-
+
- {{ formErrors.instance.terms }}
-
-
-
+
-
+
+
-
+
+
+ {{ formErrors.instance.defaultClientRoute }}
- {{ formErrors.instanceDefaultClientRoute }}
-
-
-
-
+
+
+
-
+
-
+
+
+ {{ formErrors.instance.defaultNSFWPolicy }}
- {{ formErrors.instanceDefaultNSFWPolicy }}
-
- Signup
-
-
-
-
-
-
-
-
-
-
- {{ formErrors.signupLimit }}
+
-
+
- Import
-
-
-
-
-
-
-
- Administrator
-
-
-
-
-
- {{ formErrors.adminEmail }}
+
+
+
+
-
+
+
+
+
{{ formErrors.signup.limit }}
+ Users
-
-
-
-
-
+
+
+
-
+
+
+ {{ formErrors.user.videoQuota }}
- {{ formErrors.userVideoQuota }}
+
+
@@ -53,4 +53,4 @@
+
+
+
+
+
+
+
+ {{ formErrors.user.videoQuotaDaily }}
Import
+
+
+
+
+
+
+
+ Administrator
+
+
+
+
+
- {{ formErrors.admin.email }}
-
-
@@ -45,7 +45,7 @@
-
-
-
- {{ formErrors.userVideoQuotaDaily }}
-
+
+
+
@@ -177,30 +177,35 @@
Twitter
-
-
-
+
- {{ formErrors.servicesTwitterUsername }}
-
-
+
+
+
+ {{ formErrors.services.twitter.username }}
+
+
+
+
-
Transcoding
-
-
-
-
-
-
-
-
-
-
-
- {{ formErrors.transcodingThreads }}
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ formErrors.transcoding.threads }}
+
+
+
Cache
@@ -250,74 +266,73 @@
>
-
-
-
-
-
- {{ formErrors.cachePreviewsSize }}
+
-
+
+
+
- {{ formErrors.cache.previews.size }}
-
-
-
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index f48b6fc1a..654a076b0 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'
import { ConfigService } from '@app/+admin/config/shared/config.service'
import { ServerService } from '@app/core/server/server.service'
import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
@@ -18,14 +18,11 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
resolutions: string[] = []
transcodingThreadOptions: { label: string, value: number }[] = []
- private oldCustomJavascript: string
- private oldCustomCSS: string
-
constructor (
protected formValidatorService: FormValidatorService,
private customConfigValidatorsService: CustomConfigValidatorsService,
private userValidatorsService: UserValidatorsService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private configService: ConfigService,
private serverService: ServerService,
private i18n: I18n
@@ -58,40 +55,78 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
}
getResolutionKey (resolution: string) {
- return 'transcodingResolution' + resolution
+ return 'transcoding.resolutions.' + resolution
}
ngOnInit () {
- const formGroupData: { [key: string]: any } = {
- instanceName: this.customConfigValidatorsService.INSTANCE_NAME,
- instanceShortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
- instanceDescription: null,
- instanceTerms: null,
- instanceDefaultClientRoute: null,
- instanceDefaultNSFWPolicy: null,
- servicesTwitterUsername: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME,
- servicesTwitterWhitelisted: null,
- cachePreviewsSize: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE,
- cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE,
- signupEnabled: null,
- signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT,
- signupRequiresEmailVerification: null,
- importVideosHttpEnabled: null,
- importVideosTorrentEnabled: null,
- adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL,
- userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
- userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY,
- transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS,
- transcodingEnabled: null,
- customizationJavascript: null,
- customizationCSS: null
+ const formGroupData: { [key in keyof CustomConfig ]: any } = {
+ instance: {
+ name: this.customConfigValidatorsService.INSTANCE_NAME,
+ shortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
+ description: null,
+ terms: null,
+ defaultClientRoute: null,
+ defaultNSFWPolicy: null,
+ customizations: {
+ javascript: null,
+ css: null
+ }
+ },
+ services: {
+ twitter: {
+ username: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME,
+ whitelisted: null
+ }
+ },
+ cache: {
+ previews: {
+ size: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE
+ },
+ captions: {
+ size: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE
+ }
+ },
+ signup: {
+ enabled: null,
+ limit: this.customConfigValidatorsService.SIGNUP_LIMIT,
+ requiresEmailVerification: null
+ },
+ import: {
+ videos: {
+ http: {
+ enabled: null
+ },
+ torrent: {
+ enabled: null
+ }
+ }
+ },
+ admin: {
+ email: this.customConfigValidatorsService.ADMIN_EMAIL
+ },
+ contactForm: {
+ enabled: null
+ },
+ user: {
+ videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
+ videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY
+ },
+ transcoding: {
+ enabled: null,
+ threads: this.customConfigValidatorsService.TRANSCODING_THREADS,
+ allowAdditionalExtensions: null,
+ resolutions: {}
+ }
}
- const defaultValues: BuildFormDefaultValues = {}
+ const defaultValues = {
+ transcoding: {
+ resolutions: {}
+ }
+ }
for (const resolution of this.resolutions) {
- const key = this.getResolutionKey(resolution)
- defaultValues[key] = 'false'
- formGroupData[key] = null
+ defaultValues.transcoding.resolutions[resolution] = 'false'
+ formGroupData.transcoding.resolutions[resolution] = null
}
this.buildForm(formGroupData)
@@ -101,90 +136,25 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
res => {
this.customConfig = res
- this.oldCustomCSS = this.customConfig.instance.customizations.css
- this.oldCustomJavascript = this.customConfig.instance.customizations.javascript
-
this.updateForm()
// Force form validation
this.forceCheck()
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
isTranscodingEnabled () {
- return this.form.value['transcodingEnabled'] === true
+ return this.form.value['transcoding']['enabled'] === true
}
isSignupEnabled () {
- return this.form.value['signupEnabled'] === true
+ return this.form.value['signup']['enabled'] === true
}
async formValidated () {
- const data: CustomConfig = {
- instance: {
- name: this.form.value['instanceName'],
- shortDescription: this.form.value['instanceShortDescription'],
- description: this.form.value['instanceDescription'],
- terms: this.form.value['instanceTerms'],
- defaultClientRoute: this.form.value['instanceDefaultClientRoute'],
- defaultNSFWPolicy: this.form.value['instanceDefaultNSFWPolicy'],
- customizations: {
- javascript: this.form.value['customizationJavascript'],
- css: this.form.value['customizationCSS']
- }
- },
- services: {
- twitter: {
- username: this.form.value['servicesTwitterUsername'],
- whitelisted: this.form.value['servicesTwitterWhitelisted']
- }
- },
- cache: {
- previews: {
- size: this.form.value['cachePreviewsSize']
- },
- captions: {
- size: this.form.value['cacheCaptionsSize']
- }
- },
- signup: {
- enabled: this.form.value['signupEnabled'],
- limit: this.form.value['signupLimit'],
- requiresEmailVerification: this.form.value['signupRequiresEmailVerification']
- },
- admin: {
- email: this.form.value['adminEmail']
- },
- user: {
- videoQuota: this.form.value['userVideoQuota'],
- videoQuotaDaily: this.form.value['userVideoQuotaDaily']
- },
- transcoding: {
- enabled: this.form.value['transcodingEnabled'],
- threads: this.form.value['transcodingThreads'],
- resolutions: {
- '240p': this.form.value[this.getResolutionKey('240p')],
- '360p': this.form.value[this.getResolutionKey('360p')],
- '480p': this.form.value[this.getResolutionKey('480p')],
- '720p': this.form.value[this.getResolutionKey('720p')],
- '1080p': this.form.value[this.getResolutionKey('1080p')]
- }
- },
- import: {
- videos: {
- http: {
- enabled: this.form.value['importVideosHttpEnabled']
- },
- torrent: {
- enabled: this.form.value['importVideosTorrentEnabled']
- }
- }
- }
- }
-
- this.configService.updateCustomConfig(data)
+ this.configService.updateCustomConfig(this.form.value)
.subscribe(
res => {
this.customConfig = res
@@ -194,45 +164,15 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
this.updateForm()
- this.notificationsService.success(this.i18n('Success'), this.i18n('Configuration updated.'))
+ this.notifier.success(this.i18n('Configuration updated.'))
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
private updateForm () {
- const data: { [key: string]: any } = {
- instanceName: this.customConfig.instance.name,
- instanceShortDescription: this.customConfig.instance.shortDescription,
- instanceDescription: this.customConfig.instance.description,
- instanceTerms: this.customConfig.instance.terms,
- instanceDefaultClientRoute: this.customConfig.instance.defaultClientRoute,
- instanceDefaultNSFWPolicy: this.customConfig.instance.defaultNSFWPolicy,
- servicesTwitterUsername: this.customConfig.services.twitter.username,
- servicesTwitterWhitelisted: this.customConfig.services.twitter.whitelisted,
- cachePreviewsSize: this.customConfig.cache.previews.size,
- cacheCaptionsSize: this.customConfig.cache.captions.size,
- signupEnabled: this.customConfig.signup.enabled,
- signupLimit: this.customConfig.signup.limit,
- signupRequiresEmailVerification: this.customConfig.signup.requiresEmailVerification,
- adminEmail: this.customConfig.admin.email,
- userVideoQuota: this.customConfig.user.videoQuota,
- userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily,
- transcodingThreads: this.customConfig.transcoding.threads,
- transcodingEnabled: this.customConfig.transcoding.enabled,
- customizationJavascript: this.customConfig.instance.customizations.javascript,
- customizationCSS: this.customConfig.instance.customizations.css,
- importVideosHttpEnabled: this.customConfig.import.videos.http.enabled,
- importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled
- }
-
- for (const resolution of this.resolutions) {
- const key = this.getResolutionKey(resolution)
- data[key] = this.customConfig.transcoding.resolutions[resolution]
- }
-
- this.form.patchValue(data)
+ this.form.patchValue(this.customConfig)
}
}
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
index 4a25b7ff3..9a8848bfb 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { SortMeta } from 'primeng/primeng'
import { ActorFollow } from '../../../../../../shared/models/actors/follow.model'
import { RestPagination, RestTable } from '../../../shared'
@@ -20,7 +20,7 @@ export class FollowersListComponent extends RestTable implements OnInit {
pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
constructor (
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private followService: FollowService,
private i18n: I18n
) {
@@ -32,14 +32,14 @@ export class FollowersListComponent extends RestTable implements OnInit {
}
protected loadData () {
- this.followService.getFollowers(this.pagination, this.sort)
+ this.followService.getFollowers(this.pagination, this.sort, this.search)
.subscribe(
resultList => {
this.followers = resultList.data
this.totalRecords = resultList.total
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.ts b/client/src/app/+admin/follows/following-add/following-add.component.ts
index bd9cc022b..2bb249746 100644
--- a/client/src/app/+admin/follows/following-add/following-add.component.ts
+++ b/client/src/app/+admin/follows/following-add/following-add.component.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core'
import { Router } from '@angular/router'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { ConfirmService } from '../../../core'
import { validateHost } from '../../../shared'
import { FollowService } from '../shared'
@@ -18,7 +18,7 @@ export class FollowingAddComponent {
constructor (
private router: Router,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private confirmService: ConfirmService,
private followService: FollowService,
private i18n: I18n
@@ -64,12 +64,12 @@ export class FollowingAddComponent {
this.followService.follow(hosts).subscribe(
() => {
- this.notificationsService.success(this.i18n('Success'), this.i18n('Follow request(s) sent!'))
+ this.notifier.success(this.i18n('Follow request(s) sent!'))
setTimeout(() => this.router.navigate([ '/admin/follows/following-list' ]), 500)
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts
index 9b7029f75..4517a721e 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.ts
+++ b/client/src/app/+admin/follows/following-list/following-list.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { SortMeta } from 'primeng/primeng'
import { ActorFollow } from '../../../../../../shared/models/actors/follow.model'
import { ConfirmService } from '../../../core/confirm/confirm.service'
@@ -20,7 +20,7 @@ export class FollowingListComponent extends RestTable implements OnInit {
pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
constructor (
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private confirmService: ConfirmService,
private followService: FollowService,
private i18n: I18n
@@ -41,14 +41,11 @@ export class FollowingListComponent extends RestTable implements OnInit {
this.followService.unfollow(follow).subscribe(
() => {
- this.notificationsService.success(
- this.i18n('Success'),
- this.i18n('You are not following {{host}} anymore.', { host: follow.following.host })
- )
+ this.notifier.success(this.i18n('You are not following {{host}} anymore.', { host: follow.following.host }))
this.loadData()
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
@@ -60,7 +57,7 @@ export class FollowingListComponent extends RestTable implements OnInit {
this.totalRecords = resultList.total
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
diff --git a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
index 6d77a0eb4..fa1da26bf 100644
--- a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
+++ b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
@@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { RedundancyService } from '@app/+admin/follows/shared/redundancy.service'
@@ -13,24 +13,21 @@ export class RedundancyCheckboxComponent {
@Input() host: string
constructor (
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private redundancyService: RedundancyService,
private i18n: I18n
) { }
updateRedundancyState () {
this.redundancyService.updateRedundancy(this.host, this.redundancyAllowed)
- .subscribe(
- () => {
- const stateLabel = this.redundancyAllowed ? this.i18n('enabled') : this.i18n('disabled')
+ .subscribe(
+ () => {
+ const stateLabel = this.redundancyAllowed ? this.i18n('enabled') : this.i18n('disabled')
- this.notificationsService.success(
- this.i18n('Success'),
- this.i18n('Redundancy for {{host}} is {{stateLabel}}', { host: this.host, stateLabel })
- )
- },
+ this.notifier.success(this.i18n('Redundancy for {{host}} is {{stateLabel}}', { host: this.host, stateLabel }))
+ },
- err => this.notificationsService.error(this.i18n('Error'), err.message)
- )
+ err => this.notifier.error(err.message)
+ )
}
}
diff --git a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts
index 44778ab56..b265e1dd6 100644
--- a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts
+++ b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'
import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { SortMeta } from 'primeng/primeng'
import { Job } from '../../../../../../shared/index'
import { JobState } from '../../../../../../shared/models'
@@ -25,7 +25,7 @@ export class JobsListComponent extends RestTable implements OnInit {
pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
constructor (
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private jobsService: JobService,
private i18n: I18n
) {
@@ -53,7 +53,7 @@ export class JobsListComponent extends RestTable implements OnInit {
this.totalRecords = resultList.total
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
index 3f243aee4..032bf745a 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
@@ -1,9 +1,9 @@
import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { RestPagination, RestTable } from '@app/shared'
import { SortMeta } from 'primeng/components/common/sortmeta'
-import { BlocklistService, AccountBlock } from '@app/shared/blocklist'
+import { AccountBlock, BlocklistService } from '@app/shared/blocklist'
@Component({
selector: 'my-instance-account-blocklist',
@@ -18,7 +18,7 @@ export class InstanceAccountBlocklistComponent extends RestTable implements OnIn
pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
constructor (
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private blocklistService: BlocklistService,
private i18n: I18n
) {
@@ -35,8 +35,7 @@ export class InstanceAccountBlocklistComponent extends RestTable implements OnIn
this.blocklistService.unblockAccountByInstance(blockedAccount)
.subscribe(
() => {
- this.notificationsService.success(
- this.i18n('Success'),
+ this.notifier.success(
this.i18n('Account {{nameWithHost}} unmuted by your instance.', { nameWithHost: blockedAccount.nameWithHost })
)
@@ -53,7 +52,7 @@ export class InstanceAccountBlocklistComponent extends RestTable implements OnIn
this.totalRecords = resultList.total
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
index 130009dc7..db3dfcd1c 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { RestPagination, RestTable } from '@app/shared'
import { SortMeta } from 'primeng/components/common/sortmeta'
@@ -19,7 +19,7 @@ export class InstanceServerBlocklistComponent extends RestTable implements OnIni
pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
constructor (
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private blocklistService: BlocklistService,
private i18n: I18n
) {
@@ -36,10 +36,7 @@ export class InstanceServerBlocklistComponent extends RestTable implements OnIni
this.blocklistService.unblockServerByInstance(host)
.subscribe(
() => {
- this.notificationsService.success(
- this.i18n('Success'),
- this.i18n('Instance {{host}} unmuted by your instance.', { host })
- )
+ this.notifier.success(this.i18n('Instance {{host}} unmuted by your instance.', { host }))
this.loadData()
}
@@ -54,7 +51,7 @@ export class InstanceServerBlocklistComponent extends RestTable implements OnIni
this.totalRecords = resultList.total
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss
index 02ccfc8ca..13b019c5b 100644
--- a/client/src/app/+admin/moderation/moderation.component.scss
+++ b/client/src/app/+admin/moderation/moderation.component.scss
@@ -10,6 +10,7 @@
font-weight: $font-semibold;
min-width: 200px;
display: inline-block;
+ vertical-align: top;
}
.moderation-expanded-text {
diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html
index 3a8424f68..303a788d2 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html
+++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html
@@ -1,7 +1,8 @@
- {{ formErrors.cacheCaptionsSize }}
+
+
+
+
+
- {{ formErrors.cache.captions.size }}
Customizations
-
-
-
+
- {{ formErrors.customizationJavascript }}
-
-
+
+
- {{ formErrors.instance.customizations.javascript }}
+
-
-
+ {{ formErrors.instance.customizations.css }}
+
- #custom-css .logged-in-email {{ '{' }}
- color: red;
- {{ '}' }}
-
- "
- >
-
-
- {{ formErrors.customizationCSS }}
-
-
Moderation comment
-
+
+
@@ -14,12 +15,12 @@
+
@@ -65,7 +65,9 @@
(banned)
+
This comment can only be seen by you or the other moderators.
-
+
-
\ No newline at end of file
+
diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts
index 34ab384d1..f915978ee 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts
+++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts
@@ -1,5 +1,5 @@
import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { FormReactive, VideoAbuseService, VideoAbuseValidatorsService } from '../../../shared'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -22,7 +22,7 @@ export class ModerationCommentModalComponent extends FormReactive implements OnI
constructor (
protected formValidatorService: FormValidatorService,
private modalService: NgbModal,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private videoAbuseService: VideoAbuseService,
private videoAbuseValidatorsService: VideoAbuseValidatorsService,
private i18n: I18n
@@ -45,29 +45,26 @@ export class ModerationCommentModalComponent extends FormReactive implements OnI
})
}
- hideModerationCommentModal () {
+ hide () {
this.abuseToComment = undefined
this.openedModal.close()
this.form.reset()
}
async banUser () {
- const moderationComment: string = this.form.value['moderationComment']
+ const moderationComment: string = this.form.value[ 'moderationComment' ]
this.videoAbuseService.updateVideoAbuse(this.abuseToComment, { moderationComment })
- .subscribe(
- () => {
- this.notificationsService.success(
- this.i18n('Success'),
- this.i18n('Comment updated.')
- )
+ .subscribe(
+ () => {
+ this.notifier.success(this.i18n('Comment updated.'))
- this.commentUpdated.emit(moderationComment)
- this.hideModerationCommentModal()
- },
+ this.commentUpdated.emit(moderationComment)
+ this.hide()
+ },
- err => this.notificationsService.error(this.i18n('Error'), err.message)
- )
+ err => this.notifier.error(err.message)
+ )
}
}
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
index 0374b70ef..05b549de6 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
@@ -41,7 +41,7 @@
-
@@ -51,15 +51,15 @@
-
-
+
-
+
Video name
Sensitive
+ Unfederated
Date
@@ -26,20 +27,21 @@
- {{ videoBlacklist.video.nsfw }}
+ {{ booleanToText(videoBlacklist.video.nsfw) }}
+ {{ booleanToText(videoBlacklist.unfederated) }}
{{ videoBlacklist.createdAt }}
-
-
+
-
+
Users list
-
+ {{ user.email }}
+
? {{ user.email }}
@@ -76,6 +78,7 @@
{{ user.videoQuotaUsed }} / {{ user.videoQuota }}
{{ user.roleLabel }}
{{ user.createdAt }}
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 f235769f0..5274be01c 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
@@ -2,7 +2,7 @@
@import '_mixins';
.add-button {
- @include create-button('../../../../assets/images/global/add.svg');
+ @include create-button;
}
tr.banned {
@@ -23,4 +23,4 @@ tr.banned {
input {
@include peertube-input-text(250px);
}
-}
\ No newline at end of file
+}
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts
index fb085c133..66ab796f9 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/users/user-list/user-list.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { SortMeta } from 'primeng/components/common/sortmeta'
import { ConfirmService, ServerService } from '../../../core'
import { RestPagination, RestTable, UserService } from '../../../shared'
@@ -26,7 +26,7 @@ export class UserListComponent extends RestTable implements OnInit {
bulkUserActions: DropdownActionYou don't have videos history yet.
+
+
+
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.scss b/client/src/app/+my-account/my-account-history/my-account-history.component.scss
new file mode 100644
index 000000000..e7c6863f1
--- /dev/null
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.scss
@@ -0,0 +1,99 @@
+@import '_variables';
+@import '_mixins';
+
+.no-history {
+ display: flex;
+ justify-content: center;
+ margin-top: 50px;
+ font-weight: $font-semibold;
+ font-size: 16px;
+}
+
+.top-buttons {
+ margin-bottom: 20px;
+ display: flex;
+
+ .history-switch {
+ display: flex;
+ flex-grow: 1;
+
+ label {
+ margin: 0 0 0 5px;
+ }
+ }
+
+ .delete-history {
+ font-size: 15px;
+
+ button {
+ @include peertube-button;
+ @include grey-button;
+ }
+ }
+}
+
+.video {
+ @include row-blocks;
+
+ my-video-thumbnail {
+ margin-right: 10px;
+ }
+
+ .video-info {
+ flex-grow: 1;
+
+ .video-info-name {
+ @include disable-default-a-behaviour;
+
+ color: var(--mainForegroundColor);
+ display: block;
+ width: fit-content;
+ font-size: 18px;
+ font-weight: $font-semibold;
+ }
+
+ .video-info-date-views {
+ font-size: 14px;
+ }
+
+ .video-info-account {
+ @include disable-default-a-behaviour;
+
+ display: block;
+ width: fit-content;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 14px;
+ color: $grey-foreground-color;
+
+ &:hover {
+ color: $grey-foreground-hover-color;
+ }
+ }
+ }
+}
+
+@media screen and (max-width: $small-view) {
+ .video {
+ flex-direction: column;
+ height: auto;
+ text-align: center;
+
+ .video-info-name {
+ margin: auto;
+ }
+
+ input[type=checkbox] {
+ display: none;
+ }
+
+ my-video-thumbnail {
+ margin-right: 0;
+ }
+
+ .video-buttons {
+ margin-top: 10px;
+ }
+ }
+}
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.ts b/client/src/app/+my-account/my-account-history/my-account-history.component.ts
new file mode 100644
index 000000000..394091bad
--- /dev/null
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.ts
@@ -0,0 +1,107 @@
+import { Component, OnDestroy, OnInit } 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 { AuthService } from '../../core/auth'
+import { ConfirmService } from '../../core/confirm'
+import { AbstractVideoList } from '../../shared/video/abstract-video-list'
+import { VideoService } from '../../shared/video/video.service'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { ScreenService } from '@app/shared/misc/screen.service'
+import { UserHistoryService } from '@app/shared/users/user-history.service'
+import { UserService } from '@app/shared'
+import { Notifier } from '@app/core'
+
+@Component({
+ selector: 'my-account-history',
+ templateUrl: './my-account-history.component.html',
+ styleUrls: [ './my-account-history.component.scss' ]
+})
+export class MyAccountHistoryComponent extends AbstractVideoList implements OnInit, OnDestroy {
+ titlePage: string
+ currentRoute = '/my-account/history/videos'
+ pagination: ComponentPagination = {
+ currentPage: 1,
+ itemsPerPage: 5,
+ totalItems: null
+ }
+ videosHistoryEnabled: boolean
+
+ protected baseVideoWidth = -1
+ protected baseVideoHeight = 155
+
+ constructor (
+ protected router: Router,
+ protected route: ActivatedRoute,
+ protected authService: AuthService,
+ protected userService: UserService,
+ protected notifier: Notifier,
+ protected location: Location,
+ protected screenService: ScreenService,
+ protected i18n: I18n,
+ private confirmService: ConfirmService,
+ private videoService: VideoService,
+ private userHistoryService: UserHistoryService
+ ) {
+ super()
+
+ this.titlePage = this.i18n('My videos history')
+ }
+
+ ngOnInit () {
+ super.ngOnInit()
+
+ this.videosHistoryEnabled = this.authService.getUser().videosHistoryEnabled
+ }
+
+ ngOnDestroy () {
+ super.ngOnDestroy()
+ }
+
+ getVideosObservable (page: number) {
+ const newPagination = immutableAssign(this.pagination, { currentPage: page })
+
+ return this.userHistoryService.getUserVideosHistory(newPagination)
+ }
+
+ generateSyndicationList () {
+ throw new Error('Method not implemented.')
+ }
+
+ onVideosHistoryChange () {
+ this.userService.updateMyProfile({ videosHistoryEnabled: this.videosHistoryEnabled })
+ .subscribe(
+ () => {
+ const message = this.videosHistoryEnabled === true ?
+ this.i18n('Videos history is enabled') :
+ this.i18n('Videos history is disabled')
+
+ this.notifier.success(message)
+
+ this.authService.refreshUserInformation()
+ },
+
+ err => this.notifier.error(err.message)
+ )
+ }
+
+ async deleteHistory () {
+ const title = this.i18n('Delete videos history')
+ const message = this.i18n('Are you sure you want to delete all your videos history?')
+
+ const res = await this.confirmService.confirm(message, title)
+ if (res !== true) return
+
+ this.userHistoryService.deleteUserVideosHistory()
+ .subscribe(
+ () => {
+ this.notifier.success(this.i18n('Videos history deleted'))
+
+ this.reloadVideos()
+ },
+
+ err => this.notifier.error(err.message)
+ )
+ }
+}
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
new file mode 100644
index 000000000..d518b22ec
--- /dev/null
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
Accept ownership
-
+
+
diff --git a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts
index a68b452ec..79d29b139 100644
--- a/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts
+++ b/client/src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.ts
@@ -1,5 +1,5 @@
import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier } from '@app/core'
import { FormReactive } from '@app/shared'
import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
import { VideoOwnershipService } from '@app/shared/video-ownership'
@@ -8,7 +8,6 @@ import { VideoAcceptOwnershipValidatorsService } from '@app/shared/forms/form-va
import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
import { I18n } from '@ngx-translate/i18n-polyfill'
-import { AuthService } from '@app/core'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
@Component({
@@ -31,7 +30,7 @@ export class MyAccountAcceptOwnershipComponent extends FormReactive implements O
protected formValidatorService: FormValidatorService,
private videoChangeOwnershipValidatorsService: VideoAcceptOwnershipValidatorsService,
private videoOwnershipService: VideoOwnershipService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private authService: AuthService,
private videoChannelService: VideoChannelService,
private modalService: NgbModal,
@@ -68,12 +67,12 @@ export class MyAccountAcceptOwnershipComponent extends FormReactive implements O
.acceptOwnership(videoChangeOwnership.id, { channelId: channel })
.subscribe(
() => {
- this.notificationsService.success(this.i18n('Success'), this.i18n('Ownership accepted'))
+ this.notifier.success(this.i18n('Ownership accepted'))
if (this.accepted) this.accepted.emit()
this.videoChangeOwnership = undefined
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html
index 379fd8bb1..5709e9f54 100644
--- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html
+++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html
@@ -40,10 +40,10 @@
-
diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts
index 0b51ac13c..77857c4fd 100644
--- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts
+++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts
@@ -1,13 +1,11 @@
import { Component, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
-import { I18n } from '@ngx-translate/i18n-polyfill'
+import { Notifier } from '@app/core'
import { RestPagination, RestTable } from '@app/shared'
import { SortMeta } from 'primeng/components/common/sortmeta'
import { VideoChangeOwnership } from '../../../../../shared'
import { VideoOwnershipService } from '@app/shared/video-ownership'
import { Account } from '@app/shared/account/account.model'
-import { MyAccountAcceptOwnershipComponent }
-from '@app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component'
+import { MyAccountAcceptOwnershipComponent } from './my-account-accept-ownership/my-account-accept-ownership.component'
@Component({
selector: 'my-account-ownership',
@@ -23,9 +21,8 @@ export class MyAccountOwnershipComponent extends RestTable implements OnInit {
@ViewChild('myAccountAcceptOwnershipComponent') myAccountAcceptOwnershipComponent: MyAccountAcceptOwnershipComponent
constructor (
- private notificationsService: NotificationsService,
- private videoOwnershipService: VideoOwnershipService,
- private i18n: I18n
+ private notifier: Notifier,
+ private videoOwnershipService: VideoOwnershipService
) {
super()
}
@@ -50,7 +47,7 @@ export class MyAccountOwnershipComponent extends RestTable implements OnInit {
this.videoOwnershipService.refuseOwnership(videoChangeOwnership.id)
.subscribe(
() => this.loadData(),
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
@@ -62,7 +59,7 @@ export class MyAccountOwnershipComponent extends RestTable implements OnInit {
this.totalRecords = resultList.total
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
diff --git a/client/src/app/+my-account/my-account-routing.module.ts b/client/src/app/+my-account/my-account-routing.module.ts
index 601e517b4..9996218ca 100644
--- a/client/src/app/+my-account/my-account-routing.module.ts
+++ b/client/src/app/+my-account/my-account-routing.module.ts
@@ -13,6 +13,8 @@ import { MyAccountSubscriptionsComponent } from '@app/+my-account/my-account-sub
import { MyAccountOwnershipComponent } from '@app/+my-account/my-account-ownership/my-account-ownership.component'
import { MyAccountBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-blocklist.component'
import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-blocklist/my-account-server-blocklist.component'
+import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
+import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component'
const myAccountRoutes: Routes = [
{
@@ -114,6 +116,24 @@ const myAccountRoutes: Routes = [
title: 'Muted instances'
}
}
+ },
+ {
+ path: 'history/videos',
+ component: MyAccountHistoryComponent,
+ data: {
+ meta: {
+ title: 'Videos history'
+ }
+ }
+ },
+ {
+ path: 'notifications',
+ component: MyAccountNotificationsComponent,
+ data: {
+ meta: {
+ title: 'Notifications'
+ }
+ }
}
]
}
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-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 e5343b33d..cbb068c7c 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
@@ -1,11 +1,10 @@
import { Component, OnInit } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier } from '@app/core'
import { FormReactive, UserService } from '../../../shared'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service'
import { filter } from 'rxjs/operators'
-import { AuthService } from '@app/core'
import { User } from '../../../../../../shared'
@Component({
@@ -20,7 +19,7 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
constructor (
protected formValidatorService: FormValidatorService,
private userValidatorsService: UserValidatorsService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private authService: AuthService,
private userService: UserService,
private i18n: I18n
@@ -50,7 +49,7 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
this.userService.changePassword(currentPassword, newPassword).subscribe(
() => {
- this.notificationsService.success(this.i18n('Success'), this.i18n('Password updated.'))
+ this.notifier.success(this.i18n('Password updated.'))
this.form.reset()
this.error = null
diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
index 63a121f64..3f79efe20 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
@@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { AuthService, ConfirmService, RedirectService } from '../../../core'
import { UserService } from '../../../shared'
import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -15,7 +15,7 @@ export class MyAccountDangerZoneComponent {
constructor (
private authService: AuthService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private userService: UserService,
private confirmService: ConfirmService,
private redirectService: RedirectService,
@@ -34,13 +34,13 @@ export class MyAccountDangerZoneComponent {
this.userService.deleteMe().subscribe(
() => {
- this.notificationsService.success(this.i18n('Success'), this.i18n('Your account is deleted.'))
+ this.notifier.success(this.i18n('Your account is deleted.'))
this.authService.logout()
this.redirectService.redirectToHomepage()
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/index.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/index.ts
new file mode 100644
index 000000000..5e1d51339
--- /dev/null
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/index.ts
@@ -0,0 +1 @@
+export * from './my-account-notification-preferences.component'
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html
new file mode 100644
index 000000000..59422d682
--- /dev/null
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html
@@ -0,0 +1,19 @@
+
+
+
+Activities
+ Web
+ Email
+
+
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss
new file mode 100644
index 000000000..6feb16ab1
--- /dev/null
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss
@@ -0,0 +1,25 @@
+@import '_variables';
+@import '_mixins';
+
+.custom-row {
+ display: flex;
+ align-items: center;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.10);
+
+ &:first-child {
+ font-size: 16px;
+
+ & > div {
+ font-weight: $font-semibold;
+ }
+ }
+
+ & > div {
+ width: 350px;
+ }
+
+ & > div {
+ padding: 10px
+ }
+}
+
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
new file mode 100644
index 000000000..519bdfab4
--- /dev/null
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
@@ -0,0 +1,99 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { User } from '@app/shared'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { Subject } from 'rxjs'
+import { UserNotificationSetting, UserNotificationSettingValue, UserRight } from '../../../../../../shared'
+import { Notifier, ServerService } from '@app/core'
+import { debounce } from 'lodash-es'
+import { UserNotificationService } from '@app/shared/users/user-notification.service'
+
+@Component({
+ selector: 'my-account-notification-preferences',
+ templateUrl: './my-account-notification-preferences.component.html',
+ styleUrls: [ './my-account-notification-preferences.component.scss' ]
+})
+export class MyAccountNotificationPreferencesComponent implements OnInit {
+ @Input() user: User = null
+ @Input() userInformationLoaded: Subject{{ labelNotifications[notificationType] }}
+
+
+
+
+
+
+ Profile
- Profile
+Notifications
+Password
Danger zone
-
Change ownership
-
+
+
diff --git a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts
index 9f94f3c13..37d7cf2a4 100644
--- a/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts
+++ b/client/src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.ts
@@ -1,5 +1,5 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { FormReactive, UserService } from '../../../shared/index'
import { Video } from '@app/shared/video/video.model'
@@ -25,7 +25,7 @@ export class VideoChangeOwnershipComponent extends FormReactive implements OnIni
protected formValidatorService: FormValidatorService,
private videoChangeOwnershipValidatorsService: VideoChangeOwnershipValidatorsService,
private videoOwnershipService: VideoOwnershipService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private userService: UserService,
private modalService: NgbModal,
private i18n: I18n
@@ -53,11 +53,9 @@ export class VideoChangeOwnershipComponent extends FormReactive implements OnIni
const query = event.query
this.userService.autocomplete(query)
.subscribe(
- usernames => {
- this.usernamePropositions = usernames
- },
+ usernames => this.usernamePropositions = usernames,
- err => this.notificationsService.error('Error', err.message)
+ err => this.notifier.error(err.message)
)
}
@@ -67,9 +65,9 @@ export class VideoChangeOwnershipComponent extends FormReactive implements OnIni
this.videoOwnershipService
.changeOwnership(this.video.id, username)
.subscribe(
- () => this.notificationsService.success(this.i18n('Success'), this.i18n('Ownership change request sent.')),
+ () => this.notifier.success(this.i18n('Ownership change request sent.')),
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
diff --git a/client/src/app/+my-account/my-account.component.html b/client/src/app/+my-account/my-account.component.html
index 41333c25a..3999252be 100644
--- a/client/src/app/+my-account/my-account.component.html
+++ b/client/src/app/+my-account/my-account.component.html
@@ -1,40 +1,5 @@
-
+
diff --git a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
index e4a5522c8..f9ecf664b 100644
--- a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
+++ b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
import { I18n } from '@ngx-translate/i18n-polyfill'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
import { UserService } from '@app/shared'
@Component({
@@ -17,7 +17,7 @@ export class VerifyAccountEmailComponent implements OnInit {
constructor (
private userService: UserService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private router: Router,
private route: ActivatedRoute,
private i18n: I18n
@@ -29,7 +29,7 @@ export class VerifyAccountEmailComponent implements OnInit {
this.verificationString = this.route.snapshot.queryParams['verificationString']
if (!this.userId || !this.verificationString) {
- this.notificationsService.error(this.i18n('Error'), this.i18n('Unable to find user id or verification string.'))
+ this.notifier.error(this.i18n('Unable to find user id or verification string.'))
} else {
this.verifyEmail()
}
@@ -46,7 +46,7 @@ export class VerifyAccountEmailComponent implements OnInit {
},
err => {
- this.notificationsService.error(this.i18n('Error'), err.message)
+ this.notifier.error(err.message)
}
)
}
diff --git a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts
index ea7b0e118..895b19064 100644
--- a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts
+++ b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts
@@ -3,7 +3,7 @@ import { VideoChannelService } from '@app/shared/video-channel/video-channel.ser
import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { Subscription } from 'rxjs'
-import { MarkdownService } from '@app/videos/shared'
+import { MarkdownService } from '@app/shared/renderer'
@Component({
selector: 'my-video-channel-about',
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
index 1f0744fb1..dea378a6e 100644
--- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
+++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
@@ -2,7 +2,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
import { Location } from '@angular/common'
import { immutableAssign } from '@app/shared/misc/utils'
-import { NotificationsService } from 'angular2-notifications'
import { AuthService } from '../../core/auth'
import { ConfirmService } from '../../core/confirm'
import { AbstractVideoList } from '../../shared/video/abstract-video-list'
@@ -13,6 +12,7 @@ import { tap } from 'rxjs/operators'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { Subscription } from 'rxjs'
import { ScreenService } from '@app/shared/misc/screen.service'
+import { Notifier } from '@app/core'
@Component({
selector: 'my-video-channel-videos',
@@ -35,7 +35,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
protected router: Router,
protected route: ActivatedRoute,
protected authService: AuthService,
- protected notificationsService: NotificationsService,
+ protected notifier: Notifier,
protected confirmService: ConfirmService,
protected location: Location,
protected screenService: ScreenService,
@@ -55,7 +55,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
this.videoChannelSub = this.videoChannelService.videoChannelLoaded
.subscribe(videoChannel => {
this.videoChannel = videoChannel
- this.currentRoute = '/video-channels/' + this.videoChannel.uuid + '/videos'
+ this.currentRoute = '/video-channels/' + this.videoChannel.nameWithHost + '/videos'
this.reloadVideos()
this.generateSyndicationList()
diff --git a/client/src/app/+video-channels/video-channels-routing.module.ts b/client/src/app/+video-channels/video-channels-routing.module.ts
index 935578d2a..3ac3533d9 100644
--- a/client/src/app/+video-channels/video-channels-routing.module.ts
+++ b/client/src/app/+video-channels/video-channels-routing.module.ts
@@ -7,7 +7,7 @@ import { VideoChannelAboutComponent } from './video-channel-about/video-channel-
const videoChannelsRoutes: Routes = [
{
- path: ':videoChannelId',
+ path: ':videoChannelName',
component: VideoChannelsComponent,
canActivateChild: [ MetaGuard ],
children: [
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index 0c5c814c7..41ff82e98 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -34,9 +34,9 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
ngOnInit () {
this.routeSub = this.route.params
.pipe(
- map(params => params[ 'videoChannelId' ]),
+ map(params => params[ 'videoChannelName' ]),
distinctUntilChanged(),
- switchMap(videoChannelId => this.videoChannelService.getVideoChannel(videoChannelId)),
+ switchMap(videoChannelName => this.videoChannelService.getVideoChannel(videoChannelName)),
catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ]))
)
.subscribe(videoChannel => this.videoChannel = videoChannel)
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 545d6aeda..cff37a7d6 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -43,7 +43,8 @@ const routes: Routes = [
imports: [
RouterModule.forRoot(routes, {
useHash: Boolean(history.pushState) === false,
- preloadingStrategy: PreloadSelectedModulesList
+ preloadingStrategy: PreloadSelectedModulesList,
+ anchorScrolling: 'enabled'
})
],
providers: [
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 03f7e88ed..d398d4f35 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -30,12 +30,27 @@
+
+
+
+
+
+
+
Forgot your password
-
+
+
-
+
+
+ We are sorry, you cannot recover you password because your instance administrator did not configure the PeerTube email system.
+
+
+
this.redirect(),
+ () => this.redirectService.redirectToPreviousRoute(),
err => {
if (err.message.indexOf('credentials are invalid') !== -1) this.error = this.i18n('Incorrect username or password.')
@@ -71,15 +73,6 @@ export class LoginComponent extends FormReactive implements OnInit {
)
}
- redirect () {
- const redirect = this.authService.redirectUrl
- if (redirect) {
- this.router.navigate([ redirect ])
- } else {
- this.redirectService.redirectToHomepage()
- }
- }
-
askResetPassword () {
this.userService.askResetPassword(this.forgotPasswordEmail)
.subscribe(
@@ -88,18 +81,14 @@ export class LoginComponent extends FormReactive implements OnInit {
'An email with the reset password instructions will be sent to {{email}}.',
{ email: this.forgotPasswordEmail }
)
- this.notificationsService.success(this.i18n('Success'), message)
+ this.notifier.success(message)
this.hideForgotPasswordModal()
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
- onForgotPasswordModalShown () {
- this.forgotPasswordEmailInput.nativeElement.focus()
- }
-
openForgotPasswordModal () {
this.openedForgotPasswordModal = this.modalService.open(this.forgotPasswordModal)
}
diff --git a/client/src/app/menu/avatar-notification.component.html b/client/src/app/menu/avatar-notification.component.html
new file mode 100644
index 000000000..4ef3f0e89
--- /dev/null
+++ b/client/src/app/menu/avatar-notification.component.html
@@ -0,0 +1,23 @@
+
+
+
+{{ unreadNotifications }}
+
+
+
+
+
+ Help to translate PeerTube!
+
+
diff --git a/client/src/app/menu/language-chooser.component.scss b/client/src/app/menu/language-chooser.component.scss
index 944e86f46..72deb3952 100644
--- a/client/src/app/menu/language-chooser.component.scss
+++ b/client/src/app/menu/language-chooser.component.scss
@@ -1,6 +1,11 @@
@import '_variables';
@import '_mixins';
+.help-to-translate {
+ @include peertube-button-link;
+ @include orange-button;
+}
+
.modal-body {
text-align: center;
@@ -9,4 +14,4 @@
font-size: 16px;
margin: 15px;
}
-}
\ No newline at end of file
+}
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index e04bdf3d6..aa5bfa9c9 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -2,9 +2,7 @@
Change the language
-
+