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

alterar nome desktop

Browse Source
This commit is contained in:
tiago.kayaya
2021-04-16 11:25:10 +01:00
parent 044d959bbd
commit 2499fe7794
6 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/chat.page.html
+31 -8
View File
@@ -94,17 +94,40 @@
</div>
<!-- Aside right -->
<div class="aside-content d-none flex-column height-100">
<app-empty-chat [texto]="emptyTextDescription" class="d-flex height-100 flex-column" *ngIf="showEmptyComponent" #messagecontainer></app-empty-chat>
<app-messages class="d-flex height-100 flex-column" [roomId]="roomId" *ngIf="showMessages" #messagecontainer></app-messages>
<app-contacts (openMessage)="openMessagesPage($event)" *ngIf="showContacts" class="d-flex height-100 flex-column"></app-contacts>
<app-new-group (addGroupMessage)="openGroupContactsPage($event)" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
<app-edit-group [roomId]="roomId" *ngIf="showEditGroup" class="d-flex height-100 flex-column"></app-edit-group>
<app-group-contacts (openGroupMessage)="openGroupMessagesPage($event)" [roomId]="groupRoomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
<app-empty-chat [texto]="emptyTextDescription"
class="d-flex height-100 flex-column"
*ngIf="showEmptyComponent" #messagecontainer>
</app-empty-chat>
<app-messages class="d-flex height-100 flex-column"
[roomId]="roomId" *ngIf="showMessages" #messagecontainer>
</app-messages>
<app-contacts
(openMessage)="openMessagesPage($event)"
*ngIf="showContacts" class="d-flex height-100 flex-column">
</app-contacts>
<app-new-group
(addGroupMessage)="openGroupContactsPage($event)"
*ngIf="showNewGroup" class="d-flex height-100 flex-column">
</app-new-group>
<app-edit-group [roomId]="roomId"
(closeAllDesktopComponents)="closeAllDesktopComponents()"
(openGroupMessage)="openGroupMessagesPage($event)"
*ngIf="showEditGroup" class="d-flex height-100 flex-column">
</app-edit-group>
<app-group-contacts
(openGroupMessage)="openGroupMessagesPage($event)"
[roomId]="groupRoomId" class="d-flex height-100 flex-column"
*ngIf="showGroupContacts">
</app-group-contacts>
<app-group-messages
(closeAllDesktopComponents)="closeAllDesktopComponents()"
(showEmptyContainer)="showEmptyContainer()"
(openGroupContacts)="openGroupContactsPage($event)"
*ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
(openGroupContacts)="openGroupContactsPage($event)"
(openEditGroupPage)="openEditGroupPage($event)"
*ngIf="showGroupMessages"
class="d-flex height-100 flex-column"
[roomId]="roomId" #messagecontainer>
</app-group-messages>
</div>
</div>
</ion-content>
src/app/shared/btn-seguinte/btn-seguinte.page.html
+4 -2
View File
@@ -1,3 +1,5 @@
<div class="right">
<ion-label>Seguinte</ion-label>
<div>
<button class="btn-no-color right">
<ion-label>Seguinte</ion-label>
</button>
</div>
src/app/shared/chat/edit-group/edit-group.page.html
+8 -6
View File
@@ -3,7 +3,9 @@
<div class="main-header">
<div class="title-content">
<div class="left">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="middle">
<ion-label class="title">Alterar assunto</ion-label>
@@ -14,9 +16,9 @@
</ion-toolbar>
</ion-header>
<ion-content>
<div class="main-content">
<div class="item-container">
<ion-content class="width-100">
<div class="main-content d-flex width-100">
<div class="item-container d-flex flex-column width-100">
<ion-input [(ngModel)]="groupName" placeholder="Título"></ion-input>
</div>
<div *ngIf="false" class="item-container-no-border">
@@ -24,8 +26,8 @@
<ion-label>Grupo Ultra-secreto</ion-label>
</div>
<div *ngIf="showDuration" class="container-div">
<div class="ion-item-class-2">
<div *ngIf="showDuration" class="container-div width-100">
<div class="ion-item-class-2 width-100">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-duration.svg"></ion-icon>
</div>
src/app/shared/chat/edit-group/edit-group.page.scss
+6 -8
View File
@@ -6,7 +6,7 @@ ion-content{
--opacity: 1;
}
.div-top-header{
width: 400px;
//width: 400px;
margin: 0 auto;
background-color: #0782c9;
overflow: auto;
@@ -47,7 +47,7 @@ ion-content{
transform: translate3d(0, 1px, 0);
.title-content{
width: 360px;
//width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
@@ -92,8 +92,6 @@ ion-content{
}
.main-content{
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
@@ -101,7 +99,7 @@ ion-content{
padding: 15px 20px 0 20px;
.item-container{
width: 360px;
//width: 360px;
margin: 15px auto;
border: 1px solid #ebebeb;
border-radius: 5px;
@@ -110,7 +108,7 @@ ion-content{
.item-container-no-border{
display: flex;
width: 360px;
//width: 360px;
margin: 25px auto;
border-radius: 5px;
align-items: center;
@@ -128,7 +126,7 @@ ion-content{
overflow: auto;
.ion-item-class-2{
width: 360px;
//width: 360px;
margin: 0px auto;
.ion-icon-class{
@@ -140,7 +138,7 @@ ion-content{
}
}
.ion-input-class{
width: 315px;
width: calc(100% - 45px);
height: 45px;
border: 1px solid #ebebeb;
border-radius: 5px;
src/app/shared/chat/edit-group/edit-group.page.ts
+9 -4
View File
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ModalController, NavParams, PickerController } from '@ionic/angular';
import { ModalController, PickerController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
@Component({
@@ -16,12 +16,13 @@ export class EditGroupPage implements OnInit {
room:any;
@Input() roomId:string;
@Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
@Output() openGroupMessage:EventEmitter<any> = new EventEmitter<any>();
@Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
constructor(
private modalController: ModalController,
private pickerController: PickerController,
private chatService: ChatService,
private navParams: NavParams,
) {
}
@@ -38,7 +39,9 @@ export class EditGroupPage implements OnInit {
}
close(){
this.modalController.dismiss();
//this.modalController.dismiss();
this.closeAllDesktopComponents.emit();
this.openGroupMessage.emit(this.roomId);
}
changeGroupName(){
@@ -54,8 +57,10 @@ export class EditGroupPage implements OnInit {
}
else{
console.log("Invalid name!");
}
}
this.close();
}
_ionChange(event){
this.showDuration = event.detail.checked;
}
src/app/shared/chat/group-messages/group-messages.page.ts
+4 -2
View File
@@ -30,7 +30,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
@Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
@Output() showEmptyContainer:EventEmitter<any> = new EventEmitter<any>();
@Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
@Output() openEditGroup:EventEmitter<any> = new EventEmitter<any>();
@Output() openEditGroupPage:EventEmitter<any> = new EventEmitter<any>();
constructor(
private menu: MenuController,
@@ -210,7 +210,9 @@ export class GroupMessagesPage implements OnInit, OnChanges {
console.log('CANCEL');
}
else if(res.data == 'edit'){
console.log('CANCEL');
console.log(this.roomId);
//this.closeAllDesktopComponents.emit();
this.openEditGroupPage.emit(this.roomId);
}
else{
this.roomName = res.data.name.split('-').join(' ');