From bb3842fc10246d81012640fb9a4de30afae117f9 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 11 Oct 2020 19:23:52 +0900 Subject: [PATCH 1/4] Add basic Terms of Service page --- frontend/src/app/app-routing.module.ts | 5 +++ frontend/src/app/app.module.ts | 2 + .../terms-of-service.component.html | 40 +++++++++++++++++++ .../terms-of-service.component.scss | 1 + .../terms-of-service.component.ts | 9 +++++ 5 files changed, 57 insertions(+) create mode 100644 frontend/src/app/components/terms-of-service/terms-of-service.component.html create mode 100644 frontend/src/app/components/terms-of-service/terms-of-service.component.scss create mode 100644 frontend/src/app/components/terms-of-service/terms-of-service.component.ts diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 662a96179..adeafc2af 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -15,6 +15,7 @@ import { StatusViewComponent } from './components/status-view/status-view.compon import { DashboardComponent } from './dashboard/dashboard.component'; import { LatestBlocksComponent } from './components/latest-blocks/latest-blocks.component'; import { ApiDocsComponent } from './components/api-docs/api-docs.component'; +import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component'; const routes: Routes = [ { @@ -59,6 +60,10 @@ const routes: Routes = [ path: 'api', component: ApiDocsComponent, }, + { + path: 'terms-of-service', + component: TermsOfServiceComponent + }, { path: 'address/:id', children: [], diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 9997ff97e..5a6bdc57a 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -45,6 +45,7 @@ import { DashboardComponent } from './dashboard/dashboard.component'; import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; import { faChartArea, faCogs, faCubes, faDatabase, faInfoCircle, faList, faSearch, faTachometerAlt, faThList, faTv } from '@fortawesome/free-solid-svg-icons'; import { ApiDocsComponent } from './components/api-docs/api-docs.component'; +import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component'; @NgModule({ declarations: [ @@ -78,6 +79,7 @@ import { ApiDocsComponent } from './components/api-docs/api-docs.component'; FeesBoxComponent, DashboardComponent, ApiDocsComponent, + TermsOfServiceComponent, ], imports: [ BrowserModule, diff --git a/frontend/src/app/components/terms-of-service/terms-of-service.component.html b/frontend/src/app/components/terms-of-service/terms-of-service.component.html new file mode 100644 index 000000000..b3f4b75a8 --- /dev/null +++ b/frontend/src/app/components/terms-of-service/terms-of-service.component.html @@ -0,0 +1,40 @@ +
+
+
+ +

+ +

Terms of Service

+
Updated: October 11, 2020
+ +

+ +
+ +
By using this website or accessing its API, you agree to these Terms of Service:
+ +
+ +

NO WARRANTY

+ +

This website is operated in the hope that it will be useful, but all services and data are provided on an "AS IS, AS AVAILABLE" basis, WITHOUT ANY WARRANTY OR REPRESENTATIONS; express or implied, without even the implied warranties of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, CONTINUOUS AVAILABILITY, or UNINTERRUPTED SERVICE. It is your responsibility to verify all data obtained from this website or its API service in relation to inaccuracies and omissions.

+ +
+ +

NO LIABILITY

+ +

Under no circumstance will the developers or operators of this website be held liable for any damages or losses, whether direct, indirect, or any other nature, that are deemed or alleged to have resulted from or been caused by this website or its contents, including, but without limitation to, errors, inaccuracies or ambiguity in this website or its contents, failures, malfunctions, delays or interruptions in operation or transmission, any persons use or misuse of this website or its content, any errors or omissions in content, damage for loss of business, loss of profits, business interruption, loss of business information, or any other pecuniary or consequential loss or damage.

+ +
+ +

PRIVACY POLICY

+ +

The operators of this website may collect your IP address as part of basic webserver logs and a self-hosted statistics application, but this data will never be sold or shared with third parties. Please use Tor when accessing this website to protect your privacy.

+ +
+ +

+ +
+ +
diff --git a/frontend/src/app/components/terms-of-service/terms-of-service.component.scss b/frontend/src/app/components/terms-of-service/terms-of-service.component.scss new file mode 100644 index 000000000..8d1c8b69c --- /dev/null +++ b/frontend/src/app/components/terms-of-service/terms-of-service.component.scss @@ -0,0 +1 @@ + diff --git a/frontend/src/app/components/terms-of-service/terms-of-service.component.ts b/frontend/src/app/components/terms-of-service/terms-of-service.component.ts new file mode 100644 index 000000000..c45547be5 --- /dev/null +++ b/frontend/src/app/components/terms-of-service/terms-of-service.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-terms-of-service', + templateUrl: './terms-of-service.component.html' +}) +export class TermsOfServiceComponent { + constructor() { } +} From 024b2d58f76a8377af3705f26ab87d387652a131 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 11 Oct 2020 19:25:38 +0900 Subject: [PATCH 2/4] Move social media icons to bottom, add terms of service links --- .../app/components/about/about.component.html | 50 +++++++++++-------- .../app/dashboard/dashboard.component.html | 8 ++- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index e616fd379..deb8825dd 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -4,28 +4,12 @@

+
+ Git commit: {{ gitCommit$ | async }} +
+
- - - - - - - - - - - - - - - - - - -


-

Maintainers

@@ -115,12 +99,34 @@

If you specified a Twitter handle, the profile photo should now be visible on this page when you reload.

+



+ + + + + + + + + + + + + + + + + + + +
+ -
+

- Git commit: {{ gitCommit$ | async }} + Terms of Service
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index 6a41acc37..07c3db1c0 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -130,6 +130,12 @@ +
+ +
+ Terms of Service +
+ @@ -140,4 +146,4 @@
- \ No newline at end of file + From 1d8d39db6b00259cc3a0481a1013f5b29d6bd2a3 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 11 Oct 2020 20:17:36 +0900 Subject: [PATCH 3/4] Only show first 8 characters of git commit hash on about page --- frontend/src/app/components/about/about.component.html | 2 +- frontend/src/app/components/about/about.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index deb8825dd..afadfca67 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -5,7 +5,7 @@

- Git commit: {{ gitCommit$ | async }} + v2.0-SNAPSHOT ({{ gitCommit$ | async }})

diff --git a/frontend/src/app/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index a239adf46..fc7eb6bc4 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -7,6 +7,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ApiService } from 'src/app/services/api.service'; import { env } from '../../app.constants'; import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; +import { map } from 'rxjs/operators'; @Component({ selector: 'app-about', @@ -33,7 +34,7 @@ export class AboutComponent implements OnInit { ) { } ngOnInit() { - this.gitCommit$ = this.stateService.gitCommit$; + this.gitCommit$ = this.stateService.gitCommit$.pipe(map((str) => str.substr(0, 8))); this.seoService.setTitle('About'); this.websocketService.want(['blocks']); From db16dbbc9d0d081a1e95869a1523e1deab663253 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 11 Oct 2020 20:57:52 +0900 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: softsimon --- frontend/src/app/components/about/about.component.html | 2 +- frontend/src/app/dashboard/dashboard.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index afadfca67..675459dad 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -126,7 +126,7 @@

- Terms of Service + Terms of Service
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index 07c3db1c0..107285713 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -133,7 +133,7 @@
- Terms of Service + Terms of Service