From 2c7b72a84a9c3dffa8de3c95a4769bd42a08d80f Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Tue, 1 Dec 2020 17:22:45 +0100 Subject: [PATCH] New action page and new publication page finished. --- .../new-action/new-action.page.html | 57 ++++++++++++- .../new-action/new-action.page.scss | 67 +++++++++++++++ .../new-action/new-action.page.ts | 11 ++- .../new-publication/new-publication.page.html | 59 +++++++++++++- .../new-publication/new-publication.page.scss | 81 +++++++++++++++++++ .../new-publication/new-publication.page.ts | 27 ++++++- .../pages/publications/publications.page.html | 2 +- .../pages/publications/publications.page.ts | 17 +++- .../view-publications.page.html | 4 +- .../view-publications.page.ts | 17 +++- src/assets/images/icons-add-photos.svg | 21 +++++ src/theme/variables.scss | 5 ++ 12 files changed, 356 insertions(+), 12 deletions(-) create mode 100644 src/assets/images/icons-add-photos.svg 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 a61ee03a3..842f22960 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -1,9 +1,62 @@ - + - new-action +
+
+ Nova Ação +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + + + + + + + Cancelar + + + + + Criar + + + + 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 e69de29bb..8926b49ac 100644 --- a/src/app/pages/publications/new-action/new-action.page.scss +++ b/src/app/pages/publications/new-action/new-action.page.scss @@ -0,0 +1,67 @@ + +ion-content{ + --background: transparent; + transform: translate3d(0, 5px, 0); + } + ion-toolbar{ + --padding-top: 15px; + --background: transparent; + border-width: 0 !important; + } +.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{ + margin-bottom: 15px; + overflow: auto; + } + .ion-item-container{ + width: 360px; + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + } + .ion-item-container-no-border{ + width: 100%; + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .ion-item-class-2{ + width: 360px; + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + .ion-textarea-class{ + width: 315px; + height: auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } \ No newline at end of file diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index 5cd12f661..04e3183c4 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; @Component({ selector: 'app-new-action', @@ -7,9 +8,17 @@ import { Component, OnInit } from '@angular/core'; }) export class NewActionPage implements OnInit { - constructor() { } + constructor( + private modalController: ModalController, + ) { } ngOnInit() { } + save(){ + console.log('Salvar...'); + } + close(){ + this.modalController.dismiss(); + } } 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 620fae77e..7132f88bd 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -1,9 +1,64 @@ - + - new-publication +
+
+ {{publicationTitle}} +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+ Tirar Fotografia +
+ +
+ +
+ +
+ +
+
+ Anexar Fotografia +
+ +
+ + + + + + Cancelar + + + + + Criar + + + + 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 e69de29bb..54aec171a 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.scss +++ b/src/app/pages/publications/new-publication/new-publication.page.scss @@ -0,0 +1,81 @@ + +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; + } +.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; + } + .container-div{ + margin-bottom: 15px; + overflow: auto; + } + .ion-item-container{ + width: 360px; + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + } + .ion-item-container-no-border{ + width: 100%; + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .ion-item-class-2{ + width: 360px; + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + .ion-textarea-class{ + width: 315px; + height: auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 20px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } \ No newline at end of file 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 c3efdef45..af00ecded 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController, NavParams } from '@ionic/angular'; @Component({ selector: 'app-new-publication', @@ -6,10 +7,32 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./new-publication.page.scss'], }) export class NewPublicationPage implements OnInit { - - constructor() { } + publicationType:string; + publicationTitle:string; + constructor( + private modalController: ModalController, + private navParams: NavParams, + ) { + this.publicationType = this.navParams.get('publicationType'); + this.publicationTitle = 'Nova Publicação'; + } ngOnInit() { + this.setTitle(); + } + save(){ + + } + close(){ + this.modalController.dismiss(); + } + setTitle(){ + if(this.publicationType == '1'){ + this.publicationTitle = 'Nova Publicação Rápida' + } + else{ + this.publicationTitle = 'Nova Publicação' + } } } diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 93127052c..b6f1be521 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -21,7 +21,7 @@ Ações Presidenciais
- +
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index c09808465..64909f66e 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { NewActionPage } from './new-action/new-action.page'; @Component({ selector: 'app-publications', @@ -7,9 +9,22 @@ import { Component, OnInit } from '@angular/core'; }) export class PublicationsPage implements OnInit { - constructor() { } + constructor(private modalController: ModalController,) { } ngOnInit() { } + async AddPublicationFolder(item:any) { + const modal = await this.modalController.create({ + component: NewActionPage, + componentProps:{ + item: item, + }, + cssClass: 'new-action', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + } 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 0314c90e1..63b97a05b 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -27,8 +27,8 @@

12 de Janeiro

- - + +
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index e7a87114e..be31073ac 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { NewPublicationPage } from '../new-publication/new-publication.page'; @Component({ selector: 'app-view-publications', @@ -7,9 +9,22 @@ import { Component, OnInit } from '@angular/core'; }) export class ViewPublicationsPage implements OnInit { - constructor() { } + constructor(private modalController: ModalController,) { } ngOnInit() { } + async AddPublication(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/assets/images/icons-add-photos.svg b/src/assets/images/icons-add-photos.svg new file mode 100644 index 000000000..16bc60f82 --- /dev/null +++ b/src/assets/images/icons-add-photos.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index c4644391e..24be4572a 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -357,6 +357,11 @@ margin: 10px; overflow: auto; } +.footer-toolbar{ + width: 360px; + margin: 20px auto; + overflow: auto; +} .btn-ok{ width: 160px !important; height: 45px !important;