@things-factory/auth-ui 7.0.0-alpha.9 → 7.0.0

package/client/entries/auth/checkin.ts

@@ -1,5 +1,6 @@
-import '@material/mwc-button'
-import '@material/mwc-icon'
+import '@material/web/icon/icon.js'
+import '@material/web/button/elevated-button.js'
+
 import '@operato/lottie-player'
 
 import { css, html, LitElement } from 'lit'
@@ -20,12 +21,14 @@ export class AuthCheckIn extends localize(i18next)(LitElement) {
         display: flex;
         flex-direction: column;
         margin: auto;
-        background-color: var(--auth-background);
+        background-color: var(--md-sys-color-primary);
+        color: var(--md-sys-color-on-primary);
         height: 100vh;
         height: 100dvh;
       }
       .header {
-        background-color: var(--primary-color);
+        background-color: var(--md-sys-color-primary);
+        color: var(--md-sys-color-on-primary);
         height: var(--checkin-header-height);
       }
       .content {
@@ -34,32 +37,32 @@ export class AuthCheckIn extends localize(i18next)(LitElement) {
       }
 
       .domains {
-        margin: var(--margin-wide) 0;
+        margin: var(--spacing-large) 0;
         padding: 0;
-        background-color: var(--theme-white-color);
+        background-color: var(--md-sys-color-surface);
+        color: var(--md-sys-color-on-surface);
         border-radius: var(--border-radius);
-        border: var(--border-dark-color);
+        border: var(--border-dim-color);
         list-style: none;
       }
       li {
-        border-bottom: var(--border-dark-color);
+        border-bottom: var(--border-dim-color);
         margin-bottom: -1px;
-        padding: var(--padding-default) var(--padding-wide);
+        padding: var(--spacing-medium) var(--spacing-large);
         font-size: 18px;
-        color: var(--secondary-color);
         text-align: left;
 
         cursor: pointer;
       }
       li:hover {
-        background-color: rgba(var(--primary-color-rgb), 0.2);
+        background-color: var(--md-sys-color-primary-container);
+        color: var(--md-sys-color-on-primary-container);
       }
       li span {
         display: block;
         font: normal var(--fontsize-default) var(--theme-font);
-        color: var(--secondary-text-color);
       }
-      li mwc-icon {
+      li md-icon {
         float: right;
         margin: 2px 0 0 0;
         opacity: 0.5;
@@ -67,14 +70,14 @@ export class AuthCheckIn extends localize(i18next)(LitElement) {
       .button-container {
         text-align: center;
       }
-      .button-container mwc-button {
-        margin-left: var(--margin-narrow);
+      .button-container md-elevated-button {
+        margin-left: var(--spacing-small);
       }
 
       @media (max-width: 450px) {
-        .button-container mwc-button {
+        .button-container md-elevated-button {
           width: 100%;
-          margin: var(--margin-default) 0 0 0;
+          margin: var(--spacing-medium) 0 0 0;
         }
       }
     `,
@@ -93,7 +96,7 @@ export class AuthCheckIn extends localize(i18next)(LitElement) {
     var { icon, title, description } = this.applicationMeta
 
     return html`
-      <div class="content">
+      <div class="content md-typescale-display-medium">
         <div class="wrap">
           <div class="auth-brand">
             <img src=${icon || ''} />
@@ -110,11 +113,9 @@ export class AuthCheckIn extends localize(i18next)(LitElement) {
                     domain => html`
                       <li
                         @click=${() =>
-                          (location.href = `/auth/checkin/${domain.subdomain}?redirect_to=${encodeURIComponent(
-                            this.redirectTo || '/'
-                          )}`)}
+                          (location.href = `/auth/checkin/${domain.subdomain}?redirect_to=${encodeURIComponent(this.redirectTo || '/')}`)}
                       >
-                        <mwc-icon>keyboard_arrow_right</mwc-icon>
+                        <md-icon>keyboard_arrow_right</md-icon>
                         <strong>${domain.name}</strong>
                         <span>${domain.description}</span>
                       </li>
@@ -125,18 +126,15 @@ export class AuthCheckIn extends localize(i18next)(LitElement) {
             : html` <h3>${i18next.t('text.no domain available')}</h3> `}
 
           <div class="button-container">
-            <mwc-button
-              raised
-              label=${String(i18next.t('button.logout'))}
-              @click="${() => (location.pathname = '/auth/signout')}"
-            ></mwc-button>
+            <md-elevated-button @click=${() => (location.pathname = '/auth/signout')}
+              >${String(i18next.t('button.logout'))}</md-elevated-button
+            >
 
             ${this.domainType?.toLowerCase() === 'company'
-              ? html`<mwc-button
-                  raised
-                  label=${String(i18next.t('button.register business domain'))}
+              ? html`<md-elevated-button
                   @click=${e => (location.href = `/public/business-register?email=${this.user?.email}`)}
-                ></mwc-button> `
+                  >${String(i18next.t('button.register business domain'))}</md-elevated-button
+                > `
               : ''}
           </div>
 

package/client/entries/auth/forgot-password.ts

@@ -1,4 +1,6 @@
-import '@material/mwc-button'
+import '@material/web/button/elevated-button.js'
+import '@material/web/button/text-button.js'
+
 import '@operato/i18n/ox-i18n.js'
 import '../../components/profile-component'
 
@@ -26,29 +28,33 @@ export class ForgotPassword extends AbstractAuthPage {
     const email = this.data?.email || ''
 
     return html`
-      <input id="email" name="email" type="hidden" required .value=${email} />
       <div class="field">
-        <mwc-textfield
+        <md-filled-text-field
           name="email"
           type="email"
           label=${String(i18next.t('label.email'))}
           .value=${email}
           required
-          @input=${e => {
-            this.emailInput.value = e.target.value
+          @input=${(e: Event) => {
+            const target = e.target as HTMLInputElement
+            if (target.validity.typeMismatch) {
+              target.setCustomValidity(i18next.t('text.invalid-email'))
+            } else {
+              target.setCustomValidity('')
+            }
           }}
-        ></mwc-textfield>
+        ></md-filled-text-field>
       </div>
-      <mwc-button id="submit-button" class="ui button" type="submit" raised @click=${e => this._onSubmit(e)}>
+      <md-elevated-button id="submit-button" class="ui button" type="submit" @click=${e => this._onSubmit(e)}>
         <ox-i18n msgid="button.submit"></ox-i18n>
-      </mwc-button>
+      </md-elevated-button>
     `
   }
 
   get links() {
     return html`
       <a class="link" href="/auth/signin">
-        <mwc-button><ox-i18n msgid="field.sign in"></ox-i18n></mwc-button>
+        <md-text-button><ox-i18n msgid="field.sign in"></ox-i18n></md-text-button>
       </a>
     `
   }

package/client/entries/auth/result.ts

@@ -1,6 +1,7 @@
-import '@material/mwc-button'
-import '../../components/profile-component'
+import '@material/web/button/elevated-button.js'
+
 import '@operato/lottie-player'
+import '../../components/profile-component'
 
 import { css, html, LitElement } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
@@ -17,7 +18,8 @@ export class AuthResult extends localize(i18next)(LitElement) {
         width: 100vw;
         height: 100vh;
         height: 100dvh;
-        background-color: var(--auth-background);
+        background-color: var(--md-sys-color-primary);
+        color: var(--md-sys-color-on-primary);
       }
       .wrap {
         display: block;
@@ -32,7 +34,7 @@ export class AuthResult extends localize(i18next)(LitElement) {
       .auth-brand img {
         margin: 15% auto 5px auto;
         width: 100px;
-        border: 3px solid var(--theme-white-color);
+        border: 3px solid var(--md-sys-color-on-primary);
         border-radius: 25px;
         box-shadow: var(--box-shadow);
       }
@@ -45,13 +47,13 @@ export class AuthResult extends localize(i18next)(LitElement) {
         margin: 50px 0 0 0;
         padding: 0;
         font-size: 24px;
-        color: var(--auth-title-color);
+        color: var(--auth-title-color, var(--md-sys-color-on-primary));
       }
       p {
         margin: 0;
         padding: var(--auth-description-padding);
         font: var(--auth-description-font);
-        color: var(--auth-description-color);
+        color: var(--auth-description-color, var(--md-sys-color-on-secondary));
       }
       :host *:focus {
         outline: none;
@@ -60,25 +62,26 @@ export class AuthResult extends localize(i18next)(LitElement) {
         background: url(/assets/images/icon-profile.png) center top no-repeat;
         margin: var(--profile-icon-margin);
         padding: 180px 20px 20px 20px;
-        color: var(--secondary-color);
+        color: var(--md-sys-color-secondary);
         font: var(--header-bar-title);
         text-align: center;
       }
 
       label {
         font: bold 14px var(--theme-font);
-        color: var(--primary-color);
+        color: var(--md-sys-color-primary);
       }
+
       #button-area {
         border-top: 1px dashed rgba(0, 0, 0, 0.1);
         padding-top: 10px;
       }
-      mwc-button {
-        --mdc-theme-primary: var(--auth-button-background-color);
-        --mdc-theme-on-primary: var(--primary-color);
-        --mdc-button-horizontal-padding: var(--padding-default);
-        --mdc-button-ink-color: var(--primary-color);
+
+      md-elevated-button {
+        --md-button-horizontal-padding: var(--spacing-medium);
+        --md-button-ink-color: var(--md-sys-color-primary);
       }
+
       .lottie-container {
         width: 100%;
         height: 300px;
@@ -151,14 +154,14 @@ export class AuthResult extends localize(i18next)(LitElement) {
           <p></p>
         </div>
         <div id="button-area">
-          <mwc-button
-            icon="home"
-            raised
-            label="${i18next.t('button.go to home')}"
+          <md-elevated-button
             @click=${e => {
               window.location.replace('/auth/signin')
             }}
-          ></mwc-button>
+          >
+            <md-icon slot="icon">home</md-icon>
+            ${i18next.t('button.go to home')}
+          </md-elevated-button>
         </div>
 
         ${isSafari()

package/client/entries/auth/signin.ts

@@ -11,4 +11,8 @@ export class AuthSignin extends AbstractSign {
   get actionUrl() {
     return '/auth/signin'
   }
+
+  get autocompletable() {
+    return true
+  }
 }

package/client/entries/auth/signup.ts

@@ -26,28 +26,41 @@ export class AuthSignup extends AbstractSign {
   get formfields() {
     const { name = '', email = '' } = this.data || {}
 
+    // .validationMessage=${this.passwordHelp || ''}
+    // .validationMessage=${String(i18next.t('text.passwords do not match'))}
+
     return html`
       <div class="field">
-        <mwc-textfield
+        <md-filled-text-field
           name="name"
           type="text"
           label=${String(i18next.t('field.name'))}
           .value=${name}
           required
-        ></mwc-textfield>
+        ></md-filled-text-field>
       </div>
       <div class="field">
-        <mwc-textfield
+        <md-filled-text-field
           name="email"
           type="email"
           label=${String(i18next.t('field.email'))}
           required
           .value=${email}
-          .validationMessage=${String(i18next.t('text.invalid-email'))}
-        ></mwc-textfield>
+          autocapitalize="off"
+          autocomplete="off"
+          @input=${(e: Event) => {
+            const target = e.target as HTMLInputElement
+            if (target.validity.typeMismatch) {
+              target.setCustomValidity(i18next.t('text.invalid-email'))
+            } else {
+              target.setCustomValidity('')
+            }
+          }}
+          ><md-icon slot="leading-icon">mail</md-icon></md-filled-text-field
+        >
       </div>
       <div class="field">
-        <mwc-textfield
+        <md-filled-text-field
           name="password"
           type="password"
           label=${String(i18next.t('field.password'))}
@@ -55,26 +68,30 @@ export class AuthSignup extends AbstractSign {
           helper=${this.passwordHelp || ''}
           helperPersistent
           required
+          autocomplete="off"
           @input=${e => {
             var val = e.target.value
             this.confirmPass.setAttribute('pattern', val.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '[$&]'))
           }}
-          .validationMessage=${this.passwordHelp || ''}
-        ></mwc-textfield>
+        >
+          ></md-filled-text-field
+        >
       </div>
       <div class="field">
-        <mwc-textfield
+        <md-filled-text-field
           id="confirm-password"
           name="confirm-password"
           type="password"
+          autocomplete="off"
           label=${String(i18next.t('field.confirm password'))}
           required
-          .validationMessage=${String(i18next.t('text.passwords do not match'))}
-        ></mwc-textfield>
+        >
+          ></md-filled-text-field
+        >
       </div>
-      <mwc-button class="ui button" raised @click=${e => this._onSubmit(e)}>
+      <md-elevated-button class="ui button" @click=${e => this._onSubmit(e)}>
         <ox-i18n msgid="field.${this.pageName}"></ox-i18n>
-      </mwc-button>
+      </md-elevated-button>
     `
   }
 
@@ -86,7 +103,7 @@ export class AuthSignup extends AbstractSign {
   get links() {
     return html`
       <a class="link" href="/auth/signin">
-        <mwc-button><ox-i18n msgid="field.sign in"></ox-i18n></mwc-button>
+        <md-text-button><ox-i18n msgid="field.sign in"></ox-i18n></md-text-button>
       </a>
     `
   }

package/client/entries/oauth2/oauth2-decision-error-page.ts

@@ -1,4 +1,4 @@
-import '@material/mwc-button'
+import '@material/web/button/elevated-button.js'
 
 import { html, LitElement } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
@@ -33,7 +33,7 @@ class OAuth2DecisionErrorPage extends LitElement {
         <input name="state" type="text" value="${this.req.state}" hidden />
         <input name="email" type="text" value="${this.user.email}" hidden />
 
-        <mwc-button raised @click="${() => history.back()}">Move back</mwc-button>
+        <md-elevated-button raised @click="${() => history.back()}">Move back</md-elevated-button>
       </form>
     `
   }

package/client/entries/oauth2/oauth2-decision-page.ts

@@ -1,4 +1,4 @@
-import '@material/mwc-button'
+import '@material/web/button/elevated-button.js'
 import '../../components/role-selector'
 
 import gql from 'graphql-tag'
@@ -8,60 +8,61 @@ import { customElement, property, query } from 'lit/decorators.js'
 import { client } from '@operato/graphql'
 import { i18next } from '@operato/i18n'
 import { OxPrompt } from '@operato/popup/ox-prompt.js'
+import { ButtonContainerStyles } from '@operato/styles'
 
 @customElement('oauth2-decision')
 class OAuth2DecisionPage extends LitElement {
-  static styles = css`
-    :host {
-      display: flex;
-      flex-direction: column;
-
-      border: 1px solid var(--primary-color);
-      margin: var(--margin-default);
-      padding: var(--padding-default);
-      font: normal 15px var(--theme-font);
-      color: var(--secondary-color);
-    }
-    [field-2column] {
-      border-radius: var(--border-radius);
-      display: grid;
-      grid-template-columns: 1fr 1fr;
-      gap: 5px 15px;
-      clear: both;
-      max-width: var(--input-container-max-width);
-    }
-    [field] {
-      display: flex;
-      flex-direction: column;
-      padding-bottom: var(--padding-default);
-    }
-    input {
-      border: var(--border-dark-color);
-      border-radius: var(--border-radius);
-      margin: var(--input-margin);
-      padding: var(--input-padding);
-      min-width: 250px;
-      font: var(--input-font);
-    }
-    label {
-      display: flex;
-      flex-direction: column;
-      font: var(--label-font);
-      color: var(--label-color);
-      text-transform: var(--label-text-transform);
-    }
-    [buttons] {
-      margin: 0;
-      padding: var(--padding-default);
-      background-color: rgba(var(--primary-color-rgb), 0.2);
-    }
-    mwc-button {
-      margin-right: var(--padding-narrow);
-    }
-    [danger] {
-      --mdc-theme-primary: var(--mdc-danger-button-primary-color);
-    }
-  `
+  static styles = [
+    ButtonContainerStyles,
+    css`
+      :host {
+        display: flex;
+        flex-direction: column;
+
+        border: 1px solid var(--md-sys-color-primary);
+        margin: var(--spacing-medium);
+        padding: var(--spacing-medium);
+        font: normal 15px var(--theme-font);
+        color: var(--md-sys-color-secondary);
+      }
+
+      [field-2column] {
+        border-radius: var(--border-radius);
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 5px 15px;
+        clear: both;
+        max-width: var(--input-container-max-width);
+      }
+
+      [field] {
+        display: flex;
+        flex-direction: column;
+        padding-bottom: var(--spacing-medium);
+      }
+
+      input {
+        border: var(--border-dim-color);
+        border-radius: var(--border-radius);
+        margin: var(--input-margin);
+        padding: var(--input-padding);
+        min-width: 250px;
+        font: var(--input-font);
+      }
+
+      label {
+        display: flex;
+        flex-direction: column;
+        font: var(--label-font);
+        color: var(--label-color, var(--md-sys-color-on-surface));
+        text-transform: var(--label-text-transform);
+      }
+
+      md-elevated-button {
+        margin-right: var(--spacing-small);
+      }
+    `
+  ]
 
   @property({ type: Object }) data: any = {}
   @property({ type: Object }) user: any = {}
@@ -109,9 +110,9 @@ class OAuth2DecisionPage extends LitElement {
 
       <role-selector .roleCategory="${this.domain.name}" .roles="${this.roles}"></role-selector>
 
-      <div buttons>
-        <mwc-button @click="${() => this.decision(true)}" raised label="Allow"></mwc-button>
-        <mwc-button @click="${() => this.decision(false)}" raised danger label="Deny"></mwc-button>
+      <div class="button-container">
+        <md-elevated-button @click="${() => this.decision(true)}" raised label="Allow"></md-elevated-button>
+        <md-elevated-button @click="${() => this.decision(false)}" raised danger label="Deny"></md-elevated-button>
       </div>
     `
   }