From a0bfd1db5764bcf3e2ecf64681ef7db2f50e81c6 Mon Sep 17 00:00:00 2001 From: ShyVortex Date: Thu, 25 Apr 2024 20:14:02 +0200 Subject: [PATCH] Aggiunta footer routing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Cliccando sui pulsanti della bottom bar ora si verrà reindirizzati alla corrispondente pagina. - Aggiunti i nuovi stili per la home univoca nel tema globale - Spostato il tema globale da variables.scss a global.scss per maggiore chiarezza ed efficienza --- src/app/pages/medic/home/home.page.html | 6 +- src/app/pages/medic/home/home.page.scss | 46 ---- src/app/pages/medic/home/home.page.ts | 12 + .../notifications/notifications.page.html | 36 +-- .../medic/notifications/notifications.page.ts | 34 ++- .../prescriptions/prescriptions.page.html | 36 +-- .../medic/prescriptions/prescriptions.page.ts | 34 ++- src/app/pages/nurse/drugs/drugs.page.html | 44 ++-- src/app/pages/nurse/drugs/drugs.page.ts | 38 +++- src/app/pages/nurse/home/home.page.html | 8 +- src/app/pages/nurse/home/home.page.scss | 46 ---- src/app/pages/nurse/home/home.page.ts | 16 ++ src/app/pages/nurse/shifts/shifts.page.html | 44 ++-- src/app/pages/nurse/shifts/shifts.page.ts | 38 +++- src/app/pages/nurse/sos/sos.page.html | 44 ++-- src/app/pages/nurse/sos/sos.page.ts | 38 +++- src/app/pages/patient/home/home.page.html | 8 +- src/app/pages/patient/home/home.page.scss | 46 ---- src/app/pages/patient/home/home.page.ts | 16 ++ .../pages/patient/logbook/logbook.page.html | 44 ++-- src/app/pages/patient/logbook/logbook.page.ts | 24 +- .../patient/reservation/reservation.page.html | 44 ++-- .../patient/reservation/reservation.page.ts | 38 +++- src/app/pages/patient/sos/sos.page.html | 47 ++-- src/app/pages/patient/sos/sos.page.ts | 26 ++- src/app/pages/settings/info/info.page.html | 2 +- src/global.scss | 210 ++++++++++++++++++ src/theme/variables.scss | 162 -------------- 28 files changed, 656 insertions(+), 531 deletions(-) diff --git a/src/app/pages/medic/home/home.page.html b/src/app/pages/medic/home/home.page.html index 4e97345..68da471 100644 --- a/src/app/pages/medic/home/home.page.html +++ b/src/app/pages/medic/home/home.page.html @@ -96,15 +96,15 @@

CIAO MARIO

- + Home - + Notifiche - + Prescrizioni diff --git a/src/app/pages/medic/home/home.page.scss b/src/app/pages/medic/home/home.page.scss index f07e78a..e69de29 100644 --- a/src/app/pages/medic/home/home.page.scss +++ b/src/app/pages/medic/home/home.page.scss @@ -1,46 +0,0 @@ -.user-details-title { - font-size: x-large; - font-weight: bold; - display: flex; - align-items: center; - - .item-title-icon { - width: 1.5em; - height: auto; - margin-right: 0.5em; - } -} - -.list-key { - font-size: large; - font-weight: bold; -} - -.list-value { - font-weight: normal; -} - -#security-card { - background-color: #845EC2; -} - -.access-card { - margin-top: -0.5em; - width: 10em; - height: auto; - display: inline-block; - - .card-icon { - width: 2em; - height: auto; - margin: auto; - display: block; - } - - .card-title { - color: #000; - margin-left: auto; - margin-right: auto; - display: block; - } -} diff --git a/src/app/pages/medic/home/home.page.ts b/src/app/pages/medic/home/home.page.ts index 600b18e..a49ba31 100644 --- a/src/app/pages/medic/home/home.page.ts +++ b/src/app/pages/medic/home/home.page.ts @@ -52,4 +52,16 @@ export class HomePage implements OnInit { logout() { this.navCtrl.navigateRoot("login"); } + + goToHome() { + this.navCtrl.navigateBack("medic-home"); + } + + goToNotifs() { + this.navCtrl.navigateForward("medic-notifs"); + } + + goToPrescriptions() { + this.navCtrl.navigateForward("medic-prescriptions"); + } } diff --git a/src/app/pages/medic/notifications/notifications.page.html b/src/app/pages/medic/notifications/notifications.page.html index e4c1c5e..2cbcae4 100644 --- a/src/app/pages/medic/notifications/notifications.page.html +++ b/src/app/pages/medic/notifications/notifications.page.html @@ -10,19 +10,23 @@ - - - - - Home - - - - Notifiche - - - - Prescrizioni - - - + + + + + + + Home + + + + Notifiche + + + + Prescrizioni + + + + + diff --git a/src/app/pages/medic/notifications/notifications.page.ts b/src/app/pages/medic/notifications/notifications.page.ts index 23a0a0b..f12e66d 100644 --- a/src/app/pages/medic/notifications/notifications.page.ts +++ b/src/app/pages/medic/notifications/notifications.page.ts @@ -2,28 +2,42 @@ import { Component, OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { - IonContent, - IonHeader, IonIcon, - IonImg, IonLabel, - IonTabBar, - IonTabButton, - IonTabs, - IonTitle, - IonToolbar + IonContent, IonFooter, + IonHeader, IonIcon, + IonImg, IonLabel, + IonTabBar, + IonTabButton, + IonTabs, + IonTitle, + IonToolbar } from '@ionic/angular/standalone'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-logbook', templateUrl: './notifications.page.html', styleUrls: ['./notifications.page.scss'], standalone: true, - imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonImg, IonTabBar, IonTabButton, IonTabs, IonIcon, IonLabel] + imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonImg, IonTabBar, IonTabButton, IonTabs, IonIcon, IonLabel, IonFooter] }) export class NotificationsPage implements OnInit { - constructor() { } + constructor( + private navCtrl: NavController, + ) { } ngOnInit() { } + goToHome() { + this.navCtrl.navigateBack("medic-home"); + } + + goToNotifs() { + this.navCtrl.navigateForward("medic-notifs"); + } + + goToPrescriptions() { + this.navCtrl.navigateForward("medic-prescriptions"); + } } diff --git a/src/app/pages/medic/prescriptions/prescriptions.page.html b/src/app/pages/medic/prescriptions/prescriptions.page.html index a232e3a..9aa0e7e 100644 --- a/src/app/pages/medic/prescriptions/prescriptions.page.html +++ b/src/app/pages/medic/prescriptions/prescriptions.page.html @@ -10,19 +10,23 @@ - - - - - Home - - - - Notifiche - - - - Prescrizioni - - - + + + + + + + Home + + + + Notifiche + + + + Prescrizioni + + + + + diff --git a/src/app/pages/medic/prescriptions/prescriptions.page.ts b/src/app/pages/medic/prescriptions/prescriptions.page.ts index a5ddafd..aed3475 100644 --- a/src/app/pages/medic/prescriptions/prescriptions.page.ts +++ b/src/app/pages/medic/prescriptions/prescriptions.page.ts @@ -2,28 +2,42 @@ import { Component, OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { - IonContent, - IonHeader, - IonIcon, - IonImg, IonLabel, - IonTabBar, - IonTabButton, IonTabs, - IonTitle, - IonToolbar + IonContent, IonFooter, + IonHeader, + IonIcon, + IonImg, IonLabel, + IonTabBar, + IonTabButton, IonTabs, + IonTitle, + IonToolbar } from '@ionic/angular/standalone'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-prescriptions', templateUrl: './prescriptions.page.html', styleUrls: ['./prescriptions.page.scss'], standalone: true, - imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonIcon, IonImg, IonTabBar, IonTabButton, IonTabs, IonLabel] + imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonIcon, IonImg, IonTabBar, IonTabButton, IonTabs, IonLabel, IonFooter] }) export class PrescriptionsPage implements OnInit { - constructor() { } + constructor( + private navCtrl: NavController, + ) { } ngOnInit() { } + goToHome() { + this.navCtrl.navigateBack("medic-home"); + } + + goToNotifs() { + this.navCtrl.navigateForward("medic-notifs"); + } + + goToPrescriptions() { + this.navCtrl.navigateForward("medic-prescriptions"); + } } diff --git a/src/app/pages/nurse/drugs/drugs.page.html b/src/app/pages/nurse/drugs/drugs.page.html index fe1285c..609b556 100644 --- a/src/app/pages/nurse/drugs/drugs.page.html +++ b/src/app/pages/nurse/drugs/drugs.page.html @@ -10,23 +10,27 @@ - - - - - Home - - - - Farmaci - - - - Turni - - - - SOS - - - + + + + + + + Home + + + + Farmaci + + + + Turni + + + + SOS + + + + + diff --git a/src/app/pages/nurse/drugs/drugs.page.ts b/src/app/pages/nurse/drugs/drugs.page.ts index 3ef7459..2a90ed0 100644 --- a/src/app/pages/nurse/drugs/drugs.page.ts +++ b/src/app/pages/nurse/drugs/drugs.page.ts @@ -2,28 +2,46 @@ import { Component, OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { - IonContent, - IonHeader, - IonIcon, - IonImg, IonLabel, - IonTabBar, - IonTabButton, IonTabs, - IonTitle, - IonToolbar + IonContent, IonFooter, + IonHeader, + IonIcon, + IonImg, IonLabel, + IonTabBar, + IonTabButton, IonTabs, + IonTitle, + IonToolbar } from '@ionic/angular/standalone'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-drugs', templateUrl: './drugs.page.html', styleUrls: ['./drugs.page.scss'], standalone: true, - imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonIcon, IonImg, IonTabBar, IonTabButton, IonTabs, IonLabel] + imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonIcon, IonImg, IonTabBar, IonTabButton, IonTabs, IonLabel, IonFooter] }) export class DrugsPage implements OnInit { - constructor() { } + constructor( + private navCtrl: NavController, + ) { } ngOnInit() { } + goToHome() { + this.navCtrl.navigateBack("nurse-home"); + } + + goToDrugs() { + this.navCtrl.navigateForward("nurse-drugs"); + } + + goToShifts() { + this.navCtrl.navigateForward("nurse-shifts"); + } + + goToSOS() { + this.navCtrl.navigateForward("nurse-sos"); + } } diff --git a/src/app/pages/nurse/home/home.page.html b/src/app/pages/nurse/home/home.page.html index 67f6ba5..9a1c7fa 100644 --- a/src/app/pages/nurse/home/home.page.html +++ b/src/app/pages/nurse/home/home.page.html @@ -96,19 +96,19 @@

CIAO MARIO

- + Home - + Farmaci - + Turni - + SOS diff --git a/src/app/pages/nurse/home/home.page.scss b/src/app/pages/nurse/home/home.page.scss index f07e78a..e69de29 100644 --- a/src/app/pages/nurse/home/home.page.scss +++ b/src/app/pages/nurse/home/home.page.scss @@ -1,46 +0,0 @@ -.user-details-title { - font-size: x-large; - font-weight: bold; - display: flex; - align-items: center; - - .item-title-icon { - width: 1.5em; - height: auto; - margin-right: 0.5em; - } -} - -.list-key { - font-size: large; - font-weight: bold; -} - -.list-value { - font-weight: normal; -} - -#security-card { - background-color: #845EC2; -} - -.access-card { - margin-top: -0.5em; - width: 10em; - height: auto; - display: inline-block; - - .card-icon { - width: 2em; - height: auto; - margin: auto; - display: block; - } - - .card-title { - color: #000; - margin-left: auto; - margin-right: auto; - display: block; - } -} diff --git a/src/app/pages/nurse/home/home.page.ts b/src/app/pages/nurse/home/home.page.ts index 6e49111..b512fcc 100644 --- a/src/app/pages/nurse/home/home.page.ts +++ b/src/app/pages/nurse/home/home.page.ts @@ -41,4 +41,20 @@ export class HomePage implements OnInit { logout() { this.navCtrl.navigateRoot("login"); } + + goToHome() { + this.navCtrl.navigateBack("nurse-home"); + } + + goToDrugs() { + this.navCtrl.navigateForward("nurse-drugs"); + } + + goToShifts() { + this.navCtrl.navigateForward("nurse-shifts"); + } + + goToSOS() { + this.navCtrl.navigateForward("nurse-sos"); + } } diff --git a/src/app/pages/nurse/shifts/shifts.page.html b/src/app/pages/nurse/shifts/shifts.page.html index ae60b8a..8a5cade 100644 --- a/src/app/pages/nurse/shifts/shifts.page.html +++ b/src/app/pages/nurse/shifts/shifts.page.html @@ -10,23 +10,27 @@ - - - - - Home - - - - Farmaci - - - - Turni - - - - SOS - - - + + + + + + + Home + + + + Farmaci + + + + Turni + + + + SOS + + + + + diff --git a/src/app/pages/nurse/shifts/shifts.page.ts b/src/app/pages/nurse/shifts/shifts.page.ts index a983f3e..ad57e8d 100644 --- a/src/app/pages/nurse/shifts/shifts.page.ts +++ b/src/app/pages/nurse/shifts/shifts.page.ts @@ -2,28 +2,46 @@ import { Component, OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { - IonContent, - IonHeader, IonIcon, - IonImg, IonLabel, - IonTabBar, - IonTabButton, - IonTabs, - IonTitle, - IonToolbar + IonContent, IonFooter, + IonHeader, IonIcon, + IonImg, IonLabel, + IonTabBar, + IonTabButton, + IonTabs, + IonTitle, + IonToolbar } from '@ionic/angular/standalone'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-shifts', templateUrl: './shifts.page.html', styleUrls: ['./shifts.page.scss'], standalone: true, - imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonImg, IonTabBar, IonTabButton, IonTabs, IonIcon, IonLabel] + imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonImg, IonTabBar, IonTabButton, IonTabs, IonIcon, IonLabel, IonFooter] }) export class ShiftsPage implements OnInit { - constructor() { } + constructor( + private navCtrl: NavController, + ) { } ngOnInit() { } + goToHome() { + this.navCtrl.navigateBack("nurse-home"); + } + + goToDrugs() { + this.navCtrl.navigateForward("nurse-drugs"); + } + + goToShifts() { + this.navCtrl.navigateForward("nurse-shifts"); + } + + goToSOS() { + this.navCtrl.navigateForward("nurse-sos"); + } } diff --git a/src/app/pages/nurse/sos/sos.page.html b/src/app/pages/nurse/sos/sos.page.html index e084d62..a4ce3ae 100644 --- a/src/app/pages/nurse/sos/sos.page.html +++ b/src/app/pages/nurse/sos/sos.page.html @@ -10,23 +10,27 @@ - - - - - Home - - - - Farmaci - - - - Turni - - - - SOS - - - + + + + + + + Home + + + + Farmaci + + + + Turni + + + + SOS + + + + + diff --git a/src/app/pages/nurse/sos/sos.page.ts b/src/app/pages/nurse/sos/sos.page.ts index 4ac3210..ec727fc 100644 --- a/src/app/pages/nurse/sos/sos.page.ts +++ b/src/app/pages/nurse/sos/sos.page.ts @@ -2,28 +2,46 @@ import { Component, OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { - IonContent, - IonHeader, - IonIcon, - IonImg, IonLabel, - IonTabBar, - IonTabButton, IonTabs, - IonTitle, - IonToolbar + IonContent, IonFooter, + IonHeader, + IonIcon, + IonImg, IonLabel, + IonTabBar, + IonTabButton, IonTabs, + IonTitle, + IonToolbar } from '@ionic/angular/standalone'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-sos', templateUrl: './sos.page.html', styleUrls: ['./sos.page.scss'], standalone: true, - imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonIcon, IonImg, IonTabBar, IonTabButton, IonTabs, IonLabel] + imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonIcon, IonImg, IonTabBar, IonTabButton, IonTabs, IonLabel, IonFooter] }) export class SOSPage implements OnInit { - constructor() { } + constructor( + private navCtrl: NavController, + ) { } ngOnInit() { } + goToHome() { + this.navCtrl.navigateBack("nurse-home"); + } + + goToDrugs() { + this.navCtrl.navigateForward("nurse-drugs"); + } + + goToShifts() { + this.navCtrl.navigateForward("nurse-shifts"); + } + + goToSOS() { + this.navCtrl.navigateForward("nurse-sos"); + } } diff --git a/src/app/pages/patient/home/home.page.html b/src/app/pages/patient/home/home.page.html index 8487eb2..a2153c6 100644 --- a/src/app/pages/patient/home/home.page.html +++ b/src/app/pages/patient/home/home.page.html @@ -103,19 +103,19 @@

CIAO MARIO

- + Home - + Registro - + Prenota - + SOS diff --git a/src/app/pages/patient/home/home.page.scss b/src/app/pages/patient/home/home.page.scss index f07e78a..e69de29 100644 --- a/src/app/pages/patient/home/home.page.scss +++ b/src/app/pages/patient/home/home.page.scss @@ -1,46 +0,0 @@ -.user-details-title { - font-size: x-large; - font-weight: bold; - display: flex; - align-items: center; - - .item-title-icon { - width: 1.5em; - height: auto; - margin-right: 0.5em; - } -} - -.list-key { - font-size: large; - font-weight: bold; -} - -.list-value { - font-weight: normal; -} - -#security-card { - background-color: #845EC2; -} - -.access-card { - margin-top: -0.5em; - width: 10em; - height: auto; - display: inline-block; - - .card-icon { - width: 2em; - height: auto; - margin: auto; - display: block; - } - - .card-title { - color: #000; - margin-left: auto; - margin-right: auto; - display: block; - } -} diff --git a/src/app/pages/patient/home/home.page.ts b/src/app/pages/patient/home/home.page.ts index 85c1d2a..d1d6078 100644 --- a/src/app/pages/patient/home/home.page.ts +++ b/src/app/pages/patient/home/home.page.ts @@ -52,4 +52,20 @@ export class HomePage implements OnInit { logout() { this.navCtrl.navigateRoot("login"); } + + goToHome() { + this.navCtrl.navigateBack("patient-home"); + } + + goToLogbook() { + this.navCtrl.navigateForward("patient-logbook"); + } + + goToReservation() { + this.navCtrl.navigateForward("patient-reservation"); + } + + goToSOS() { + this.navCtrl.navigateForward("patient-sos"); + } } diff --git a/src/app/pages/patient/logbook/logbook.page.html b/src/app/pages/patient/logbook/logbook.page.html index 56d2898..0d50537 100644 --- a/src/app/pages/patient/logbook/logbook.page.html +++ b/src/app/pages/patient/logbook/logbook.page.html @@ -10,23 +10,27 @@ - - - - - Home - - - - Registro - - - - Prenota - - - - SOS - - - + + + + + + + Home + + + + Registro + + + + Prenota + + + + SOS + + + + + diff --git a/src/app/pages/patient/logbook/logbook.page.ts b/src/app/pages/patient/logbook/logbook.page.ts index 579b472..e5a2998 100644 --- a/src/app/pages/patient/logbook/logbook.page.ts +++ b/src/app/pages/patient/logbook/logbook.page.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { - IonContent, + IonContent, IonFooter, IonHeader, IonIcon, IonImg, IonLabel, IonTabBar, @@ -11,19 +11,37 @@ import { IonTitle, IonToolbar } from '@ionic/angular/standalone'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-logbook', templateUrl: './logbook.page.html', styleUrls: ['./logbook.page.scss'], standalone: true, - imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonImg, IonTabBar, IonTabButton, IonTabs, IonIcon, IonLabel] + imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonImg, IonTabBar, IonTabButton, IonTabs, IonIcon, IonLabel, IonFooter] }) export class LogbookPage implements OnInit { - constructor() { } + constructor( + private navCtrl: NavController, + ) { } ngOnInit() { } + goToHome() { + this.navCtrl.navigateBack("patient-home"); + } + + goToLogbook() { + this.navCtrl.navigateForward("patient-logbook"); + } + + goToReservation() { + this.navCtrl.navigateForward("patient-reservation"); + } + + goToSOS() { + this.navCtrl.navigateForward("patient-sos"); + } } diff --git a/src/app/pages/patient/reservation/reservation.page.html b/src/app/pages/patient/reservation/reservation.page.html index 8237744..033c8f6 100644 --- a/src/app/pages/patient/reservation/reservation.page.html +++ b/src/app/pages/patient/reservation/reservation.page.html @@ -10,23 +10,27 @@ - - - - - Home - - - - Registro - - - - Prenota - - - - SOS - - - + + + + + + + Home + + + + Registro + + + + Prenota + + + + SOS + + + + + diff --git a/src/app/pages/patient/reservation/reservation.page.ts b/src/app/pages/patient/reservation/reservation.page.ts index 920b401..5386f44 100644 --- a/src/app/pages/patient/reservation/reservation.page.ts +++ b/src/app/pages/patient/reservation/reservation.page.ts @@ -2,28 +2,46 @@ import { Component, OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { - IonContent, - IonHeader, IonIcon, - IonImg, IonLabel, - IonTabBar, - IonTabButton, - IonTabs, - IonTitle, - IonToolbar + IonContent, IonFooter, + IonHeader, IonIcon, + IonImg, IonLabel, + IonTabBar, + IonTabButton, + IonTabs, + IonTitle, + IonToolbar } from '@ionic/angular/standalone'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-reservation', templateUrl: './reservation.page.html', styleUrls: ['./reservation.page.scss'], standalone: true, - imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonImg, IonTabBar, IonTabButton, IonTabs, IonIcon, IonLabel] + imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonImg, IonTabBar, IonTabButton, IonTabs, IonIcon, IonLabel, IonFooter] }) export class ReservationPage implements OnInit { - constructor() { } + constructor( + private navCtrl: NavController, + ) { } ngOnInit() { } + goToHome() { + this.navCtrl.navigateBack("patient-home"); + } + + goToLogbook() { + this.navCtrl.navigateForward("patient-logbook"); + } + + goToReservation() { + this.navCtrl.navigateForward("patient-reservation"); + } + + goToSOS() { + this.navCtrl.navigateForward("patient-sos"); + } } diff --git a/src/app/pages/patient/sos/sos.page.html b/src/app/pages/patient/sos/sos.page.html index c9caf4f..6706c42 100644 --- a/src/app/pages/patient/sos/sos.page.html +++ b/src/app/pages/patient/sos/sos.page.html @@ -3,26 +3,33 @@ +
+ SOS +
- - - - - Home - - - - Notifiche - - - - Prenota - - - - SOS - - - + + + + + + + Home + + + + Registro + + + + Prenota + + + + SOS + + + + + diff --git a/src/app/pages/patient/sos/sos.page.ts b/src/app/pages/patient/sos/sos.page.ts index e3ceaab..38e2972 100644 --- a/src/app/pages/patient/sos/sos.page.ts +++ b/src/app/pages/patient/sos/sos.page.ts @@ -2,28 +2,46 @@ import { Component, OnInit } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { - IonContent, + IonContent, IonFooter, IonHeader, IonIcon, - IonImg, + IonImg, IonLabel, IonTabBar, IonTabButton, IonTabs, IonTitle, IonToolbar } from '@ionic/angular/standalone'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-sos', templateUrl: './sos.page.html', styleUrls: ['./sos.page.scss'], standalone: true, - imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonIcon, IonImg, IonTabBar, IonTabButton, IonTabs] + imports: [IonContent, IonHeader, IonTitle, IonToolbar, CommonModule, FormsModule, IonIcon, IonImg, IonTabBar, IonTabButton, IonTabs, IonFooter, IonLabel] }) export class SOSPage implements OnInit { - constructor() { } + constructor( + private navCtrl: NavController, + ) { } ngOnInit() { } + goToHome() { + this.navCtrl.navigateBack("patient-home"); + } + + goToLogbook() { + this.navCtrl.navigateForward("patient-logbook"); + } + + goToReservation() { + this.navCtrl.navigateForward("patient-reservation"); + } + + goToSOS() { + this.navCtrl.navigateForward("patient-sos"); + } } diff --git a/src/app/pages/settings/info/info.page.html b/src/app/pages/settings/info/info.page.html index 8b0b4ba..b7403d8 100644 --- a/src/app/pages/settings/info/info.page.html +++ b/src/app/pages/settings/info/info.page.html @@ -16,7 +16,7 @@ Versione app:
- dev-build_tJ7fI + dev-build_RkUwn

diff --git a/src/global.scss b/src/global.scss index 791a630..21490c6 100644 --- a/src/global.scss +++ b/src/global.scss @@ -24,3 +24,213 @@ @import "@ionic/angular/css/text-alignment.css"; @import "@ionic/angular/css/text-transformation.css"; @import "@ionic/angular/css/flex-utils.css"; + + +/** LIGHT MODE GLOBAL THEME **/ +ion-tab-bar { + ion-tab-button { + --color: #000; + } +} + +.top-toolbar { + // --ion-toolbar-background: #20D77F; COLORE VECCHIO TEMA + --ion-toolbar-background: #65eab5; // COLORE NUOVO TEMA - VAR. 1 + // --ion-toolbar-background: #72d4a0; // COLORE NUOVO TEMA - VAR. 2 + height: 12.5em; + border-bottom-left-radius: 2em; + border-bottom-right-radius: 2em; + + .back-button { + --color: #000; + margin-top: 1.5em; + font-family: Inter, sans-serif; + letter-spacing: 0; + font-weight: bold; + font-size: xx-large; + flex: 0 0 auto; + } + + .tab-name { + color: #000; + text-transform: none; + margin-top: 1.85em; + font-family: Inter, sans-serif; + letter-spacing: 0; + font-weight: bold; + font-size: 25px; + } + + .profile-container { + margin-top: 2em; + margin-left: 1.5em; + + .images-container { + margin-top: 1em; + margin-left: auto; + margin-right: auto; + display: block; + + .profile-image { + width: 6.5em; + height: auto; + position: relative; + margin: auto; + display: block; + } + + .change-pic-image { + width: 1.5em; + height: auto; + margin-left: auto; + margin-right: auto; + margin-top: -1em; + position: relative; + display: block; + z-index: 1; + } + } + + .text-container { + margin-top: -1.65em; + + .profile-name { + color: #000; + text-align: center; + margin-left: 1em; + margin-bottom: 10em; + } + } + } +} + +#settings-icon { + margin-top: -4.5em; + margin-right: 0.2em; + font-size: 2em; +} + +.home-content { + width: 100%; + height: auto; + margin: auto; + + .home-container { + margin-top: 1.5em; + margin-left: 1em; + } + + .user-details-title { + font-size: x-large; + font-weight: bold; + display: flex; + align-items: center; + + .item-title-icon { + width: 1.5em; + height: auto; + margin-right: 0.5em; + } + } + + .list-key { + font-size: large; + font-weight: bold; + } + + .list-value { + font-weight: normal; + } + + #security-card { + background-color: #845EC2; + } + + .access-card { + margin-top: -0.5em; + width: 10em; + height: auto; + display: inline-block; + + .card-icon { + width: 2em; + height: auto; + margin: auto; + display: block; + } + + .card-title { + color: #000; + margin-left: auto; + margin-right: auto; + display: block; + } + } +} + +.bottom-bar { + .bottom-tab-bar { + // --ion-background-color: #8DECB4; // COLORE VECCHIO TEMA + --ion-background-color: #a6f3d4; // COLORE NUOVO TEMA + } + + .bottom-bar-buttons { + font-family: Roboto, sans-serif; + letter-spacing: 0; + font-weight: bold; + font-size: 12px; + } + + .bottom-bar-icons { + width: 1.65em; + height: auto; + } +} + +.variables-container { + margin-top: 1em; + + .edit-labels { + margin-top: 1em; + margin-left: 1.1em; + font-family: Inter, sans-serif; + letter-spacing: 0; + } + + .label-textarea { + width: 90%; + margin-left: 1em; + pointer-events: none; + font-family: Inter, sans-serif; + font-size: large; + } + + .edit-icon { + width: 1.5em; + height: auto; + } +} + +.variables-container-alt { + margin-top: 2em; + + .edit-labels { + margin-top: 1em; + margin-left: 1.1em; + font-family: Inter, sans-serif; + letter-spacing: 0; + } + + .label-textarea { + width: 90%; + margin-left: 1em; + pointer-events: none; + font-family: Inter, sans-serif; + font-size: large; + } + + .edit-icon { + width: 1.5em; + height: auto; + } +} diff --git a/src/theme/variables.scss b/src/theme/variables.scss index b3b206d..c6b90d9 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -78,168 +78,6 @@ --ion-color-light-tint: #f5f6f9; } -/** LIGHT MODE GLOBAL THEME **/ -ion-tab-bar { - ion-tab-button { - --color: #000; - } -} - -.top-toolbar { - // --ion-toolbar-background: #20D77F; COLORE VECCHIO TEMA - --ion-toolbar-background: #65eab5; // COLORE NUOVO TEMA - VAR. 1 - // --ion-toolbar-background: #72d4a0; // COLORE NUOVO TEMA - VAR. 2 - height: 12.5em; - border-bottom-left-radius: 2em; - border-bottom-right-radius: 2em; - - .back-button { - --color: #000; - margin-top: 1.5em; - font-family: Inter, sans-serif; - letter-spacing: 0; - font-weight: bold; - font-size: xx-large; - flex: 0 0 auto; - } - - .tab-name { - color: #000; - text-transform: none; - margin-top: 1.85em; - font-family: Inter, sans-serif; - letter-spacing: 0; - font-weight: bold; - font-size: 25px; - } - - .profile-container { - margin-top: 2em; - margin-left: 1.5em; - - .images-container { - margin-top: 1em; - margin-left: auto; - margin-right: auto; - display: block; - - .profile-image { - width: 6.5em; - height: auto; - position: relative; - margin: auto; - display: block; - } - - .change-pic-image { - width: 1.5em; - height: auto; - margin-left: auto; - margin-right: auto; - margin-top: -1em; - position: relative; - display: block; - z-index: 1; - } - } - - .text-container { - margin-top: -1.65em; - - .profile-name { - color: #000; - text-align: center; - margin-left: 1em; - margin-bottom: 10em; - } - } - } -} - -#settings-icon { - margin-top: -4.5em; - margin-right: 0.2em; - font-size: 2em; -} - -.home-content { - width: 100%; - height: auto; - margin: auto; - - .home-container { - margin-top: 1.5em; - margin-left: 1em; - } -} - -.bottom-bar { - .bottom-tab-bar { - // --ion-background-color: #8DECB4; // COLORE VECCHIO TEMA - --ion-background-color: #a6f3d4; // COLORE NUOVO TEMA - } - - .bottom-bar-buttons { - font-family: Roboto, sans-serif; - letter-spacing: 0; - font-weight: bold; - font-size: 12px; - } - - .bottom-bar-icons { - width: 1.65em; - height: auto; - } -} - -.variables-container { - margin-top: 1em; - - .edit-labels { - margin-top: 1em; - margin-left: 1.1em; - font-family: Inter, sans-serif; - letter-spacing: 0; - } - - .label-textarea { - width: 90%; - margin-left: 1em; - pointer-events: none; - font-family: Inter, sans-serif; - font-size: large; - } - - .edit-icon { - width: 1.5em; - height: auto; - } -} - -.variables-container-alt { - margin-top: 2em; - - .edit-labels { - margin-top: 1em; - margin-left: 1.1em; - font-family: Inter, sans-serif; - letter-spacing: 0; - } - - .label-textarea { - width: 90%; - margin-left: 1em; - pointer-events: none; - font-family: Inter, sans-serif; - font-size: large; - } - - .edit-icon { - width: 1.5em; - height: auto; - } -} - /** DARK MODE SETTINGS **/ body.dark { --ion-color-primary: #428cff;