From a3465117472c8f81ea1c810162beb8edf05f24ef Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 1 Nov 2019 12:00:52 +0200 Subject: [PATCH] Adds pages: /terms-of-service, /privacy-policy --- dmp-frontend/src/app/app-routing.module.ts | 16 +++++++++ .../dmp-listing-item.component.html | 2 +- .../dmp-listing-item.component.scss | 4 +++ .../privacy/privacy.component.html | 12 +++++++ .../privacy/privacy.component.scss | 12 +++++++ .../privacy/privacy.component.ts | 15 ++++++++ .../sidebar-footer/privacy/privacy.module.ts | 15 ++++++++ .../sidebar-footer/privacy/privacy.routing.ts | 16 +++++++++ .../sidebar-footer.component.css | 34 ++++++++++-------- .../sidebar-footer.component.html | 36 ++++++++++++++----- .../sidebar-footer.component.ts | 2 +- .../sidebar-footer/terms/terms.component.html | 12 +++++++ .../sidebar-footer/terms/terms.component.scss | 12 +++++++ .../sidebar-footer/terms/terms.component.ts | 15 ++++++++ .../sidebar-footer/terms/terms.module.ts | 15 ++++++++ .../sidebar-footer/terms/terms.routing.ts | 16 +++++++++ dmp-frontend/src/assets/i18n/en.json | 14 +++++++- 17 files changed, 222 insertions(+), 26 deletions(-) create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.html create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.scss create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.ts create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.module.ts create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.routing.ts create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.module.ts create mode 100644 dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.routing.ts diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index 47399592d..cc74e9ff6 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -93,6 +93,22 @@ const appRoutes: Routes = [ title: 'GENERAL.TITLES.DATASET-PROFILES' } }, + { + path: 'privacy-policy', + loadChildren: () => import('./ui/sidebar/sidebar-footer/privacy/privacy.module').then(m => m.PrivacyModule), + data: { + breadcrumb: true, + title: 'GENERAL.TITLES.PRIVACY' + } + }, + { + path: 'terms-of-service', + loadChildren: () => import('./ui/sidebar/sidebar-footer/terms/terms.module').then(m => m.TermsModule), + data: { + breadcrumb: true, + title: 'GENERAL.TITLES.TERMS' + } + }, { path: 'home', loadChildren: () => import('./ui/dashboard/dashboard.module').then(m => m.DashboardModule), diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html index bcf1271df..eef507cea 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.html @@ -58,7 +58,7 @@ settings -

{{roleDisplay(dmp.users).toUpperCase()}}

+

{{roleDisplay(dmp.users).toUpperCase()}}

diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss index 41678d7ac..cb8fd4ab6 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss @@ -106,3 +106,7 @@ p { left: 50%; margin: -5px 0px 0px -5px; } + +.role { + min-width: 74px; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.html new file mode 100644 index 000000000..89e52c053 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.html @@ -0,0 +1,12 @@ +
+
+
+

{{ 'PRIVACY-POLICY.TITLE' | translate}}

+
+
+
+
+

{{ 'PRIVACY-POLICY.MAIN-CONTENT' | translate}}

+
+
+
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.scss new file mode 100644 index 000000000..9b960ac31 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.scss @@ -0,0 +1,12 @@ +h1 { + text-align: center; +} + +img { + height: 150px; + width: 100%; +} + +.privacy-component { + margin-top: 80px; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.ts new file mode 100644 index 000000000..d90640371 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-privacy', + templateUrl: './privacy.component.html', + styleUrls: ['./privacy.component.scss'] +}) +export class PrivacyComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.module.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.module.ts new file mode 100644 index 000000000..37921fc36 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { PrivacyComponent } from './privacy.component'; +import { PrivacyRoutingModule } from './privacy.routing'; +import { CommonUiModule } from '../../../../common/ui/common-ui.module'; + +@NgModule({ + imports: [ + CommonUiModule, + PrivacyRoutingModule + ], + declarations: [ + PrivacyComponent + ] +}) +export class PrivacyModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.routing.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.routing.ts new file mode 100644 index 000000000..6a17f75b9 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/privacy/privacy.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { PrivacyComponent } from './privacy.component'; + +const routes: Routes = [ + { + path: '', + component: PrivacyComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class PrivacyRoutingModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css index faab6bfae..62dc5de9d 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css @@ -1,27 +1,31 @@ .sidebar-footer { - padding: white; - color: rgb(117, 117, 117); - /* background-color: #ffffff; */ - /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ + padding: white; + color: rgb(117, 117, 117); + background-color: #3333333d; + /* background-color: #ffffff; */ + /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */ } .sidebar-footer .option { - margin: 0px; - padding-top: 2px; - padding-bottom: 2px; - padding-right: 10px; - border-radius: 0px; - color: white; - cursor: pointer; - display: inline-flex; + margin: 0px; + padding-top: 2px; + padding-bottom: 2px; + border-radius: 0px; + color: white; + cursor: pointer; + display: inline-flex; + font-size: small; } .sidebar-footer :hover { - color: #00b29f; + color: #00b29f; } .sidebar-footer .vl { - border-right: 1px solid #d4d4d4; - color: white; + border-right: 1px solid #d4d4d4; + color: white; } +.option-active { + color: #00b29f !important; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html index b369bb370..8cb3890ee 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html @@ -1,4 +1,4 @@ -
+
-
-

{{'FOOTER.GLOSSARY' | translate}}

+
+
+

+ + {{'FOOTER.GLOSSARY' | translate}}

+
+
+

+ + {{'FOOTER.FAQ' | translate}}

+
+
+

+ + {{'FOOTER.CONTACT-SUPPORT' | translate}}

+
-
-

{{'FOOTER.FAQ' | translate}}

-
-
-

{{'FOOTER.CONTACT-SUPPORT' | translate}}

+
+
+ + + {{'FOOTER.TERMS-OF-SERVICE' | translate}} +
+
+ + + {{'FOOTER.PRIVACY-POLICY' | translate}} +
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts index ecc9546cf..3916f8ef0 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.ts @@ -42,7 +42,7 @@ export class SidebarFooterComponent extends BaseComponent implements OnInit { } else { const dialogRef = this.dialog.open(ContactDialogComponent, { - width: '400px', + width: '550px', disableClose: true, data: this.formGroup }); diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html new file mode 100644 index 000000000..e469ae59b --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.html @@ -0,0 +1,12 @@ +
+
+
+

{{ 'TERMS-OF-SERVICE.TITLE' | translate}}

+
+
+
+
+

{{ 'TERMS-OF-SERVICE.MAIN-CONTENT' | translate}}

+
+
+
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss new file mode 100644 index 000000000..b49fda4bd --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss @@ -0,0 +1,12 @@ +h1 { + text-align: center; +} + +img { + height: 150px; + width: 100%; +} + +.terms-component { + margin-top: 80px; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts new file mode 100644 index 000000000..b17d4e5ed --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-terms', + templateUrl: './terms.component.html', + styleUrls: ['./terms.component.scss'] +}) +export class TermsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.module.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.module.ts new file mode 100644 index 000000000..d9c62dcc5 --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { TermsComponent } from './terms.component'; +import { TermsRoutingModule } from './terms.routing'; +import { CommonUiModule } from '../../../../common/ui/common-ui.module'; + +@NgModule({ + imports: [ + CommonUiModule, + TermsRoutingModule + ], + declarations: [ + TermsComponent + ], +}) +export class TermsModule { } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.routing.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.routing.ts new file mode 100644 index 000000000..718e98c0e --- /dev/null +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.routing.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { TermsComponent } from './terms.component'; + +const routes: Routes = [ + { + path: '', + component: TermsComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class TermsRoutingModule { } diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index c93e7e86f..95a24eefa 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -74,6 +74,8 @@ "PREFIX": "Open DMP - ", "GENERAL": "Data Management Plans Creator", "ABOUT": "About", + "PRIVACY": "Privacy Policy", + "TERMS": "Terms Of Service", "PLANS": "My DMPs", "EXPLORE-PLANS": "Published DMPs", "QUICK-WIZARD": "New DMP (Wizard)", @@ -947,7 +949,9 @@ "FOOTER": { "CONTACT-SUPPORT": "Contact Support", "FAQ": "FAQ", - "GLOSSARY": "Glossary" + "GLOSSARY": "Glossary", + "TERMS-OF-SERVICE": "Terms Of Service", + "PRIVACY-POLICY": "Privacy Policy" }, "GLOSSARY": { "TITLE": "Glossary", @@ -957,6 +961,14 @@ "TITLE": "FAQ", "CLOSE": "Close" }, + "PRIVACY-POLICY": { + "TITLE": "-Privacy Policy-", + "MAIN-CONTENT": "" + }, + "TERMS-OF-SERVICE": { + "TITLE": "-Terms Of Service-", + "MAIN-CONTENT": "" + }, "CONTACT": { "SUPPORT": { "TITLE": "Contact Support",