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

package/client/entries/public/home.ts

@@ -1,8 +1,10 @@
-import '@material/mwc-icon-button'
-import '@material/mwc-button'
+import '@material/web/icon/icon.js'
+import '@material/web/button/text-button.js'
+import '@material/web/button/elevated-button.js'
 
 import { css, html, LitElement } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
+import { ifDefined } from 'lit/directives/if-defined.js'
 
 import { i18next, localize } from '@operato/i18n'
 
@@ -15,19 +17,33 @@ export class HomePage extends localize(i18next)(LitElement) {
         position: relative;
       }
 
-      [home] {
+      .signin {
         position: absolute;
-        left: 20px;
+        right: 20px;
         top: 10px;
-        font-size: 2em;
-        color: var(--primary-color);
+        display: inline-block;
+        padding: 12px 24px;
+        font-size: 16px;
+        font-weight: bold;
+        color: var(--md-sys-color-on-primary);
+        background-color: var(--md-sys-color-primary-container);
+        border: none;
+        border-radius: 4px;
+        text-align: center;
+        text-decoration: none;
+        transition:
+          background-color 0.3s,
+          transform 0.3s;
       }
 
-      [signin] {
-        position: absolute;
-        right: 20px;
-        top: 20px;
-        font-size: 2em;
+      .signin:hover {
+        background-color: var(--md-sys-color-on-primary-container);
+        transform: translateY(-2px);
+      }
+
+      .signin:active {
+        background-color: var(--md-sys-color-primary-container);
+        transform: translateY(0);
       }
 
       [message] {
@@ -96,7 +112,7 @@ export class HomePage extends localize(i18next)(LitElement) {
       input {
         border: var(--border-dark-color);
         border-radius: var(--border-radius);
-        padding: var(--input-padding);
+        padding: var(--padding-default);
         font: var(--input-font);
       }
 
@@ -150,7 +166,7 @@ export class HomePage extends localize(i18next)(LitElement) {
           margin: var(--margin-narrow) 0 var(--margin-default) 0;
           text-align: center;
         }
-        fieldset mwc-button {
+        fieldset md-text-button {
           width: 100%;
         }
       }
@@ -171,8 +187,15 @@ export class HomePage extends localize(i18next)(LitElement) {
     const explanation2 = this.explanation2 || 'Everything you need to go from where you are, to where you want to be.'
 
     return html`
-      <mwc-icon-button home icon="home" @click=${e => (window.location.href = '/')}></mwc-icon-button>
-      <mwc-button signin dense @click=${e => (window.location.href = '/auth/signin')}>sign in</mwc-button>
+      <a
+        class="signin"
+        @click=${e => {
+          e.preventDefault()
+          window.location.href = '/auth/signin'
+        }}
+      >
+        ${i18next.t('button.sign_in')}</a
+      >
 
       <div message>
         <strong>${tagline}</strong> ${explanation1} <br />
@@ -181,14 +204,13 @@ export class HomePage extends localize(i18next)(LitElement) {
       </div>
 
       <div ticket>
-        <div brand><img src=${icon} /></div>
+        <div brand><img src=${ifDefined(icon)} /></div>
         <div content>
-          <form action="/auth/join" accept-charset="utf-8" name="join" method="POST">
+          <form action="/auth/join" accept-charset="utf-8" name="join" method="post">
             <fieldset>
               <legend>${title} invitation ticket</legend>
               <input type="text" name="email" placeholder="Enter your email address" />
               <input type="submit" value="join now" />
-              <!-- help this button, pls <mwc-button raised label="join now"></mwc-button> -->
             </fieldset>
           </form>
         </div>

package/client/index.ts

@@ -1,97 +1,124 @@
-import '@material/mwc-icon'
+import '@material/web/icon/icon.js'
 import '@operato/i18n/ox-i18n.js'
 
 import { html } from 'lit-html'
 
 import { navigate, store } from '@operato/shell'
-import { ADD_MORENDA } from '@things-factory/more-base'
+import { ADD_MORENDA } from '@things-factory/more-base/client'
 import { hasPrivilege } from '@things-factory/auth-base/dist-client'
 
 export * from './components/role-selector.js'
 export * from './components/domain-switch.js'
 export * from './components/invite-user.js'
 
-export async function setAuthManagementMenus() {
+export type AuthManagementMenuOptions = {
+  role?: boolean
+  appliance?: boolean
+  application?: boolean
+  user?: boolean
+  authProvider?: boolean
+  domain?: boolean
+  attribute?: boolean
+}
+
+export async function setAuthManagementMenus(options?: any) {
+  const {
+    role = true,
+    appliance = true,
+    application = true,
+    user = true,
+    authProvider = true,
+    domain = true,
+    attribute = true
+  } = options || {}
+
   if (
     await hasPrivilege({ privilege: 'mutation', category: 'user', domainOwnerGranted: true, superUserGranted: true })
   ) {
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <mwc-icon>how_to_reg</mwc-icon> `,
-        name: html` <ox-i18n msgid="text.role_management"></ox-i18n> `,
-        action: () => {
-          navigate('roles')
+    role &&
+      store.dispatch({
+        type: ADD_MORENDA,
+        morenda: {
+          icon: html` <md-icon>how_to_reg</md-icon> `,
+          name: html` <ox-i18n msgid="text.role_management"></ox-i18n> `,
+          action: () => {
+            navigate('roles')
+          }
         }
-      }
-    })
+      })
 
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <mwc-icon>devices</mwc-icon> `,
-        name: html` <ox-i18n msgid="text.appliance"></ox-i18n> `,
-        action: () => {
-          navigate('appliance-home')
+    appliance &&
+      store.dispatch({
+        type: ADD_MORENDA,
+        morenda: {
+          icon: html` <md-icon>devices</md-icon> `,
+          name: html` <ox-i18n msgid="text.appliance"></ox-i18n> `,
+          action: () => {
+            navigate('appliance-home')
+          }
         }
-      }
-    })
+      })
 
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <mwc-icon>apps</mwc-icon> `,
-        name: html` <ox-i18n msgid="text.application management"></ox-i18n> `,
-        action: () => {
-          navigate('applications')
+    application &&
+      store.dispatch({
+        type: ADD_MORENDA,
+        morenda: {
+          icon: html` <md-icon>apps</md-icon> `,
+          name: html` <ox-i18n msgid="text.application management"></ox-i18n> `,
+          action: () => {
+            navigate('applications')
+          }
         }
-      }
-    })
+      })
 
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <mwc-icon>people</mwc-icon> `,
-        name: html` <ox-i18n msgid="text.user management"></ox-i18n> `,
-        action: () => {
-          navigate('users')
+    user &&
+      store.dispatch({
+        type: ADD_MORENDA,
+        morenda: {
+          icon: html` <md-icon>people</md-icon> `,
+          name: html` <ox-i18n msgid="text.user management"></ox-i18n> `,
+          action: () => {
+            navigate('users')
+          }
         }
-      }
-    })
+      })
 
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <mwc-icon>badge</mwc-icon> `,
-        name: html` <ox-i18n msgid="text.auth-provider management"></ox-i18n> `,
-        action: () => {
-          navigate('auth-providers')
+    authProvider &&
+      store.dispatch({
+        type: ADD_MORENDA,
+        morenda: {
+          icon: html` <md-icon>badge</md-icon> `,
+          name: html` <ox-i18n msgid="text.auth-provider management"></ox-i18n> `,
+          action: () => {
+            navigate('auth-providers')
+          }
         }
-      }
-    })
+      })
   }
 
   if (await hasPrivilege({ superUserGranted: true })) {
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <mwc-icon>business</mwc-icon> `,
-        name: html` <ox-i18n msgid="text.domain management"></ox-i18n> `,
-        action: () => {
-          navigate('domains')
+    domain &&
+      store.dispatch({
+        type: ADD_MORENDA,
+        morenda: {
+          icon: html` <md-icon>business</md-icon> `,
+          name: html` <ox-i18n msgid="text.domain management"></ox-i18n> `,
+          action: () => {
+            navigate('domains')
+          }
         }
-      }
-    })
+      })
 
-    store.dispatch({
-      type: ADD_MORENDA,
-      morenda: {
-        icon: html` <mwc-icon>dataset</mwc-icon> `,
-        name: html` <ox-i18n msgid="text.attribute management"></ox-i18n> `,
-        action: () => {
-          navigate('attributes')
+    attribute &&
+      store.dispatch({
+        type: ADD_MORENDA,
+        morenda: {
+          icon: html` <md-icon>dataset</md-icon> `,
+          name: html` <ox-i18n msgid="text.attribute management"></ox-i18n> `,
+          action: () => {
+            navigate('attributes')
+          }
         }
-      }
-    })
+      })
   }
 }

package/client/pages/app-binding/app-binding.ts

@@ -1,3 +1,5 @@
+import '@material/web/icon/icon.js'
+
 import Clipboard from 'clipboard'
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
@@ -164,7 +166,7 @@ class AppBinding extends connect(store)(PageView) {
 
     return html`
       <div>
-        <h2><mwc-icon>link</mwc-icon>&nbsp;${app.name}</h2>
+        <h2><md-icon>link</md-icon>&nbsp;${app.name}</h2>
         <p page-description>${app.description}</p>
       </div>
 
@@ -235,10 +237,7 @@ class AppBinding extends connect(store)(PageView) {
                 <input id="access-token" type="text" .value=${this.accessToken || ''} readonly />
                 <button button-in-field clipboard-copy @click=${e => e.preventDefault()}>copy</button>
                 ${accessTokenExp
-                  ? html`<div input-hint>
-                      expired in ${new Date(accessTokenExp).toLocaleString()} :
-                      ${asyncReplace(this.expTimer(accessTokenExp))}
-                    </div>`
+                  ? html`<div input-hint>expired in ${new Date(accessTokenExp).toLocaleString()} : ${asyncReplace(this.expTimer(accessTokenExp))}</div>`
                   : html``}
               </div>
 
@@ -247,10 +246,7 @@ class AppBinding extends connect(store)(PageView) {
                 <input id="refresh-token" type="text" .value=${binding.refreshToken || ''} readonly />
                 <button button-in-field clipboard-copy @click=${e => e.preventDefault()}>copy</button>
                 ${refreshTokenExp
-                  ? html`<div input-hint>
-                      expired in ${new Date(refreshTokenExp).toLocaleString()} :
-                      ${asyncReplace(this.expTimer(refreshTokenExp))}
-                    </div>`
+                  ? html`<div input-hint>expired in ${new Date(refreshTokenExp).toLocaleString()} : ${asyncReplace(this.expTimer(refreshTokenExp))}</div>`
                   : html``}
               </div>
             </div>

package/client/pages/app-binding/app-bindings.ts

@@ -16,7 +16,7 @@ class AppBindings extends connect(store)(PageView) {
 
         overflow: auto;
       }
-      mwc-button {
+      md-elevated-button {
         margin-right: 0;
         float: right;
       }
@@ -114,7 +114,7 @@ class AppBindings extends connect(store)(PageView) {
           `
         )}
       </table>
-      <mwc-button raised @click=${e => navigate('applications')} label="registered applications .."></mwc-button>
+      <md-elevated-button @click=${e => navigate('applications')}>registered applications ..</md-elevated-button>
     `
   }
 

package/client/pages/appliance/appliance.ts

@@ -1,3 +1,5 @@
+import '@material/web/icon/icon.js'
+
 import Clipboard from 'clipboard'
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
@@ -150,7 +152,7 @@ class Appliance extends connect(store)(PageView) {
 
     return html`
       <div>
-        <h2><mwc-icon>devices</mwc-icon>&nbsp;${appliance.name}</h2>
+        <h2><md-icon>devices</md-icon>&nbsp;${appliance.name}</h2>
         <p page-description>${appliance.description}</p>
       </div>
 
@@ -199,13 +201,10 @@ class Appliance extends connect(store)(PageView) {
               <div field grid-span>
                 <label for="access-token">${i18next.t('label.access token')}</label>
                 <input id="access-token" type="text" .value=${appliance.accessToken} readonly />
-                <button button-in-field clipboard-copy @click=${e => e.preventDefault()}>
-                  ${i18next.t('button.copy')}
-                </button>
+                <button button-in-field clipboard-copy @click=${e => e.preventDefault()}>${i18next.t('button.copy')}</button>
                 ${accessTokenExp
                   ? html`<div input-hint>
-                      ${i18next.t('text.token expiry time')} ${new Date(accessTokenExp * 1000).toLocaleString()} :
-                      ${asyncReplace(this.expTimer(accessTokenExp))}
+                      ${i18next.t('text.token expiry time')} ${new Date(accessTokenExp * 1000).toLocaleString()} : ${asyncReplace(this.expTimer(accessTokenExp))}
                     </div>`
                   : html``}
               </div>
@@ -214,9 +213,7 @@ class Appliance extends connect(store)(PageView) {
         </div>
 
         <button @click=${this.deleteAppliance.bind(this)}>${i18next.t('button.delete this appliance')}</button>
-        <button @click=${this.generateApplianceSecret.bind(this)}>
-          ${i18next.t('button.generate new access token')}
-        </button>
+        <button @click=${this.generateApplianceSecret.bind(this)}>${i18next.t('button.generate new access token')}</button>
         <button @click=${this.updateAppliance.bind(this)}>${i18next.t('button.update')}</button>
       </form>
     `

package/client/pages/appliance/home.ts

@@ -96,10 +96,10 @@ class Appliances extends connect(store)(PageView) {
       <div>
         <h2>Registered Appliances</h2>
         <p page-description>
-          What type of appliance are you building?<br />Choose the app type that best suits the audience you’re building
-          for. The appliance type can’t be changed after it’s created.
+          What type of appliance are you building?<br />Choose the app type that best suits the audience you’re building for. The appliance type can’t be changed after
+          it’s created.
         </p>
-        <mwc-button raised @click=${e => navigate('appliance-register')} label="register new appliance"></mwc-button>
+        <md-elevated-button @click=${e => navigate('appliance-register')}>register new appliance</md-elevated-button>
       </div>
 
       <table>

package/client/pages/appliance/register.ts

@@ -136,7 +136,7 @@ class ApplianceRegister extends connect(store)(PageView) {
               <input id="netmask" type="text" name="netmask" />
             </div>
 
-            <mwc-button grid-span @click=${this.createAppliance.bind(this)} raised label="register"></mwc-button>
+            <md-elevated-button grid-span @click=${this.createAppliance.bind(this)}>register</md-elevated-button>
           </div>
         </form>
       </div>

package/client/pages/application/application.ts

@@ -1,3 +1,5 @@
+import '@material/web/icon/icon.js'
+
 import Clipboard from 'clipboard'
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
@@ -8,10 +10,12 @@ import { APPLICATION_TYPES } from '../../constants/application'
 
 import { client } from '@operato/graphql'
 import { navigate, PageView, store } from '@operato/shell'
+import { ButtonContainerStyles } from '@operato/styles'
 
 @customElement('application-page')
 class Application extends connect(store)(PageView) {
   static styles = [
+    ButtonContainerStyles,
     css`
       :host {
         display: flex;
@@ -53,15 +57,12 @@ class Application extends connect(store)(PageView) {
         border: var(--border-dark-color);
         border-radius: var(--border-radius);
         margin: var(--input-margin);
-        padding: var(--input-padding);
+        padding: 9px;
         font: var(--input-font);
         flex: 1;
       }
       select:focus,
       input:focus,
-      button {
-        outline: none;
-      }
       form {
         max-width: var(--content-container-max-width);
       }
@@ -102,23 +103,19 @@ class Application extends connect(store)(PageView) {
       }
       [button-in-field] {
         position: absolute;
-        top: 24px;
-        right: 4px;
+        top: 16px;
+        right: 2px;
+        padding: 0;
+        border-radius: 0;
       }
       [input-hint] {
         font: var(--input-hint-font);
         color: var(--input-hint-color);
       }
       [danger] {
-        --mdc-theme-primary: var(--mdc-danger-button-primary-color);
-      }
-      .button-container {
-        margin-top: var(--margin-wide);
-        text-align: right;
-      }
-      .button-container mwc-button {
-        margin-left: var(--margin-narrow);
+        --md-theme-primary: var(--md-danger-button-primary-color);
       }
+
       @media screen and (max-width: 480px) {
         [field] {
           grid-column: span 2;
@@ -145,7 +142,7 @@ class Application extends connect(store)(PageView) {
 
     return html`
       <div>
-        <h2><mwc-icon>apps</mwc-icon>&nbsp;${app.name}</h2>
+        <h2><md-icon>apps</md-icon>&nbsp;${app.name}</h2>
         <p page-description>${app.description}</p>
       </div>
 
@@ -211,28 +208,18 @@ class Application extends connect(store)(PageView) {
               <div field grid-span>
                 <label for="auth-url">auth URL</label>
                 <input id="auth-url" type="text" .value=${app.authUrl} readonly />
-                <mwc-button
-                  dense
-                  unelevated
-                  button-in-field
-                  clipboard-copy
-                  @click=${e => e.preventDefault()}
-                  label="copy"
-                ></mwc-button>
+                <md-text-button dense button-in-field clipboard-copy @click=${e => e.preventDefault()}
+                  >copy</md-text-button
+                >
                 The endpoint for authorization server. This is used to get the authorization code.
               </div>
 
               <div field grid-span>
                 <label for="access-token-url">access token URL</label>
                 <input id="access-token-url" type="text" .value=${app.accessTokenUrl} readonly />
-                <mwc-button
-                  dense
-                  unelevated
-                  button-in-field
-                  clipboard-copy
-                  @click=${e => e.preventDefault()}
-                  label="copy"
-                ></mwc-button>
+                <md-text-button dense button-in-field clipboard-copy @click=${e => e.preventDefault()}
+                  >copy</md-text-button
+                >
                 The endpoint for authentication server. This is used to exchange the authorization code for an access
                 token.
               </div>
@@ -247,36 +234,28 @@ class Application extends connect(store)(PageView) {
               <div field grid-span>
                 <label for="app-key">appKey</label>
                 <input id="app-key" type="text" .value=${app.appKey} readonly />
-                <mwc-button
-                  dense
-                  unelevated
-                  button-in-field
-                  clipboard-copy
-                  @click=${e => e.preventDefault()}
-                  label="copy"
-                ></mwc-button>
+                <md-text-button dense button-in-field clipboard-copy @click=${e => e.preventDefault()}
+                  >copy</md-text-button
+                >
               </div>
 
               <div field grid-span>
                 <label for="app-secret">appSecret</label>
                 <input id="app-secret" type="text" .value=${app.appSecret} readonly />
-                <mwc-button
-                  dense
-                  unelevated
-                  button-in-field
-                  clipboard-copy
-                  @click=${e => e.preventDefault()}
-                  label="copy"
-                ></mwc-button>
+                <md-text-button dense button-in-field clipboard-copy @click=${e => e.preventDefault()}
+                  >copy</md-text-button
+                >
               </div>
             </div>
           </fieldset>
         </div>
 
         <div class="button-container">
-          <mwc-button raised danger label="delete this app" @click=${this.deleteApplication.bind(this)}></mwc-button>
-          <mwc-button raised label="update" @click=${this.updateApplication.bind(this)}></mwc-button>
-          <mwc-button outlined label="generate new secret"></mwc-button>
+          <button danger @click=${this.deleteApplication.bind(this)}>
+            <md-icon>delete_forever</md-icon>delete this app
+          </button>
+          <button @click=${this.updateApplication.bind(this)}><md-icon>save</md-icon>update</button>
+          <button><md-icon>passkey</md-icon>generate new secret</button>
         </div>
       </form>
     `

package/client/pages/application/applications.ts

@@ -17,7 +17,7 @@ class Applications extends connect(store)(PageView) {
         overflow: auto;
       }
 
-      [outlined] {
+      md-outlined-button {
         float: right;
         margin-top: var(--margin-default);
       }
@@ -99,17 +99,10 @@ class Applications extends connect(store)(PageView) {
     return html`
       <div>
         <h2>Registered Applications</h2>
-        <p page-description>
-          What type of app are you building?<br />Choose the app type that best suits the audience you’re building for.
-        </p>
-        <mwc-button
-          raised
-          @click=${e => navigate('application-register')}
-          label="register new application"
-        ></mwc-button>
+        <p page-description>What type of app are you building?<br />Choose the app type that best suits the audience you’re building for.</p>
+        <md-elevated-button @click=${e => navigate('application-register')}>register new application</md-elevated-button>
       </div>
 
-      <!-- <div> -->
       <table>
         <tr>
           <th>app name</th>
@@ -134,8 +127,7 @@ class Applications extends connect(store)(PageView) {
         )}
       </table>
 
-      <mwc-button outlined @click=${e => navigate('app-bindings')} label="bound applications .."></mwc-button>
-      <!-- </div> -->
+      <md-outlined-button @click=${e => navigate('app-bindings')}>bound applications ..</md-outlined-button>
     `
   }
 

package/client/pages/application/register.ts

@@ -165,7 +165,7 @@ class ApplicationRegister extends connect(store)(PageView) {
               <input id="email" type="text" name="email" />
             </div>
 
-            <mwc-button grid-span @click=${this.createApplication.bind(this)} raised label="register"></mwc-button>
+            <md-elevated-button grid-span @click=${this.createApplication.bind(this)}>register</md-elevated-button>
           </div>
         </form>
       </div>