diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 41d7e67dc..8635d5f26 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -96,7 +96,7 @@ const routes: Routes = [ path:'event-list', children: [ { - path:':profile', + path:'', loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule) }, ] @@ -136,7 +136,20 @@ const routes: Routes = [ { path:'', loadChildren: ()=> import('../pages/publications/publications.module').then(m => m.PublicationsPageModule) - } + }, + { + path:'view-publications', + children: [ + { + path:'', + loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule) + }, + { + path:'publication-detail', + loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule) + }, + ] + }, ] }, ] diff --git a/src/app/pages/publications/gallery/gallery.page.html b/src/app/pages/publications/gallery/gallery.page.html index e356937b2..3fce691b5 100644 --- a/src/app/pages/publications/gallery/gallery.page.html +++ b/src/app/pages/publications/gallery/gallery.page.html @@ -1,9 +1,57 @@ - - - gallery - + + +
+
+ +
+ +
+ +
+
+ - +
+
+
+
+ Galeria de fotos +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ + +
+
+ + + + + Cancelar + + + + + Selecionar + + + + diff --git a/src/app/pages/publications/gallery/gallery.page.scss b/src/app/pages/publications/gallery/gallery.page.scss index e69de29bb..7a1bb0b03 100644 --- a/src/app/pages/publications/gallery/gallery.page.scss +++ b/src/app/pages/publications/gallery/gallery.page.scss @@ -0,0 +1,92 @@ +:host{ + background: #0782c9; + } + ion-content{ + --background: transparent; + transform: translate3d(0, 5px, 0); + --border-radius: 30px; + } + ion-footer{ + background: #fff; + } + ion-toolbar{ + /* --background:#0782c9; */ + border-width: 0 !important; + } + .div-top-header{ + width: 400px; + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: 15px; + border: 0!important; + } + .div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px + } + .div-logo{ + background: transparent; + width: 140px; + margin: 5px 0 0px 71px; + float: left; + } + .div-logo img{ + width: 100%; + } + .div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; + } + .content-top{ + width: 344px; + background: #f3f2f2; + height: 20px; + margin: 0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; +} + .content-container{ + width: 100%; + margin:0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background: #ffffff; + height: 100%; + box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6); + padding: 25px 20px 0 20px; + overflow: auto; + } + .title-content{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + } + .div-title{ + width: 270px; + /* padding: 0!important; */ + float: left; + margin: 2.5px 0 0 5px; +} +.title{ + font-size: 25px; +} +.gallery-items{ + width: 360px; + margin: 0 auto; +} +.gallery-item{ + width: 118px; + height: 118px; + float: left; + overflow: hidden; + margin: 1px; + border: 1px solid #ccc; +} +.gallery-item img{ + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/src/app/pages/publications/gallery/gallery.page.ts b/src/app/pages/publications/gallery/gallery.page.ts index cec825cc0..5ce8e2787 100644 --- a/src/app/pages/publications/gallery/gallery.page.ts +++ b/src/app/pages/publications/gallery/gallery.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; @Component({ selector: 'app-gallery', @@ -7,9 +8,15 @@ import { Component, OnInit } from '@angular/core'; }) export class GalleryPage implements OnInit { - constructor() { } + constructor(private modalController: ModalController,) { } ngOnInit() { } + cancel(){ + this.modalController.dismiss(); + } + save(){ + + } } diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index 842f22960..2ea7cd099 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -1,14 +1,28 @@ - -
-
- Nova Ação -
+ +
+
+
- + +
+ +
+
+ +
+
+
+
+ Nova Ação +
+
+
@@ -41,6 +55,7 @@
+ diff --git a/src/app/pages/publications/new-action/new-action.page.scss b/src/app/pages/publications/new-action/new-action.page.scss index 8926b49ac..f7b025963 100644 --- a/src/app/pages/publications/new-action/new-action.page.scss +++ b/src/app/pages/publications/new-action/new-action.page.scss @@ -1,29 +1,80 @@ - +:host{ + background: #0782c9; +} ion-content{ - --background: transparent; - transform: translate3d(0, 5px, 0); - } - ion-toolbar{ - --padding-top: 15px; - --background: transparent; - border-width: 0 !important; - } + --background: transparent; + transform: translate3d(0, 5px, 0); + --border-radius: 30px; +} +ion-footer{ + background: #fff; +} +ion-toolbar{ + /* --background:#0782c9; */ + border-width: 0 !important; +} +.div-top-header{ + width: 400px; + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: 15px; + border: 0!important; +} +.div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px +} +.div-logo{ + background: transparent; + width: 140px; + margin: 5px 0 0px 71px; + float: left; +} +.div-logo img{ + width: 100%; +} +.div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; +} +.content-top{ + width: 344px; + background: #f3f2f2; + height: 20px; + margin: 0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; +} +.content-container{ + width: 100%; + margin:0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background: #ffffff; + height: 100%; + box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6); + padding: 25px 20px 0 20px; + overflow: auto; +} .title-content{ - width: 360px; - margin: 0px auto; - overflow: auto; - padding: 0 !important; - } - .div-title{ - width: 221px; - /* padding: 0!important; */ - float: left; - margin: 5px 0 0 5px; - } - .title{ - font-size: 25px; - } - .container-div{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; +} +.div-title{ + width: 270px; +/* padding: 0!important; */ +float: left; +margin: 2.5px 0 0 5px; +} +.title{ +font-size: 25px; +} +.container-div{ margin-bottom: 15px; overflow: auto; } diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 7132f88bd..9dfd3f455 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -1,19 +1,32 @@ - + +
+
+ +
+ +
+ +
+
+ + + + +
+
{{publicationTitle}}
- - - - -
+
-
+
@@ -36,7 +49,7 @@
- +
@@ -45,7 +58,7 @@
- +
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss index 54aec171a..29a45dc37 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.scss +++ b/src/app/pages/publications/new-publication/new-publication.page.scss @@ -1,29 +1,79 @@ - +:host{ + background: #0782c9; +} ion-content{ - --background: transparent; - transform: translate3d(0, 5px, 0); - --padding-start: 20px; - --padding-end: 20px; - } - ion-toolbar{ - --padding-top: 15px; - --background: transparent; - border-width: 0 !important; - } + --background: transparent; + transform: translate3d(0, 5px, 0); + --border-radius: 30px; +} +ion-footer{ + background: #fff; +} +ion-toolbar{ + /* --background:#0782c9; */ + border-width: 0 !important; +} +.div-top-header{ + width: 400px; + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: 15px; + border: 0!important; +} +.div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px +} +.div-logo{ + background: transparent; + width: 140px; + margin: 5px 0 0px 71px; + float: left; +} +.div-logo img{ + width: 100%; +} +.div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; +} +.content-top{ + width: 344px; + background: #f3f2f2; + height: 20px; + margin: 0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; +} +.content-container{ + width: 100%; + margin:0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background: #ffffff; + height: 100%; + box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6); + padding: 25px 20px 0 20px; + overflow: auto; +} .title-content{ - width: 360px; - margin: 0px auto; - overflow: auto; - padding: 0 !important; - } - .div-title{ - width: 100%; - float: left; - margin: 5px 0 0 5px; - } - .title{ - font-size: 25px; - } + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; +} +.div-title{ + width: 270px; +/* padding: 0!important; */ +float: left; +margin: 2.5px 0 0 5px; +} +.title{ +font-size: 25px; +} .container-div{ margin-bottom: 15px; overflow: auto; diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index af00ecded..85223f300 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams } from '@ionic/angular'; +import { GalleryPage } from '../gallery/gallery.page'; @Component({ selector: 'app-new-publication', @@ -30,9 +31,24 @@ export class NewPublicationPage implements OnInit { if(this.publicationType == '1'){ this.publicationTitle = 'Nova Publicação Rápida' } - else{ + else if(this.publicationType == '2'){ this.publicationTitle = 'Nova Publicação' } + else if(this.publicationType == '3'){ + this.publicationTitle = 'Editar Publicação' + } + } + + async openGallery() { + const modal = await this.modalController.create({ + component: GalleryPage, + componentProps:{ + }, + cssClass: 'new-publication', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); } } diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html deleted file mode 100644 index decc298b8..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail.page.html +++ /dev/null @@ -1,9 +0,0 @@ - - - publication-detail - - - - - - diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/publication-detail/publication-detail.page.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts deleted file mode 100644 index 822d0a0e4..000000000 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-publication-detail', - templateUrl: './publication-detail.page.html', - styleUrls: ['./publication-detail.page.scss'], -}) -export class PublicationDetailPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/pages/publications/publications-routing.module.ts b/src/app/pages/publications/publications-routing.module.ts index 28e1de170..46e9a3d95 100644 --- a/src/app/pages/publications/publications-routing.module.ts +++ b/src/app/pages/publications/publications-routing.module.ts @@ -20,13 +20,18 @@ const routes: Routes = [ path: 'new-action', loadChildren: () => import('./new-action/new-action.module').then( m => m.NewActionPageModule) }, - { - path: 'publication-detail', - loadChildren: () => import('./publication-detail/publication-detail.module').then( m => m.PublicationDetailPageModule) - }, { path: 'view-publications', - loadChildren: () => import('./view-publications/view-publications.module').then( m => m.ViewPublicationsPageModule) + children: [ + { + path:'', + loadChildren: ()=> import('./view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule) + }, + { + path:'publication-detail', + loadChildren: ()=> import('./view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule) + }, + ] } ]; diff --git a/src/app/pages/publications/publication-detail/publication-detail-routing.module.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail-routing.module.ts similarity index 100% rename from src/app/pages/publications/publication-detail/publication-detail-routing.module.ts rename to src/app/pages/publications/view-publications/publication-detail/publication-detail-routing.module.ts diff --git a/src/app/pages/publications/publication-detail/publication-detail.module.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts similarity index 100% rename from src/app/pages/publications/publication-detail/publication-detail.module.ts rename to src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html new file mode 100644 index 000000000..a05bad5f4 --- /dev/null +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -0,0 +1,53 @@ + + +
+
+ +
+ +
+ +
+
+ + + + +
+
+
+
+ +
+
+ Aterragem em Maputo +

Há 1h atrás

+
+
+
+
+ image +
+
+

Presidente João Lourenço chega a Maputo para investidura de Filipe Nyusi como presidente de Moçambique

+
+
+
+ + + + + + Eliminar + + + + + Editar + + + + + diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss new file mode 100644 index 000000000..8ebe3479b --- /dev/null +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss @@ -0,0 +1,82 @@ +:host{ + background: #0782c9; + } + ion-content{ + --background: transparent; + transform: translate3d(0, 5px, 0); + --border-radius: 30px; + } + ion-footer{ + background: #fff; + } + ion-toolbar{ + /* --background:#0782c9; */ + border-width: 0 !important; + } + .div-top-header{ + width: 400px; + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: 15px; + border: 0!important; + } + .div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px + } + .div-logo{ + background: transparent; + width: 140px; + margin: 5px 0 0px 71px; + float: left; + } + .div-logo img{ + width: 100%; + } + .div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; + } + .content-top{ + width: 344px; + background: #f3f2f2; + height: 20px; + margin: 0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; +} + .content-container{ + width: 100%; + margin:0 auto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background: #ffffff; + height: 100%; + box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6); + padding: 25px 20px 0 20px; + overflow: auto; + } + .title-content{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + } + .back-icon{ + width: auto; + float: left; + font-size: 35px; + overflow: auto; + } + .div-title{ + width: 270px; + /* padding: 0!important; */ + float: left; + margin: 2.5px 0 0 5px; + } + .title{ + font-size: 25px; + } \ No newline at end of file diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.spec.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.spec.ts similarity index 100% rename from src/app/pages/publications/publication-detail/publication-detail.page.spec.ts rename to src/app/pages/publications/view-publications/publication-detail/publication-detail.page.spec.ts 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 new file mode 100644 index 000000000..c4cf6a763 --- /dev/null +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -0,0 +1,34 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { NewPublicationPage } from '../../new-publication/new-publication.page'; + +@Component({ + selector: 'app-publication-detail', + templateUrl: './publication-detail.page.html', + styleUrls: ['./publication-detail.page.scss'], +}) +export class PublicationDetailPage implements OnInit { + + constructor(private modalController: ModalController,) { } + + ngOnInit() { + } + + deletePost(){ + + } + + async editPost(publicationType:any) { + const modal = await this.modalController.create({ + component: NewPublicationPage, + componentProps:{ + publicationType: publicationType, + }, + cssClass: 'new-publication', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + +} diff --git a/src/app/pages/publications/view-publications/view-publications-routing.module.ts b/src/app/pages/publications/view-publications/view-publications-routing.module.ts index 6493c8be8..07babf103 100644 --- a/src/app/pages/publications/view-publications/view-publications-routing.module.ts +++ b/src/app/pages/publications/view-publications/view-publications-routing.module.ts @@ -7,6 +7,10 @@ const routes: Routes = [ { path: '', component: ViewPublicationsPage + }, + { + path: 'publication-detail', + loadChildren: () => import('./publication-detail/publication-detail.module').then( m => m.PublicationDetailPageModule) } ]; diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 63b97a05b..942fc67a6 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -32,7 +32,8 @@
-
+
image
diff --git a/src/app/pages/publications/view-publications/view-publications.page.scss b/src/app/pages/publications/view-publications/view-publications.page.scss index 422165c0f..d1fe7294a 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.scss +++ b/src/app/pages/publications/view-publications/view-publications.page.scss @@ -39,7 +39,7 @@ margin-right: 10px; } .content-top{ - width: 90%; + width: 344px; background: #f3f2f2; height: 20px; margin: 0 auto; @@ -53,7 +53,7 @@ border-top-right-radius: 25px; background: #ffffff; height: 100%; - box-shadow: 20px 10px 18px #888888; + box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6); padding: 25px 20px 0 20px; overflow: auto; } @@ -74,7 +74,7 @@ width: 221px; /* padding: 0!important; */ float: left; - margin: 5px 0 0 5px; + margin: 2.5px 0 0 5px; } .title{ font-size: 25px; diff --git a/src/assets/images/icons-tirar-foto.svg b/src/assets/images/icons-tirar-foto.svg new file mode 100644 index 000000000..0f66a02d3 --- /dev/null +++ b/src/assets/images/icons-tirar-foto.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 24be4572a..6d4ffd5d2 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -358,9 +358,10 @@ overflow: auto; } .footer-toolbar{ - width: 360px; - margin: 20px auto; + width: 400px; + margin: 10px auto; overflow: auto; + --background: #fff; } .btn-ok{ width: 160px !important;