Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Usman
PERFORMA_REPLICA
Commits
01d921f3
Commit
01d921f3
authored
Jan 21, 2020
by
GD-A-150752
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
S53527357 # Client - Incoming Issues #Mobile UX - messaging
parent
0c88a652
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
22 deletions
+71
-22
message-engine.component.html
...p/components/message-engine/message-engine.component.html
+10
-10
message-engine.component.scss
...p/components/message-engine/message-engine.component.scss
+54
-11
custom.scss
frontend/angular/src/assets/css/custom.scss
+7
-1
No files found.
frontend/angular/src/app/components/message-engine/message-engine.component.html
View file @
01d921f3
...
@@ -21,23 +21,23 @@
...
@@ -21,23 +21,23 @@
<div
class=
"ui-g ui-fluid {{embedded ? '' : 'form' }}"
>
<div
class=
"ui-g ui-fluid {{embedded ? '' : 'form' }}"
>
<div
class=
"ui-g-12 ui-md-12"
>
<div
class=
"ui-g-12 ui-md-12"
>
<div
class=
"ui-g-12 ui-md-12 messages-wrapper"
>
<div
class=
"ui-g-12 ui-md-12 messages-wrapper"
>
<div
class=
"ui-g ui-fluid"
*
ngFor=
"let message of jobApplication.Messages"
>
<div
class=
"ui-g ui-fluid
top-div
"
*
ngFor=
"let message of jobApplication.Messages"
>
<div
class=
"
ui-g-10 message-block
"
*
ngIf=
"message.SentBy.ObjectID !== loggedInId"
>
<div
class=
"
message-block other
"
*
ngIf=
"message.SentBy.ObjectID !== loggedInId"
>
<div
class=
"
ui-g-12 ui-md-1 name other
{{embedded ? 'pad-5' : '' }}"
>
<div
class=
"
name
{{embedded ? 'pad-5' : '' }}"
>
<label>
{{message.SentBy.Name[0]}}
</label>
<label>
{{message.SentBy.Name[0]}}
</label>
</div>
</div>
<div
class=
"
ui-g-12 ui-md-11
"
>
<div
class=
"
msg
"
>
<ng-container
<ng-container
*
ngTemplateOutlet=
"messageDisplay; context:{message: message}"
></ng-container>
*
ngTemplateOutlet=
"messageDisplay; context:{message: message}"
></ng-container>
</div>
</div>
</div>
</div>
<div
class=
"
ui-g-offset-2 ui-g-10 message-block
"
<div
class=
"
message-block owner
"
*
ngIf=
"message.SentBy.ObjectID === loggedInId"
>
*
ngIf=
"message.SentBy.ObjectID === loggedInId"
>
<div
class=
"
ui-g-10 ui-md-11
"
>
<div
class=
"
msg
"
>
<ng-container
<ng-container
*
ngTemplateOutlet=
"messageDisplay; context:{message: message}"
></ng-container>
*
ngTemplateOutlet=
"messageDisplay; context:{message: message}"
></ng-container>
</div>
</div>
<div
class=
"
ui-g-12 ui-md-1 name owner
{{embedded ? 'pad-5' : '' }}"
>
<div
class=
"
name
{{embedded ? 'pad-5' : '' }}"
>
<label>
{{message.SentBy.Name[0]}}
</label>
<label>
{{message.SentBy.Name[0]}}
</label>
</div>
</div>
</div>
</div>
...
@@ -49,8 +49,8 @@
...
@@ -49,8 +49,8 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"ui-g-12 ui-fluid"
>
<div
class=
"ui-g-12 ui-fluid
flex
"
>
<div
class=
"
ui-g-9
resizeable"
>
<div
class=
"
msg-container
resizeable"
>
<p-editor
#
message
[(
ngModel
)]="
Message
.
MessageContent
"
name=
"MessageContent"
>
<p-editor
#
message
[(
ngModel
)]="
Message
.
MessageContent
"
name=
"MessageContent"
>
<p-header>
<p-header>
<span
class=
"ql-formats"
>
<span
class=
"ql-formats"
>
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
</p-header>
</p-header>
</p-editor>
</p-editor>
</div>
</div>
<div
class=
"
ui-g-3
"
>
<div
class=
"
btn-container
"
>
<p-splitButton
[
class
.
non-embed
]="!
embedded
"
label=
"Send"
icon=
"ui-icon-send"
<p-splitButton
[
class
.
non-embed
]="!
embedded
"
label=
"Send"
icon=
"ui-icon-send"
(
onClick
)="
saveEngineApplicantView
()"
(
onClick
)="
saveEngineApplicantView
()"
[
disabled
]="
sendCriteria
()"
[
disabled
]="
sendCriteria
()"
...
...
frontend/angular/src/app/components/message-engine/message-engine.component.scss
View file @
01d921f3
...
@@ -75,6 +75,11 @@ a {
...
@@ -75,6 +75,11 @@ a {
}
}
}
}
.top-div
{
display
:
flex
;
flex-direction
:
column
;
}
.message-block
{
.message-block
{
background-color
:
white
;
background-color
:
white
;
border-radius
:
20px
;
border-radius
:
20px
;
...
@@ -83,26 +88,51 @@ a {
...
@@ -83,26 +88,51 @@ a {
border
:
solid
1px
#dbdbdf
;
border
:
solid
1px
#dbdbdf
;
margin-top
:
5px
;
margin-top
:
5px
;
padding-bottom
:
0
!
important
;
padding-bottom
:
0
!
important
;
display
:
flex
;
width
:
90%
;
.name
{
&
.other
{
height
:
95%
;
justify-content
:
flex-start
;
background
:
rgba
(
1
,
1
,
1
,
0
.1
);
margin-right
:
10%
;
font-size
:
2em
;
.name
{
margin-left
:
5px
;
border-top-left-radius
:
12px
;
border-bottom-left-radius
:
12px
;
}
}
&
.owner
{
justify-content
:
flex-end
;
margin-left
:
10%
;
&
.owner
{
.name
{
margin-right
:
5px
;
border-top-right-radius
:
12px
;
border-top-right-radius
:
12px
;
border-bottom-right-radius
:
12px
;
border-bottom-right-radius
:
12px
;
}
}
}
&
.other
{
.name
{
border-top-left-radius
:
12px
;
background
:
rgba
(
1
,
1
,
1
,
0
.1
);
border-bottom-left-radius
:
12px
;
font-size
:
2em
;
min-width
:
60px
;
margin-top
:
5px
;
margin-bottom
:
5px
;
label
{
width
:
100%
;
margin
:
0
;
height
:
100%
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
}
}
}
}
.
initial
{
.
msg
{
width
:
100%
;
padding
:
0
.5em
;
text-align
:
center
;
width
:
87%
;
}
}
.message-footer
{
.message-footer
{
...
@@ -289,3 +319,16 @@ a {
...
@@ -289,3 +319,16 @@ a {
resize
:
both
;
resize
:
both
;
overflow
:
auto
;
overflow
:
auto
;
}
}
.msg-container
{
width
:
100%
;
margin-right
:
10px
;
}
.btn-container
{
min-width
:
160px
;
}
.flex
{
display
:
flex
;
}
frontend/angular/src/assets/css/custom.scss
View file @
01d921f3
...
@@ -309,7 +309,13 @@ body .ui-dropdown-panel .ui-dropdown-filter-container {
...
@@ -309,7 +309,13 @@ body .ui-dropdown-panel .ui-dropdown-filter-container {
bottom
:
20px
;
bottom
:
20px
;
right
:
85px
;
right
:
85px
;
background-image
:
url('../images/chat-icon.jpg')
;
background-image
:
url('../images/chat-icon.jpg')
;
background-repeat
:
round
;
background-repeat
:
no-repeat
;
background-attachment
:
scroll
;
background-position
:
center
center
;
-webkit-background-size
:
cover
;
-moz-background-size
:
cover
;
-o-background-size
:
cover
;
background-size
:
cover
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment