Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into feature/websocket

This commit is contained in:
Peter Maquiran
2022-01-12 12:00:40 +01:00
25 changed files with 340 additions and 75 deletions
+1
View File
@@ -33,6 +33,7 @@
<ion-icon *ngIf="pathname == '/home/chat'" class="nav-icon" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon>
<ion-label>Chat</ion-label>
</ion-tab-button>
</ion-tab-bar>
</ion-tabs>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" rel="stylesheet">
+6 -2
View File
@@ -4,6 +4,10 @@ ion-tab-bar{
--color: #797979;
}
// ion-tab-button{
// --color-selected: #061b52;
// }
// Badge
// --------------------------------------------------
@@ -18,7 +22,7 @@ ion-badge {/* */
/* display: inline-block;*/
min-width: 18px;
min-width: 18px;
font-size: $badge-font-size;
/* font-weight: $badge-font-weight;
line-height: 1;
@@ -46,4 +50,4 @@ ion-badge {/* */
ion-tab-button.active{
color: #061b52;
}
}
+39 -1
View File
@@ -60,6 +60,13 @@ export class HomePage implements OnInit {
showAttendees: false,
showAttendeeModal: false
}
tabButton = {
home: false,
agenda: false,
gabinete: false,
actions: false,
chat: false,
}
eventToaprove: any = {
back: false,
serialNumber: "",
@@ -167,11 +174,42 @@ export class HomePage implements OnInit {
}
myWorker.postMessage('ali'); */
this.clearTabButtonSelection();
}
clearTabButtonSelection(){
this.tabButton.home = false;
this.tabButton.agenda = false;
this.tabButton.gabinete = false;
this.tabButton.actions = false;
this.tabButton.chat = false;
}
selectedTab(url?:string){
this.clearTabButtonSelection();
if(url =='/home/events'){
this.tabButton.home = true;
}
else if(url == '/home/agenda'){
this.tabButton.agenda = true;
}
else if(url =='/home/gabinete-digital'){
this.tabButton.gabinete = true;
}
else if(url =='/home/publications'){
this.tabButton.actions = true;
}
else if(url == '/home/chat'){
this.tabButton.chat = true;
}
else{
this.clearTabButtonSelection();
}
}
logDeviceInfo = async () => {
const info = await Device.getInfo();
console.log('Device info',info);
};