@things-factory/auth-ui 7.0.1-alpha.9 → 7.0.1-alpha.90

package/client/components/user-role-editor.ts

@@ -1,3 +1,6 @@
+import '@material/web/icon/icon.js'
+import '@material/web/button/elevated-button.js'
+
 import './ownership-transfer-popup'
 import './role-selector'
 
@@ -11,12 +14,13 @@ import { i18next } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
 import { store } from '@operato/shell'
 import { OxPrompt } from '@operato/popup/ox-prompt.js'
-
+import { ButtonContainerStyles } from '@operato/styles'
 import { RoleSelector } from './role-selector'
 
 @customElement('user-role-editor')
 class UserRoleEditor extends connect(store)(LitElement) {
   static styles = [
+    ButtonContainerStyles,
     css`
       :host {
         display: flex;
@@ -51,9 +55,9 @@ class UserRoleEditor extends connect(store)(LitElement) {
       [detail] {
         background-color: rgba(var(--primary-color-rgb), 0.05);
       }
-      [detail] mwc-icon {
+      [detail] md-icon {
+        --md-icon-size: var(--fontsize-default);
         vertical-align: middle;
-        --mdc-icon-size: var(--fontsize-default);
         color: var(--primary-color);
       }
       [detail] li {
@@ -63,20 +67,15 @@ class UserRoleEditor extends connect(store)(LitElement) {
         flex: 1;
       }
 
-      [buttons] {
-        margin: 0;
-        padding: 5px;
-        background-color: rgba(var(--primary-color-rgb), 0.2);
-      }
-
-      mwc-button {
+      md-elevated-button {
         margin: 5px;
       }
 
       [danger] {
-        --mdc-theme-primary: var(--mdc-danger-button-primary-color);
+        --md-theme-primary: var(--md-danger-button-primary-color);
       }
-      [outlined] {
+
+      md-outlined-button {
         background-color: var(--theme-white-color);
       }
 
@@ -117,7 +116,7 @@ class UserRoleEditor extends connect(store)(LitElement) {
                 ? html`
                     <li>
                       <span>
-                        <mwc-icon>email</mwc-icon>
+                        <md-icon>email</md-icon>
                         ${user.email}
                       </span>
                     </li>
@@ -141,10 +140,9 @@ class UserRoleEditor extends connect(store)(LitElement) {
           `
         : ''}
 
-      <div buttons>
+      <div class="button-container">
         ${this.isRoleEditable()
-          ? html` <mwc-button
-              raised
+          ? html` <md-elevated-button
               @click=${() => {
                 const { availableRoles, selectedRoles } = Array.from(
                   this.renderRoot.querySelectorAll('role-selector') as NodeListOf<RoleSelector>
@@ -169,46 +167,37 @@ class UserRoleEditor extends connect(store)(LitElement) {
                 )
                 this.onSave(user, availableRoles, selectedRoles)
               }}
-              label=${String(i18next.t('button.save'))}
-            ></mwc-button>`
+              >${String(i18next.t('button.save'))}</md-elevated-button
+            >`
           : ''}
         ${user.userType === 'user'
           ? html`
               ${this.isTransferable(user)
                 ? html`
-                    <mwc-button
-                      raised
-                      danger
-                      @click=${() => this.onTransfer(user)}
-                      label=${String(i18next.t('button.transfer owner'))}
-                    ></mwc-button>
+                    <md-elevated-button danger @click=${() => this.onTransfer(user)}
+                      >${String(i18next.t('button.transfer owner'))}</md-elevated-button
+                    >
                   `
                 : ''}
               ${this.isPasswordResettable(user)
-                ? html`<mwc-button
-                    raised
-                    danger
-                    @click="${() => this.onResetPassword(user)}"
-                    label=${String(i18next.t('title.reset password'))}
-                  ></mwc-button>`
+                ? html`<md-elevated-button danger @click=${() => this.onResetPassword(user)}
+                    >${String(i18next.t('title.reset password'))}</md-elevated-button
+                  >`
                 : ''}
             `
           : ''}
         ${this.isRemovable(user)
           ? html`
-              <mwc-button
-                raised
-                danger
-                label=${String(i18next.t('button.delete user'))}
-                @click=${() => this.onDelete(user)}
-              ></mwc-button>
+              <md-elevated-button danger @click=${() => this.onDelete(user)}
+                >${String(i18next.t('button.delete user'))}</md-elevated-button
+              >
             `
           : ''}
         ${this.isActivatable(user)
-          ? html`<mwc-button raised danger @click="${() => this.onActivate(user)}" label="activate"></mwc-button>`
+          ? html`<md-elevated-button danger @click=${() => this.onActivate(user)}>activate</md-elevated-button>`
           : ''}
         ${this.isInactivatable(user)
-          ? html`<mwc-button raised danger @click="${() => this.onInactivate(user)}" label="inactivate"></mwc-button>`
+          ? html`<md-elevated-button danger @click=${() => this.onInactivate(user)}>inactivate</md-elevated-button>`
           : ''}
       </div>
     `

package/client/entries/auth/activate.ts

@@ -1,4 +1,6 @@
-import '@material/mwc-button'
+import '@material/web/icon/icon.js'
+import '@material/web/button/elevated-button.js'
+
 import '@operato/i18n/ox-i18n.js'
 import '@operato/layout/ox-snack-bar.js'
 import '@operato/lottie-player'
@@ -66,11 +68,11 @@ export class AuthActivate extends localize(i18next)(LitElement) {
         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-theme-primary: var(--auth-button-background-color);
+        --md-theme-on-primary: var(--primary-color);
+        --md-button-horizontal-padding: var(--padding-default);
+        --md-button-ink-color: var(--primary-color);
       }
 
       contact-us {
@@ -162,20 +164,18 @@ export class AuthActivate extends localize(i18next)(LitElement) {
         </form>
 
         <div id="button-area">
-          <mwc-button
-            raised
-            icon="mail_outline"
-            label=${i18next.t('label.send activation email')}
-            @click=${e => this.requestResend(e)}
-          ></mwc-button>
-          <mwc-button
-            raised
-            icon="home"
-            label=${i18next.t('button.go to home')}
+          <md-elevated-button @click=${e => this.requestResend(e)}>
+            <md-icon slot="icon">mail_outline</md-icon>
+            ${i18next.t('label.send activation email')}
+          </md-elevated-button>
+          <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>
         <contact-us></contact-us>
 

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'
@@ -59,7 +60,7 @@ export class AuthCheckIn extends localize(i18next)(LitElement) {
         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,12 +68,12 @@ export class AuthCheckIn extends localize(i18next)(LitElement) {
       .button-container {
         text-align: center;
       }
-      .button-container mwc-button {
+      .button-container md-elevated-button {
         margin-left: var(--margin-narrow);
       }
 
       @media (max-width: 450px) {
-        .button-container mwc-button {
+        .button-container md-elevated-button {
           width: 100%;
           margin: var(--margin-default) 0 0 0;
         }
@@ -93,7 +94,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 +111,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 +124,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'
 
@@ -28,7 +30,7 @@ export class ForgotPassword extends AbstractAuthPage {
     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'))}
@@ -37,18 +39,18 @@ export class ForgotPassword extends AbstractAuthPage {
           @input=${e => {
             this.emailInput.value = e.target.value
           }}
-        ></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'
@@ -73,11 +74,11 @@ export class AuthResult extends localize(i18next)(LitElement) {
         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-theme-primary: var(--auth-button-background-color);
+        --md-theme-on-primary: var(--primary-color);
+        --md-button-horizontal-padding: var(--padding-default);
+        --md-button-ink-color: var(--primary-color);
       }
       .lottie-container {
         width: 100%;
@@ -151,14 +152,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/signup.ts

@@ -26,28 +26,28 @@ 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
-          name="name"
-          type="text"
-          label=${String(i18next.t('field.name'))}
-          .value=${name}
-          required
-        ></mwc-textfield>
+        <md-filled-text-field name="name" type="text" label=${String(i18next.t('field.name'))} .value=${name} required></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>
+          @input=${(e: Event) => {
+            const target = e.target as HTMLFormElement
+            target.setCustomValidity(i18next.t('text.invalid-email'))
+          }}
+        ></md-filled-text-field>
       </div>
       <div class="field">
-        <mwc-textfield
+        <md-filled-text-field
           name="password"
           type="password"
           label=${String(i18next.t('field.password'))}
@@ -59,22 +59,18 @@ export class AuthSignup extends AbstractSign {
             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
-          id="confirm-password"
-          name="confirm-password"
-          type="password"
-          label=${String(i18next.t('field.confirm password'))}
-          required
-          .validationMessage=${String(i18next.t('text.passwords do not match'))}
-        ></mwc-textfield>
+        <md-filled-text-field id="confirm-password" name="confirm-password" type="password" label=${String(i18next.t('field.confirm password'))} required>
+          ></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 +82,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,65 @@ 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(--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);
+      }
+
+      md-elevated-button {
+        margin-right: var(--padding-narrow);
+      }
+
+      [danger] {
+        --md-theme-primary: var(--md-danger-button-primary-color);
+      }
+    `
+  ]
 
   @property({ type: Object }) data: any = {}
   @property({ type: Object }) user: any = {}
@@ -109,9 +114,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>
     `
   }