From 7d253675c833e8b566c18a8c3f162a8300fa9a4c Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 Feb 2024 16:06:54 +0100 Subject: [PATCH] Made legal modals global - Redesigned credits page --- .../src/app/credits/credits.component.html | 59 +++++++++++------ frontend/src/app/credits/credits.component.ts | 16 ++++- frontend/src/app/home/home.component.html | 65 +------------------ frontend/src/app/home/home.component.ts | 16 ++--- frontend/src/app/navbar/navbar.component.html | 62 ++++++++++++++++++ frontend/src/app/navbar/navbar.component.ts | 35 ++++++++-- frontend/src/service/legalService.ts | 19 ++++++ 7 files changed, 175 insertions(+), 97 deletions(-) create mode 100644 frontend/src/service/legalService.ts diff --git a/frontend/src/app/credits/credits.component.html b/frontend/src/app/credits/credits.component.html index 11be4c4..d8e8077 100644 --- a/frontend/src/app/credits/credits.component.html +++ b/frontend/src/app/credits/credits.component.html @@ -1,21 +1,40 @@ -

credits works!

+
+
+ + SharePulse Logo + SharePulse + +
+

+ Upload a file. Share the URL/link. Download the file. Simple as that. +

+
+
+

Developer:

+

Walzen665

+
+
+

Version:

+

1.0.0

+
+
+

API-Status:

+

online

+
+
+

Libraries:

+

+ Fontawesome, + TailwindCSS, + AXIOS http, + TailwindCSS Animations +

+
+
-

- Used media -

- +

+ Privacy Policy | + Terms of Use +

+ +
diff --git a/frontend/src/app/credits/credits.component.ts b/frontend/src/app/credits/credits.component.ts index 38205bc..f23db40 100644 --- a/frontend/src/app/credits/credits.component.ts +++ b/frontend/src/app/credits/credits.component.ts @@ -1,12 +1,26 @@ import { Component } from '@angular/core'; +import {RouterLink} from "@angular/router"; +import {LegalService} from "../../service/legalService"; @Component({ selector: 'app-credits', standalone: true, - imports: [], + imports: [ + RouterLink + ], templateUrl: './credits.component.html', styleUrl: './credits.component.scss' }) export class CreditsComponent { + constructor(private legalService: LegalService) { + } + + openPrivacyPolicyModal() { + this.legalService.openPrivacyPolicy(); + } + + openTermsOfUseModal() { + this.legalService.openTermsOfUse(); + } } diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 4c30bf4..25d86be 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -25,72 +25,11 @@

We prioritize data security and privacy consequently. Files uploaded by our clients are securely stored on our servers for a maximum duration of one day, after which they are permanently deleted to guarantee the highest level of confidentiality and data protection. Read more in our - Privacy Policy note. - By using SharePulse, you agree to the Terms of Use.

+ Privacy Policy note. + By using SharePulse, you agree to the Terms of Use.

- -
-

SharePulse™ Privacy Policy

-
-
-
    -
  1. Uploaded files are stored on a secure server.
    2. -
  2. Files are stored for a maximum of 24 hours.
    3. -
  3. SharePulse tracks your IP address when uploading files. This serves as a method of identification, allowing you to check the status of your upload.
    4. -
  4. SharePulse may track your IP address when downloading files.
    5. -
  5. SharePulse does not track you when accessing the website.
    6. -
  6. Personal information collected by SharePulse is used solely for data protection and is not processed.
    7. -
  7. SharePulse will not sell, rent, or share personal information with third parties without user consent, except as required by law.
    8. -
  8. Users have the right to request the deletion of their data from SharePulse's servers at any time.
    9. -
  9. SharePulse does not store any cookies on your device.
    10. -
  10. Operators do not view or manipulate uploaded files.
    11. -
  11. Users are encouraged to review the privacy policy periodically for any changes or updates.
    12. -
-
-
- -
-
-
- -
-
-
- -
- - - -
-

SharePulse™ Terms of Use

-
-
-
    -
  1. Users must not upload files that contain malware, illegal content, or violate copyright laws.
    2. -
  2. SharePulse is not responsible for the content of the files shared through its service.
    3. -
  3. By using SharePulse, users agree not to attempt to breach the security of the service.
    4. -
  4. SharePulse reserves the right to remove any files or suspend users that violate these terms without notice.
    5. -
  5. The service is provided "as is" without warranty of any kind, express or implied.
    6. -
  6. Users agree to indemnify and hold harmless SharePulse from any claims resulting from the use of the service.
    7. -
  7. SharePulse reserves the right to modify these terms at any time. Continued use of the service after such changes constitutes acceptance of the new terms.
    8. - -
-
-
- -
-
-
- -
-
-
- -
- - + + + +
+

SharePulse™ Privacy Policy

+
+
+
    +
  1. Uploaded files are stored on a secure server.
    2. +
  2. Files are stored for a maximum of 24 hours.
    3. +
  3. SharePulse tracks your IP address when uploading files. This serves as a method of identification, allowing you to check the status of your upload.
    4. +
  4. SharePulse may track your IP address when downloading files.
    5. +
  5. SharePulse does not track you when accessing the website.
    6. +
  6. Personal information collected by SharePulse is used solely for data protection and is not processed.
    7. +
  7. SharePulse will not sell, rent, or share personal information with third parties without user consent, except as required by law.
    8. +
  8. Users have the right to request the deletion of their data from SharePulse's servers at any time.
    9. +
  9. SharePulse does not store any cookies on your device.
    10. +
  10. Operators do not view or manipulate uploaded files.
    11. +
  11. Users are encouraged to review the privacy policy periodically for any changes or updates.
    12. +
+
+
+ +
+
+
+ +
+
+
+ +
+ + + +
+

SharePulse™ Terms of Use

+
+
+
    +
  1. Users must not upload files that contain malware, illegal content, or violate copyright laws.
    2. +
  2. SharePulse is not responsible for the content of the files shared through its service.
    3. +
  3. By using SharePulse, users agree not to attempt to breach the security of the service.
    4. +
  4. SharePulse reserves the right to remove any files or suspend users that violate these terms without notice.
    5. +
  5. The service is provided "as is" without warranty of any kind, express or implied.
    6. +
  6. Users agree to indemnify and hold harmless SharePulse from any claims resulting from the use of the service.
    7. +
  7. SharePulse reserves the right to modify these terms at any time. Continued use of the service after such changes constitutes acceptance of the new terms.
    8. + +
+
+
+ +
+
+
+ +
+
+
+ +
+ diff --git a/frontend/src/app/navbar/navbar.component.ts b/frontend/src/app/navbar/navbar.component.ts index e995551..11f884a 100644 --- a/frontend/src/app/navbar/navbar.component.ts +++ b/frontend/src/app/navbar/navbar.component.ts @@ -1,21 +1,46 @@ -import { Component } from '@angular/core'; +import {Component, ElementRef, ViewChild} from '@angular/core'; import {RouterLink} from "@angular/router"; import {NgClass} from "@angular/common"; +import {FormsModule} from "@angular/forms"; +import {LegalService} from "../../service/legalService"; @Component({ selector: 'app-navbar', standalone: true, - imports: [ - RouterLink, - NgClass - ], + imports: [ + RouterLink, + NgClass, + FormsModule + ], templateUrl: './navbar.component.html', styleUrl: './navbar.component.scss' }) export class NavbarComponent { + + @ViewChild('privacy_policy_modal') privacy_policy_modal: ElementRef | undefined; + @ViewChild('terms_of_use_modal') terms_of_use_modal: ElementRef | undefined; + isMenuOpen = false; + constructor(private legalService: LegalService) { + this.legalService.openModal$.subscribe((modalId) => { + if (modalId === 'privacyPolicy') { + this.openPrivacyPolicy(); + } else if (modalId === 'termsOfUse') { + this.openTermsOfUse(); + } + }); + } + toggleMenu(): void { this.isMenuOpen = !this.isMenuOpen; } + + openPrivacyPolicy() { + this.privacy_policy_modal?.nativeElement.showModal(); + } + + openTermsOfUse() { + this.terms_of_use_modal?.nativeElement.showModal(); + } } diff --git a/frontend/src/service/legalService.ts b/frontend/src/service/legalService.ts new file mode 100644 index 0000000..21f428f --- /dev/null +++ b/frontend/src/service/legalService.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { Subject } from 'rxjs'; + +@Injectable({ + providedIn: 'root', +}) +export class LegalService { + private openModalSource = new Subject(); + + openModal$ = this.openModalSource.asObservable(); + + openPrivacyPolicy() { + this.openModalSource.next('privacyPolicy'); + } + + openTermsOfUse() { + this.openModalSource.next('termsOfUse'); + } +}