From 1e245c53d3a01a631132dbbe3eea9d7ad0ce80c3 Mon Sep 17 00:00:00 2001 From: Gion-Andri Cantieni Date: Thu, 4 Jan 2024 16:50:20 +0100 Subject: [PATCH] feat: implement imprint and privacy policy pages --- src/app/app-routing.module.ts | 2 -- src/app/app.module.ts | 6 ++-- .../components/header/header.component.html | 2 -- .../static/contact/contact.component.html | 9 ------ .../static/contact/contact.component.scss | 0 .../pages/static/contact/contact.component.ts | 10 ------ .../static/imprint/imprint.component.html | 32 +++++++++++++++---- .../static/privacy/privacy.component.html | 31 ++++++++++++++---- src/assets/i18n/rm.json | 3 +- 9 files changed, 53 insertions(+), 42 deletions(-) delete mode 100644 src/app/pages/static/contact/contact.component.html delete mode 100644 src/app/pages/static/contact/contact.component.scss delete mode 100644 src/app/pages/static/contact/contact.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4142e1d..8146945 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -5,7 +5,6 @@ import { EventsDetailsComponent } from "./pages/events/events-details/events-det import { NotFoundComponent } from "./pages/static/not-found/not-found.component"; import { canMatchEventId } from "./routing/match-event-id.guard"; import { HelpComponent } from "./pages/static/help/help.component"; -import { ContactComponent } from "./pages/static/contact/contact.component"; import { OrganisationComponent } from "./pages/static/organisation/organisation.component"; import { ImprintComponent } from "./pages/static/imprint/imprint.component"; import { PrivacyComponent } from "./pages/static/privacy/privacy.component"; @@ -29,7 +28,6 @@ const routes: Routes = [ }, {path: ':id', canMatch: [canMatchEventId], pathMatch: 'full', component: EventsDetailsComponent}, {path: 'help', pathMatch: 'full', component: HelpComponent}, - {path: 'contact', pathMatch: 'full', component: ContactComponent}, {path: 'organisation', pathMatch: 'full', component: OrganisationComponent}, {path: 'imprint', pathMatch: 'full', component: ImprintComponent}, {path: 'privacy', pathMatch: 'full', component: PrivacyComponent}, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e05625d..8c68515 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,7 +10,6 @@ import { HttpClient, HttpClientModule } from "@angular/common/http"; import { JWT_OPTIONS, JwtModule } from "@auth0/angular-jwt"; import { environment } from "../environments/environment"; import { HelpComponent } from './pages/static/help/help.component'; -import { ContactComponent } from './pages/static/contact/contact.component'; import { ImprintComponent } from './pages/static/imprint/imprint.component'; import { PrivacyComponent } from './pages/static/privacy/privacy.component'; import { OrganisationComponent } from './pages/static/organisation/organisation.component'; @@ -51,7 +50,9 @@ import { DatepickerHeaderComponent } from './components/datepicker-header/datepi import { NoEventsComponent } from './components/events/no-events/no-events.component'; import { ScrollableTitleDirective } from './shared/directives/scrollable-title.directive'; import { FilterScrollPositionDirective } from './shared/directives/filter-scroll-position.directive'; -import { PwaInstallInstructionsComponent } from './components/pwa-install-instructions/pwa-install-instructions.component'; +import { + PwaInstallInstructionsComponent +} from './components/pwa-install-instructions/pwa-install-instructions.component'; import { TrackingRtrComponent } from './components/tracking-rtr/tracking-rtr.component'; export function jwtOptionsFactory(authService: AuthenticationService) { @@ -86,7 +87,6 @@ export function inIframe() { HeaderComponent, BackButtonComponent, HelpComponent, - ContactComponent, ImprintComponent, PrivacyComponent, OrganisationComponent, diff --git a/src/app/components/header/header.component.html b/src/app/components/header/header.component.html index cd67826..7a585b8 100644 --- a/src/app/components/header/header.component.html +++ b/src/app/components/header/header.component.html @@ -31,8 +31,6 @@
  • {{ 'COMPONENTS.HEADER.MAIN_MENU.HELP' | translate }}
    • -
  • {{ 'COMPONENTS.HEADER.MAIN_MENU.CONTACT' | translate }}
  • {{ 'COMPONENTS.HEADER.MAIN_MENU.ORGANISATION' | translate }}
    • diff --git a/src/app/pages/static/contact/contact.component.html b/src/app/pages/static/contact/contact.component.html deleted file mode 100644 index 10da113..0000000 --- a/src/app/pages/static/contact/contact.component.html +++ /dev/null @@ -1,9 +0,0 @@ -
    -

    Contact

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet aspernatur delectus exercitationem nulla odio - officiis quis tempora vel voluptatem voluptates! Atque culpa eveniet fugit id, iusto magni quisquam. Quos, - vitae.

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Asperiores aut beatae consequatur distinctio dolorem, - et in minus modi nam praesentium quaerat repellendus saepe sapiente sed tenetur. Dolorum inventore possimus - quod!

    -
    diff --git a/src/app/pages/static/contact/contact.component.scss b/src/app/pages/static/contact/contact.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/pages/static/contact/contact.component.ts b/src/app/pages/static/contact/contact.component.ts deleted file mode 100644 index f2f437b..0000000 --- a/src/app/pages/static/contact/contact.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-contact', - templateUrl: './contact.component.html', - styleUrls: ['./contact.component.scss'] -}) -export class ContactComponent { - -} diff --git a/src/app/pages/static/imprint/imprint.component.html b/src/app/pages/static/imprint/imprint.component.html index abb4185..adbaa25 100644 --- a/src/app/pages/static/imprint/imprint.component.html +++ b/src/app/pages/static/imprint/imprint.component.html @@ -1,9 +1,27 @@
    -

    Impressum

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet aspernatur delectus exercitationem nulla odio - officiis quis tempora vel voluptatem voluptates! Atque culpa eveniet fugit id, iusto magni quisquam. Quos, - vitae.

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Asperiores aut beatae consequatur distinctio dolorem, - et in minus modi nam praesentium quaerat repellendus saepe sapiente sed tenetur. Dolorum inventore possimus - quod!

    +

    Contact ed impressum

    + +

    Tar dumondas davart il cuntegn ed la moderaziun da quel pudais Vus gugent contactar:

    + +

    + RTR Radiotelevisiun Svizra Rumantscha
    + Via da Masans 2
    + 7000 Cuira
    + Tel. 058 136 30 00
    + stab.program@rtr.ch
    + www.rtr.ch +

    + +

    Autras dumondas en connex cun la pagina pudais Vus trametter a:

    + +

    + Uniun da las Rumantschas
    + e dals Rumantschs en la Bassa
    + Roman Pfister
    + Zimikerried 11
    + 8603 Schwerzenbach
    + roman.pfister@uniun-urb.clubdesk.com
    + www.uniun-urb.ch +

    diff --git a/src/app/pages/static/privacy/privacy.component.html b/src/app/pages/static/privacy/privacy.component.html index 0633543..afa58af 100644 --- a/src/app/pages/static/privacy/privacy.component.html +++ b/src/app/pages/static/privacy/privacy.component.html @@ -1,9 +1,26 @@
    -

    Decleraziun da protecziun da datas

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet aspernatur delectus exercitationem nulla odio - officiis quis tempora vel voluptatem voluptates! Atque culpa eveniet fugit id, iusto magni quisquam. Quos, - vitae.

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Asperiores aut beatae consequatur distinctio dolorem, - et in minus modi nam praesentium quaerat repellendus saepe sapiente sed tenetur. Dolorum inventore possimus - quod!

    +

    Decleraziun davart la protecziun da datas

    +

    + Nus prendain serius la protecziun da Vossas datas e sa basain sin las directivas legalas vertentas. Nus vulain + che Vus As sentias segira e segir durant che Vus faschais diever da nossas purschidas. Perquai chattais Vus qua + tut las infurmaziuns en detagl: +

    +

    + Protecziun da datas SRG SSR / Datenschutz SRG SSR:
    + + www.srgssr.ch/rm/decleraziun-davart-la-protecziun-da-datas + +

    + +

    + Sche Vus avais dumondas concretas areguard la protecziun da datas tar RTR, pudais Vus gugent contactar nus sco + suonda: +

    + +

    + Contact da la protecziun da datas tar RTR
    + Radiotelevisiun Svizra Rumantscha
    + Via da Masans 2 CH-7000 Cuira
    + e-mail: protecziun.datas@rtr.ch
    +

    diff --git a/src/assets/i18n/rm.json b/src/assets/i18n/rm.json index 2551051..bde5ace 100644 --- a/src/assets/i18n/rm.json +++ b/src/assets/i18n/rm.json @@ -46,9 +46,8 @@ "MAIN_MENU": { "EVENTS": "occurrenzas", "HELP": "agid", - "CONTACT": "contact", "ORGANISATION": "purtaders", - "IMPRINT": "impressum", + "IMPRINT": "contact ed impressum", "PRIVACY": "protecziun da datas" }, "PROFILE_MENU": {