Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract title/description to vaadin-login-overlay #48

Merged
merged 9 commits into from
Dec 14, 2018
Merged

Extract title/description to vaadin-login-overlay #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8a4407a
Move title/description to vaadin-login-overlay
DiegoCardoso Dec 11, 2018
23f90b1
Add title/description props to VLOE
DiegoCardoso Dec 12, 2018
19cba78
Extract vaadin-login-overlay-element
DiegoCardoso Dec 12, 2018
711135b
Avoid using ::slotted() due IE11 issuess
DiegoCardoso Dec 12, 2018
8c3bf8d
Fix review changes request
DiegoCardoso Dec 13, 2018
978d3e7
Remove commented line
DiegoCardoso Dec 13, 2018
937f201
Fix demo for IE11
DiegoCardoso Dec 13, 2018
d775e60
Fix review comments
DiegoCardoso Dec 14, 2018
d4dddd9
Fix license header to Apache 2
DiegoCardoso Dec 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions demo/element-basic-demos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ <h3>Login opened in full screen</h3>
</vaadin-dialog>
<script>
window.addDemoReadyListener('#login-overlay', function(document) {
const button = document.querySelector('vaadin-button');
const vaadinLoginOverlay = document.querySelector('vaadin-login-overlay');
const feedbackDialog = document.querySelector('#feedbackDialog');
var button = document.querySelector('vaadin-button');
var vaadinLoginOverlay = document.querySelector('vaadin-login-overlay');
var feedbackDialog = document.querySelector('#feedbackDialog');

const i18n = Object.assign(
var i18n = Object.assign(
{},
vaadinLoginOverlay.i18n,
{additionalInformation: 'For this demo, use admin/admin to a successful login.'}
Expand All @@ -79,9 +79,11 @@ <h3>Login opened in full screen</h3>
vaadinLoginOverlay.opened = true;
});

vaadinLoginOverlay.addEventListener('login', (e) => {
vaadinLoginOverlay.addEventListener('login', function(e) {
feedbackDialog.opened = true;
const {username, password} = e.detail;
var detail = e.detail,
username = detail.username,
password = detail.password;

setTimeout(function() {
feedbackDialog.opened = false;
Expand Down
15 changes: 14 additions & 1 deletion demo/i18n-demos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,20 @@ <h3>Internationalization</h3>
<p>Set the <code>i18n</code> object to localize the component</p>
<vaadin-demo-snippet id="login-demo-internationalisation">
<template preserve-content>
<vaadin-login></vaadin-login>
<style include="lumo-typography lumo-color">
</style>
</custom-style>
<style>
main {
display: flex;
justify-content: center;
background: var(--lumo-base-color) linear-gradient(var(--lumo-shade-5pct), var(--lumo-shade-5pct));
padding: var(--lumo-space-m);
}
</style>
<main>
<vaadin-login></vaadin-login>
</main>
<script>
window.addDemoReadyListener('#login-demo-internationalisation', function(document) {
const login = document.querySelector('vaadin-login');
Expand Down
16 changes: 0 additions & 16 deletions src/vaadin-login-mixin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,22 +116,6 @@
};
},
notify: true
},
/**
* Defines the application title
*/
title: {
type: String,
value: 'App name',
notify: true
},
/**
* Defines the application description
*/
description: {
type: String,
value: 'Application description',
notify: true
}
};
}
Expand Down
100 changes: 100 additions & 0 deletions src/vaadin-login-overlay-element.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<!--
@license
Vaadin Login
Copyright (C) 2018 Vaadin Ltd
This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
-->

<link rel="import" href="../../polymer/polymer-element.html">
<link rel="import" href="../../vaadin-overlay/src/vaadin-overlay.html">

<dom-module id="vaadin-login-overlay-element-template">
<template>
<style>
[part="overlay"] {
outline: none;
}

[part="card"] {
max-width: 100%;
box-sizing: border-box;
overflow: hidden;
display: flex;
flex-direction: column;
}

[part="brand"] {
box-sizing: border-box;
overflow: hidden;
flex-grow: 1;
flex-shrink: 0;
display: flex;
flex-direction: column;
justify-content: flex-end;
}

[part="brand"] h1 {
color: inherit;
margin: 0;
}
</style>
<section part="card">
<div part="brand">
<h1>[[title]]</h1>
<p>[[description]]</p>
</div>
<div part="form">
<slot></slot>
</div>
</section>
</template>
<script>
(function() {
let memoizedTemplate;

/**
* The overlay element
*
* @memberof Vaadin
* @private
*/
class LoginOverlayElement extends Vaadin.OverlayElement {
static get is() {
return 'vaadin-login-overlay-element';
}

static get properties() {
return {
title: {
type: String
},
description: {
type: String
}
};
}

static get template() {
if (!memoizedTemplate) {
// Clone the superclass template
memoizedTemplate = super.template.cloneNode(true);

// Retrieve the elements from component's template
const thisTemplate = Polymer.DomModule.import(this.is + '-template', 'template');
const card = thisTemplate.content.querySelector('[part=card]');
const styles = thisTemplate.content.querySelector('style');

// Append elements to cloned template
const content = memoizedTemplate.content.querySelector('#content');
content.replaceChild(card, content.children[0]);
content.appendChild(styles);
}

return memoizedTemplate;
}
}

customElements.define(LoginOverlayElement.is, LoginOverlayElement);
})();
</script>
</dom-module>
67 changes: 35 additions & 32 deletions src/vaadin-login-overlay.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,30 @@
<link rel="import" href="../../polymer/polymer-element.html">
<link rel="import" href="../../vaadin-themable-mixin/vaadin-themable-mixin.html">
<link rel="import" href="../../vaadin-element-mixin/vaadin-element-mixin.html">
<link rel="import" href="../../vaadin-overlay/src/vaadin-overlay.html">

<link rel="import" href="vaadin-login.html">
<link rel="import" href="vaadin-login-mixin.html">
<link rel="import" href="vaadin-login-overlay-element.html">

<dom-module id="vaadin-login-overlay-styles" theme-for="vaadin-login-overlay-element">
<template>
<style>
[part="overlay"] {
outline: none;
}
</style>
</template>
</dom-module>

<dom-module id="vaadin-login-overlay">
<template>
<vaadin-login-overlay-element id="overlay" opened="{{opened}}" focus-trap with-backdrop>
<vaadin-login
<vaadin-login-overlay-element id="overlay" opened="{{opened}}" focus-trap with-backdrop title="[[title]]" description="[[description]]">
<vaadin-login
theme="with-overlay"
id="login"
action="{{action}}"
disabled="{{disabled}}"
error="{{error}}"
no-forgot-password="{{noForgotPassword}}"
i18n="{{i18n}}"
title="{{title}}"
description="{{description}}"
on-login="_handleEvent"
on-forgot-password="_handleEvent">
</vaadin-login>
</vaadin-login-overlay-element>
</template>
<script>
(function() {

/**
* The overlay element
*
* @memberof Vaadin
* @private
*/
class LoginOverlayElement extends Vaadin.OverlayElement {
static get is() {
return 'vaadin-login-overlay-element';
}
}

customElements.define(LoginOverlayElement.is, LoginOverlayElement);


/**
* `<vaadin-login-overlay>` is a Web Component.
*
Expand All @@ -79,15 +52,35 @@

static get properties() {
return {
/**
* Defines the application description
*/
description: {
type: String,
value: 'Application description',
notify: true
DiegoCardoso marked this conversation as resolved.
Show resolved Hide resolved
},
opened: {
type: Boolean,
value: false,
observer: '_onOpenedChange',
notify: true
observer: '_onOpenedChange'
},
/**
* Defines the application title
*/
title: {
type: String,
value: 'App name'
}
};
}

static get observers() {
return [
'__i18nChanged(i18n.header.*)'
];
}

ready() {
super.ready();

Expand All @@ -109,6 +102,16 @@
this.$.overlay.opened = false;
}


__i18nChanged(i18n) {
const header = i18n.base;
if (!header) {
return;
}
this.title = header.title;
this.description = header.description;
}

_preventClosingLogin(e) {
e.preventDefault();
}
Expand Down
81 changes: 18 additions & 63 deletions src/vaadin-login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,8 @@
display: none !important;
}

[part="card"] {
max-width: 100%;
box-sizing: border-box;
overflow: hidden;
display: flex;
flex-direction: column;
}

[part="brand"] {
box-sizing: border-box;
overflow: hidden;
flex-grow: 1;
flex-shrink: 0;
display: flex;
flex-direction: column;
justify-content: flex-end;
}

[part="brand"] h1 {
color: inherit;
margin: 0;
}

[part="form"] {
flex: none;
flex: 1;
display: flex;
flex-direction: column;
box-sizing: border-box;
Expand All @@ -72,32 +49,25 @@
position: relative;
}
</style>
<section part="card">
<div part="brand">
<h1>[[title]]</h1>
<p>[[description]]</p>
<section part="form">
<h2>[[i18n.form.title]]</h2>
<div part="error-message" hidden$="[[!error]]">
<h5>[[i18n.errorMessage.title]]</h5>
<p>[[i18n.errorMessage.message]]</p>
</div>
<iron-form id="loginForm" allow-redirect>
<form method="POST" action$="[[action]]">
<vaadin-text-field label="[[i18n.form.username]]" name="username" id="username" required on-keydown="_handleInputKeydown"></vaadin-text-field>
<vaadin-password-field label="[[i18n.form.password]]" name="password" id="password" required on-keydown="_handleInputKeydown"></vaadin-password-field>

<div part="form">
<h2>[[i18n.form.title]]</h2>
<div part="error-message" hidden$="[[!error]]">
<h5>[[i18n.errorMessage.title]]</h5>
<p>[[i18n.errorMessage.message]]</p>
</div>
<iron-form id="loginForm" allow-redirect>
<form method="POST" action$="[[action]]">
<vaadin-text-field label="[[i18n.form.username]]" name="username" id="username" required on-keydown="_handleInputKeydown"></vaadin-text-field>
<vaadin-password-field label="[[i18n.form.password]]" name="password" id="password" required on-keydown="_handleInputKeydown"></vaadin-password-field>

<vaadin-button id="submit" theme="primary contained" on-click="submit" disabled$="[[disabled]]">[[i18n.form.submit]]</vaadin-button>
</form>
</iron-form>

<vaadin-button id="forgotPasswordButton" theme="tertiary small" on-click="_forgotPassword" hidden$="[[noForgotPassword]]">[[i18n.form.forgotPassword]]</vaadin-button>

<div part="footer">
<p>[[i18n.additionalInformation]]</p>
</div>
<vaadin-button id="submit" theme="primary contained" on-click="submit" disabled$="[[disabled]]">[[i18n.form.submit]]</vaadin-button>
</form>
</iron-form>

<vaadin-button id="forgotPasswordButton" theme="tertiary small" on-click="_forgotPassword" hidden$="[[noForgotPassword]]">[[i18n.form.forgotPassword]]</vaadin-button>

<div part="footer">
<p>[[i18n.additionalInformation]]</p>
</div>
</section>
</template>
Expand Down Expand Up @@ -126,21 +96,6 @@ <h5>[[i18n.errorMessage.title]]</h5>
return '1.0.0-alpha3';
}

static get observers() {
return [
'__i18nChanged(i18n.header.*)'
];
}

__i18nChanged(i18n) {
const header = i18n.base;
if (!header) {
return;
}
this.title = header.title;
this.description = header.description;
}

submit() {
if (this.disabled || !(this.$.username.validate() && this.$.password.validate())) {
return;
Expand Down
Loading