peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-11-19 14:56:45 +01:00
parent cb3d5957f4 69d3ff31c2
commit 9298faf43f
11 changed files with 173 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/group-icons/group-icons.page.html
+38 -31
View File
@@ -1,31 +1,38 @@
<ion-card >
<ion-card-content >
<ion-row>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="removerIcone()" fill="clear" color="light">
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
<ion-icon class="redla" name="trash-outline"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="openGaleria()" fill="clear" color="light">
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
<ion-icon class="redla" name="flower-outline"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="OpenCamera()" fill="clear" color="light">
<ion-icon class="redla" name="camera-outline"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="pesquizarWeb()" fill="clear" color="light">
<ion-icon class="redla" name="search-outline"></ion-icon>
</ion-button>
</ion-col>
</ion-row>
</ion-card-content>
</ion-card>
<ion-card class="cardconteudo" (click)= "dismiss()" >
<ion-card-header>
</ion-card-header>
<ion-card-content >
<ion-row>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="removerIcone()" fill="clear" color="light">
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
<ion-icon class="redla" name="trash-outline"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="openGaleria()" fill="clear" color="light">
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
<ion-icon class="redla" name="flower-outline"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="OpenCamera()" fill="clear" color="light">
<ion-icon class="redla" name="camera-outline"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="pesquizarWeb()" fill="clear" color="light">
<ion-icon class="redla" name="search-outline"></ion-icon>
</ion-button>
</ion-col>
</ion-row>
</ion-card-content>
</ion-card>
src/app/modals/group-icons/group-icons.page.scss
+63
View File
@@ -0,0 +1,63 @@
// .animated{
// animation: duration 5s;
// animation-fill-mode: both;
// }
// @keyframes bounceInUp{
// 0%{
// opacity:0;
// transform: translateY(300px);
// }
// 60%{
// opacity:0;
// transform: translateY(-30px);
// }
// 80%{
// opacity:0;
// transform: translateY(10px);
// }
// 100%{
// opacity:0;
// transform: translateY(0);
// }
// }
// .bounceInUp{
// animation-name: bounceInUp;
// }
// @keyframes bounceInUp{
// from{down:0px}
// 30% {top: 100px !important;} /* ignored */
// from{down:200px}
// }
.rollover {
position: relative;
animation: mymove 5s infinite;
}
@keyframes mymove {
from {bottom: 0px; }
to {bottom: 100px;}
}
@media only screen and (min-height: 600px) and (min-width: 768px)
{
.custom-modal {
.modal-wrapper {
position: absolute !important;
height: 500px !important;
top: calc(100% - (500px));
}
}
}
.redla{
color: rgb(255, 38, 0);
// background-color: rgb(255, 72, 0);
}
src/app/modals/preview-camera/preview-camera.module.ts
+4 -1
View File
@@ -8,6 +8,7 @@ import { PreviewCameraPageRoutingModule } from './preview-camera-routing.module'
import { PreviewCameraPage } from './preview-camera.page';
import { ImageCropperModule } from 'ngx-image-cropper';
import { GroupIconsPage } from '../group-icons/group-icons.page';
@NgModule({
imports: [
@@ -17,6 +18,8 @@ import { ImageCropperModule } from 'ngx-image-cropper';
ImageCropperModule,
PreviewCameraPageRoutingModule
],
declarations: [PreviewCameraPage]
declarations: [PreviewCameraPage],
})
export class PreviewCameraPageModule {}
src/app/modals/preview-camera/preview-camera.page.html
+14 -11
View File
@@ -1,13 +1,15 @@
<ion-card >
<ion-card class="cardconteudo" >
<ion-card-content >
<ion-card-header >
<ion-toolbar>
{{username}} <span>{{_updatedAt}}</span>
<ion-text color="light" size="6">{{username}} <span>{{_updatedAt | date}}</span><div class="right" (click)="getIconGallery()"><ion-icon name="pencil-outline" ></ion-icon></div></ion-text>
</ion-toolbar>
</ion-card-header>
<img src="{{image}}" />
@@ -23,7 +25,7 @@
></image-cropper> -->
<ion-footer>
<ion-footer color="light">
<ion-row>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="zoom(false)" fill="clear" color="light">
@@ -32,9 +34,10 @@
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
<ion-button (click)="zoom(false)" fill="clear" color="light">
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
<ion-icon class="redla" name="call-outline"></ion-icon>
<ion-button (click)="zoom(false)" fill="clear" color="light">
<!-- <ion-icon name="remove" slot="start"></ion-icon> -->
<ion-icon class="redla" name="flower-outline"></ion-icon>
</ion-button>
</ion-col>
<ion-col size="3" class="ion-text-center">
@@ -52,4 +55,4 @@
</ion-col>
</ion-row>
</ion-footer>
</ion-card>
</ion-card>
src/app/modals/preview-camera/preview-camera.page.scss
+13 -7
View File
@@ -1,10 +1,3 @@
ion-content {
--background:black;
--color: red;
}
ion-footer {
margin-bottom: 10px;
}
@@ -19,4 +12,17 @@ ion-slides {
// background-color: rgb(255, 72, 0);
}
.cardconteudo {
background: rgba(255,255,255,0.5);
}
.whiter{
color: white;
}
.right{
float: right;
}
.center{
clear: both;
}
src/app/modals/preview-camera/preview-camera.page.ts
+11
View File
@@ -66,7 +66,18 @@ close(){
// });
// modal.present();
// }
async getIconGallery(){
const modal = await this.modalController.create({
component: GroupIconsPage ,
animated: true,
cssClass: 'transparentblack-modal',
});
modal.present();
}
}
src/app/pages/chat/chat.page.html
+1 -3
View File
@@ -97,8 +97,6 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40-hover.svg"></ion-icon>
</div>
<div
(click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1 cursor-pointer">
@@ -125,7 +123,7 @@
</div>
</div>
</ion-item-sliding>
am i here?!
</ion-list>
</div>
<!-- <button (click)="sendMsg()" style="height: 41px;">Send message</button> -->
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
-3
View File
@@ -29,9 +29,6 @@
</ion-refresher-content>
</ion-refresher>
<div class="main-content">
<div *ngIf="members">
<ion-label class="members-label">Contactos selecção:</ion-label>
src/app/pages/chat/group-messages/group-messages.page.html
+1 -4
View File
@@ -67,10 +67,7 @@
<div *ngIf="msg.attachments" class="message-attachments">
<div *ngFor="let file of msg.attachments">
<img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" >
<div>
<div>
<div class="file">
<!-- <canvas id="pdf_canvas"></canvas> -->
@@ -157,5 +154,5 @@
</button>
</div>
</div>
in group!
</ion-footer>
src/app/pages/chat/messages/messages.page.html
+2 -2
View File
@@ -138,7 +138,7 @@
<button (click)="stopRecording()">Stop Recording</button> -->
<div class="container width-100 d-flex">
<div>
aqui
<button class="btn-no-color" (click)="openChatOptions()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options" src="assets/images/theme/gov/icons-add.svg"></ion-icon>
@@ -164,5 +164,5 @@
</button>
</div>
</div>
in message!
</ion-footer>