diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 72418ddbe..d9067fd6c 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -39,9 +39,9 @@ ion-content{ font-family: Roboto; margin: 0 auto; background-color: #fff; - //overflow:auto; border-top-left-radius: 25px; border-top-right-radius: 25px; + overflow: auto; .aside-wrapper{ padding: 0 !important; diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 7771d71c2..e31f52f53 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -86,17 +86,16 @@ export class ChatPage implements OnInit { this.authService.userData$.subscribe((res:any)=>{ this.loggedUser=res; console.log(this.loggedUser); + this.load(); }); this.storage.get('userDataKey').then(val=> { let t = JSON.parse(unescape(atob(val))); this.loggedUser=t; - this.load(); + //this.load(); }) console.log(this.roomId); - - } closeAllDesktopComponents() { this.showMessages=false; diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 65cef7c68..437f8909d 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -2,9 +2,8 @@
-
- {{room.name}} + {{room.name.split('-').join(' ')}}
@@ -35,43 +34,38 @@ {{message}} Esta conversa passou a grupo
A conversa original mantêm-se como chat individual
-
-
-
- {{msg.u.name}} - {{msg._updatedAt | date: 'HH:mm' }} +
+
+
+
+ {{msg.u.name}} + {{msg._updatedAt | date: 'HH:mm' }} +
+
+ {{msg.msg}} +
-
- {{msg.msg}} +
+ Alterou o assunto de para "{{msg.msg.split('-').join(' ')}}"
-
- Alterou o assunto de para "{{msg.msg.split('-').join(' ')}}"
-
- - - - - - - - - - - - - - - - - - - - - +
+
+ +
+
+ + + + +
+
+ +
+
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss index 8ff426140..9018913ce 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/src/app/shared/chat/group-messages/group-messages.page.scss @@ -4,16 +4,12 @@ --opacity: 1; .main-header{ - width: 100%; /* 400px */ + width: 100%; height: 100%; - font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background-color: #fff; - overflow:hidden; + overflow:auto; padding: 30px 20px 0px 20px; color:#000; - transform: translate3d(0, 1px, 0); + //transform: translate3d(0, 1px, 0); .header-top{ //width: 360px; @@ -36,9 +32,8 @@ } } .header-bottom{ - width: 310px; + width: 95%; overflow: auto; - margin: 0 auto; .header-bottom-icon{ width: 30px; @@ -109,66 +104,73 @@ overflow: auto; .incoming-true, .incoming-false{ - width: 305px; padding: 15px 20px; border-radius: 10px; + } + .incoming-true{ + margin: 10px 75px 10px 20px; + background: #ebebeb; + float: left; + } + .container-width-100{ + width: 100%; + overflow: auto; + } } - - .incoming-true{ - margin: 10px 75px 10px 20px; - background: #ebebeb; - float: left; - } - } .incoming-false{ margin: 10px 20px 10px 75px; background: #e4f4fe; float: right; } .title{ + display: inline; color: #0782c9; - font-weight: bold; margin-bottom: 5px; .time{ color: #797979; text-align: right; + margin-left: 10px; float: right; } } } ion-footer{ - .row{ - width: 100%; - margin: 0 auto; - } + padding-top: 7.5px; + padding-bottom: 7.5px; + .container{ + justify-content: center; + justify-content: space-evenly; + + } + + .chat-icon-options{ + display:block !important; + font-size: 25px; + float: right !important; + margin-top: 10px; + } - .chat-icon-options{ - display:block !important; - font-size: 25px; - float: right !important; - margin-top: 10px; - } - - .chat-icon-send{ - font-size: 45px; - margin: 0 auto; - margin-top: 4px; - } + .chat-icon-send{ + font-size: 45px; + margin: 0 auto; + margin-top: 4px; + } .type-message{ - display: flex; - border: 1px solid #ebebeb; - border-radius: 25px; - padding-left: 15px; - align-items: center; - overflow: auto; + display: flex; + border: 1px solid #ebebeb; + border-radius: 25px; + padding-left: 15px; + align-items: center; + overflow: auto; - ion-textarea{ - margin: 0 !important; - align-self: center; - } - } + ion-textarea{ + margin: 0 !important; + align-self: center; + } } + +} diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 1b451ff26..8578835ea 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -1,5 +1,5 @@ -import { AfterViewChecked, Component, OnChanges, OnInit, Input, SimpleChanges, Output } from '@angular/core'; -import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { Component, OnChanges, OnInit, Input, SimpleChanges} from '@angular/core'; +import { ActionSheetController, MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; @@ -22,7 +22,6 @@ export class GroupMessagesPage implements OnInit, OnChanges { room:any; - roomName:any; members:any; @Input() roomId:string; @@ -33,12 +32,9 @@ export class GroupMessagesPage implements OnInit, OnChanges { private actionSheetController: ActionSheetController, public popoverController: PopoverController, private chatService: ChatService, - /* private navParams: NavParams, */ private authService: AuthService, ) { this.isGroupCreated = true; - /* this.room = this.navParams.get('room'); */ - /* this.roomName = this.room.name.split('-').join(' '); */ } ngOnChanges(changes: SimpleChanges): void { this.getRoomInfo(); diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 9e4bfb0a5..2936836e6 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -30,7 +30,7 @@
-
+
{{msg.u.name}} {{msg._updatedAt | date: 'HH:mm' }} diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss index 94252123c..547b63b8f 100644 --- a/src/app/shared/chat/messages/messages.page.scss +++ b/src/app/shared/chat/messages/messages.page.scss @@ -7,8 +7,6 @@ width: 100%; /* 400px */ height: 100%; font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; background-color: #fff; overflow:hidden; //padding: 0px 20px 0px 20px; diff --git a/src/global.scss b/src/global.scss index 73ff0a2f2..625e68241 100644 --- a/src/global.scss +++ b/src/global.scss @@ -397,4 +397,21 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .gabinete-digital-mobile-modal-to-Desktop{ border-top-right-radius: 27px; +} + +/* Breakpoints */ +._xs{ + width: 100%; +} +._sm{ + width: 540px; +} +._md{ + width: 720px; +} +._lg{ + width: 960px; +} +._xl{ + width: 1140px; } \ No newline at end of file diff --git a/src/style/main.scss b/src/style/main.scss index ccb5ab9e9..3f9ccf56d 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -365,6 +365,7 @@ .width-70{width: 70%;} .width-60{width: 60%;} .width-50{width: 50%;} +.width-45{width: 45%;} .width-40{width: 40%;} .width-30{width: 30%;} .width-20{width: 20%;} @@ -376,6 +377,7 @@ .max-width-70{max-width: 70%;} .max-width-60{max-width: 60%;} .max-width-50{max-width: 50%;} +.max-width-45{max-width: 45%;} .max-width-40{max-width: 40%;} .max-width-30{max-width: 30%;} .max-width-20{max-width: 20%;}