Add visitor settings, rework logged-in dropdown (#2514)

* Add visitor settings, rework logged-in dropdown

* Make user dropdown P2P switch functional

* Fix lint

* Fix unnecessary notification when user logs out

* Simplify visitor settings code and remove unnecessary icons

* Catch parsing errors and reindent menu styles
pull/2530/head
Rigel Kent 2020-02-28 13:52:21 +01:00 committed by GitHub
parent 64645512b0
commit d3217560a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 912 additions and 255 deletions

View File

@ -327,4 +327,5 @@
* [Robbie Pearce](https://robbiepearce.com/softies/) * [Robbie Pearce](https://robbiepearce.com/softies/)
* [Fork-Awesome](https://github.com/ForkAwesome/Fork-Awesome) * [Fork-Awesome](https://github.com/ForkAwesome/Fork-Awesome)
* playlist add by Material UI * `playlist add` by Material UI
* `language` by Aaron Jin

View File

@ -96,7 +96,7 @@
</div> </div>
<div class="col"> <div class="col">
<div i18n class="middle-title"> <div id="statistics" i18n class="middle-title">
STATISTICS STATISTICS
</div> </div>
<my-instance-statistics></my-instance-statistics> <my-instance-statistics></my-instance-statistics>

View File

@ -12,6 +12,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
import { Subscription } from 'rxjs' import { Subscription } from 'rxjs'
import { ScreenService } from '@app/shared/misc/screen.service' import { ScreenService } from '@app/shared/misc/screen.service'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { UserService } from '@app/shared'
import { LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-account-videos', selector: 'my-account-videos',
@ -34,9 +36,11 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit,
protected serverService: ServerService, protected serverService: ServerService,
protected route: ActivatedRoute, protected route: ActivatedRoute,
protected authService: AuthService, protected authService: AuthService,
protected userService: UserService,
protected notifier: Notifier, protected notifier: Notifier,
protected confirmService: ConfirmService, protected confirmService: ConfirmService,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
private accountService: AccountService, private accountService: AccountService,
private videoService: VideoService private videoService: VideoService
) { ) {

View File

@ -11,6 +11,7 @@ import { ScreenService } from '@app/shared/misc/screen.service'
import { UserHistoryService } from '@app/shared/users/user-history.service' import { UserHistoryService } from '@app/shared/users/user-history.service'
import { UserService } from '@app/shared' import { UserService } from '@app/shared'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-account-history', selector: 'my-account-history',
@ -35,6 +36,7 @@ export class MyAccountHistoryComponent extends AbstractVideoList implements OnIn
protected userService: UserService, protected userService: UserService,
protected notifier: Notifier, protected notifier: Notifier,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
private confirmService: ConfirmService, private confirmService: ConfirmService,
private videoService: VideoService, private videoService: VideoService,
private userHistoryService: UserHistoryService private userHistoryService: UserHistoryService

View File

@ -12,5 +12,5 @@
</div> </div>
</div> </div>
<input type="submit" i18n-value value="Save" [disabled]="!form.valid"> <input *ngIf="!reactiveUpdate" type="submit" class="mt-0" i18n-value value="Save" [disabled]="!form.valid">
</form> </form>

View File

@ -1,21 +1,26 @@
import { Component, Input, OnInit } from '@angular/core' import { Component, Input, OnInit, OnDestroy } from '@angular/core'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { ServerConfig, UserUpdateMe } from '../../../../../../shared' import { ServerConfig, UserUpdateMe } from '../../../../../../shared'
import { AuthService } from '../../../core' import { AuthService } from '../../../core'
import { FormReactive, User, UserService } from '../../../shared' import { FormReactive } from '../../../shared/forms/form-reactive'
import { User, UserService } from '../../../shared/users'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
import { Subject } from 'rxjs' import { Subject, Subscription } from 'rxjs'
@Component({ @Component({
selector: 'my-account-interface-settings', selector: 'my-account-interface-settings',
templateUrl: './my-account-interface-settings.component.html', templateUrl: './my-account-interface-settings.component.html',
styleUrls: [ './my-account-interface-settings.component.scss' ] styleUrls: [ './my-account-interface-settings.component.scss' ]
}) })
export class MyAccountInterfaceSettingsComponent extends FormReactive implements OnInit { export class MyAccountInterfaceSettingsComponent extends FormReactive implements OnInit, OnDestroy {
@Input() user: User = null @Input() user: User = null
@Input() reactiveUpdate = false
@Input() notifyOnUpdate = true
@Input() userInformationLoaded: Subject<any> @Input() userInformationLoaded: Subject<any>
formValuesWatcher: Subscription
private serverConfig: ServerConfig private serverConfig: ServerConfig
constructor ( constructor (
@ -48,9 +53,17 @@ export class MyAccountInterfaceSettingsComponent extends FormReactive implements
this.form.patchValue({ this.form.patchValue({
theme: this.user.theme theme: this.user.theme
}) })
if (this.reactiveUpdate) {
this.formValuesWatcher = this.form.valueChanges.subscribe(val => this.updateInterfaceSettings())
}
}) })
} }
ngOnDestroy () {
this.formValuesWatcher?.unsubscribe()
}
updateInterfaceSettings () { updateInterfaceSettings () {
const theme = this.form.value['theme'] const theme = this.form.value['theme']
@ -58,14 +71,19 @@ export class MyAccountInterfaceSettingsComponent extends FormReactive implements
theme theme
} }
this.userService.updateMyProfile(details).subscribe( if (this.authService.isLoggedIn()) {
() => { this.userService.updateMyProfile(details).subscribe(
this.authService.refreshUserInformation() () => {
this.authService.refreshUserInformation()
this.notifier.success(this.i18n('Interface settings updated.')) if (this.notifyOnUpdate) this.notifier.success(this.i18n('Interface settings updated.'))
}, },
err => this.notifier.error(err.message) err => this.notifier.error(err.message)
) )
} else {
this.userService.updateMyAnonymousProfile(details)
if (this.notifyOnUpdate) this.notifier.success(this.i18n('Interface settings updated.'))
}
} }
} }

View File

@ -35,6 +35,8 @@
</div> </div>
</div> </div>
<ng-content select="inner-title"></ng-content>
<div class="form-group"> <div class="form-group">
<my-peertube-checkbox <my-peertube-checkbox
inputName="webTorrentEnabled" formControlName="webTorrentEnabled" inputName="webTorrentEnabled" formControlName="webTorrentEnabled"
@ -56,5 +58,5 @@
></my-peertube-checkbox> ></my-peertube-checkbox>
</div> </div>
<input type="submit" i18n-value value="Save" [disabled]="!form.valid"> <input *ngIf="!reactiveUpdate" type="submit" i18n-value value="Save" [disabled]="!form.valid">
</form> </form>

View File

@ -1,24 +1,31 @@
import { Component, Input, OnInit } from '@angular/core' import { Component, Input, OnInit, OnDestroy } from '@angular/core'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { UserUpdateMe } from '../../../../../../shared' import { UserUpdateMe } from '../../../../../../shared/models/users'
import { User, UserService } from '@app/shared/users'
import { AuthService } from '../../../core' import { AuthService } from '../../../core'
import { FormReactive, User, UserService } from '../../../shared' import { FormReactive } from '@app/shared/forms/form-reactive'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
import { forkJoin, Subject } from 'rxjs' import { forkJoin, Subject, Subscription } from 'rxjs'
import { SelectItem } from 'primeng/api' import { SelectItem } from 'primeng/api'
import { first } from 'rxjs/operators' import { first } from 'rxjs/operators'
import { NSFWPolicyType } from '@shared/models/videos/nsfw-policy.type'
import { pick } from 'lodash-es'
@Component({ @Component({
selector: 'my-account-video-settings', selector: 'my-account-video-settings',
templateUrl: './my-account-video-settings.component.html', templateUrl: './my-account-video-settings.component.html',
styleUrls: [ './my-account-video-settings.component.scss' ] styleUrls: [ './my-account-video-settings.component.scss' ]
}) })
export class MyAccountVideoSettingsComponent extends FormReactive implements OnInit { export class MyAccountVideoSettingsComponent extends FormReactive implements OnInit, OnDestroy {
@Input() user: User = null @Input() user: User = null
@Input() reactiveUpdate = false
@Input() notifyOnUpdate = true
@Input() userInformationLoaded: Subject<any> @Input() userInformationLoaded: Subject<any>
languageItems: SelectItem[] = [] languageItems: SelectItem[] = []
defaultNSFWPolicy: NSFWPolicyType
formValuesWatcher: Subscription
constructor ( constructor (
protected formValidatorService: FormValidatorService, protected formValidatorService: FormValidatorService,
@ -32,6 +39,8 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
} }
ngOnInit () { ngOnInit () {
let oldForm: any
this.buildForm({ this.buildForm({
nsfwPolicy: null, nsfwPolicy: null,
webTorrentEnabled: null, webTorrentEnabled: null,
@ -42,8 +51,9 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
forkJoin([ forkJoin([
this.serverService.getVideoLanguages(), this.serverService.getVideoLanguages(),
this.serverService.getConfig(),
this.userInformationLoaded.pipe(first()) this.userInformationLoaded.pipe(first())
]).subscribe(([ languages ]) => { ]).subscribe(([ languages, config ]) => {
this.languageItems = [ { label: this.i18n('Unknown language'), value: '_unknown' } ] this.languageItems = [ { label: this.i18n('Unknown language'), value: '_unknown' } ]
this.languageItems = this.languageItems this.languageItems = this.languageItems
.concat(languages.map(l => ({ label: l.label, value: l.id }))) .concat(languages.map(l => ({ label: l.label, value: l.id })))
@ -52,17 +62,32 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
? this.user.videoLanguages ? this.user.videoLanguages
: this.languageItems.map(l => l.value) : this.languageItems.map(l => l.value)
this.defaultNSFWPolicy = config.instance.defaultNSFWPolicy
this.form.patchValue({ this.form.patchValue({
nsfwPolicy: this.user.nsfwPolicy, nsfwPolicy: this.user.nsfwPolicy || this.defaultNSFWPolicy,
webTorrentEnabled: this.user.webTorrentEnabled, webTorrentEnabled: this.user.webTorrentEnabled,
autoPlayVideo: this.user.autoPlayVideo === true, autoPlayVideo: this.user.autoPlayVideo === true,
autoPlayNextVideo: this.user.autoPlayNextVideo, autoPlayNextVideo: this.user.autoPlayNextVideo,
videoLanguages videoLanguages
}) })
if (this.reactiveUpdate) {
oldForm = { ...this.form.value }
this.formValuesWatcher = this.form.valueChanges.subscribe((formValue: any) => {
const updatedKey = Object.keys(formValue).find(k => formValue[k] !== oldForm[k])
oldForm = { ...this.form.value }
this.updateDetails([updatedKey])
})
}
}) })
} }
updateDetails () { ngOnDestroy () {
this.formValuesWatcher?.unsubscribe()
}
updateDetails (onlyKeys?: string[]) {
const nsfwPolicy = this.form.value[ 'nsfwPolicy' ] const nsfwPolicy = this.form.value[ 'nsfwPolicy' ]
const webTorrentEnabled = this.form.value['webTorrentEnabled'] const webTorrentEnabled = this.form.value['webTorrentEnabled']
const autoPlayVideo = this.form.value['autoPlayVideo'] const autoPlayVideo = this.form.value['autoPlayVideo']
@ -81,7 +106,7 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
} }
} }
const details: UserUpdateMe = { let details: UserUpdateMe = {
nsfwPolicy, nsfwPolicy,
webTorrentEnabled, webTorrentEnabled,
autoPlayVideo, autoPlayVideo,
@ -89,15 +114,22 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
videoLanguages videoLanguages
} }
this.userService.updateMyProfile(details).subscribe( if (onlyKeys) details = pick(details, onlyKeys)
() => {
this.notifier.success(this.i18n('Video settings updated.'))
this.authService.refreshUserInformation() if (this.authService.isLoggedIn()) {
}, this.userService.updateMyProfile(details).subscribe(
() => {
this.authService.refreshUserInformation()
err => this.notifier.error(err.message) if (this.notifyOnUpdate) this.notifier.success(this.i18n('Video settings updated.'))
) },
err => this.notifier.error(err.message)
)
} else {
this.userService.updateMyAnonymousProfile(details)
if (this.notifyOnUpdate) this.notifier.success(this.i18n('Display/Video settings updated.'))
}
} }
getDefaultVideoLanguageLabel () { getDefaultVideoLanguageLabel () {

View File

@ -1,7 +1,7 @@
<div class="row"> <div class="row">
<my-top-menu-dropdown [menuEntries]="menuEntries"></my-top-menu-dropdown> <my-top-menu-dropdown [menuEntries]="menuEntries"></my-top-menu-dropdown>
<div class="margin-content"> <div class="margin-content pb-5">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
</div> </div>

View File

@ -5,7 +5,6 @@ import { InputSwitchModule } from 'primeng/inputswitch'
import { SharedModule } from '../shared' import { SharedModule } from '../shared'
import { MyAccountRoutingModule } from './my-account-routing.module' import { MyAccountRoutingModule } from './my-account-routing.module'
import { MyAccountChangePasswordComponent } from './my-account-settings/my-account-change-password/my-account-change-password.component' import { MyAccountChangePasswordComponent } from './my-account-settings/my-account-change-password/my-account-change-password.component'
import { MyAccountVideoSettingsComponent } from './my-account-settings/my-account-video-settings/my-account-video-settings.component'
import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component' import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component'
import { MyAccountComponent } from './my-account.component' import { MyAccountComponent } from './my-account.component'
import { MyAccountVideosComponent } from './my-account-videos/my-account-videos.component' import { MyAccountVideosComponent } from './my-account-videos/my-account-videos.component'
@ -37,7 +36,6 @@ import {
} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component' } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'
import { DragDropModule } from '@angular/cdk/drag-drop' import { DragDropModule } from '@angular/cdk/drag-drop'
import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email' import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email'
import { MyAccountInterfaceSettingsComponent } from '@app/+my-account/my-account-settings/my-account-interface'
@NgModule({ @NgModule({
imports: [ imports: [
@ -54,10 +52,8 @@ import { MyAccountInterfaceSettingsComponent } from '@app/+my-account/my-account
MyAccountComponent, MyAccountComponent,
MyAccountSettingsComponent, MyAccountSettingsComponent,
MyAccountChangePasswordComponent, MyAccountChangePasswordComponent,
MyAccountVideoSettingsComponent,
MyAccountProfileComponent, MyAccountProfileComponent,
MyAccountChangeEmailComponent, MyAccountChangeEmailComponent,
MyAccountInterfaceSettingsComponent,
MyAccountVideosComponent, MyAccountVideosComponent,

View File

@ -12,6 +12,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
import { Subscription } from 'rxjs' import { Subscription } from 'rxjs'
import { ScreenService } from '@app/shared/misc/screen.service' import { ScreenService } from '@app/shared/misc/screen.service'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { UserService } from '@app/shared'
import { LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-video-channel-videos', selector: 'my-video-channel-videos',
@ -34,9 +36,11 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
protected serverService: ServerService, protected serverService: ServerService,
protected route: ActivatedRoute, protected route: ActivatedRoute,
protected authService: AuthService, protected authService: AuthService,
protected userService: UserService,
protected notifier: Notifier, protected notifier: Notifier,
protected confirmService: ConfirmService, protected confirmService: ConfirmService,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
private videoChannelService: VideoChannelService, private videoChannelService: VideoChannelService,
private videoService: VideoService private videoService: VideoService
) { ) {

View File

@ -27,11 +27,6 @@
<div class="main-row"> <div class="main-row">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
<footer class="row">
<a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer" i18n-title>Powered by PeerTube</a>&nbsp;-&nbsp;
<a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer" i18n-title>CopyLeft 2015-2020</a>
</footer>
</div> </div>
</div> </div>
</div> </div>

View File

@ -19,6 +19,7 @@ import { WelcomeModalComponent } from '@app/modal/welcome-modal.component'
import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component' import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component'
import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models' import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models'
import { APP_BASE_HREF } from '@angular/common' import { APP_BASE_HREF } from '@angular/common'
import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
export function metaFactory (serverService: ServerService): MetaLoader { export function metaFactory (serverService: ServerService): MetaLoader {
return new MetaStaticLoader({ return new MetaStaticLoader({
@ -39,6 +40,7 @@ export function metaFactory (serverService: ServerService): MetaLoader {
MenuComponent, MenuComponent,
LanguageChooserComponent, LanguageChooserComponent,
QuickSettingsModalComponent,
AvatarNotificationComponent, AvatarNotificationComponent,
HeaderComponent, HeaderComponent,
SearchTypeaheadComponent, SearchTypeaheadComponent,

View File

@ -67,17 +67,6 @@ class Tokens {
} }
export class AuthUser extends User implements ServerMyUserModel { export class AuthUser extends User implements ServerMyUserModel {
private static KEYS = {
ID: 'id',
ROLE: 'role',
EMAIL: 'email',
VIDEOS_HISTORY_ENABLED: 'videos-history-enabled',
USERNAME: 'username',
NSFW_POLICY: 'nsfw_policy',
WEBTORRENT_ENABLED: 'peertube-videojs-' + 'webtorrent_enabled',
AUTO_PLAY_VIDEO: 'auto_play_video'
}
tokens: Tokens tokens: Tokens
specialPlaylists: MyUserSpecialPlaylist[] specialPlaylists: MyUserSpecialPlaylist[]
@ -106,10 +95,6 @@ export class AuthUser extends User implements ServerMyUserModel {
peertubeLocalStorage.removeItem(this.KEYS.USERNAME) peertubeLocalStorage.removeItem(this.KEYS.USERNAME)
peertubeLocalStorage.removeItem(this.KEYS.ID) peertubeLocalStorage.removeItem(this.KEYS.ID)
peertubeLocalStorage.removeItem(this.KEYS.ROLE) peertubeLocalStorage.removeItem(this.KEYS.ROLE)
peertubeLocalStorage.removeItem(this.KEYS.NSFW_POLICY)
peertubeLocalStorage.removeItem(this.KEYS.WEBTORRENT_ENABLED)
peertubeLocalStorage.removeItem(this.KEYS.VIDEOS_HISTORY_ENABLED)
peertubeLocalStorage.removeItem(this.KEYS.AUTO_PLAY_VIDEO)
peertubeLocalStorage.removeItem(this.KEYS.EMAIL) peertubeLocalStorage.removeItem(this.KEYS.EMAIL)
Tokens.flush() Tokens.flush()
} }

View File

@ -4,16 +4,15 @@ import { ServerService } from '@app/core/server'
import { environment } from '../../../environments/environment' import { environment } from '../../../environments/environment'
import { PluginService } from '@app/core/plugins/plugin.service' import { PluginService } from '@app/core/plugins/plugin.service'
import { ServerConfig, ServerConfigTheme } from '@shared/models' import { ServerConfig, ServerConfigTheme } from '@shared/models'
import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
import { first } from 'rxjs/operators' import { first } from 'rxjs/operators'
import { User } from '@app/shared/users/user.model'
import { UserService } from '@app/shared/users/user.service'
import { LocalStorageService } from '@app/shared/misc/storage.service'
import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
@Injectable() @Injectable()
export class ThemeService { export class ThemeService {
private static KEYS = {
LAST_ACTIVE_THEME: 'last_active_theme'
}
private oldThemeName: string private oldThemeName: string
private themes: ServerConfigTheme[] = [] private themes: ServerConfigTheme[] = []
@ -24,8 +23,10 @@ export class ThemeService {
constructor ( constructor (
private auth: AuthService, private auth: AuthService,
private userService: UserService,
private pluginService: PluginService, private pluginService: PluginService,
private server: ServerService private server: ServerService,
private localStorageService: LocalStorageService
) {} ) {}
initialize () { initialize () {
@ -77,11 +78,11 @@ export class ThemeService {
private getCurrentTheme () { private getCurrentTheme () {
if (this.themeFromLocalStorage) return this.themeFromLocalStorage.name if (this.themeFromLocalStorage) return this.themeFromLocalStorage.name
if (this.auth.isLoggedIn()) { const theme = this.auth.isLoggedIn()
const theme = this.auth.getUser().theme ? this.auth.getUser().theme
if (theme !== 'instance-default') return theme : this.userService.getAnonymousUser().theme
}
if (theme !== 'instance-default') return theme
return this.serverConfig.theme.default return this.serverConfig.theme.default
} }
@ -111,9 +112,9 @@ export class ThemeService {
this.pluginService.reloadLoadedScopes() this.pluginService.reloadLoadedScopes()
peertubeLocalStorage.setItem(ThemeService.KEYS.LAST_ACTIVE_THEME, JSON.stringify(theme)) this.localStorageService.setItem(User.KEYS.THEME, JSON.stringify(theme), false)
} else { } else {
peertubeLocalStorage.removeItem(ThemeService.KEYS.LAST_ACTIVE_THEME) this.localStorageService.removeItem(User.KEYS.THEME, false)
} }
this.oldThemeName = currentTheme this.oldThemeName = currentTheme
@ -126,6 +127,10 @@ export class ThemeService {
if (!this.auth.isLoggedIn()) { if (!this.auth.isLoggedIn()) {
this.updateCurrentTheme() this.updateCurrentTheme()
this.localStorageService.watch([User.KEYS.THEME]).subscribe(
() => this.updateCurrentTheme()
)
} }
this.auth.userInformationLoaded this.auth.userInformationLoaded
@ -134,7 +139,7 @@ export class ThemeService {
} }
private loadAndSetFromLocalStorage () { private loadAndSetFromLocalStorage () {
const lastActiveThemeString = peertubeLocalStorage.getItem(ThemeService.KEYS.LAST_ACTIVE_THEME) const lastActiveThemeString = this.localStorageService.getItem(User.KEYS.THEME)
if (!lastActiveThemeString) return if (!lastActiveThemeString) return
try { try {

View File

@ -4,6 +4,8 @@
.help-to-translate { .help-to-translate {
@include peertube-button-link; @include peertube-button-link;
@include orange-button; @include orange-button;
border-radius: 0;
} }
.modal-body { .modal-body {

View File

@ -1,7 +1,9 @@
import { Component, ElementRef, ViewChild } from '@angular/core' import { Component, ElementRef, ViewChild, Inject, LOCALE_ID } from '@angular/core'
import { I18N_LOCALES } from '../../../../shared' import { I18N_LOCALES } from '../../../../shared'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { sortBy } from '@app/shared/misc/utils' import { sortBy } from '@app/shared/misc/utils'
import { getCompleteLocale } from '@shared/models/i18n'
import { isOnDevLocale, getDevLocale } from '@app/shared/i18n/i18n-utils'
@Component({ @Component({
selector: 'my-language-chooser', selector: 'my-language-chooser',
@ -13,7 +15,10 @@ export class LanguageChooserComponent {
languages: { id: string, label: string }[] = [] languages: { id: string, label: string }[] = []
constructor (private modalService: NgbModal) { constructor (
private modalService: NgbModal,
@Inject(LOCALE_ID) private localeId: string
) {
const l = Object.keys(I18N_LOCALES) const l = Object.keys(I18N_LOCALES)
.map(k => ({ id: k, label: I18N_LOCALES[k] })) .map(k => ({ id: k, label: I18N_LOCALES[k] }))
@ -28,4 +33,10 @@ export class LanguageChooserComponent {
return window.location.origin + '/' + lang.id return window.location.origin + '/' + lang.id
} }
getCurrentLanguage () {
const english = 'English'
const locale = isOnDevLocale() ? getDevLocale() : getCompleteLocale(this.localeId)
if (locale) return I18N_LOCALES[locale] || english
return english
}
} }

View File

@ -11,31 +11,62 @@
<div class="logged-in-username">{{ user.username }}</div> <div class="logged-in-username">{{ user.username }}</div>
</div> </div>
<div class="logged-in-more" ngbDropdown placement="bottom-right auto" container="body"> <div class="logged-in-more" ngbDropdown placement="right-top auto" container="body" autoClose="outside">
<my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon> <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon>
<div ngbDropdownMenu> <div ngbDropdownMenu>
<a *ngIf="user.account" [routerLink]="[ '/accounts', user.account.nameWithHost ]" class="dropdown-item"> <a *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/accounts', user.account.nameWithHost ]">
<my-global-icon iconName="go"></my-global-icon> <ng-container i18n>Public profile</ng-container> <my-global-icon iconName="go"></my-global-icon> <ng-container i18n>Public profile</ng-container>
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a routerLink="/my-account" class="dropdown-item"> <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account">
<my-global-icon iconName="user"></my-global-icon> <ng-container i18n>Account settings</ng-container> <my-global-icon iconName="user"></my-global-icon> <ng-container i18n>Account settings</ng-container>
</a> </a>
<a routerLink="/my-account/video-channels" class="dropdown-item"> <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/video-channels">
<my-global-icon iconName="folder"></my-global-icon> <ng-container i18n>Channels settings</ng-container> <my-global-icon iconName="folder"></my-global-icon> <ng-container i18n>Channels settings</ng-container>
</a> </a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item" href="https://joinpeertube.org/help" target="_blank" rel="noopener noreferrer"> <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openLanguageChooser()">
<my-global-icon iconName="help"></my-global-icon> <ng-container i18n>Help</ng-container> <my-global-icon iconName="language"></my-global-icon>
<ng-container i18n>Interface: {{ language }}</ng-container>
<i class="ml-auto glyphicon glyphicon-menu-right"></i>
</a> </a>
<a (click)="logout($event)" class="dropdown-item" href="#"> <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account">
<my-global-icon iconName="video-lang"></my-global-icon>
<ng-container i18n>Videos: {{ videoLanguages.join(', ') }}</ng-container>
<i class="ml-auto glyphicon glyphicon-menu-right"></i>
</a>
<a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account">
<my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy === 'display' }" iconName="sensitive"></my-global-icon>
<my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy !== 'display' }" iconName="unsensitive"></my-global-icon>
<ng-container i18n>Sensitive: {{ nsfwPolicy }}</ng-container>
<i class="ml-auto glyphicon glyphicon-menu-right"></i>
</a>
<a ngbDropdownItem class="dropdown-item" (click)="toggleUseP2P()">
<my-global-icon iconName="p2p"></my-global-icon>
<ng-container i18n>Help share videos</ng-container>
<input type="checkbox" [checked]="user.webTorrentEnabled"/><label class="ml-auto" for="switch">Toggle p2p</label>
</a>
<a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account">
<my-global-icon iconName="more-horizontal"></my-global-icon> <ng-container i18n>More account settings</ng-container>
</a>
<div class="dropdown-divider"></div>
<a ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openHotkeysCheatSheet()">
<i class="icon icon-shortcuts"></i> <ng-container i18n>Keyboard shortcuts</ng-container>
</a>
<a ngbDropdownItem ngbDropdownToggle (click)="logout($event)" class="dropdown-item" href="#">
<my-global-icon iconName="sign-out"></my-global-icon> <ng-container i18n>Log out</ng-container> <my-global-icon iconName="sign-out"></my-global-icon> <ng-container i18n>Log out</ng-container>
</a> </a>
</div> </div>
@ -100,32 +131,56 @@
<ng-container i18n>Local</ng-container> <ng-container i18n>Local</ng-container>
</a> </a>
</div> </div>
</div>
<div class="footer">
<div class="panel-block"> <div class="panel-block">
<div class="block-title" i18n>MORE</div>
<a *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active"> <a *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active">
<my-global-icon iconName="administration"></my-global-icon> <my-global-icon iconName="cog"></my-global-icon>
<ng-container i18n>Administration</ng-container> <ng-container i18n>Administration</ng-container>
</a> </a>
<a *ngIf="!isLoggedIn" (click)="openQuickSettings()">
<a routerLink="/about" routerLinkActive="active"> <my-global-icon iconName="cog"></my-global-icon>
<my-global-icon iconName="about"></my-global-icon> <ng-container i18n>Settings</ng-container>
</a>
<a routerLink="/about/instance">
<my-global-icon iconName="help"></my-global-icon>
<ng-container i18n>About</ng-container> <ng-container i18n>About</ng-container>
</a> </a>
</div> </div>
</div>
<div class="footer d-flex justify-content-between"> <div class="d-flex flex-column">
<span class="language"> <div class="footer-links">
<span tabindex="0" role="button" (keyup.enter)="openLanguageChooser()" (click)="openLanguageChooser()" i18n-title title="Change the language" class="icon icon-language"></span> <a i18n routerLink="/about/instance">Contact</a>
</span> <a i18n routerLink="/about/instance">Terms of Service</a>
<a i18n routerLink="/about/instance" fragment="statistics">Stats</a>
<span class="shortcuts"> <a (click)="openLanguageChooser()" class="c-hand">
<span tabindex="0" role="button" (keyup.enter)="openHotkeysCheatSheet()" (click)="openHotkeysCheatSheet()" i18n-title title="Show keyboard shortcuts" class="icon icon-shortcuts"></span> <span i18n>Interface: {{ language }}</span>
</span> </a>
</div>
<div class="footer-links">
<a i18n href="https://joinpeertube.org/#you-are-a-video-maker" i18n-title title="Creator guide" target="_blank" rel="noopener noreferrer">Creators</a>
<a i18n href="https://docs.joinpeertube.org/#/contribute-getting-started" i18n-title title="PeerTube license" target="_blank" rel="noopener noreferrer">Contributors</a>
<a i18n routerLink="/about/peertube" i18n-title title="More information about privacy within PeerTube">Privacy</a>
<a i18n href="https://joinpeertube.org/faq" i18n-title title="Frequently asked questions about PeerTube" target="_blank" rel="noopener noreferrer">FAQ</a>
<a i18n href="https://docs.joinpeertube.org/api-rest-reference.html" i18n-title title="API documentation" target="_blank" rel="noopener noreferrer">API</a>
<a i18n href="https://joinpeertube.org/help" i18n-title title="Get help using PeerTube" target="_blank" rel="noopener noreferrer">Help</a>
<a (click)="openHotkeysCheatSheet()" class="c-hand" i18n>Shortcuts</a>
</div>
<div class="footer-copyleft">
<small class="d-inline" i18n-title title="powered by PeerTube - CopyLeft 2015-2020">
<a href="https://joinpeertube.org" i18n-title title="PeerTube website" target="_blank" rel="noopener noreferrer" i18n>
powered by PeerTube
</a>
<a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" i18n-title title="PeerTube license" target="_blank" rel="noopener noreferrer">
<span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">&copy;</span> 2015-2020
</a>
</small>
</div>
</div>
</div> </div>
</menu> </menu>
</div> </div>
<my-language-chooser #languageChooserModal></my-language-chooser> <my-language-chooser #languageChooserModal></my-language-chooser>
<my-quick-settings #quickSettingsModal></my-quick-settings>

View File

@ -29,7 +29,7 @@ menu {
&.logged-in { &.logged-in {
.panel-block { .panel-block {
margin-bottom: 25px; margin-bottom: 20px;
} }
.block-title { .block-title {
@ -88,22 +88,6 @@ menu {
@include apply-svg-color(var(--menuForegroundColor)); @include apply-svg-color(var(--menuForegroundColor));
} }
} }
.dropdown-item {
@include dropdown-with-icon-item;
my-global-icon {
width: 22px;
height: 22px;
&[iconName="sign-out"] {
position: relative;
right: -1px;
height: 21px;
width: 21px;
}
}
}
} }
} }
@ -143,7 +127,7 @@ menu {
} }
.panel-block { .panel-block {
margin-bottom: 45px; margin-bottom: 15px;
a { a {
@include disable-default-a-behaviour; @include disable-default-a-behaviour;
@ -198,57 +182,159 @@ menu {
} }
.footer { .footer {
padding-bottom: 15px;
padding-left: $menu-lateral-padding;
padding-right: $menu-lateral-padding;
width: $menu-width; width: $menu-width;
padding-bottom: 15px;
.language, .shortcuts, .color-palette { & > div:not(.panel-block) {
display: inline-block; padding-left: $menu-lateral-padding;
color: $menu-bottom-color; padding-right: $menu-lateral-padding;
cursor: pointer; row-gap: 1em;
font-size: 12px; }
font-weight: $font-semibold;
.icon { $footer-links-base-opacity: .8;
@include disable-outline;
@include icon(28px);
opacity: 0.9;
&.icon-language { .footer-links {
position: relative; display: inline-flex;
top: -1px; flex-wrap: wrap;
width: 28px;
height: 24px;
background-image: url('../../assets/images/menu/language.png'); & > a {
} @include disable-default-a-behaviour;
&.icon-shortcuts { display: inline-block;
position: relative; text-decoration: none;
top: -1px; color: var(--mainBackgroundColor);
width: 24px; opacity: $footer-links-base-opacity;
height: 24px; white-space: nowrap;
font-size: 90%;
font-weight: 500;
line-height: 1.4rem;
margin-right: 8px;
background-image: url('../../assets/images/menu/keyboard.png'); &.inline-global-icon {
filter: invert(100%); display: inline-flex;
} align-items: center;
white-space: nowrap;
height: 1.4rem;
&.icon-moonsun { my-global-icon {
margin-left: 10px; @include apply-svg-color(var(--mainBackgroundColor));
position: relative;
top: -1px; display: flex;
width: 24px; width: auto;
height: 24px; height: 90%;
margin-right: .2rem;
background-image: url('../../assets/images/menu/moonsun.svg'); }
}
&:hover {
opacity: 1;
} }
} }
} }
.footer-copyleft small a {
@include disable-default-a-behaviour;
color: var(--mainBackgroundColor);
opacity: $footer-links-base-opacity - .2;
}
}
}
.dropdown-menu {
width: calc(100% + 40px);
}
.dropdown-item {
@include dropdown-with-icon-item;
cursor: pointer;
display: flex;
align-items: center;
i.glyphicon-menu-right {
opacity: .4;
}
my-global-icon {
&[iconName="cog"],
&[iconName="sign-out"] {
position: relative;
right: -2px;
height: 20px;
width: 20px;
}
}
my-global-icon.not-displayed {
display: none;
}
&:hover {
my-global-icon.hover-display-toggle.not-displayed {
display: inherit;
}
my-global-icon.hover-display-toggle {
display: none;
}
}
}
.more-settings {
text-transform: uppercase;
font-size: 80%;
color: #6c757d;
}
.icon {
@include disable-outline;
@include icon(22px);
opacity: 0.8;
&.icon-shortcuts {
position: relative;
top: -1px;
margin-right: 10px;
background-image: url('../../assets/images/menu/keyboard.png');
}
}
input[type=checkbox]{
position: absolute;
visibility: hidden;
}
label {
cursor: pointer;
text-indent: -9999px;
width: 35px;
height: 20px;
background: #cccccc;
display: block;
border-radius: 100px;
position: relative;
margin: 0;
&:after {
content: '';
position: absolute;
top: 3px;
left: 3px;
width: 14px;
height: 14px;
background: var(--mainBackgroundColor);
border-radius: 50%;
transition: 0.3s ease-out;
}
&:active:after {
width: 40px;
}
}
input:checked + label {
background: var(--mainColor);
&:after {
left: calc(100% - 3px);
transform: translateX(-100%);
} }
} }

View File

@ -1,10 +1,13 @@
import { Component, OnInit, ViewChild } from '@angular/core' import { Component, OnInit, ViewChild } from '@angular/core'
import { UserRight } from '../../../../shared/models/users/user-right.enum' import { UserRight } from '../../../../shared/models/users/user-right.enum'
import { AuthService, AuthStatus, RedirectService, ServerService, ThemeService } from '../core' import { AuthService, AuthStatus, RedirectService, ServerService } from '../core'
import { User } from '../shared/users/user.model' import { User } from '@app/shared/users/user.model'
import { UserService } from '@app/shared/users/user.service'
import { LanguageChooserComponent } from '@app/menu/language-chooser.component' import { LanguageChooserComponent } from '@app/menu/language-chooser.component'
import { HotkeysService } from 'angular2-hotkeys' import { HotkeysService } from 'angular2-hotkeys'
import { ServerConfig } from '@shared/models' import { ServerConfig, VideoConstant } from '@shared/models'
import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
import { I18n } from '@ngx-translate/i18n-polyfill'
@Component({ @Component({
selector: 'my-menu', selector: 'my-menu',
@ -13,11 +16,14 @@ import { ServerConfig } from '@shared/models'
}) })
export class MenuComponent implements OnInit { export class MenuComponent implements OnInit {
@ViewChild('languageChooserModal', { static: true }) languageChooserModal: LanguageChooserComponent @ViewChild('languageChooserModal', { static: true }) languageChooserModal: LanguageChooserComponent
@ViewChild('quickSettingsModal', { static: true }) quickSettingsModal: QuickSettingsModalComponent
user: User user: User
isLoggedIn: boolean isLoggedIn: boolean
userHasAdminAccess = false userHasAdminAccess = false
helpVisible = false helpVisible = false
languages: VideoConstant<string>[] = []
private serverConfig: ServerConfig private serverConfig: ServerConfig
private routesPerRight: { [ role in UserRight ]?: string } = { private routesPerRight: { [ role in UserRight ]?: string } = {
@ -31,9 +37,11 @@ export class MenuComponent implements OnInit {
constructor ( constructor (
private authService: AuthService, private authService: AuthService,
private userService: UserService,
private serverService: ServerService, private serverService: ServerService,
private redirectService: RedirectService, private redirectService: RedirectService,
private hotkeysService: HotkeysService private hotkeysService: HotkeysService,
private i18n: I18n
) {} ) {}
ngOnInit () { ngOnInit () {
@ -63,9 +71,33 @@ export class MenuComponent implements OnInit {
} }
) )
this.hotkeysService.cheatSheetToggle.subscribe(isOpen => { this.hotkeysService.cheatSheetToggle.subscribe(isOpen => this.helpVisible = isOpen)
this.helpVisible = isOpen
}) this.serverService.getVideoLanguages().subscribe(languages => this.languages = languages)
}
get language () {
return this.languageChooserModal.getCurrentLanguage()
}
get videoLanguages (): string[] {
if (!this.user) return
if (!this.user.videoLanguages) return [this.i18n('any language')]
return this.user.videoLanguages
.map(locale => this.langForLocale(locale))
.map(value => value === undefined ? '?' : value)
}
get nsfwPolicy () {
if (!this.user) return
switch (this.user.nsfwPolicy) {
case 'do_not_list':
return this.i18n('hide')
case 'blur':
return this.i18n('blur')
case 'display':
return this.i18n('display')
}
} }
isRegistrationAllowed () { isRegistrationAllowed () {
@ -117,6 +149,22 @@ export class MenuComponent implements OnInit {
this.hotkeysService.cheatSheetToggle.next(!this.helpVisible) this.hotkeysService.cheatSheetToggle.next(!this.helpVisible)
} }
openQuickSettings () {
this.quickSettingsModal.show()
}
toggleUseP2P () {
if (!this.user) return
this.user.webTorrentEnabled = !this.user.webTorrentEnabled
this.userService.updateMyProfile({
webTorrentEnabled: this.user.webTorrentEnabled
}).subscribe(() => this.authService.refreshUserInformation())
}
langForLocale(localeId: string) {
return this.languages.find(lang => lang.id = localeId).label
}
private computeIsUserHasAdminAccess () { private computeIsUserHasAdminAccess () {
const right = this.getFirstAdminRightAvailable() const right = this.getFirstAdminRightAvailable()

View File

@ -0,0 +1,19 @@
<ng-template #modal let-hide="close">
<div class="modal-header">
<h4 i18n class="modal-title">Settings</h4>
</div>
<div class="modal-body">
<div i18n class="mb-4 quick-settings-title">Display settings</div>
<my-account-video-settings *ngIf="!isUserLoggedIn()" [user]="user" [userInformationLoaded]="userInformationLoaded" [reactiveUpdate]="true" [notifyOnUpdate]="true">
<ng-container ngProjectAs="inner-title">
<div i18n class="mb-4 mt-4 quick-settings-title">Video settings</div>
</ng-container>
</my-account-video-settings>
<div i18n class="mb-4 mt-4 quick-settings-title">Interface settings</div>
<my-account-interface-settings *ngIf="!isUserLoggedIn()" [user]="user" [userInformationLoaded]="userInformationLoaded" [reactiveUpdate]="true" [notifyOnUpdate]="true"></my-account-interface-settings>
</div>
</ng-template>

View File

@ -0,0 +1,39 @@
@import '_mixins';
.modal-button {
@include disable-default-a-behaviour;
transform: translateY(2px);
button {
@include peertube-button;
@include grey-button;
@include button-with-icon(18px, 4px, -1px);
my-global-icon {
@include apply-svg-color(#585858);
}
}
& + .modal-button {
margin-left: 1rem;
}
}
.icon {
@include disable-outline;
@include icon(22px);
opacity: 0.6;
margin-left: -1px;
&.icon-shortcuts {
position: relative;
top: -1px;
margin-right: 4px;
background-image: url('../../assets/images/menu/keyboard.png');
}
}
.quick-settings-title {
@include in-content-small-title;
}

View File

@ -0,0 +1,62 @@
import { Component, ViewChild, OnInit } from '@angular/core'
import { AuthService, AuthStatus } from '@app/core'
import { FormReactive, FormValidatorService, UserService, User } from '@app/shared'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
import { ReplaySubject } from 'rxjs'
import { LocalStorageService } from '@app/shared/misc/storage.service'
import { filter } from 'rxjs/operators'
@Component({
selector: 'my-quick-settings',
templateUrl: './quick-settings-modal.component.html',
styleUrls: [ './quick-settings-modal.component.scss' ]
})
export class QuickSettingsModalComponent extends FormReactive implements OnInit {
@ViewChild('modal', { static: true }) modal: NgbModal
user: User
userInformationLoaded = new ReplaySubject<boolean>(1)
private openedModal: NgbModalRef
constructor (
protected formValidatorService: FormValidatorService,
private modalService: NgbModal,
private userService: UserService,
private authService: AuthService,
private localStorageService: LocalStorageService
) {
super()
}
ngOnInit () {
this.user = this.userService.getAnonymousUser()
this.localStorageService.watch().subscribe(
() => this.user = this.userService.getAnonymousUser()
)
this.userInformationLoaded.next(true)
this.authService.loginChangedSource
.pipe(filter(status => status !== AuthStatus.LoggedIn))
.subscribe(
() => {
this.user = this.userService.getAnonymousUser()
this.userInformationLoaded.next(true)
}
)
}
isUserLoggedIn () {
return this.authService.isLoggedIn()
}
show () {
this.openedModal = this.modalService.open(this.modal, { centered: true })
}
hide () {
this.openedModal.close()
this.form.reset()
}
}

View File

@ -39,15 +39,18 @@ const icons = {
'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg'), 'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg'),
'play': require('!!raw-loader?!../../../assets/images/global/play.svg'), 'play': require('!!raw-loader?!../../../assets/images/global/play.svg'),
'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg'), 'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg'),
'about': require('!!raw-loader?!../../../assets/images/menu/about.svg'),
'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg'), 'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg'),
'home': require('!!raw-loader?!../../../assets/images/menu/home.svg'), 'home': require('!!raw-loader?!../../../assets/images/menu/home.svg'),
'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg'), 'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg'),
'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg'), 'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg'),
'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg'),
'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg'), 'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg'),
'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg'), 'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg'),
'administration': require('!!raw-loader?!../../../assets/images/menu/administration.svg'),
'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg'), 'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg'),
'language': require('!!raw-loader?!../../../assets/images/menu/language.svg'),
'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg'),
'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg'),
'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg'),
'users': require('!!raw-loader?!../../../assets/images/global/users.svg'), 'users': require('!!raw-loader?!../../../assets/images/global/users.svg'),
'search': require('!!raw-loader?!../../../assets/images/global/search.svg'), 'search': require('!!raw-loader?!../../../assets/images/global/search.svg'),
'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg') 'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg')

View File

@ -17,6 +17,7 @@
::ng-deep { ::ng-deep {
.help-popover { .help-popover {
z-index: z(help-popover) !important;
max-width: 300px; max-width: 300px;
.popover-body { .popover-body {

View File

@ -0,0 +1,40 @@
import { Injectable } from '@angular/core'
import { Observable, Subject } from 'rxjs'
import {
peertubeLocalStorage,
peertubeSessionStorage
} from './peertube-web-storage'
import { filter } from 'rxjs/operators'
abstract class StorageService {
protected instance: Storage
static storageSub = new Subject<string>()
watch (keys?: string[]): Observable<string> {
return StorageService.storageSub.asObservable().pipe(filter(val => keys ? keys.includes(val) : true))
}
getItem (key: string) {
return this.instance.getItem(key)
}
setItem (key: string, data: any, notifyOfUpdate = true) {
this.instance.setItem(key, data)
if (notifyOfUpdate) StorageService.storageSub.next(key)
}
removeItem (key: string, notifyOfUpdate = true) {
this.instance.removeItem(key)
if (notifyOfUpdate) StorageService.storageSub.next(key)
}
}
@Injectable()
export class LocalStorageService extends StorageService {
protected instance: Storage = peertubeLocalStorage
}
@Injectable()
export class SessionStorageService extends StorageService {
protected instance: Storage = peertubeSessionStorage
}

View File

@ -47,6 +47,7 @@ import {
import { I18nPrimengCalendarService } from '@app/shared/i18n/i18n-primeng-calendar' import { I18nPrimengCalendarService } from '@app/shared/i18n/i18n-primeng-calendar'
import { InputMaskModule } from 'primeng/inputmask' import { InputMaskModule } from 'primeng/inputmask'
import { ScreenService } from '@app/shared/misc/screen.service' import { ScreenService } from '@app/shared/misc/screen.service'
import { LocalStorageService, SessionStorageService } from '@app/shared/misc/storage.service'
import { VideoCaptionsValidatorsService } from '@app/shared/forms/form-validators/video-captions-validators.service' import { VideoCaptionsValidatorsService } from '@app/shared/forms/form-validators/video-captions-validators.service'
import { VideoCaptionService } from '@app/shared/video-caption' import { VideoCaptionService } from '@app/shared/video-caption'
import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.component' import { PeertubeCheckboxComponent } from '@app/shared/forms/peertube-checkbox.component'
@ -101,6 +102,10 @@ import { FeatureBooleanComponent } from '@app/shared/instance/feature-boolean.co
import { InputReadonlyCopyComponent } from '@app/shared/forms/input-readonly-copy.component' import { InputReadonlyCopyComponent } from '@app/shared/forms/input-readonly-copy.component'
import { RedundancyService } from '@app/shared/video/redundancy.service' import { RedundancyService } from '@app/shared/video/redundancy.service'
import { ClipboardModule } from '@angular/cdk/clipboard' import { ClipboardModule } from '@angular/cdk/clipboard'
import { InputSwitchModule } from 'primeng/inputswitch'
import { MyAccountVideoSettingsComponent } from '@app/+my-account/my-account-settings/my-account-video-settings'
import { MyAccountInterfaceSettingsComponent } from '@app/+my-account/my-account-settings/my-account-interface'
@NgModule({ @NgModule({
imports: [ imports: [
@ -122,7 +127,8 @@ import { ClipboardModule } from '@angular/cdk/clipboard'
PrimeSharedModule, PrimeSharedModule,
InputMaskModule, InputMaskModule,
NgPipesModule, NgPipesModule,
MultiSelectModule MultiSelectModule,
InputSwitchModule
], ],
declarations: [ declarations: [
@ -180,7 +186,10 @@ import { ClipboardModule } from '@angular/cdk/clipboard'
DateToggleComponent, DateToggleComponent,
GlobalIconComponent, GlobalIconComponent,
PreviewUploadComponent PreviewUploadComponent,
MyAccountVideoSettingsComponent,
MyAccountInterfaceSettingsComponent
], ],
exports: [ exports: [
@ -258,7 +267,10 @@ import { ClipboardModule } from '@angular/cdk/clipboard'
FromNowPipe, FromNowPipe,
HighlightPipe, HighlightPipe,
PeerTubeTemplateDirective, PeerTubeTemplateDirective,
VideoDurationPipe VideoDurationPipe,
MyAccountVideoSettingsComponent,
MyAccountInterfaceSettingsComponent
], ],
providers: [ providers: [
@ -303,6 +315,7 @@ import { ClipboardModule } from '@angular/cdk/clipboard'
I18nPrimengCalendarService, I18nPrimengCalendarService,
ScreenService, ScreenService,
LocalStorageService, SessionStorageService,
UserNotificationService, UserNotificationService,

View File

@ -1,10 +1,32 @@
import { hasUserRight, User as UserServerModel, UserNotificationSetting, UserRight, UserRole, VideoChannel } from '../../../../../shared' import {
hasUserRight,
User as UserServerModel,
UserNotificationSetting,
UserRight,
UserRole
} from '../../../../../shared/models/users'
import { VideoChannel } from '../../../../../shared/models/videos'
import { NSFWPolicyType } from '../../../../../shared/models/videos/nsfw-policy.type' import { NSFWPolicyType } from '../../../../../shared/models/videos/nsfw-policy.type'
import { Account } from '@app/shared/account/account.model' import { Account } from '@app/shared/account/account.model'
import { Avatar } from '../../../../../shared/models/avatars/avatar.model' import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
import { UserAdminFlag } from '@shared/models/users/user-flag.model' import { UserAdminFlag } from '@shared/models/users/user-flag.model'
export class User implements UserServerModel { export class User implements UserServerModel {
static KEYS = {
ID: 'id',
ROLE: 'role',
EMAIL: 'email',
VIDEOS_HISTORY_ENABLED: 'videos-history-enabled',
USERNAME: 'username',
NSFW_POLICY: 'nsfw_policy',
WEBTORRENT_ENABLED: 'peertube-videojs-' + 'webtorrent_enabled',
AUTO_PLAY_VIDEO: 'auto_play_video',
SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO: 'auto_play_next_video',
AUTO_PLAY_VIDEO_PLAYLIST: 'auto_play_video_playlist',
THEME: 'last_active_theme',
VIDEO_LANGUAGES: 'video_languages'
}
id: number id: number
username: string username: string
email: string email: string
@ -60,8 +82,11 @@ export class User implements UserServerModel {
this.nsfwPolicy = hash.nsfwPolicy this.nsfwPolicy = hash.nsfwPolicy
this.webTorrentEnabled = hash.webTorrentEnabled this.webTorrentEnabled = hash.webTorrentEnabled
this.videosHistoryEnabled = hash.videosHistoryEnabled
this.autoPlayVideo = hash.autoPlayVideo this.autoPlayVideo = hash.autoPlayVideo
this.autoPlayNextVideo = hash.autoPlayNextVideo
this.autoPlayNextVideoPlaylist = hash.autoPlayNextVideoPlaylist
this.videosHistoryEnabled = hash.videosHistoryEnabled
this.videoLanguages = hash.videoLanguages
this.theme = hash.theme this.theme = hash.theme

View File

@ -1,8 +1,8 @@
import { from, Observable, of } from 'rxjs' import { from, Observable } from 'rxjs'
import { catchError, concatMap, map, share, shareReplay, tap, toArray } from 'rxjs/operators' import { catchError, concatMap, map, shareReplay, toArray } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http' import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core' import { Injectable } from '@angular/core'
import { ResultList, User, UserCreate, UserRole, UserUpdate, UserUpdateMe, UserVideoQuota } from '../../../../../shared' import { ResultList, User as UserServerModel, UserCreate, UserRole, UserUpdate, UserUpdateMe, UserVideoQuota } from '../../../../../shared'
import { environment } from '../../../environments/environment' import { environment } from '../../../environments/environment'
import { RestExtractor, RestPagination, RestService } from '../rest' import { RestExtractor, RestPagination, RestService } from '../rest'
import { Avatar } from '../../../../../shared/models/avatars/avatar.model' import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
@ -10,6 +10,10 @@ import { SortMeta } from 'primeng/api'
import { BytesPipe } from 'ngx-pipes' import { BytesPipe } from 'ngx-pipes'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { UserRegister } from '@shared/models/users/user-register.model' import { UserRegister } from '@shared/models/users/user-register.model'
import { User } from './user.model'
import { NSFWPolicyType } from '@shared/models/videos/nsfw-policy.type'
import { has } from 'lodash-es'
import { LocalStorageService, SessionStorageService } from '../misc/storage.service'
@Injectable() @Injectable()
export class UserService { export class UserService {
@ -17,12 +21,14 @@ export class UserService {
private bytesPipe = new BytesPipe() private bytesPipe = new BytesPipe()
private userCache: { [ id: number ]: Observable<User> } = {} private userCache: { [ id: number ]: Observable<UserServerModel> } = {}
constructor ( constructor (
private authHttp: HttpClient, private authHttp: HttpClient,
private restExtractor: RestExtractor, private restExtractor: RestExtractor,
private restService: RestService, private restService: RestService,
private localStorageService: LocalStorageService,
private sessionStorageService: SessionStorageService,
private i18n: I18n private i18n: I18n
) { } ) { }
@ -64,6 +70,30 @@ export class UserService {
) )
} }
updateMyAnonymousProfile (profile: UserUpdateMe) {
const supportedKeys = {
// local storage keys
nsfwPolicy: (val: NSFWPolicyType) => this.localStorageService.setItem(User.KEYS.NSFW_POLICY, val),
webTorrentEnabled: (val: boolean) => this.localStorageService.setItem(User.KEYS.WEBTORRENT_ENABLED, String(val)),
autoPlayVideo: (val: boolean) => this.localStorageService.setItem(User.KEYS.AUTO_PLAY_VIDEO, String(val)),
autoPlayNextVideoPlaylist: (val: boolean) => this.localStorageService.setItem(User.KEYS.AUTO_PLAY_VIDEO_PLAYLIST, String(val)),
theme: (val: string) => this.localStorageService.setItem(User.KEYS.THEME, val),
videoLanguages: (val: string[]) => this.localStorageService.setItem(User.KEYS.VIDEO_LANGUAGES, JSON.stringify(val)),
// session storage keys
autoPlayNextVideo: (val: boolean) =>
this.sessionStorageService.setItem(User.KEYS.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO, String(val))
}
for (const key of Object.keys(profile)) {
try {
if (has(supportedKeys, key)) supportedKeys[key](profile[key])
} catch (err) {
console.error(`Cannot set item ${key} in localStorage. Likely due to a value impossible to stringify.`, err)
}
}
}
deleteMe () { deleteMe () {
const url = UserService.BASE_USERS_URL + 'me' const url = UserService.BASE_USERS_URL + 'me'
@ -187,7 +217,7 @@ export class UserService {
) )
} }
updateUsers (users: User[], userUpdate: UserUpdate) { updateUsers (users: UserServerModel[], userUpdate: UserUpdate) {
return from(users) return from(users)
.pipe( .pipe(
concatMap(u => this.authHttp.put(UserService.BASE_USERS_URL + u.id, userUpdate)), concatMap(u => this.authHttp.put(UserService.BASE_USERS_URL + u.id, userUpdate)),
@ -205,17 +235,40 @@ export class UserService {
} }
getUser (userId: number) { getUser (userId: number) {
return this.authHttp.get<User>(UserService.BASE_USERS_URL + userId) return this.authHttp.get<UserServerModel>(UserService.BASE_USERS_URL + userId)
.pipe(catchError(err => this.restExtractor.handleError(err))) .pipe(catchError(err => this.restExtractor.handleError(err)))
} }
getUsers (pagination: RestPagination, sort: SortMeta, search?: string): Observable<ResultList<User>> { getAnonymousUser () {
let videoLanguages
try {
videoLanguages = JSON.parse(this.localStorageService.getItem(User.KEYS.VIDEO_LANGUAGES))
} catch (err) {
videoLanguages = null
console.error('Cannot parse desired video languages from localStorage.', err)
}
return new User({
// local storage keys
nsfwPolicy: this.localStorageService.getItem(User.KEYS.NSFW_POLICY) as NSFWPolicyType,
webTorrentEnabled: this.localStorageService.getItem(User.KEYS.WEBTORRENT_ENABLED) !== 'false',
autoPlayVideo: this.localStorageService.getItem(User.KEYS.AUTO_PLAY_VIDEO) === 'true',
autoPlayNextVideoPlaylist: this.localStorageService.getItem(User.KEYS.AUTO_PLAY_VIDEO_PLAYLIST) === 'true',
theme: this.localStorageService.getItem(User.KEYS.THEME) || 'default',
videoLanguages,
// session storage keys
autoPlayNextVideo: this.sessionStorageService.getItem(User.KEYS.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true'
})
}
getUsers (pagination: RestPagination, sort: SortMeta, search?: string): Observable<ResultList<UserServerModel>> {
let params = new HttpParams() let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort) params = this.restService.addRestGetParams(params, pagination, sort)
if (search) params = params.append('search', search) if (search) params = params.append('search', search)
return this.authHttp.get<ResultList<User>>(UserService.BASE_USERS_URL, { params }) return this.authHttp.get<ResultList<UserServerModel>>(UserService.BASE_USERS_URL, { params })
.pipe( .pipe(
map(res => this.restExtractor.convertResultListDateToHuman(res)), map(res => this.restExtractor.convertResultListDateToHuman(res)),
map(res => this.restExtractor.applyToResultListData(res, this.formatUser.bind(this))), map(res => this.restExtractor.applyToResultListData(res, this.formatUser.bind(this))),
@ -223,7 +276,7 @@ export class UserService {
) )
} }
removeUser (usersArg: User | User[]) { removeUser (usersArg: UserServerModel | UserServerModel[]) {
const users = Array.isArray(usersArg) ? usersArg : [ usersArg ] const users = Array.isArray(usersArg) ? usersArg : [ usersArg ]
return from(users) return from(users)
@ -234,7 +287,7 @@ export class UserService {
) )
} }
banUsers (usersArg: User | User[], reason?: string) { banUsers (usersArg: UserServerModel | UserServerModel[], reason?: string) {
const body = reason ? { reason } : {} const body = reason ? { reason } : {}
const users = Array.isArray(usersArg) ? usersArg : [ usersArg ] const users = Array.isArray(usersArg) ? usersArg : [ usersArg ]
@ -246,7 +299,7 @@ export class UserService {
) )
} }
unbanUsers (usersArg: User | User[]) { unbanUsers (usersArg: UserServerModel | UserServerModel[]) {
const users = Array.isArray(usersArg) ? usersArg : [ usersArg ] const users = Array.isArray(usersArg) ? usersArg : [ usersArg ]
return from(users) return from(users)
@ -257,7 +310,7 @@ export class UserService {
) )
} }
private formatUser (user: User) { private formatUser (user: UserServerModel) {
let videoQuota let videoQuota
if (user.videoQuota === -1) { if (user.videoQuota === -1) {
videoQuota = this.i18n('Unlimited') videoQuota = this.i18n('Unlimited')

View File

@ -1,4 +1,4 @@
import { debounceTime, first, tap } from 'rxjs/operators' import { debounceTime, first, tap, throttleTime } from 'rxjs/operators'
import { OnDestroy, OnInit } from '@angular/core' import { OnDestroy, OnInit } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router' import { ActivatedRoute, Router } from '@angular/router'
import { fromEvent, Observable, of, Subject, Subscription } from 'rxjs' import { fromEvent, Observable, of, Subject, Subscription } from 'rxjs'
@ -15,6 +15,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
import { isLastMonth, isLastWeek, isToday, isYesterday } from '@shared/core-utils/miscs/date' import { isLastMonth, isLastWeek, isToday, isYesterday } from '@shared/core-utils/miscs/date'
import { ServerConfig } from '@shared/models' import { ServerConfig } from '@shared/models'
import { GlobalIconName } from '@app/shared/images/global-icon.component' import { GlobalIconName } from '@app/shared/images/global-icon.component'
import { UserService, User } from '../users'
import { LocalStorageService } from '../misc/storage.service'
enum GroupDate { enum GroupDate {
UNKNOWN = 0, UNKNOWN = 0,
@ -72,9 +74,11 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
protected abstract notifier: Notifier protected abstract notifier: Notifier
protected abstract authService: AuthService protected abstract authService: AuthService
protected abstract userService: UserService
protected abstract route: ActivatedRoute protected abstract route: ActivatedRoute
protected abstract serverService: ServerService protected abstract serverService: ServerService
protected abstract screenService: ScreenService protected abstract screenService: ScreenService
protected abstract storageService: LocalStorageService
protected abstract router: Router protected abstract router: Router
protected abstract i18n: I18n protected abstract i18n: I18n
abstract titlePage: string abstract titlePage: string
@ -124,6 +128,16 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
if (this.loadOnInit === true) { if (this.loadOnInit === true) {
loadUserObservable.subscribe(() => this.loadMoreVideos()) loadUserObservable.subscribe(() => this.loadMoreVideos())
} }
this.storageService.watch([
User.KEYS.NSFW_POLICY,
User.KEYS.VIDEO_LANGUAGES
]).pipe(throttleTime(200)).subscribe(
() => {
this.loadUserVideoLanguagesIfNeeded()
if (this.hasDoneFirstQuery) this.reloadVideos()
}
)
} }
ngOnDestroy () { ngOnDestroy () {
@ -279,7 +293,12 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
} }
private loadUserVideoLanguagesIfNeeded () { private loadUserVideoLanguagesIfNeeded () {
if (!this.authService.isLoggedIn() || !this.useUserVideoLanguagePreferences) { if (!this.useUserVideoLanguagePreferences) {
return of(true)
}
if (!this.authService.isLoggedIn()) {
this.languageOneOf = this.userService.getAnonymousUser().videoLanguages
return of(true) return of(true)
} }

View File

@ -27,10 +27,11 @@ import { objectToFormData } from '@app/shared/misc/utils'
import { Account } from '@app/shared/account/account.model' import { Account } from '@app/shared/account/account.model'
import { AccountService } from '@app/shared/account/account.service' import { AccountService } from '@app/shared/account/account.service'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
import { ServerService } from '@app/core' import { ServerService, AuthService } from '@app/core'
import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service' import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service'
import { VideoChannel } from '@app/shared/video-channel/video-channel.model' import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { NSFWPolicyType } from '@shared/models/videos/nsfw-policy.type'
export interface VideosProvider { export interface VideosProvider {
getVideos (parameters: { getVideos (parameters: {
@ -49,6 +50,8 @@ export class VideoService implements VideosProvider {
constructor ( constructor (
private authHttp: HttpClient, private authHttp: HttpClient,
private authService: AuthService,
private userService: UserService,
private restExtractor: RestExtractor, private restExtractor: RestExtractor,
private restService: RestService, private restService: RestService,
private serverService: ServerService, private serverService: ServerService,
@ -199,9 +202,10 @@ export class VideoService implements VideosProvider {
filter?: VideoFilter, filter?: VideoFilter,
categoryOneOf?: number, categoryOneOf?: number,
languageOneOf?: string[], languageOneOf?: string[],
skipCount?: boolean skipCount?: boolean,
nsfw?: boolean
}): Observable<ResultList<Video>> { }): Observable<ResultList<Video>> {
const { videoPagination, sort, filter, categoryOneOf, languageOneOf, skipCount } = parameters const { videoPagination, sort, filter, categoryOneOf, languageOneOf, skipCount, nsfw } = parameters
const pagination = this.restService.componentPaginationToRestPagination(videoPagination) const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
@ -212,6 +216,15 @@ export class VideoService implements VideosProvider {
if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '') if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '')
if (skipCount) params = params.set('skipCount', skipCount + '') if (skipCount) params = params.set('skipCount', skipCount + '')
if (nsfw) {
params = params.set('nsfw', nsfw + '')
} else {
const nsfwPolicy = this.authService.isLoggedIn()
? this.authService.getUser().nsfwPolicy
: this.userService.getAnonymousUser().nsfwPolicy
if (this.nsfwPolicyToFilter(nsfwPolicy)) params.set('nsfw', 'false')
}
if (languageOneOf) { if (languageOneOf) {
for (const l of languageOneOf) { for (const l of languageOneOf) {
params = params.append('languageOneOf[]', l) params = params.append('languageOneOf[]', l)
@ -368,4 +381,8 @@ export class VideoService implements VideosProvider {
catchError(err => this.restExtractor.handleError(err)) catchError(err => this.restExtractor.handleError(err))
) )
} }
private nsfwPolicyToFilter (policy: NSFWPolicyType) {
return policy === 'do_not_list'
}
} }

View File

@ -22,6 +22,8 @@ import { VideoSortField } from '@app/shared/video/sort-field.type'
import { ComponentPagination } from '@app/shared/rest/component-pagination.model' import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { ResultList } from '@shared/models' import { ResultList } from '@shared/models'
import { UserService } from '../users'
import { LocalStorageService } from '../misc/storage.service'
export type SelectionType = { [ id: number ]: boolean } export type SelectionType = { [ id: number ]: boolean }
@ -51,7 +53,9 @@ export class VideosSelectionComponent extends AbstractVideoList implements OnIni
protected route: ActivatedRoute, protected route: ActivatedRoute,
protected notifier: Notifier, protected notifier: Notifier,
protected authService: AuthService, protected authService: AuthService,
protected userService: UserService,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
protected serverService: ServerService protected serverService: ServerService
) { ) {
super() super()

View File

@ -9,6 +9,7 @@ import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.
import { VideoPlaylistElement } from '@app/shared/video-playlist/video-playlist-element.model' import { VideoPlaylistElement } from '@app/shared/video-playlist/video-playlist-element.model'
import { peertubeLocalStorage, peertubeSessionStorage } from '@app/shared/misc/peertube-web-storage' import { peertubeLocalStorage, peertubeSessionStorage } from '@app/shared/misc/peertube-web-storage'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { SessionStorageService, LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-video-watch-playlist', selector: 'my-video-watch-playlist',
@ -42,16 +43,18 @@ export class VideoWatchPlaylistComponent {
private notifier: Notifier, private notifier: Notifier,
private i18n: I18n, private i18n: I18n,
private videoPlaylist: VideoPlaylistService, private videoPlaylist: VideoPlaylistService,
private localStorageService: LocalStorageService,
private sessionStorageService: SessionStorageService,
private router: Router private router: Router
) { ) {
// defaults to true // defaults to true
this.autoPlayNextVideoPlaylist = this.auth.isLoggedIn() this.autoPlayNextVideoPlaylist = this.auth.isLoggedIn()
? this.auth.getUser().autoPlayNextVideoPlaylist ? this.auth.getUser().autoPlayNextVideoPlaylist
: peertubeLocalStorage.getItem(VideoWatchPlaylistComponent.LOCAL_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) !== 'false' : this.localStorageService.getItem(VideoWatchPlaylistComponent.LOCAL_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) !== 'false'
this.setAutoPlayNextVideoPlaylistSwitchText() this.setAutoPlayNextVideoPlaylistSwitchText()
// defaults to false // defaults to false
this.loopPlaylist = peertubeSessionStorage.getItem(VideoWatchPlaylistComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) === 'true' this.loopPlaylist = this.sessionStorageService.getItem(VideoWatchPlaylistComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) === 'true'
this.setLoopPlaylistSwitchText() this.setLoopPlaylistSwitchText()
} }

View File

@ -257,15 +257,18 @@
<div class="row privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false"> <div class="row privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false">
<div class="privacy-concerns-text"> <div class="privacy-concerns-text">
<strong i18n>Friendly Reminder: </strong> <span i18n class="mr-2">
<ng-container i18n> <strong>Help your peers</strong>
the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers. and activate the sharing system to improve the experience for everyone.
</ng-container> </span>
<a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a> <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a>
</div> </div>
<div i18n class="privacy-concerns-okay" (click)="acceptedPrivacyConcern()"> <div i18n class="privacy-concerns-button" (click)="declinedPrivacyConcern()">
OK No thanks
</div>
<div i18n class="privacy-concerns-button privacy-concerns-okay" (click)="acceptedPrivacyConcern()">
Activate
</div> </div>
</div> </div>
</div> </div>

View File

@ -443,6 +443,7 @@ my-video-comments {
// If the view is not expanded, take into account the menu // If the view is not expanded, take into account the menu
.privacy-concerns { .privacy-concerns {
z-index: z(dropdown) + 1;
width: calc(100% - #{$menu-width}); width: calc(100% - #{$menu-width});
} }
@ -488,11 +489,11 @@ my-video-comments {
} }
} }
.privacy-concerns-okay { .privacy-concerns-button {
background-color: var(--mainColor);
padding: 5px 8px 5px 7px; padding: 5px 8px 5px 7px;
margin-left: auto; margin-left: auto;
border-radius: 3px; border-radius: 3px;
white-space: nowrap;
cursor: pointer; cursor: pointer;
transition: background-color 0.3s; transition: background-color 0.3s;
font-weight: $font-semibold; font-weight: $font-semibold;
@ -501,6 +502,11 @@ my-video-comments {
background-color: #000; background-color: #000;
} }
} }
.privacy-concerns-okay {
background-color: var(--mainColor);
margin-left: 10px;
}
} }
@media screen and (max-width: 1600px) { @media screen and (max-width: 1600px) {

View File

@ -2,7 +2,7 @@ import { catchError } from 'rxjs/operators'
import { ChangeDetectorRef, Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' import { ChangeDetectorRef, Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router' import { ActivatedRoute, Router } from '@angular/router'
import { RedirectService } from '@app/core/routing/redirect.service' import { RedirectService } from '@app/core/routing/redirect.service'
import { peertubeLocalStorage, peertubeSessionStorage } from '@app/shared/misc/peertube-web-storage' import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component' import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component'
import { MetaService } from '@ngx-meta/core' import { MetaService } from '@ngx-meta/core'
import { AuthUser, Notifier, ServerService } from '@app/core' import { AuthUser, Notifier, ServerService } from '@app/core'
@ -10,7 +10,7 @@ import { forkJoin, Observable, Subscription } from 'rxjs'
import { Hotkey, HotkeysService } from 'angular2-hotkeys' import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import { ServerConfig, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared' import { ServerConfig, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared'
import { AuthService, ConfirmService } from '../../core' import { AuthService, ConfirmService } from '../../core'
import { RestExtractor } from '../../shared' import { RestExtractor, UserService } from '../../shared'
import { VideoDetails } from '../../shared/video/video-details.model' import { VideoDetails } from '../../shared/video/video-details.model'
import { VideoService } from '../../shared/video/video.service' import { VideoService } from '../../shared/video/video.service'
import { VideoShareComponent } from './modal/video-share.component' import { VideoShareComponent } from './modal/video-share.component'
@ -35,7 +35,6 @@ import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watc
import { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage' import { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
import { HooksService } from '@app/core/plugins/hooks.service' import { HooksService } from '@app/core/plugins/hooks.service'
import { PlatformLocation } from '@angular/common' import { PlatformLocation } from '@angular/common'
import { RecommendedVideosComponent } from '../recommendations/recommended-videos.component'
import { scrollToTop, isXPercentInViewport } from '@app/shared/misc/utils' import { scrollToTop, isXPercentInViewport } from '@app/shared/misc/utils'
@Component({ @Component({
@ -95,6 +94,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
private confirmService: ConfirmService, private confirmService: ConfirmService,
private metaService: MetaService, private metaService: MetaService,
private authService: AuthService, private authService: AuthService,
private userService: UserService,
private serverService: ServerService, private serverService: ServerService,
private restExtractor: RestExtractor, private restExtractor: RestExtractor,
private notifier: Notifier, private notifier: Notifier,
@ -118,6 +118,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
return this.authService.getUser() return this.authService.getUser()
} }
get anonymousUser () {
return this.userService.getAnonymousUser()
}
async ngOnInit () { async ngOnInit () {
this.serverConfig = this.serverService.getTmpConfig() this.serverConfig = this.serverService.getTmpConfig()
@ -266,6 +270,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.redirectService.redirectToHomepage() this.redirectService.redirectToHomepage()
} }
declinedPrivacyConcern () {
peertubeLocalStorage.setItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY, 'false')
this.hasAlreadyAcceptedPrivacyConcern = false
}
acceptedPrivacyConcern () { acceptedPrivacyConcern () {
peertubeLocalStorage.setItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY, 'true') peertubeLocalStorage.setItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY, 'true')
this.hasAlreadyAcceptedPrivacyConcern = true this.hasAlreadyAcceptedPrivacyConcern = true
@ -290,7 +299,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
isAutoPlayEnabled () { isAutoPlayEnabled () {
return ( return (
(this.user && this.user.autoPlayNextVideo) || (this.user && this.user.autoPlayNextVideo) ||
peertubeSessionStorage.getItem(RecommendedVideosComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true' this.anonymousUser.autoPlayNextVideo
) )
} }
@ -302,7 +311,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
isPlaylistAutoPlayEnabled () { isPlaylistAutoPlayEnabled () {
return ( return (
(this.user && this.user.autoPlayNextVideoPlaylist) || (this.user && this.user.autoPlayNextVideoPlaylist) ||
peertubeSessionStorage.getItem(VideoWatchPlaylistComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO_PLAYLIST) === 'true' this.anonymousUser.autoPlayNextVideoPlaylist
) )
} }

View File

@ -12,7 +12,6 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
import { RecommendationsModule } from '@app/videos/recommendations/recommendations.module' import { RecommendationsModule } from '@app/videos/recommendations/recommendations.module'
import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watch-playlist.component' import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watch-playlist.component'
import { QRCodeModule } from 'angularx-qrcode' import { QRCodeModule } from 'angularx-qrcode'
import { InputSwitchModule } from 'primeng/inputswitch'
import { TimestampRouteTransformerDirective } from '@app/shared/angular/timestamp-route-transformer.directive' import { TimestampRouteTransformerDirective } from '@app/shared/angular/timestamp-route-transformer.directive'
@NgModule({ @NgModule({
@ -21,8 +20,7 @@ import { TimestampRouteTransformerDirective } from '@app/shared/angular/timestam
SharedModule, SharedModule,
NgbTooltipModule, NgbTooltipModule,
QRCodeModule, QRCodeModule,
RecommendationsModule, RecommendationsModule
InputSwitchModule
], ],
declarations: [ declarations: [

View File

@ -8,7 +8,7 @@
[ngbTooltip]="autoPlayNextVideoTooltip" placement="bottom-right auto" [ngbTooltip]="autoPlayNextVideoTooltip" placement="bottom-right auto"
> >
<span i18n>AUTOPLAY</span> <span i18n>AUTOPLAY</span>
<p-inputSwitch [(ngModel)]="autoPlayNextVideo" (ngModelChange)="switchAutoPlayNextVideo()"></p-inputSwitch> <p-inputSwitch class="small" [(ngModel)]="autoPlayNextVideo" (ngModelChange)="switchAutoPlayNextVideo()"></p-inputSwitch>
</div> </div>
</div> </div>

View File

@ -25,25 +25,3 @@
font-weight: 600; font-weight: 600;
} }
} }
/* p-inputSwitch styles to reduce the switch size */
::ng-deep {
p-inputswitch {
height: 20px;
}
.ui-inputswitch {
width: 2.5em !important;
height: 1.45em !important;
.ui-inputswitch-slider::before {
height: 1em !important;
width: 1em !important;
}
}
.ui-inputswitch-checked .ui-inputswitch-slider::before {
transform: translateX(1em) !important;
}
}

View File

@ -7,8 +7,8 @@ import { RecommendedVideosStore } from '@app/videos/recommendations/recommended-
import { User } from '@app/shared' import { User } from '@app/shared'
import { AuthService, Notifier } from '@app/core' import { AuthService, Notifier } from '@app/core'
import { UserService } from '@app/shared/users/user.service' import { UserService } from '@app/shared/users/user.service'
import { peertubeSessionStorage } from '@app/shared/misc/peertube-web-storage'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { SessionStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-recommended-videos', selector: 'my-recommended-videos',
@ -16,8 +16,6 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
styleUrls: [ './recommended-videos.component.scss' ] styleUrls: [ './recommended-videos.component.scss' ]
}) })
export class RecommendedVideosComponent implements OnChanges { export class RecommendedVideosComponent implements OnChanges {
static SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO = 'auto_play_next_video'
@Input() inputRecommendation: RecommendationInfo @Input() inputRecommendation: RecommendationInfo
@Input() user: User @Input() user: User
@Input() playlist: VideoPlaylist @Input() playlist: VideoPlaylist
@ -34,15 +32,21 @@ export class RecommendedVideosComponent implements OnChanges {
private authService: AuthService, private authService: AuthService,
private notifier: Notifier, private notifier: Notifier,
private i18n: I18n, private i18n: I18n,
private store: RecommendedVideosStore private store: RecommendedVideosStore,
private sessionStorageService: SessionStorageService
) { ) {
this.videos$ = this.store.recommendations$ this.videos$ = this.store.recommendations$
this.hasVideos$ = this.store.hasRecommendations$ this.hasVideos$ = this.store.hasRecommendations$
this.videos$.subscribe(videos => this.gotRecommendations.emit(videos)) this.videos$.subscribe(videos => this.gotRecommendations.emit(videos))
this.autoPlayNextVideo = this.authService.isLoggedIn() if (this.authService.isLoggedIn()) {
? this.authService.getUser().autoPlayNextVideo this.autoPlayNextVideo = this.authService.getUser().autoPlayNextVideo
: peertubeSessionStorage.getItem(RecommendedVideosComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true' || false } else {
this.autoPlayNextVideo = this.sessionStorageService.getItem(User.KEYS.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true' || false
this.sessionStorageService.watch([User.KEYS.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO]).subscribe(
() => this.autoPlayNextVideo = this.sessionStorageService.getItem(User.KEYS.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true'
)
}
this.autoPlayNextVideoTooltip = this.i18n('When active, the next video is automatically played after the current one.') this.autoPlayNextVideoTooltip = this.i18n('When active, the next video is automatically played after the current one.')
} }
@ -58,7 +62,7 @@ export class RecommendedVideosComponent implements OnChanges {
} }
switchAutoPlayNextVideo () { switchAutoPlayNextVideo () {
peertubeSessionStorage.setItem(RecommendedVideosComponent.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO, this.autoPlayNextVideo.toString()) this.sessionStorageService.setItem(User.KEYS.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO, this.autoPlayNextVideo.toString())
if (this.authService.isLoggedIn()) { if (this.authService.isLoggedIn()) {
const details = { const details = {

View File

@ -11,6 +11,8 @@ import { ScreenService } from '@app/shared/misc/screen.service'
import { UserRight } from '../../../../../shared/models/users' import { UserRight } from '../../../../../shared/models/users'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { HooksService } from '@app/core/plugins/hooks.service' import { HooksService } from '@app/core/plugins/hooks.service'
import { UserService } from '@app/shared'
import { LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-videos-local', selector: 'my-videos-local',
@ -31,7 +33,9 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On
protected route: ActivatedRoute, protected route: ActivatedRoute,
protected notifier: Notifier, protected notifier: Notifier,
protected authService: AuthService, protected authService: AuthService,
protected userService: UserService,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
private videoService: VideoService, private videoService: VideoService,
private hooks: HooksService private hooks: HooksService
) { ) {

View File

@ -9,6 +9,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
import { ScreenService } from '@app/shared/misc/screen.service' import { ScreenService } from '@app/shared/misc/screen.service'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { HooksService } from '@app/core/plugins/hooks.service' import { HooksService } from '@app/core/plugins/hooks.service'
import { UserService } from '@app/shared'
import { LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-videos-most-liked', selector: 'my-videos-most-liked',
@ -28,7 +30,9 @@ export class VideoMostLikedComponent extends AbstractVideoList implements OnInit
protected route: ActivatedRoute, protected route: ActivatedRoute,
protected notifier: Notifier, protected notifier: Notifier,
protected authService: AuthService, protected authService: AuthService,
protected userService: UserService,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
private videoService: VideoService, private videoService: VideoService,
private hooks: HooksService private hooks: HooksService
) { ) {

View File

@ -9,6 +9,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
import { ScreenService } from '@app/shared/misc/screen.service' import { ScreenService } from '@app/shared/misc/screen.service'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { HooksService } from '@app/core/plugins/hooks.service' import { HooksService } from '@app/core/plugins/hooks.service'
import { UserService } from '@app/shared'
import { LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-videos-recently-added', selector: 'my-videos-recently-added',
@ -29,7 +31,9 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On
protected router: Router, protected router: Router,
protected notifier: Notifier, protected notifier: Notifier,
protected authService: AuthService, protected authService: AuthService,
protected userService: UserService,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
private videoService: VideoService, private videoService: VideoService,
private hooks: HooksService private hooks: HooksService
) { ) {

View File

@ -9,6 +9,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
import { ScreenService } from '@app/shared/misc/screen.service' import { ScreenService } from '@app/shared/misc/screen.service'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { HooksService } from '@app/core/plugins/hooks.service' import { HooksService } from '@app/core/plugins/hooks.service'
import { UserService } from '@app/shared'
import { LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-videos-trending', selector: 'my-videos-trending',
@ -28,7 +30,9 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit,
protected route: ActivatedRoute, protected route: ActivatedRoute,
protected notifier: Notifier, protected notifier: Notifier,
protected authService: AuthService, protected authService: AuthService,
protected userService: UserService,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
private videoService: VideoService, private videoService: VideoService,
private hooks: HooksService private hooks: HooksService
) { ) {

View File

@ -10,6 +10,8 @@ import { ScreenService } from '@app/shared/misc/screen.service'
import { OwnerDisplayType } from '@app/shared/video/video-miniature.component' import { OwnerDisplayType } from '@app/shared/video/video-miniature.component'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { HooksService } from '@app/core/plugins/hooks.service' import { HooksService } from '@app/core/plugins/hooks.service'
import { UserService } from '@app/shared'
import { LocalStorageService } from '@app/shared/misc/storage.service'
@Component({ @Component({
selector: 'my-videos-user-subscriptions', selector: 'my-videos-user-subscriptions',
@ -29,7 +31,9 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement
protected route: ActivatedRoute, protected route: ActivatedRoute,
protected notifier: Notifier, protected notifier: Notifier,
protected authService: AuthService, protected authService: AuthService,
protected userService: UserService,
protected screenService: ScreenService, protected screenService: ScreenService,
protected storageService: LocalStorageService,
private videoService: VideoService, private videoService: VideoService,
private hooks: HooksService private hooks: HooksService
) { ) {

View File

@ -0,0 +1,15 @@
<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" style="transform:scale(1.1);">
<g class="layer" style="transform: scale(.9);">
<g fill="none" fill-rule="evenodd">
<g transform="translate(-884.000000, -863.000000)">
<g transform="translate(884.000000, 863.000000)">
<path d="m22.78031,7.45167c0,0 -0.21495,-1.56763 -0.87461,-2.25797c-0.83658,-0.90605 -1.7743,-0.91055 -2.20433,-0.96357c-3.07858,-0.23013 -7.69661,-0.23013 -7.69661,-0.23013l-0.00956,0c0,0 -4.61792,0 -7.69661,0.23013c-0.43005,0.05302 -1.36743,0.05752 -2.20431,0.96357c-0.65962,0.69034 -0.87427,2.25797 -0.87427,2.25797c0,0 -0.22001,1.84092 -0.22001,3.68182l0,1.72585c0,1.84087 0.22001,3.68177 0.22001,3.68177c0,0 0.21465,1.56766 0.87427,2.25799c0.83688,0.90608 1.93618,0.87741 2.42581,0.97238c1.76002,0.17451 7.47991,0.22852 7.47991,0.22852c0,0 4.62279,-0.00719 7.70137,-0.2373c0.43003,-0.05305 1.36775,-0.05752 2.20433,-0.9636c0.65966,-0.69033 0.87461,-2.25799 0.87461,-2.25799c0,0 0.21969,-1.8409 0.21969,-3.68177l0,-1.72585c0,-1.8409 -0.21969,-3.68182 -0.21969,-3.68182l0,0z" fill="#ffffff" stroke="#000000" stroke-width="2"/>
</g>
</g>
</g>
<g>
<path d="m9.639451,16.289861a0.758829,0.758829 0 0 1 -0.537251,-1.296079l3.226539,-3.226539l-2.689289,0a0.758829,0.758829 0 0 1 0,-1.517657l4.521101,0a0.758829,0.758829 0 0 1 0.537251,1.296079l-4.522619,4.521101a0.758829,0.758829 0 0 1 -0.535733,0.223096z" fill="#000000" stroke="#000000" stroke-width="0"/>
<path d="m13.029897,9.507451l-2.208191,0a0.758829,0.758829 0 1 1 0,-1.517657l2.21578,0a0.758829,0.758829 0 0 1 0,1.517657l-0.007588,0z" fill="#000000" stroke="#000000" stroke-width="0"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Artboard-4" transform="translate(-400.000000, -247.000000)">
<g id="69" transform="translate(400.000000, 247.000000)">
<circle id="Oval-7" stroke="#000000" stroke-width="2" cx="12" cy="12" r="10"></circle>
<path d="M12.016,14.544 C12.384,14.544 12.64,14.256 12.704,13.904 L12.768,13.168 C14.544,12.864 16,11.952 16,9.936 L16,9.904 C16,7.904 14.48,6.656 12.24,6.656 C10.768,6.656 9.696,7.184 8.848,7.984 C8.624,8.176 8.528,8.432 8.528,8.672 C8.528,9.152 8.928,9.552 9.424,9.552 C9.648,9.552 9.856,9.456 10.016,9.328 C10.656,8.752 11.344,8.448 12.192,8.448 C13.344,8.448 14.032,9.072 14.032,9.968 L14.032,10 C14.032,11.008 13.2,11.584 11.696,11.728 C11.264,11.776 11.008,12.096 11.072,12.528 L11.232,13.904 C11.28,14.272 11.552,14.544 11.92,14.544 L12.016,14.544 Z M10.784,16.816 L10.784,16.976 C10.784,17.6 11.264,18.08 11.92,18.08 C12.576,18.08 13.056,17.6 13.056,16.976 L13.056,16.816 C13.056,16.192 12.576,15.712 11.92,15.712 C11.264,15.712 10.784,16.192 10.784,16.816 Z" id="?" fill="#000000"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Artboard-4" transform="translate(-444.000000, -247.000000)" fill="#000000">
<g id="70" transform="translate(444.000000, 247.000000)">
<path d="M8.82929429,17 L20.0066023,17 C20.5552407,17 21,17.4438648 21,18 C21,18.5522847 20.5550537,19 20.0066023,19 L8.82929429,19 C8.41745788,20.1651924 7.30621883,21 6,21 C4.34314575,21 3,19.6568542 3,18 C3,16.3431458 4.34314575,15 6,15 C7.30621883,15 8.41745788,15.8348076 8.82929429,17 Z M9.17070571,13 L3.99339768,13 C3.44475929,13 3,12.5561352 3,12 C3,11.4477153 3.44494629,11 3.99339768,11 L9.17070571,11 C9.58254212,9.83480763 10.6937812,9 12,9 C13.3062188,9 14.4174579,9.83480763 14.8292943,11 L20.0066023,11 C20.5552407,11 21,11.4438648 21,12 C21,12.5522847 20.5550537,13 20.0066023,13 L14.8292943,13 C14.4174579,14.1651924 13.3062188,15 12,15 C10.6937812,15 9.58254212,14.1651924 9.17070571,13 Z M15.1659641,6.98648118 C15.1124525,6.99537358 15.05751,7 15.0014977,7 L3.99850233,7 C3.44704472,7 3,6.55613518 3,6 C3,5.44771525 3.44748943,5 3.99850233,5 L15.0014977,5 C15.0575314,5 15.1124871,5.00458274 15.1660053,5.01340035 C15.5740343,3.84121344 16.6887792,3 18,3 C19.6568542,3 21,4.34314575 21,6 C21,7.65685425 19.6568542,9 18,9 C16.688735,9 15.5739592,8.15872988 15.1659641,6.98648118 Z M18,7 C18.5522847,7 19,6.55228475 19,6 C19,5.44771525 18.5522847,5 18,5 C17.4477153,5 17,5.44771525 17,6 C17,6.55228475 17.4477153,7 18,7 Z M12,13 C12.5522847,13 13,12.5522847 13,12 C13,11.4477153 12.5522847,11 12,11 C11.4477153,11 11,11.4477153 11,12 C11,12.5522847 11.4477153,13 12,13 Z M6,19 C6.55228475,19 7,18.5522847 7,18 C7,17.4477153 6.55228475,17 6,17 C5.44771525,17 5,17.4477153 5,18 C5,18.5522847 5.44771525,19 6,19 Z" id="Combined-Shape"></path>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -0,0 +1,17 @@
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs/>
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
<g transform="translate(-796.000000, -1046.000000)" stroke="#000000" stroke-width="2">
<g transform="translate(48.000000, 1046.000000)">
<g transform="translate(760.000000, 12.000000) scale(1, -1) translate(-760.000000, -12.000000) translate(748.000000, 0.000000)">
<path d="M2,14 C2,14 5,7 12,7 C19,7 22,14 22,14" id="Path-80" stroke-linejoin="round"/>
<path d="M12,7 L12,5"/>
<path d="M18,8.5 L19,7"/>
<path d="M21,12 L22.5,11"/>
<path d="M1.5,12 L3,11" transform="translate(2.250000, 11.500000) scale(1, -1) translate(-2.250000, -11.500000) "/>
<path d="M5,8.5 L6,7" transform="translate(5.500000, 7.750000) scale(-1, 1) translate(-5.500000, -7.750000) "/>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -0,0 +1,15 @@
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(-268.000000, -203.000000)" stroke="#000000" stroke-width="2">
<g transform="translate(268.000000, 203.000000)">
<path d="M2,12 C2,12 5,5 12,5 C19,5 22,12 22,12 C22,12 19,19 12,19 C5,19 2,12 2,12 Z" stroke-linejoin="round"/>
<circle id="Oval-50" cx="12" cy="12" r="3"/>
<path d="M12,5 L12,3" stroke-linecap="round"/>
<path d="M18,6.5 L19,5" stroke-linecap="round"/>
<path d="M21,10 L22.5,9" stroke-linecap="round"/>
<path d="M1.5,10 L3,9" stroke-linecap="round" transform="translate(2.250000, 9.500000) scale(1, -1) translate(-2.250000, -9.500000) "/>
<path d="M5,6.5 L6,5" stroke-linecap="round" transform="translate(5.500000, 5.750000) scale(-1, 1) translate(-5.500000, -5.750000) "/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1023 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,10 @@
<!-- by Aaron Jin - free for commercial use -->
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200" style="transform:scale(1.2)">
<path stroke="#000000" fill="#000000" stroke-width="3" d="M92.63,155H42.09a17.8,17.8,0,0,1-17.78-17.78V29.31a5,5,0,0,1,5-5h88.32a5,5,0,0,1,4.9,6L97.53,151A5,5,0,0,1,92.63,155ZM34.31,34.31V137.22A7.79,7.79,0,0,0,42.09,145H88.56L111.49,34.31Z"/>
<path stroke="#000000" fill="#000000" stroke-width="3" d="M170.69,175.69H75a5,5,0,0,1-4.9-6L74.39,149a5,5,0,0,1,9.8,2l-3,14.67h84.55V62.78A7.79,7.79,0,0,0,157.91,55H113.35a5,5,0,0,1,0-10h44.56a17.8,17.8,0,0,1,17.78,17.78V170.69A5,5,0,0,1,170.69,175.69Z"/>
<path stroke="#000000" fill="#000000" stroke-width="3" d="M50,92h0a5,5,0,0,1-5-5l0-24.49a17.49,17.49,0,0,1,35,0V87a5,5,0,0,1-10,0V62.49a7.49,7.49,0,0,0-15,0L55,87A5,5,0,0,1,50,92Z"/>
<path stroke="#000000" fill="#000000" stroke-width="3" d="M75,76H50a5,5,0,0,1,0-10H75a5,5,0,0,1,0,10Z"/>
<path stroke="#000000" fill="#000000" stroke-width="3" d="M120.21,155a5,5,0,0,1-3.54-8.54l21.26-21.26H120.21a5,5,0,0,1,0-10H150a5,5,0,0,1,3.54,8.54l-29.8,29.79A5,5,0,0,1,120.21,155Z"/>
<path stroke="#000000" fill="#000000" stroke-width="3" d="M150,155a5,5,0,0,1-3.54-1.47l-14.89-14.89a5,5,0,0,1,7.07-7.07l14.9,14.89A5,5,0,0,1,150,155Z"/>
<path stroke="#000000" fill="#000000" stroke-width="3" d="M142.55,110.31H128a5,5,0,1,1,0-10h14.6a5,5,0,0,1,0,10Z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -1 +0,0 @@
<svg height="300px" width="300px" fill="#fff" xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 100 100" x="0px" y="0px"><title>Artboard 633</title><circle cx="50" cy="6" r="4"/><circle cx="50" cy="94" r="4"/><circle cx="6" cy="50" r="4"/><circle cx="94" cy="50" r="4"/><circle cx="18" cy="18" r="4"/><circle cx="82" cy="82" r="4"/><circle cx="18" cy="82" r="4"/><circle cx="82" cy="18" r="4"/><path d="M82,50A32,32,0,1,0,50,82,32,32,0,0,0,82,50ZM50,26a23.67,23.67,0,0,1,5.87.76c4.36,9.93.57,19-4.66,24.29s-14.4,9.24-24.45,4.83A23.75,23.75,0,0,1,26,50,24,24,0,0,1,50,26Zm0,48a23.94,23.94,0,0,1-18.26-8.47,29.38,29.38,0,0,0,3.74.26,30.07,30.07,0,0,0,21.41-9.11,29.82,29.82,0,0,0,8.61-25A24,24,0,0,1,50,74Z"/></svg>

Before

Width:  |  Height:  |  Size: 731 B

View File

@ -0,0 +1,11 @@
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs/>
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(-752.000000, -423.000000)" fill="#000000">
<g transform="translate(752.000000, 423.000000)">
<path d="M19.1632285,17.9958742 C20.7455119,17.9132011 22,16.5984601 22,14.9914698 L22,7.0085302 C22,5.35043647 20.6598453,4 19.0049107,4 L4.99508929,4 C3.33899222,4 2,5.34829734 2,7.0085302 L2,14.9914698 C2,16.5963573 3.25552676,17.9130154 4.83678095,17.9958629 L6.5,16 L4.99508929,16 C4.4481604,16 4,15.5484013 4,14.9914698 L4,7.0085302 C4,6.4497782 4.44667411,6 4.99508929,6 L19.0049107,6 C19.5518396,6 20,6.45159872 20,7.0085302 L20,14.9914698 C20,15.5502218 19.5533259,16 19.0049107,16 L17.5,16 L19.1632285,17.9958742 Z" fill-rule="nonzero"/>
<polygon stroke="#000000" stroke-width="2" stroke-linejoin="round" points="12 14 17 20 7 20"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -24,6 +24,7 @@ body {
// now beware node-sass requires interpolation // now beware node-sass requires interpolation
// for css custom properties #{$var} // for css custom properties #{$var}
--mainColor: #{$orange-color}; --mainColor: #{$orange-color};
--mainColorLighter: #{$orange-color-lighter};
--mainHoverColor: #{$orange-hover-color}; --mainHoverColor: #{$orange-hover-color};
--mainBackgroundColor: #{$bg-color}; --mainBackgroundColor: #{$bg-color};
--mainForegroundColor: #{$fg-color}; --mainForegroundColor: #{$fg-color};

View File

@ -13,6 +13,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
flex: auto; flex: auto;
} }
.c-hand {
cursor: pointer;
}
@keyframes spin { @keyframes spin {
from { from {
transform: scale(1) rotate(0deg); transform: scale(1) rotate(0deg);
@ -41,6 +45,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
background-color: var(--mainHoverColor); background-color: var(--mainHoverColor);
opacity: .9; opacity: .9;
} }
&::after {
display: none;
}
} }
button { button {

View File

@ -72,6 +72,14 @@
} }
} }
@mixin fill-svg-color ($color) {
::ng-deep svg {
path {
fill: $color;
}
}
}
@mixin button-focus-visible-shadow($color) { @mixin button-focus-visible-shadow($color) {
&.focus-visible { &.focus-visible {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 4px $color; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 4px $color;

View File

@ -14,6 +14,7 @@ $grey-foreground-color: #585858;
$grey-foreground-hover-color: #303030; $grey-foreground-hover-color: #303030;
$orange-color: #F1680D; $orange-color: #F1680D;
$orange-color-lighter: rgb(233, 159, 110);
$orange-hover-color: #F97D46; $orange-hover-color: #F97D46;
$cyan-color: hsl(187, 77%, 34%); $cyan-color: hsl(187, 77%, 34%);
@ -74,6 +75,7 @@ $activated-action-button-color: black;
// to be warned of non-existing variables // to be warned of non-existing variables
$variables: ( $variables: (
--mainColor: var(--mainColor), --mainColor: var(--mainColor),
--mainColorLighter: var(--mainColorLighter),
--mainHoverColor: var(--mainHoverColor), --mainHoverColor: var(--mainHoverColor),
--mainBackgroundColor: var(--mainBackgroundColor), --mainBackgroundColor: var(--mainBackgroundColor),
--mainForegroundColor: var(--mainForegroundColor), --mainForegroundColor: var(--mainForegroundColor),
@ -112,8 +114,9 @@ $zindex: (
tooltip : 14000, tooltip : 14000,
loadbar : 15000, loadbar : 15000,
modal : 16000, modal : 16000,
notification : 17000, help-popover : 17000,
hotkeys : 18000 notification : 18000,
hotkeys : 19000
); );
@function z($label) { @function z($label) {

View File

@ -274,6 +274,15 @@ p-multiselect {
// left: -2px !important; // left: -2px !important;
//} //}
} }
.ui-multiselect-panel .ui-multiselect-items .ui-multiselect-item.ui-state-highlight {
background-color: var(--mainColorLighter);
}
.ui-inputtext:enabled:focus:not(.ui-state-error) {
border-color: var(--mainColorLighter) !important;
box-shadow: none;
}
} }
// PrimeNG calendar tweaks // PrimeNG calendar tweaks
@ -379,6 +388,24 @@ p-inputswitch {
.ui-inputswitch-checked .ui-inputswitch-slider { .ui-inputswitch-checked .ui-inputswitch-slider {
background-color: var(--mainColor) !important; background-color: var(--mainColor) !important;
} }
&.small {
height: 20px;
.ui-inputswitch {
width: 2.5em !important;
height: 1.45em !important;
.ui-inputswitch-slider::before {
height: 1em !important;
width: 1em !important;
}
}
.ui-inputswitch-checked .ui-inputswitch-slider::before {
transform: translateX(1em) !important;
}
}
} }
p-toast { p-toast {