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
e5295b93
Commit
e5295b93
authored
Jul 28, 2020
by
Muhammad Usman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard ui fixes
parent
dd6df822
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
120 additions
and
5 deletions
+120
-5
publish.component.ts
...areer-history/career-history/publish/publish.component.ts
+0
-1
account.component.html
...pp/my-career-web/dashboard/account/account.component.html
+23
-0
account.component.scss
...pp/my-career-web/dashboard/account/account.component.scss
+30
-0
account.component.ts
.../app/my-career-web/dashboard/account/account.component.ts
+27
-0
dashboard.module.ts
...gular/src/app/my-career-web/dashboard/dashboard.module.ts
+3
-1
dashboard.routing.ts
...ular/src/app/my-career-web/dashboard/dashboard.routing.ts
+5
-0
dashboard.component.html
...y-career-web/dashboard/dashboard/dashboard.component.html
+2
-2
dashboard.component.scss
...y-career-web/dashboard/dashboard/dashboard.component.scss
+9
-0
dashboard.component.ts
.../my-career-web/dashboard/dashboard/dashboard.component.ts
+9
-0
left-sidebar.component.html
...er-web/dashboard/left-sidebar/left-sidebar.component.html
+1
-1
helper.service.ts
.../angular/src/app/my-career-web/services/helper.service.ts
+11
-0
No files found.
frontend/angular/src/app/my-career-web/career-history/career-history/publish/publish.component.ts
View file @
e5295b93
...
...
@@ -42,7 +42,6 @@ export class PublishComponent extends BaseComponent implements OnInit {
this
.
careerProfile
=
response
;
this
.
updatedObjs
[
this
.
careerProfile
.
ObjectID
]
=
this
.
careerProfile
;
this
.
careerProfileLoaded
.
emit
(
this
.
careerProfile
);
console
.
log
(
this
.
careerProfile
);
},
err
=>
{
this
.
isLoading
=
false
;
this
.
utilsService
.
handleError
(
err
);
...
...
frontend/angular/src/app/my-career-web/dashboard/account/account.component.html
0 → 100644
View file @
e5295b93
<div
class=
"mc-page-header-text"
>
Subscription
</div>
<div
class=
"account-wrapper"
>
<div
class=
"mc-card position-relative"
>
<app-overlay
[
isActive
]="
isLoading
"
></app-overlay>
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<h4>
Subscription Details
</h4>
</div>
<div
class=
"col-md-6"
>
<h4>
Card Details
</h4>
</div>
<div
class=
"col-md-12 mt-3"
>
<h4>
Card Details
</h4>
</div>
</div>
</div>
</div>
frontend/angular/src/app/my-career-web/dashboard/account/account.component.scss
0 → 100644
View file @
e5295b93
@import
"../../../../styles/my-career-styles/variables"
;
.account-wrapper
{
padding
:
0
8%
;
.mc-card
{
margin-top
:
-30px
;
h4
{
color
:
#58595B
;
font-family
:
$bodyFont
;
font-size
:
20px
;
letter-spacing
:
0
;
line-height
:
27px
;
margin-bottom
:
24px
;
font-weight
:
500
;
position
:
relative
;
&
:after
{
content
:
''
;
position
:
absolute
;
left
:
0
;
bottom
:
-7px
;
height
:
1px
;
width
:
47px
;
border
:
1px
solid
#F37124
;
}
}
}
}
frontend/angular/src/app/my-career-web/dashboard/account/account.component.ts
0 → 100644
View file @
e5295b93
import
{
Component
,
OnDestroy
,
OnInit
}
from
'@angular/core'
;
import
{
HelperService
}
from
'../../services/helper.service'
;
import
{
BaseComponent
}
from
'../../base/base.component'
;
@
Component
({
selector
:
'app-account'
,
templateUrl
:
'./account.component.html'
,
styleUrls
:
[
'./account.component.scss'
]
})
export
class
AccountComponent
extends
BaseComponent
implements
OnInit
,
OnDestroy
{
constructor
(
private
helperService
:
HelperService
)
{
super
();
}
ngOnInit
():
void
{
this
.
helperService
.
hideTaskBar
=
true
;
}
ngOnDestroy
():
void
{
super
.
ngOnDestroy
();
this
.
helperService
.
hideTaskBar
=
false
;
}
}
frontend/angular/src/app/my-career-web/dashboard/dashboard.module.ts
View file @
e5295b93
...
...
@@ -9,6 +9,7 @@ import { LeftSidebarComponent } from './left-sidebar/left-sidebar.component';
import
{
ProfileTasksComponent
}
from
'./profile-tasks/profile-tasks.component'
;
import
{
GoPremiumComponent
}
from
'./go-premium/go-premium.component'
;
import
{
SummaryReportComponent
}
from
'./summary-report/summary-report.component'
;
import
{
AccountComponent
}
from
'./account/account.component'
;
@
NgModule
({
imports
:
[
...
...
@@ -22,7 +23,8 @@ import { SummaryReportComponent } from './summary-report/summary-report.componen
LeftSidebarComponent
,
ProfileTasksComponent
,
GoPremiumComponent
,
SummaryReportComponent
SummaryReportComponent
,
AccountComponent
]
})
...
...
frontend/angular/src/app/my-career-web/dashboard/dashboard.routing.ts
View file @
e5295b93
...
...
@@ -5,6 +5,7 @@ import { HomeComponent } from './home/home.component';
import
{
PersonalDetailsComponent
}
from
'../mc-shared/personal-details/personal-details.component'
;
import
{
GoPremiumComponent
}
from
'./go-premium/go-premium.component'
;
import
{
SummaryReportComponent
}
from
'./summary-report/summary-report.component'
;
import
{
AccountComponent
}
from
'./account/account.component'
;
const
routes
:
Routes
=
[
{
...
...
@@ -28,6 +29,10 @@ const routes: Routes = [
component
:
SummaryReportComponent
},
{
path
:
'account'
,
component
:
AccountComponent
},
{
path
:
''
,
redirectTo
:
'home'
,
pathMatch
:
'full'
...
...
frontend/angular/src/app/my-career-web/dashboard/dashboard/dashboard.component.html
View file @
e5295b93
<div
class=
"row"
style=
"min-height: 100vh;"
*
ngIf=
"!isMobileView"
>
<div
class=
"col-md-12 dashboard-wrapper"
style=
"padding: 0; min-height: 100vh;"
>
<div
class=
"col-md-12 dashboard-wrapper"
style=
"padding: 0; min-height: 100vh;"
[
ngClass
]="{
hiddenTasks:
hideTaskBar
}"
>
<div
class=
"dashboard-left-sidebar"
>
<app-left-sidebar></app-left-sidebar>
...
...
@@ -9,7 +9,7 @@
<router-outlet></router-outlet>
</div>
<div
class=
"dashboard-right-sidebar"
>
<div
class=
"dashboard-right-sidebar"
*
ngIf=
"!hideTaskBar"
>
<app-profile-tasks></app-profile-tasks>
</div>
</div>
...
...
frontend/angular/src/app/my-career-web/dashboard/dashboard/dashboard.component.scss
View file @
e5295b93
...
...
@@ -7,12 +7,21 @@
background
:
#FAFCFD
;
position
:
relative
;
&
.hiddenTasks
{
justify-content
:
flex-start
;
.dashboard-content
{
flex
:
1
;
}
}
.dashboard
{
&
-left-sidebar
,
&
-right-sidebar
{
min-height
:
100vh
;
box-shadow
:
0
0
20px
0
rgba
(
128
,
130
,
133
,
0
.13
);
min-width
:
260px
;
max-width
:
260px
;
width
:
18%
;
background
:
#fff
;
}
...
...
frontend/angular/src/app/my-career-web/dashboard/dashboard/dashboard.component.ts
View file @
e5295b93
...
...
@@ -6,6 +6,7 @@ import { takeUntil } from 'rxjs/operators';
import
{
PersonalDetailsService
}
from
'../../services/personal-details.service'
;
import
{
CareerProfileModel
}
from
'../../models/career-profile.model'
;
import
{
environment
}
from
'../../../../environments/environment'
;
import
{
HelperService
}
from
'../../services/helper.service'
;
@
Component
({
selector
:
'app-dashboard'
,
...
...
@@ -17,16 +18,24 @@ export class DashboardComponent extends BaseComponent implements OnInit {
showMobileNav
;
careerProfile
=
new
CareerProfileModel
();
unassumeLink
=
`
${
environment
.
baseUrl
}
unassume_mc.jsp`
;
hideTaskBar
=
false
;
constructor
(
private
authService
:
AuthService
,
private
router
:
Router
,
private
helperService
:
HelperService
,
private
personalDetailsService
:
PersonalDetailsService
)
{
super
();
}
ngOnInit
():
void
{
this
.
helperService
.
hideTaskBar$
()
.
pipe
(
takeUntil
(
this
.
componentInView
))
.
subscribe
(
response
=>
{
this
.
hideTaskBar
=
response
;
});
this
.
personalDetailsService
.
careerProfileUpdated$
.
pipe
(
takeUntil
(
this
.
componentInView
))
.
subscribe
(
response
=>
{
...
...
frontend/angular/src/app/my-career-web/dashboard/left-sidebar/left-sidebar.component.html
View file @
e5295b93
...
...
@@ -32,7 +32,7 @@
</div>
<div
class=
"sidebar-navigation-item"
>
<div
class=
"sidebar-navigation-item"
routerLink=
"/my-career-web/dashboard/account"
routerLinkActive=
"active"
>
<span
class=
"sidebar-navigation-item-icon"
>
<i
class=
"fa fa-gear"
></i>
</span>
...
...
frontend/angular/src/app/my-career-web/services/helper.service.ts
View file @
e5295b93
import
{
Injectable
}
from
'@angular/core'
;
import
{
FormArray
,
FormControl
,
FormGroup
}
from
'@angular/forms'
;
import
{
Observable
,
Subject
}
from
'rxjs'
;
@
Injectable
()
export
class
HelperService
{
private
_hideTaskBar$
=
new
Subject
<
boolean
>
();
hideTaskBar$
():
Observable
<
boolean
>
{
return
this
.
_hideTaskBar$
.
asObservable
();
}
set
hideTaskBar
(
value
)
{
this
.
_hideTaskBar$
.
next
(
value
);
}
validateAllFormFields
(
form
?:
any
):
void
{
const
formObj
=
typeof
form
.
form
?
form
.
form
:
form
;
Object
...
...
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