Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Toolkit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
digital blueprint
Web Component Framework
Toolkit
Commits
b0579eba
Commit
b0579eba
authored
4 years ago
by
Reiter, Christoph
Browse files
Options
Downloads
Patches
Plain Diff
Port to vpu-auth-button
parent
58d409ec
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/app-shell/src/app-shell.js
+4
-2
4 additions, 2 deletions
packages/app-shell/src/app-shell.js
packages/app-shell/vendor/auth
+1
-1
1 addition, 1 deletion
packages/app-shell/vendor/auth
with
5 additions
and
3 deletions
packages/app-shell/src/app-shell.js
+
4
−
2
View file @
b0579eba
...
...
@@ -3,7 +3,7 @@ import {html, css, LitElement} from 'lit-element';
import
{
ScopedElementsMixin
}
from
'
@open-wc/scoped-elements
'
;
import
{
LanguageSelect
}
from
'
vpu-language-select
'
;
import
{
Icon
,
EventBus
}
from
'
vpu-common
'
;
import
{
Auth
}
from
'
vpu-auth
'
;
import
{
Auth
,
AuthButton
}
from
'
vpu-auth
'
;
import
{
Notification
}
from
'
vpu-notification
'
;
import
*
as
commonStyles
from
'
vpu-common/styles
'
;
import
*
as
commonUtils
from
'
vpu-common/utils
'
;
...
...
@@ -66,6 +66,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
'
vpu-tugraz-logo
'
:
TUGrazLogo
,
'
vpu-build-info
'
:
BuildInfo
,
'
vpu-auth
'
:
Auth
,
'
vpu-auth-button
'
:
AuthButton
,
'
vpu-notification
'
:
Notification
,
'
vpu-icon
'
:
Icon
,
};
...
...
@@ -708,6 +709,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
return
html
`
<slot class="
${
slotClassMap
}
"></slot>
<vpu-auth lang="
${
this
.
lang
}
" keycloak-config="
${
JSON
.
stringify
(
this
.
keycloakConfig
)}
" load-person try-login></vpu-auth>
<div class="
${
mainClassMap
}
">
<div id="main">
<vpu-notification lang="
${
this
.
lang
}
"></vpu-notification>
...
...
@@ -718,7 +720,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
<div class="hd1-middle">
</div>
<div class="hd1-right">
<vpu-auth class="auth-button" lang="
${
this
.
lang
}
"
keycloak-config="
${
JSON
.
stringify
(
this
.
keycloakConfig
)}
" load-person try-login
></vpu-auth>
<vpu-auth
-button
class="auth-button" lang="
${
this
.
lang
}
"></vpu-auth
-button
>
</div>
<div class="hd2-left">
<div class="header">
...
...
This diff is collapsed.
Click to expand it.
auth
@
46cecbc4
Subproject commit 4
594a22095b2a7a06c0f91ec0a51a0a55125b356
Subproject commit 4
6cecbc422e0c25ff9b0336c2c1bd7083117306f
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment