diff --git a/__bitbucket-pipelines.yml b/bitbucket-pipelines.yml similarity index 100% rename from __bitbucket-pipelines.yml rename to bitbucket-pipelines.yml diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 2642fb2db..141a6baab 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -144,8 +144,16 @@ export class ChatPage implements OnInit { let t = this.showDateDuration(new Date()); - this.router.events.forEach((event) => { - if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) { + if (this.dataService.get("newGroup")) { + this.openNewGroupPage(); + } + else{ + this.closeAllDesktopComponents(); + this.showEmptyComponent = true; + } + + /* this.router.events.forEach((event) => { + if (event instanceof NavigationStart || event.url.endsWith('/home/chat')) { if (this.dataService.get("newGroup")) { this.openNewGroupPage(); } @@ -157,7 +165,7 @@ export class ChatPage implements OnInit { else{ this.dataService.set("newGroup", false); } - }); + }); */ } numSequence(n: number): Array { diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 55ac044ef..c2809e856 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -37,7 +37,8 @@
-

Uma iniciativa do Gabinete do Calendário Partilhado

+ +

diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 05e78eb67..7168f285f 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -58,11 +58,10 @@
- +
+

Calendário Partilhado