peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Lorito Tiago
2023-07-26 16:48:27 +01:00
parent a08bb5d4f4
commit d31394ad39
7 changed files with 626 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/App/Podfile
+1
View File
@@ -20,6 +20,7 @@ def capacitor_pods
pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
pod 'CapacitorLocalNotifications', :path => '../../node_modules/@capacitor/local-notifications'
pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network'
pod 'CapacitorPushNotifications', :path => '../../node_modules/@capacitor/push-notifications'
pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage'
pod 'SentryCapacitor', :path => '../../node_modules/@sentry/capacitor'
src/app/modals/profile/edit-profile/edit-profile.page.html
+23 -12
View File
@@ -1,13 +1,15 @@
<ion-content class=" bg-blue">
<div class="main-content width-100 overflow-y-auto height-100">
<div class="main-content width-100 overflow-y-auto height-100 header-fix">
<div class="profile-header width-100">
<div class="div-logo width-40">
<div class="logo-icon">
<img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A1.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'doneIt' "
src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A1.png' alt='logo'>
</div>
<div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
<div *ngIf="ThemeService.currentTheme == 'gov'"
class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<!-- <p class="logo-description-text">Calendário Partilhado</p> -->
<p class="logo-description-text tp-5">{{ environment.logoLabel }}</p>
@@ -15,7 +17,8 @@
<p class="logo-description-text tp-5">GABINETE DIGITAL</p>
</div>
</div>
<div *ngIf="ThemeService.currentTheme == 'default'" class="logo-description d-flex align-center justify-content-center">
<div *ngIf="ThemeService.currentTheme == 'default'"
class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<!-- <p class="logo-description-text color-white">Calendário Partilhado</p> -->
<p class="logo-description-text tp-5 color-white">{{ environment.logoLabel }}</p>
@@ -24,18 +27,23 @@
</div>
</div>
<div *ngIf="ThemeService.currentTheme == 'doneIt'" class="logo-description d-flex align-center justify-content-center">
<div *ngIf="ThemeService.currentTheme == 'doneIt'"
class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<!-- <p class="logo-description-text color-white">Calendário Partilhado</p> -->
<p class="logo-description-text tp-5 color-white" style="color: transparent;">{{ environment.logoLabel }}</p>
<p class="logo-description-text tp-5 color-white" style="color: transparent;">{{ environment.logoLabel }}
</p>
<div class="add-line-white"></div>
</div>
</div>
</div>
<div class="btn-close d-flex cursor-pointer" (click)="close()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon"
src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon"
src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon"
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-search-close.svg"></ion-icon>
</div>
</div>
<div class="profile-content overflow-y-auto width-100 height-100">
@@ -51,9 +59,12 @@
<div>
<div class="d-flex align-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="profile-pic" src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="profile-pic" src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="profile-pic" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="profile-pic"
src="assets/images/icons-default-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="profile-pic"
src="assets/images/theme/gov/icons-profile.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="profile-pic"
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-profile.svg"></ion-icon>
</div>
</div>
src/app/modals/profile/profile.page.html
+22 -13
View File
@@ -1,19 +1,22 @@
<ion-header class=" bg-blue ion-no-border">
<ion-header class=" bg-blue ion-no-border header-fix">
<div class="profile-header width-100">
<div class="div-logo d-md-none width-40">
<div class="logo-icon" *ngIf="hideImage">
<img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A.png' alt='logo'>
<img *ngIf="ThemeService.currentTheme == 'doneIt' "
src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A.png' alt='logo'>
</div>
<div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
<div *ngIf="ThemeService.currentTheme == 'gov'"
class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<p class="logo-description-text tp-5">{{ environment.logoLabel }}</p>
<div class="add-line"></div>
<p class="logo-description-text tp-5">GABINETE DIGITAL</p>
</div>
</div>
<div *ngIf="ThemeService.currentTheme == 'default'" class="logo-description d-flex align-center justify-content-center">
<div *ngIf="ThemeService.currentTheme == 'default'"
class="logo-description d-flex align-center justify-content-center">
<div class="logo-description-content">
<p class="logo-description-text tp-5 color-white">{{ environment.logoLabel }}</p>
<div class="add-line-white"></div>
@@ -22,9 +25,12 @@
</div>
</div>
<div class="btn-close d-flex cursor-pointer" *ngIf="hideImage" (click)="close()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon"
src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon"
src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon"
src="assets/images/theme/{{ThemeService.currentTheme}}/icons-search-close.svg"></ion-icon>
</div>
</div>
</ion-header>
@@ -61,14 +67,17 @@
<ion-list>
<div class="item cursor-pointer ion-no-padding ion-no-margin" lines="none"
*ngFor="let item of notificationdata; let i = index"
(click)="notificatinsRoutes(item.index,item.Service,item.Object,item.IdObject,item.FolderId)"
>
(click)="notificatinsRoutes(item.index,item.Service,item.Object,item.IdObject,item.FolderId)">
<div class="item-conten-{{item.Service}}-{{item.TypeAgenda}}-{{item.Role}}">
<div class="notification-item">
<img class="notification-icon" slot="end" *ngIf = "item.Service == 'agenda'" src="assets/images/icons-default-agenda.svg" >
<img class="notification-icon" slot="end" *ngIf = "item.Service == 'gabinete-digital'" src="assets/images/icons-correspondencias.svg" >
<img class="notification-icon" slot="end" *ngIf = "item.Service == 'accoes'" src="assets/images/icons-nav-accoes-active.svg" >
<img class="notification-icon" slot="end" *ngIf = "item.Service == 'chat'" src="assets/images/icons-nav-agenda-active.svg" >
<img class="notification-icon" slot="end" *ngIf="item.Service == 'agenda'"
src="assets/images/icons-default-agenda.svg">
<img class="notification-icon" slot="end" *ngIf="item.Service == 'gabinete-digital'"
src="assets/images/icons-correspondencias.svg">
<img class="notification-icon" slot="end" *ngIf="item.Service == 'accoes'"
src="assets/images/icons-nav-accoes-active.svg">
<img class="notification-icon" slot="end" *ngIf="item.Service == 'chat'"
src="assets/images/icons-nav-agenda-active.svg">
</div>
<div class="approve-event-time">
<p *ngIf="item.Service == 'agenda'">{{item.dateInit}}</p>
src/app/pages/chat/group-messages/group-messages.page.scss
+28 -3
View File
@@ -1,10 +1,12 @@
@import '~src/function.scss';
.header-toolbar {
--background: transparent;
--opacity: 1;
.main-header {
width: 100%; /* 400px */
width: 100%;
/* 400px */
height: 100%;
font-family: Roboto;
border-top-left-radius: 25px;
@@ -45,6 +47,7 @@
font-size: rem(25);
}
}
.middle-container-options {
padding: 0 !important;
float: left;
@@ -56,12 +59,14 @@
font-size: rem(23);
}
}
.right {
padding: 0 !important;
float: right;
font-size: rem(25);
color: #0782c9;
}
.header-top-btn {
background: transparent;
font-size: rem(25) !important;
@@ -71,6 +76,7 @@
padding: 0 5px 0 5px;
}
}
.header-bottom {
padding-left: 10px;
overflow: auto;
@@ -83,6 +89,7 @@
padding: 2px;
}
.header-bottom-contacts {
width: calc(100% - 40px);
font-size: rem(15);
@@ -109,12 +116,14 @@
overflow: auto;
padding: 1px;
}
.div-icon ion-icon {
float: right;
padding-left: 20px;
}
}
}
ion-content {
.welcome-text {
/* width: 322px; */
@@ -129,6 +138,7 @@
margin: 20px 39px 25px;
border-radius: 8px;
}
.info-text {
display: flex;
width: fit-content;
@@ -142,6 +152,7 @@
line-height: 1.2rem;
border-radius: 8px;
}
.info-text-leave {
display: flex;
align-items: center;
@@ -160,6 +171,7 @@
line-height: 1.2rem;
}
}
.messages {
font-size: rem(13);
font-family: Roboto;
@@ -179,6 +191,7 @@
.messages-list-item-wrapper {
overflow: hidden;
}
.messages-list-item-wrapper-active {
background: #e6f6ff75 !important;
}
@@ -188,7 +201,8 @@
}
.incoming-true, .incoming-false{
.incoming-true,
.incoming-false {
width: 305px;
padding: 15px 20px;
border-radius: 10px;
@@ -200,11 +214,13 @@
float: left;
}
}
.incoming-false {
margin: 10px 20px 10px 75px;
background: var(--chat-incoming-msg-color);
float: right;
}
.title {
color: var(--title-text-color);
@@ -221,15 +237,19 @@
.online {
color: #99e47b !important;
}
.offline {
color: #cbced1 !important;
}
.away {
color: #ffd21f !important;
}
.invisible {
color: #cbced1 !important;
}
.busy {
color: #f5455c !important;
}
@@ -252,14 +272,17 @@
font-size: rem(10);
font-style: italic;
}
.info-meeting-medium {
font-size: rem(12);
}
.info-meeting-normal {
color: #0782c9;
font-weight: 700;
text-decoration: underline;
}
.info-meeting-normal:hover {
text-decoration: underline;
color: #0782c9;
@@ -268,7 +291,8 @@
ion-footer {
padding-top: 7.5px;
padding-bottom: 7.5px;
padding-bottom: 20px;
.container {
justify-content: center;
justify-content: space-evenly;
@@ -309,6 +333,7 @@
}
}
.preview-slides {
margin-top: 20%;
background: #e6e6e6;
src/app/pages/chat/messages/messages.page.scss
+24 -3
View File
@@ -22,7 +22,8 @@
--opacity: 1;
.main-header {
width: 100%; /* 400px */
width: 100%;
/* 400px */
height: 100%;
font-family: Roboto;
border-top-left-radius: 25px;
@@ -79,6 +80,7 @@
font-size: rem(23);
}
}
.right {
padding: 0 !important;
float: right;
@@ -87,6 +89,7 @@
margin: 5px 0 0 0;
}
}
.header-bottom {
width: 310px;
overflow: auto;
@@ -99,6 +102,7 @@
padding: 2px;
}
.header-bottom-contacts {
width: 275px;
font-size: rem(15);
@@ -119,6 +123,7 @@
text-overflow: ellipsis !important;
float: left;
}
.div-icon {
width: rem(40);
float: right;
@@ -126,6 +131,7 @@
overflow: auto;
padding: 1px;
}
.div-icon ion-icon {
float: right;
padding-left: 20px;
@@ -147,6 +153,7 @@
margin: 20px 39px 25px;
border-radius: 8px;
}
.messages {
font-size: rem(13);
font-family: Roboto;
@@ -166,6 +173,7 @@
.messages-list-itrem-wrapper {
overflow: hidden;
}
.messages-list-itrem-wrapper-active {
background: #e6f6ff75 !important;
}
@@ -175,7 +183,8 @@
}
.incoming-true, .incoming-false{
.incoming-true,
.incoming-false {
width: 305px;
padding: 15px 20px;
border-radius: 10px;
@@ -187,11 +196,13 @@
float: left;
}
}
.incoming-false {
margin: 10px 20px 10px 75px;
background: var(--chat-incoming-msg-color);
float: right;
}
.title {
display: inline;
color: var(--title-text-color);
@@ -223,14 +234,17 @@
font-size: rem(10);
font-style: italic;
}
.info-meeting-medium {
font-size: rem(12);
}
.info-meeting-normal {
color: #0782c9;
font-weight: 700;
text-decoration: underline;
}
.info-meeting-normal:hover {
text-decoration: underline;
color: #0782c9;
@@ -239,7 +253,8 @@
ion-footer {
padding-top: 7.5px;
padding-bottom: 7.5px;
padding-bottom: 20px;
.container {
justify-content: center;
justify-content: space-evenly;
@@ -282,36 +297,42 @@
font-weight: 500;
letter-spacing: normal;
}
.user-status-online {
display: block;
float: left;
color: #99e47b;
padding-left: 10px;
}
.online {
display: block;
float: left;
color: #99e47b;
padding-left: 10px;
}
.offline {
color: #cbced1;
display: block;
float: left;
padding-left: 10px;
}
.away {
color: #ffd21f;
display: block;
float: left;
padding-left: 10px;
}
.invisible {
color: #cbced1;
display: block;
float: left;
padding-left: 10px;
}
.busy {
color: #f5455c;
display: block;
src/app/shared/popover/chat-popover/chat-popover.page.html
+7 -4
View File
@@ -1,14 +1,17 @@
<ion-content class="options-container">
<div class="arrow-right">
<div class="arrow-right header-fix">
<button class="btn-no-color" (click)="close('cancel')">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" class="arrow-right-icon"
src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon"
src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
<button *ngIf="isAdmin" (click)="addUser()" class="btn-cancel" shape="round">Adicionar</button>
<button (click)="leaveGroup()" class="btn-cancel" shape="round">Sair do Grupo</button>
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" >Alterar nome do grupo</button>
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round">Alterar
nome do grupo</button>
<div class="solid"></div>
<button (click)="close('cancel')" full class="btn-cancel mobile-only" shape="round">Cancelar</button>
<button *ngIf="isAdmin" (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
src/style/ios.scss
+12
View File
@@ -82,6 +82,7 @@
-o-transform: none !important;
}
}
.modal-desktop-remove-background::part(backdrop) {
display: none;
transform: none !important;
@@ -160,6 +161,7 @@ ion-modal::part(content) {
right: 0 !important;
top: unset !important;
}
.group-duration::part(content) {
width: 100% !important;
left: 0 !important;
@@ -175,6 +177,7 @@ ion-modal::part(content) {
right: 0 !important;
top: unset !important;
}
.messages-options::part(content) {
width: 100% !important;
left: 0 !important;
@@ -182,6 +185,7 @@ ion-modal::part(content) {
right: 0 !important;
top: unset !important;
}
.events-options::part(content) {
width: 100% !important;
left: 0 !important;
@@ -190,3 +194,11 @@ ion-modal::part(content) {
top: unset !important;
}
ion-toolbar {
padding-top: 0px !important;
}
.header-fix {
padding-top: var(--ion-safe-area-top);
}