Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
feudal
feudalWebpage
Commits
6e87dc8c
Commit
6e87dc8c
authored
Jan 19, 2019
by
Lukas Burgey
Browse files
WIP: Rename stuff
parent
8e571c0e
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/app/account/account.component.html
View file @
6e87dc8c
<div
*ngIf=
"(userService.
subscribeUser
() | async) as user"
class=
"mat-typography"
style=
"margin-bottom: 50px;"
>
<div
*ngIf=
"(userService.
userSrc
() | async) as user"
class=
"mat-typography"
style=
"margin-bottom: 50px;"
>
<h2>
User Info
</h2>
<p>
You can inspect the user information we received about you.
...
...
src/app/app.component.html
View file @
6e87dc8c
<header
feudal-header
></header>
<div
class=
"mat-typography"
class=
"body"
>
<div
*ngIf=
"(userService.
subscribeUser
() | async) as user"
style=
"max-width: 800px;"
class=
"centered"
>
<div
*ngIf=
"(userService.s
ubscribeSSH
Keys() | async)?.length > 0; else noCredentials"
>
<div
*ngIf=
"(userService.
userSrc
() | async) as user"
style=
"max-width: 800px;"
class=
"centered"
>
<div
*ngIf=
"(userService.s
sh
Keys
Src
() | async)?.length > 0; else noCredentials"
>
<div
style=
"margin-bottom: 50px;"
>
<h3>
Your services
</h3>
<mat-accordion
*ngIf=
"(userService.s
ubscribeS
ervices() | async) as services; else noServices"
>
<mat-accordion
*ngIf=
"(userService.services
Src
() | async) as services; else noServices"
>
<app-service
*ngFor=
"let service of services"
[service]=
"service"
></app-service>
</mat-accordion>
<ng-template
#noServices
>
...
...
@@ -15,7 +15,7 @@
</div>
<div>
<h3>
Your Virtual Organisations
</h3>
<mat-accordion
*ngIf=
"(userService.
subscribeVOs
() | async) as vos; else noVOs"
>
<mat-accordion
*ngIf=
"(userService.
vosSrc
() | async) as vos; else noVOs"
>
<app-vo-data
*ngFor=
"let vo of vos"
[vo]=
"vo"
></app-vo-data>
</mat-accordion>
<ng-template
#noVOs
>
...
...
src/app/dialogues/account/account.component.html
View file @
6e87dc8c
<div
*ngIf=
"(userService.
subscribeUser
() | async) as user"
class=
"mat-typography"
style=
"margin-bottom: 50px;"
>
<div
*ngIf=
"(userService.
userSrc
() | async) as user"
class=
"mat-typography"
style=
"margin-bottom: 50px;"
>
<h2>
User Info
</h2>
<p>
You can inspect the user information we received about you.
...
...
src/app/header/header.component.html
View file @
6e87dc8c
...
...
@@ -4,7 +4,7 @@
Federated User Credential Deployment Portal
</h1>
<div
class=
"header-bar"
>
<span
*ngIf=
"(userService.
subscribeUser
() | async) as user; else notLoggedIn"
>
<span
*ngIf=
"(userService.
userSrc
() | async) as user; else notLoggedIn"
>
<button
mat-button
mat-icon-button
(click)=
"dialog.openAccount()"
>
<mat-icon>
settings
</mat-icon>
</button>
...
...
src/app/sshkeys/sshkeys-data-source.ts
View file @
6e87dc8c
...
...
@@ -12,7 +12,7 @@ export class SSHKeysDataSource implements DataSource<SSHKey> {
)
{}
connect
(
collectionViewer
:
CollectionViewer
):
Observable
<
SSHKey
[]
>
{
return
this
.
userService
.
s
ubscribeSSH
Keys
();
return
this
.
userService
.
s
sh
Keys
Src
();
}
disconnect
(
collectionViewer
:
CollectionViewer
):
void
{
...
...
src/app/user.service.ts
View file @
6e87dc8c
...
...
@@ -56,7 +56,7 @@ export class UserService {
private
connect
():
void
{
this
.
fetch
();
this
.
subscribeUser
().
subscribe
(
this
.
userSrc
().
subscribe
(
(
newUser
:
User
)
=>
{
console
.
log
(
'
user$:
'
,
newUser
);
...
...
@@ -343,22 +343,22 @@ export class UserService {
// DATA SERVICE API
//
public
subscribeSpecific
<
T
>
(
selector
:
(
user
:
User
)
=>
T
):
Observable
<
T
>
{
return
this
.
subscribeUser
().
pipe
(
map
(
selector
));
return
this
.
userSrc
().
pipe
(
map
(
selector
));
}
public
s
ubscribeSSH
Keys
():
Observable
<
SSHKey
[]
>
{
public
s
sh
Keys
Src
():
Observable
<
SSHKey
[]
>
{
return
this
.
sshKeys$
.
asObservable
();
}
public
subscribeUser
():
Observable
<
User
>
{
public
userSrc
():
Observable
<
User
>
{
return
this
.
user$
.
asObservable
();
}
public
subscribeD
eployments
():
Observable
<
Deployment
[]
>
{
public
d
eployments
Src
():
Observable
<
Deployment
[]
>
{
return
this
.
deployments$
.
asObservable
();
}
public
subscribeDeployment
States
():
Observable
<
DeploymentState
[]
>
{
public
dep
States
Src
():
Observable
<
DeploymentState
[]
>
{
return
this
.
deploymentStates$
.
asObservable
();
}
...
...
@@ -371,7 +371,7 @@ export class UserService {
}
public
subscribeDeployment
(
selector
:
(
dep
:
Deployment
)
=>
boolean
):
Observable
<
Deployment
>
{
return
this
.
subscribeD
eployments
().
pipe
(
return
this
.
d
eployments
Src
().
pipe
(
map
((
deployments
:
Deployment
[])
=>
{
return
deployments
.
find
(
(
dep
:
Deployment
)
=>
selector
(
dep
),
...
...
@@ -381,11 +381,11 @@ export class UserService {
);
}
public
s
ubscribeS
ervices
():
Observable
<
Service
[]
>
{
public
services
Src
():
Observable
<
Service
[]
>
{
return
this
.
subscribeSpecific
(
this
.
serviceSelector
);
}
public
subscribeVOs
():
Observable
<
VO
[]
>
{
public
vosSrc
():
Observable
<
VO
[]
>
{
return
this
.
prefs
.
connect
().
pipe
(
combineLatest
(
this
.
user$
.
asObservable
(),
...
...
src/app/vo-data/vo-data.component.ts
View file @
6e87dc8c
...
...
@@ -44,7 +44,7 @@ export class VoDataComponent implements OnInit {
);
// this is just used when no deployment exists
this
.
userService
.
s
ubscribeS
ervices
().
subscribe
(
this
.
userService
.
services
Src
().
subscribe
(
(
services
:
Service
[])
=>
{
this
.
services
=
services
;
this
.
services$
.
next
(
this
.
services
);
...
...
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