diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a4ecbee4b..a85a10ecd 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,15 +1,20 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; - -const routes: Routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, { +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + +const routes: Routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { + path: 'events', + loadChildren: () => import('./pages/events/events.module').then( m => m.EventsPageModule) + }, + { path: 'chat', loadChildren: () => import('./pages/chat/chat.module').then( m => m.ChatPageModule) }, @@ -46,33 +51,33 @@ const routes: Routes = [ loadChildren: () => import('./shared/popover/chat-options-popover/chat-options-popover.module').then( m => m.ChatOptionsPopoverPageModule) }, - - /* { - path: 'cal-modal', - loadChildren: () => import('./pages/cal-modal/cal-modal.module').then( m => m.CalModalPageModule) - }, */ - /* { - path: 'events', - loadChildren: () => import('./pages/events/events.module').then( m => m.EventsPageModule) - }, */ - - /* - { - path: 'gabinete-digital-menu', - loadChildren: () => import('./pages/gabinete-digital-menu/gabinete-digital-menu.module').then( m => m.GabineteDigitalMenuPageModule) - }, - - - { - path: 'view-event', - loadChildren: () => import('./pages/view-event/view-event.module').then( m => m.ViewEventPageModule) - }, */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + + /* { + path: 'cal-modal', + loadChildren: () => import('./pages/cal-modal/cal-modal.module').then( m => m.CalModalPageModule) + }, */ + /* { + path: 'events', + loadChildren: () => import('./pages/events/events.module').then( m => m.EventsPageModule) + }, */ + + /* + { + path: 'gabinete-digital-menu', + loadChildren: () => import('./pages/gabinete-digital-menu/gabinete-digital-menu.module').then( m => m.GabineteDigitalMenuPageModule) + }, + + + { + path: 'view-event', + loadChildren: () => import('./pages/view-event/view-event.module').then( m => m.ViewEventPageModule) + }, */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index ec29eb7f3..2d788629c 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -153,7 +153,7 @@ const routes: Routes = [ }, { path: '', - redirectTo: 'home/events', + redirectTo: '/home/events', pathMatch: 'full' } ]; diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 09e809849..ca0a8e4b8 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -26,10 +26,67 @@ - - - - +
+ Esta conversa passou a grupo
+ A conversa original mantêm-se como chat individual +
+
+
+
+ Secretário Assuntos sociais + 14:23 +
+
+ + +
+
+
+
+ Secretário Assuntos sociais + 14:23 +
+
+ Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república +
+
+
+
+ Presidente da República + 14:23 +
+
+ Pois é, momentos históricos +
+
+
+
+ Ministro do interior + 16:23 +
+
+ Grande momento +
+
+
+
+ Secretário Assuntos sociais + 14:23 +
+
+ Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república +
+
+
+
+ Secretário Assuntos sociais + 14:23 +
+
+ Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república +
+
+
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index bd9519c4e..660b3fd84 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -1,3 +1,4 @@ +@import '~src/function.scss'; .header-toolbar{ --background:transparent; --opacity: 1; @@ -75,22 +76,70 @@ } } } + ion-content{ + .welcome-text{ + /* width: 322px; */ + width: em(422px); + background: #ebebeb; + text-align: center; + font-size: 13px; + color: #797979; + padding: 10px; + margin: 0 auto; + line-height: 1.2rem; + margin: 20px 39px 25px; + border-radius: 8px; + } + .messages{ + font-size: 13px; + font-family: Roboto; + overflow: auto; + .incoming, .outgoing{ + width: 305px; + padding: 15px 20px; + border-radius: 10px; + } + + .incoming{ + margin: 10px 75px 10px 20px; + background: #ebebeb; + float: left; + + } + } + .outgoing{ + margin: 10px 20px 10px 75px; + background: #e4f4fe; + float: right; + } + .title{ + color: #0782c9; + + font-weight: bold; + margin-bottom: 5px; + + .time{ + color: #797979; + text-align: right; + float: right; + } + } + } ion-footer{ .row{ width: 380px; margin: 0 auto; } - ion-col{ -/* border: 1px solid red; */ - } + .chat-icon-options{ display:block !important; font-size: 25px; float: right !important; margin-top: 10px; } + .chat-icon-send{ font-size: 45px; margin: 0 auto; diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 3bd5967dc..29226a050 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -70,9 +70,6 @@ export class PublicationDetailPage implements OnInit { this.showLoader = false; }); } - doRefresh(event){ - - } close(){ this.modalController.dismiss(); diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index f6003bb0e..57d54bff0 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -1,20 +1,3 @@ - -