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
4c7bf15a
Commit
4c7bf15a
authored
Jun 16, 2020
by
Muhammad Usman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
profile percentage & mobile percentage masks
parent
8fe0d4e1
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
30 additions
and
18 deletions
+30
-18
register.component.html
...nents/my-career-web/auth/register/register.component.html
+1
-9
register.component.ts
...ponents/my-career-web/auth/register/register.component.ts
+1
-2
home.component.html
...mponents/my-career-web/dashboard/home/home.component.html
+2
-2
personal-details.component.html
...ashboard/personal-details/personal-details.component.html
+3
-2
profile-tasks.component.html
...-web/dashboard/profile-tasks/profile-tasks.component.html
+2
-2
profile-tasks.component.scss
...-web/dashboard/profile-tasks/profile-tasks.component.scss
+1
-1
profile-tasks.component.ts
...er-web/dashboard/profile-tasks/profile-tasks.component.ts
+9
-0
mc-shared.module.ts
...pp/components/my-career-web/mc-shared/mc-shared.module.ts
+2
-0
career-profile.model.ts
...p/components/my-career-web/models/career-profile.model.ts
+1
-0
_styles.scss
frontend/angular/src/styles/my-career-styles/_styles.scss
+1
-0
_mask.scss
...nd/angular/src/styles/my-career-styles/primeng/_mask.scss
+7
-0
No files found.
frontend/angular/src/app/components/my-career-web/auth/register/register.component.html
View file @
4c7bf15a
...
@@ -23,14 +23,6 @@
...
@@ -23,14 +23,6 @@
</app-form-control>
</app-form-control>
</div>
</div>
<div
class=
"form-group position-relative"
>
<label>
Confirm your new password
</label>
<app-form-control>
<input
[
type
]="
showPassword
?
'
text
'
:
'
password
'"
name=
"confirmPassword"
required
class=
"form-control"
[(
ngModel
)]="
registerForm
.
confirmPassword
"
>
</app-form-control>
<small
*
ngIf=
"form.valid && registerForm.password !== registerForm.confirmPassword"
class=
"text-danger"
>
Passwords do not match.
</small>
</div>
<div
class=
"was-referred form-group"
>
<div
class=
"was-referred form-group"
>
<span>
Were you referred by another member?
</span>
<span>
Were you referred by another member?
</span>
<div
class=
"mt-sm-top"
style=
"white-space: nowrap;"
>
<div
class=
"mt-sm-top"
style=
"white-space: nowrap;"
>
...
@@ -62,7 +54,7 @@
...
@@ -62,7 +54,7 @@
<div
class=
"d-flex justify-content-center"
>
<div
class=
"d-flex justify-content-center"
>
<app-overlay
[
isActive
]="
isLoading
"
></app-overlay>
<app-overlay
[
isActive
]="
isLoading
"
></app-overlay>
<button
class=
"action-btn"
(
click
)="
register
()"
[
disabled
]="
isLoading
||
!
registerForm
.
terms
||
!
registerForm
.
policy
||
registerForm
.
password
!==
registerForm
.
confirmPassword
||
form
.
invalid
"
>
<button
class=
"action-btn"
(
click
)="
register
()"
[
disabled
]="
isLoading
||
!
registerForm
.
terms
||
!
registerForm
.
policy
||
form
.
invalid
"
>
Sign up
Sign up
</button>
</button>
</div>
</div>
...
...
frontend/angular/src/app/components/my-career-web/auth/register/register.component.ts
View file @
4c7bf15a
...
@@ -20,7 +20,6 @@ export class RegisterComponent extends BaseComponent implements OnInit {
...
@@ -20,7 +20,6 @@ export class RegisterComponent extends BaseComponent implements OnInit {
lastname
:
''
,
lastname
:
''
,
email
:
''
,
email
:
''
,
password
:
''
,
password
:
''
,
confirmPassword
:
''
,
ReferralCode
:
''
,
ReferralCode
:
''
,
was_referred
:
false
,
was_referred
:
false
,
terms
:
false
,
terms
:
false
,
...
@@ -45,7 +44,7 @@ export class RegisterComponent extends BaseComponent implements OnInit {
...
@@ -45,7 +44,7 @@ export class RegisterComponent extends BaseComponent implements OnInit {
}
}
register
():
void
{
register
():
void
{
if
(
this
.
form
.
invalid
||
this
.
registerForm
.
password
!==
this
.
registerForm
.
confirmPassword
)
{
if
(
this
.
form
.
invalid
)
{
return
this
.
hs
.
validateAllFormFields
(
this
.
form
);
return
this
.
hs
.
validateAllFormFields
(
this
.
form
);
}
}
this
.
registerForm
.
firstname
=
'AA'
;
this
.
registerForm
.
firstname
=
'AA'
;
...
...
frontend/angular/src/app/components/my-career-web/dashboard/home/home.component.html
View file @
4c7bf15a
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<div
class=
"home-header-card-content"
>
<div
class=
"home-header-card-content"
>
We need some information from you so you can fill out your career profile and get job hunting.
We need some information from you so you can fill out your career profile and get job hunting.
</div>
</div>
<div
class=
"home-header-card-action"
>
I'm ready to get started
</div>
<div
class=
"home-header-card-action"
routerLink=
"/my-career-web/dashboard/personal-details"
>
I'm ready to get started
</div>
</div>
</div>
</div>
</div>
<div
class=
"home-body"
>
<div
class=
"home-body"
>
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
<div
class=
"mobile-header-heading"
>
Hey Mark, Welcome to Matchd Career.
</div>
<div
class=
"mobile-header-heading"
>
Hey Mark, Welcome to Matchd Career.
</div>
<div
class=
"mobile-header-card"
>
<div
class=
"mobile-header-card"
>
We need some information from you so you can fill out your career profile and get job hunting.
We need some information from you so you can fill out your career profile and get job hunting.
<div
class=
"mobile-header-card-action"
>
I'm ready to get started
</div>
<div
class=
"mobile-header-card-action"
routerLink=
"/my-career-web/dashboard/personal-details"
>
I'm ready to get started
</div>
</div>
</div>
</div>
</div>
...
...
frontend/angular/src/app/components/my-career-web/dashboard/personal-details/personal-details.component.html
View file @
4c7bf15a
...
@@ -29,9 +29,10 @@
...
@@ -29,9 +29,10 @@
<div
class=
"col-md-6 form-group"
>
<div
class=
"col-md-6 form-group"
>
<label>
Mobile
</label>
<label>
Mobile
</label>
<app-form-control>
<app-form-control>
<input
type=
"text"
class=
"form-control"
placeholder=
"Mobile No"
[(
ngModel
)]="
careerProfile
.
Mobile
"
name=
"Mobile"
>
<p-inputMask
mask=
"9999 999 9999"
styleClass=
"form-control"
placeholder=
"Mobile No"
[(
ngModel
)]="
careerProfile
.
Mobile
"
name=
"Mobile"
>
</p-inputMask>
</app-form-control>
</app-form-control>
<div
class=
"mobile-no-msg"
*
ngIf=
"!careerProfile.Mobile"
>
<div
class=
"mobile-no-msg"
*
ngIf=
"!careerProfile.Mobile
&& !isLoading
"
>
You did not enter a mobile phone number. We occasionally try to contact you via text message.
You did not enter a mobile phone number. We occasionally try to contact you via text message.
</div>
</div>
</div>
</div>
...
...
frontend/angular/src/app/components/my-career-web/dashboard/profile-tasks/profile-tasks.component.html
View file @
4c7bf15a
...
@@ -2,12 +2,12 @@
...
@@ -2,12 +2,12 @@
<app-overlay
[
isActive
]="
isLoading
"
></app-overlay>
<app-overlay
[
isActive
]="
isLoading
"
></app-overlay>
<div
class=
"user-profile"
>
<div
class=
"user-profile"
>
<i
class=
"fa fa-bell"
*
ngIf=
"!isMobileView"
></i>
<i
class=
"fa fa-bell"
*
ngIf=
"!isMobileView"
></i>
<div
class=
"user-profile-avatar-wrapper"
>
<div
class=
"user-profile-avatar-wrapper"
[
ngStyle
]="{
backgroundImage:
avatarBorder
}"
>
<div
class=
"user-profile-avatar"
>
<div
class=
"user-profile-avatar"
>
<img
src=
"assets/my-career-web/svgs/avatar.svg"
alt=
""
>
<img
src=
"assets/my-career-web/svgs/avatar.svg"
alt=
""
>
</div>
</div>
</div>
</div>
<div
class=
"user-profile-label"
>
Profile
67
% complete
</div>
<div
class=
"user-profile-label"
>
Profile
{{careerProfile.CompletedPercentage || 0}}
% complete
</div>
<hr
style=
"border-bottom: 1px solid #E0E0E0; margin: 24px 0;"
>
<hr
style=
"border-bottom: 1px solid #E0E0E0; margin: 24px 0;"
>
...
...
frontend/angular/src/app/components/my-career-web/dashboard/profile-tasks/profile-tasks.component.scss
View file @
4c7bf15a
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
height
:
112px
;
height
:
112px
;
margin
:
0
auto
;
margin
:
0
auto
;
border-radius
:
100%
;
border-radius
:
100%
;
background
:
linear-gradient
(
270deg
,
#1469A2
50%
,
transparent
50%
)
,
linear-gradient
(
-90deg
,
#1469A2
50%
,
#EAECEE
50%
)
;
background
-color
:
#1469A2
;
padding
:
4px
;
padding
:
4px
;
.user-profile-avatar
{
.user-profile-avatar
{
...
...
frontend/angular/src/app/components/my-career-web/dashboard/profile-tasks/profile-tasks.component.ts
View file @
4c7bf15a
...
@@ -15,6 +15,7 @@ export class ProfileTasksComponent extends BaseComponent implements OnInit {
...
@@ -15,6 +15,7 @@ export class ProfileTasksComponent extends BaseComponent implements OnInit {
assocs
=
[
'Candidate.User'
,
'Candidate.OccupationPreference'
];
assocs
=
[
'Candidate.User'
,
'Candidate.OccupationPreference'
];
careerProfile
=
new
CareerProfileModel
();
careerProfile
=
new
CareerProfileModel
();
avatarBorder
=
'linear-gradient(90deg, transparent 50%, #EAECEE 50%), linear-gradient(90deg, #EAECEE 50%, transparent 50%)'
;
constructor
(
constructor
(
private
hs
:
HelperService
,
private
hs
:
HelperService
,
...
@@ -30,6 +31,7 @@ export class ProfileTasksComponent extends BaseComponent implements OnInit {
...
@@ -30,6 +31,7 @@ export class ProfileTasksComponent extends BaseComponent implements OnInit {
.
pipe
(
takeUntil
(
this
.
componentInView
))
.
pipe
(
takeUntil
(
this
.
componentInView
))
.
subscribe
(
profile
=>
{
.
subscribe
(
profile
=>
{
this
.
careerProfile
=
this
.
us
.
cloneObject
(
profile
);
this
.
careerProfile
=
this
.
us
.
cloneObject
(
profile
);
this
.
setProfileCompletion
();
})
})
}
}
...
@@ -39,6 +41,7 @@ export class ProfileTasksComponent extends BaseComponent implements OnInit {
...
@@ -39,6 +41,7 @@ export class ProfileTasksComponent extends BaseComponent implements OnInit {
.
pipe
(
takeUntil
(
this
.
componentInView
))
.
pipe
(
takeUntil
(
this
.
componentInView
))
.
subscribe
(
response
=>
{
.
subscribe
(
response
=>
{
this
.
careerProfile
=
response
;
this
.
careerProfile
=
response
;
this
.
setProfileCompletion
();
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
},
err
=>
{
},
err
=>
{
this
.
hs
.
handleHttpError
(
err
);
this
.
hs
.
handleHttpError
(
err
);
...
@@ -46,4 +49,10 @@ export class ProfileTasksComponent extends BaseComponent implements OnInit {
...
@@ -46,4 +49,10 @@ export class ProfileTasksComponent extends BaseComponent implements OnInit {
})
})
}
}
setProfileCompletion
():
void
{
const
percentage
=
(
this
.
careerProfile
.
CompletedPercentage
||
0
)
*
3.6
;
const
degree
=
percentage
<=
180
?
90
+
percentage
:
percentage
-
90
;
this
.
avatarBorder
=
`linear-gradient(
${
degree
}
deg, transparent 50%, #EAECEE 50%), linear-gradient(90deg, #EAECEE 50%, transparent 50%)`
;
}
}
}
frontend/angular/src/app/components/my-career-web/mc-shared/mc-shared.module.ts
View file @
4c7bf15a
...
@@ -14,6 +14,7 @@ import { PersonalDetailsService } from '../services/personal-details.service';
...
@@ -14,6 +14,7 @@ import { PersonalDetailsService } from '../services/personal-details.service';
import
{
InputSwitchModule
}
from
'primeng/inputswitch'
;
import
{
InputSwitchModule
}
from
'primeng/inputswitch'
;
import
{
ButtonModule
}
from
'primeng/button'
;
import
{
ButtonModule
}
from
'primeng/button'
;
import
{
GooglePlacesAutocompleteDirective
}
from
'./google-places-autocomplete.directive'
;
import
{
GooglePlacesAutocompleteDirective
}
from
'./google-places-autocomplete.directive'
;
import
{
InputMaskModule
}
from
'primeng/inputmask'
;
const
MODULES
=
[
const
MODULES
=
[
ReactiveFormsModule
,
ReactiveFormsModule
,
...
@@ -25,6 +26,7 @@ const MODULES = [
...
@@ -25,6 +26,7 @@ const MODULES = [
ToastModule
,
ToastModule
,
InputSwitchModule
,
InputSwitchModule
,
ButtonModule
,
ButtonModule
,
InputMaskModule
];
];
const
COMPONENTS
=
[
const
COMPONENTS
=
[
...
...
frontend/angular/src/app/components/my-career-web/models/career-profile.model.ts
View file @
4c7bf15a
...
@@ -8,6 +8,7 @@ export class CareerProfileModel extends BaseModel {
...
@@ -8,6 +8,7 @@ export class CareerProfileModel extends BaseModel {
GoogleAddress
:
string
;
GoogleAddress
:
string
;
Skype
:
string
;
Skype
:
string
;
Candidate
=
new
CandidateModel
();
Candidate
=
new
CandidateModel
();
CompletedPercentage
:
number
;
IsGoogleConnected
:
boolean
;
IsGoogleConnected
:
boolean
;
IsLinkedInConnected
:
boolean
;
IsLinkedInConnected
:
boolean
;
}
}
frontend/angular/src/styles/my-career-styles/_styles.scss
View file @
4c7bf15a
...
@@ -15,5 +15,6 @@
...
@@ -15,5 +15,6 @@
@import
"primeng/dropdown"
;
@import
"primeng/dropdown"
;
@import
"primeng/switch"
;
@import
"primeng/switch"
;
@import
"primeng/button"
;
@import
"primeng/button"
;
@import
"primeng/mask"
;
}
}
frontend/angular/src/styles/my-career-styles/primeng/_mask.scss
0 → 100644
View file @
4c7bf15a
p-inputMask
{
input
{
width
:
100%
!
important
;
background-image
:
none
!
important
;
padding
:
6px
12px
;
}
}
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