diff options
author | Chocobozzz <me@florianbigard.com> | 2018-06-27 14:21:03 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-06-27 14:59:09 +0200 |
commit | 78f912ed5733028ec2bf10c06c19f75b07943be2 (patch) | |
tree | 4bf9692230deabc4e050e5a7de126b38901969e9 /client/src/app/about | |
parent | 61b909b9bf849516f30dab2bf5977acfbbddc5c6 (diff) | |
download | PeerTube-78f912ed5733028ec2bf10c06c19f75b07943be2.tar.gz PeerTube-78f912ed5733028ec2bf10c06c19f75b07943be2.tar.zst PeerTube-78f912ed5733028ec2bf10c06c19f75b07943be2.zip |
Improve P2P & Privacy section
Diffstat (limited to 'client/src/app/about')
-rw-r--r-- | client/src/app/about/about-routing.module.ts | 23 | ||||
-rw-r--r-- | client/src/app/about/about.component.html | 50 | ||||
-rw-r--r-- | client/src/app/about/about.component.scss | 12 | ||||
-rw-r--r-- | client/src/app/about/about.component.ts | 50 | ||||
-rw-r--r-- | client/src/app/about/about.module.ts | 24 | ||||
-rw-r--r-- | client/src/app/about/index.ts | 3 |
6 files changed, 0 insertions, 162 deletions
diff --git a/client/src/app/about/about-routing.module.ts b/client/src/app/about/about-routing.module.ts deleted file mode 100644 index 11a650c80..000000000 --- a/client/src/app/about/about-routing.module.ts +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | import { NgModule } from '@angular/core' | ||
2 | import { RouterModule, Routes } from '@angular/router' | ||
3 | import { MetaGuard } from '@ngx-meta/core' | ||
4 | import { AboutComponent } from './about.component' | ||
5 | |||
6 | const aboutRoutes: Routes = [ | ||
7 | { | ||
8 | path: 'about', | ||
9 | component: AboutComponent, | ||
10 | canActivate: [ MetaGuard ], | ||
11 | data: { | ||
12 | meta: { | ||
13 | title: 'About' | ||
14 | } | ||
15 | } | ||
16 | } | ||
17 | ] | ||
18 | |||
19 | @NgModule({ | ||
20 | imports: [ RouterModule.forChild(aboutRoutes) ], | ||
21 | exports: [ RouterModule ] | ||
22 | }) | ||
23 | export class AboutRoutingModule {} | ||
diff --git a/client/src/app/about/about.component.html b/client/src/app/about/about.component.html deleted file mode 100644 index dc13f785d..000000000 --- a/client/src/app/about/about.component.html +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | <div class="margin-content"> | ||
2 | <div i18n class="title-page title-page-single"> | ||
3 | Welcome to the {{ instanceName }} instance | ||
4 | </div> | ||
5 | |||
6 | <div class="short-description"> | ||
7 | <div>{{ shortDescription }}</div> | ||
8 | </div> | ||
9 | |||
10 | <div class="description"> | ||
11 | <div i18n class="section-title">Description</div> | ||
12 | |||
13 | <div [innerHTML]="descriptionHTML"></div> | ||
14 | </div> | ||
15 | |||
16 | <div class="terms"> | ||
17 | <div i18n class="section-title">Terms</div> | ||
18 | |||
19 | <div [innerHTML]="termsHTML"></div> | ||
20 | </div> | ||
21 | |||
22 | <div class="signup"> | ||
23 | <div i18n class="section-title">Signup</div> | ||
24 | |||
25 | <div *ngIf="isSignupAllowed"> | ||
26 | <ng-container i18n>User registration is allowed and</ng-container> | ||
27 | |||
28 | <ng-container i18n *ngIf="userVideoQuota !== -1"> | ||
29 | this instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users. | ||
30 | </ng-container> | ||
31 | |||
32 | <ng-container i18n *ngIf="userVideoQuota === -1"> | ||
33 | this instance provides unlimited space for the videos of its users. | ||
34 | </ng-container> | ||
35 | </div> | ||
36 | |||
37 | <div i18n *ngIf="isSignupAllowed === false"> | ||
38 | User registration is currently not allowed. | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | <div id="p2p-privacy"> | ||
43 | <div i18n class="section-title">P2P & Privacy</div> | ||
44 | |||
45 | <p i18n> | ||
46 | PeerTube uses the BitTorrent protocol to share bandwidth between users. It implies that your public IP address is stored in the public BitTorrent tracker of the video PeerTube instance as long as you're watching the video. | ||
47 | If you want to keep your public IP address private, please use a VPN or the Tor Browser. | ||
48 | </p> | ||
49 | </div> | ||
50 | </div> | ||
diff --git a/client/src/app/about/about.component.scss b/client/src/app/about/about.component.scss deleted file mode 100644 index a63cd229c..000000000 --- a/client/src/app/about/about.component.scss +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | @import '_variables'; | ||
2 | @import '_mixins'; | ||
3 | |||
4 | .section-title { | ||
5 | font-weight: $font-semibold; | ||
6 | font-size: 20px; | ||
7 | margin-bottom: 5px; | ||
8 | } | ||
9 | |||
10 | .short-description, .description, .terms, .signup { | ||
11 | margin-bottom: 30px; | ||
12 | } | ||
diff --git a/client/src/app/about/about.component.ts b/client/src/app/about/about.component.ts deleted file mode 100644 index c37b9318b..000000000 --- a/client/src/app/about/about.component.ts +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | ||
2 | import { ServerService } from '@app/core' | ||
3 | import { MarkdownService } from '@app/videos/shared' | ||
4 | import { NotificationsService } from 'angular2-notifications' | ||
5 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
6 | |||
7 | @Component({ | ||
8 | selector: 'my-about', | ||
9 | templateUrl: './about.component.html', | ||
10 | styleUrls: [ './about.component.scss' ] | ||
11 | }) | ||
12 | |||
13 | export class AboutComponent implements OnInit { | ||
14 | shortDescription = '' | ||
15 | descriptionHTML = '' | ||
16 | termsHTML = '' | ||
17 | |||
18 | constructor ( | ||
19 | private notificationsService: NotificationsService, | ||
20 | private serverService: ServerService, | ||
21 | private markdownService: MarkdownService, | ||
22 | private i18n: I18n | ||
23 | ) {} | ||
24 | |||
25 | get instanceName () { | ||
26 | return this.serverService.getConfig().instance.name | ||
27 | } | ||
28 | |||
29 | get userVideoQuota () { | ||
30 | return this.serverService.getConfig().user.videoQuota | ||
31 | } | ||
32 | |||
33 | get isSignupAllowed () { | ||
34 | return this.serverService.getConfig().signup.allowed | ||
35 | } | ||
36 | |||
37 | ngOnInit () { | ||
38 | this.serverService.getAbout() | ||
39 | .subscribe( | ||
40 | res => { | ||
41 | this.shortDescription = res.instance.shortDescription | ||
42 | this.descriptionHTML = this.markdownService.textMarkdownToHTML(res.instance.description) | ||
43 | this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms) | ||
44 | }, | ||
45 | |||
46 | err => this.notificationsService.error(this.i18n('Error getting about from server'), err) | ||
47 | ) | ||
48 | } | ||
49 | |||
50 | } | ||
diff --git a/client/src/app/about/about.module.ts b/client/src/app/about/about.module.ts deleted file mode 100644 index da3163f43..000000000 --- a/client/src/app/about/about.module.ts +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | import { NgModule } from '@angular/core' | ||
2 | |||
3 | import { AboutRoutingModule } from './about-routing.module' | ||
4 | import { AboutComponent } from './about.component' | ||
5 | import { SharedModule } from '../shared' | ||
6 | |||
7 | @NgModule({ | ||
8 | imports: [ | ||
9 | AboutRoutingModule, | ||
10 | SharedModule | ||
11 | ], | ||
12 | |||
13 | declarations: [ | ||
14 | AboutComponent | ||
15 | ], | ||
16 | |||
17 | exports: [ | ||
18 | AboutComponent | ||
19 | ], | ||
20 | |||
21 | providers: [ | ||
22 | ] | ||
23 | }) | ||
24 | export class AboutModule { } | ||
diff --git a/client/src/app/about/index.ts b/client/src/app/about/index.ts deleted file mode 100644 index 218d09801..000000000 --- a/client/src/app/about/index.ts +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | export * from './about-routing.module' | ||
2 | export * from './about.component' | ||
3 | export * from './about.module' | ||