Merge branch 'main' into dev

smartcommunitylab · Apr 9, 2024 · d31d3e9 · d31d3e9
2 parents 7040282 + a83109d
commit d31d3e9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -44,6 +44,10 @@ <h1 class="warning-user-not-valid">
             <h2 style="margin-left: 20px;">{{'loading' | translate}}...</h2>
         </div>
     </div>
+    <div class="footer" #footer>
+        <button mat-button  (click)="privacy($event)">{{"privacy" | translate}}</button>
+
+        </div>
 </div>
 <mat-menu #menu="matMenu">
     <div style="padding: 5px;">

diff --git a/src/app/app.component.scss b/src/app/app.component.scss
@@ -52,6 +52,8 @@
   float: left;
   z-index: -30;
   margin-top: 60px;
+  padding-bottom: 64px;
+
 }
 
 .loading-container {
@@ -124,4 +126,18 @@
 .lang{
   width: 60%;
   max-width: 200px;
-}
+}
+
+.footer {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  height: 64px;
+  background-color:#01579b;
+  color: #ffffff;
+  text-align: center;
+  margin: 0px;
+  display: flex;
+  align-items: center;
+  flex-direction: row-reverse;
+  }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, ElementRef, OnInit, ViewChild } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 import { LoadingService } from "./shared/services/loading.service";
 import { delay } from "rxjs/operators";
@@ -32,6 +32,8 @@ export interface Tile {
   styleUrls: ["./app.component.scss"],
 })
 export class AppComponent implements OnInit {
+  @ViewChild("footer") footer: ElementRef;
+
   title = "backOfficeConsolePlayGo";
   loading: boolean = false;
   territories: TerritoryClass[];
@@ -195,7 +197,9 @@ export class AppComponent implements OnInit {
   logout(event: any){
     this.authService.logout();
   }
-
+privacy(event:any) {
+  window.open("https://www.smartcommunitylab.it/playandgo-privacy-policy/", "_blank");
+}
 
 //   waitForRoles() {
 //     if (typeof Worker !== 'undefined') {

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -353,6 +353,7 @@
   "hideCompanyDesc":"Hide company descriptions",
   "registrationCompanyDesc":"Registration form message",
   "limitCompanyDesc":"Limit popup message",
+  "privacy":"Privacy policy",
   "":"",
   "":"",
   "":"",

diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
@@ -357,7 +357,7 @@
 "hideCompanyDesc":"Nascondi dati aziendali",
 "registrationCompanyDesc":"Messaggio form iscrizione",
 "limitCompanyDesc":"Messaggio popup limiti",
-"":"",
+"privacy":"Privacy policy",
 "":"",
 "":"",
 "":"",