@@ -11,11 +12,17 @@
Palavra-passe
-
-
-
Iniciar
+
+
+
+
+
+
+
Uma iniciativa do Gabinete do Presidente da República
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss
index c767ce0e8..17037bc06 100644
--- a/src/app/pages/login/login.page.scss
+++ b/src/app/pages/login/login.page.scss
@@ -1,5 +1,26 @@
+@import '~src/function.scss';
+:host, app-login {
+ ion-content {
+ background: linear-gradient(180deg, #42B9FE 0%, #0782C9 100%) !important;
+ }
+}
+ion-content{
+ background-color: white !important;
+}
+
+.main-wrapper{
+ background: linear-gradient(180deg, #42B9FE 0%, #0782C9 100%) !important;
+ display: flex;
+ height: calc(100% - 50Px);
+ overflow: auto;
+
+}
.wrapper{
- margin: 0 auto;
+ width: 400px;
+ height: auto;
+ padding: 0 !important;
+ margin: auto !important;
+ overflow: auto;
}
.div-logo{
width: 200px;
@@ -10,19 +31,19 @@
width: 100%;
}
.wrapper ion-input{
- font-size: 18px;
+ font-size: 16px;
}
.wrapper ion-button{
font-size: medium;
- margin-top: 18px;
+ margin-top: 16px;
}
ion-item{
--background: transparent;
}
.form{
width: 300px;
+ margin: auto;
overflow: auto;
- margin: 0 auto;
}
.form-label{
margin: 15px 0 5px 0;
@@ -30,33 +51,18 @@ ion-item{
}
.form-input{
--background: #fff;
- /* --color:#fff; */
- border-radius: 10px;
- margin: 5px 0 5px 0;
-}
-.btn-ok-login{
- width: 160px !important;
- height: 45px !important;
- margin: 15px auto;
- padding: 10px 15px;
+ --color:#000;
border-radius: 22.5px;
- background-color: #42b9fe;
- color: #ffffff !important;
+ margin: 10px 0 10px 0;
+}
+.btn-login{
+ font-size: 16px;
}
-:host, app-login {
- ion-content {
- background: linear-gradient(180deg, #42B9FE 0%, #0782C9 100%) !important;
- }
-}
-ion-content{
- background-color: white !important;
-}
-@import '~src/function.scss';
.div-top-header{
margin: 0 em(20px);
@@ -140,4 +146,24 @@ ion-content{
.voltar{
user-select: none;
+}
+
+.msg-bottom{
+ width: 100%;
+ color: #fff;
+ align-items: center;
+ justify-content: center;
+
+ .msg-bottom-p{
+ width: 220px;
+ position: absolute;
+ bottom: 0 !important;
+ text-align: center;
+ }
+}
+
+@media only screen and (min-width: 1024px){
+ .form{
+ width: 400px;
+ }
}
\ No newline at end of file
diff --git a/src/app/services/alert.service.ts b/src/app/services/alert.service.ts
index 9952f17e2..1e9a09ba9 100644
--- a/src/app/services/alert.service.ts
+++ b/src/app/services/alert.service.ts
@@ -1,12 +1,15 @@
import { Injectable } from '@angular/core';
-import { AlertController } from '@ionic/angular';
+import { AlertController, AnimationController } from '@ionic/angular';
@Injectable({
providedIn: 'root'
})
export class AlertService {
- constructor(public alertController: AlertController) { }
+ constructor(
+ public alertController: AlertController,
+ private animationController: AnimationController,
+ ) { }
async presentAlert(message:string) {
const alert = await this.alertController.create({
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 584d9738f..1ca515558 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -1,12 +1,18 @@
import { Injectable } from '@angular/core';
-import { ToastController } from '@ionic/angular';
+import { AnimationController, ModalController, ToastController } from '@ionic/angular';
+import { BadRequestPage } from '../shared/popover/bad-request/bad-request.page';
+import { SuccessMessagePage } from '../shared/popover/success-message/success-message.page';
@Injectable({
providedIn: 'root'
})
export class ToastService {
- constructor(public toastController: ToastController) { }
+ constructor(
+ public toastController: ToastController,
+ private animationController: AnimationController,
+ private modalController: ModalController,
+ ) { }
async presentToast(infoMessage: string) {
const toast = await this.toastController.create({
@@ -16,4 +22,90 @@ export class ToastService {
toast.present();
}
+ async successMessage(message?: string) {
+
+ const enterAnimation = (baseEl: any) => {
+ const backdropAnimation = this.animationController.create()
+ .addElement(baseEl.querySelector('ion-backdrop')!)
+ .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+ const wrapperAnimation = this.animationController.create()
+ .addElement(baseEl.querySelector('.modal-wrapper')!)
+ .keyframes([
+ { offset: 0, opacity: '1', right: '-100%' },
+ { offset: 1, opacity: '1', right: '0px' }
+ ]);
+
+ return this.animationController.create()
+ .addElement(baseEl)
+ .easing('ease-out')
+ .duration(500)
+ .addAnimation([backdropAnimation, wrapperAnimation]);
+ }
+
+ const leaveAnimation = (baseEl: any) => {
+ return enterAnimation(baseEl).direction('reverse');
+ }
+
+
+ const modal = await this.modalController.create({
+ enterAnimation,
+ leaveAnimation,
+ component: SuccessMessagePage,
+ componentProps: {
+ message: message || 'Processo efetuado' ,
+ },
+ cssClass: 'notification-modal'
+ });
+
+ modal.present()
+
+ setTimeout(()=>{
+ modal.dismiss()
+ },7000)
+
+ }
+
+ async badRequest(message?: string) {
+ const enterAnimation = (baseEl: any) => {
+ const backdropAnimation = this.animationController.create()
+ .addElement(baseEl.querySelector('ion-backdrop')!)
+ .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+ const wrapperAnimation = this.animationController.create()
+ .addElement(baseEl.querySelector('.modal-wrapper')!)
+ .keyframes([
+ { offset: 0, opacity: '1', right: '-100%' },
+ { offset: 1, opacity: '1', right: '0px' }
+ ]);
+
+ return this.animationController.create()
+ .addElement(baseEl)
+ .easing('ease-out')
+ .duration(7000)
+ .addAnimation([backdropAnimation, wrapperAnimation]);
+ }
+
+ const leaveAnimation = (baseEl: any) => {
+ return enterAnimation(baseEl).direction('reverse');
+ }
+
+
+ const modal = await this.modalController.create({
+ enterAnimation,
+ leaveAnimation,
+ component: BadRequestPage,
+ componentProps: {
+ message: message || 'Processo efetuado' ,
+ },
+ cssClass: 'notification-modal'
+ });
+
+ modal.present()
+
+ setTimeout(()=>{
+ modal.dismiss()
+ },3000)
+ }
+
}
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index 1015447c2..f0eba1f3d 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -11,33 +11,6 @@