@drumee/ui-toolkit 0.0.1 → 0.0.2

package/index.js

@@ -0,0 +1,19 @@
+
+
+function start() {
+  Kind.registerAddons({
+    'dtk_otp': import('./widgets/otp'),
+    'dtk_dialog': import('./widgets/dialog'),
+    'dtk_pwsetter': import('./widgets/pwsetter'),
+  })
+}
+
+if (document.readyState == 'complete') {
+  start()
+} else {
+  if (location.hash) {
+    document.addEventListener('drumee:plugins:ready', start);
+  } else {
+    document.addEventListener('drumee:router:ready', start);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drumee/ui-toolkit",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "",
   "main": ".",
   "repository": {
@@ -59,4 +59,4 @@
   "dependencies": {
     "@drumee/ui-styles": "^1.0.1"
   }
-}
+}

package/skeletons/index.js

@@ -1,3 +1,5 @@
+const haptic = 3000;
+
 /**
  * 
  * @param {*} ui 
@@ -136,6 +138,7 @@ export function entry(ui, opt) {
   })
 }
 
+
 /**
 * 
 * @param {*} ui 
@@ -166,3 +169,76 @@ export function password(ui, opt) {
   });
 }
 
+
+/**
+* 
+* @param {*} ui 
+* @param {*} cn 
+* @param {*} passmeter 
+* @returns 
+*/
+export function password_box(ui, opt) {
+  const fig = ui.fig.family
+  return Skeletons.Box.Y({
+    className: `${fig}__form`,
+    kids: [
+      entry(ui, {
+        placeholder: LOCALE.EMAIL,
+        name: _a.email,
+        sys_pn: _a.email,
+        service: _a.input,
+        value: ui.mget(_a.email) || ""
+      }),
+      password(ui, {
+        placeholder: LOCALE.PASSWORD,
+        name: _a.password,
+        sys_pn: _a.password,
+        interactive: 1,
+        service: 'password-input'
+      }),
+      password(ui, {
+        placeholder: LOCALE.PASSWORD_CONFIRM,
+        name: "password2",
+        sys_pn: "password2",
+      }),
+      { kind: 'dtk_pwsetter', sys_pn: 'pwsetter' },
+      button(ui, {
+        label: LOCALE.CREATE_ACCOUNT,
+        service: 'create-account',
+        type: _a.email,
+        sys_pn: "commit-button",
+        haptic
+      }),
+    ]
+  })
+}
+
+/**
+ * 
+ * @param {*} ui 
+ * @param {*} opt 
+ * @returns 
+ */
+export function dialog_box(ui, opt) {
+  const fig = ui.fig.family
+  const { title, message, buttons, content } = opt;
+  const Buttons = Skeletons.Box.X({
+    className: `${fig}__buttons`,
+    kids: buttons
+  })
+
+  return Skeletons.Box.Y({
+    className: `${fig}__main`,
+    debug: __filename,
+    kids: [
+      header(ui, title),
+      Skeletons.Element({ className: `${fig}__message`, content: message || LOCALE.ERROR_SERVER }),
+      content,
+      Buttons
+    ]
+  })
+
+}
+
+
+

package/skin/index.scss

@@ -0,0 +1,174 @@
+@use '@drumee/ui-styles/src/mixins';
+
+@mixin dtk-butler-main {
+
+  &__ui {
+    width: 100vw;
+    height: 100vh;
+    align-content: center;
+    align-items: center;
+    justify-content: start;
+    background-color: var(--neutral-100);
+    overflow: auto;
+    font-family: var(--font-main);
+    flex-wrap: wrap;
+    padding: var(--spacer-7);
+    gap: var(--spacer-8);
+    flex-shrink: 0;
+
+    &[data-device="mobile"] {
+      padding: 10px;
+      height: auto;
+    }
+  }
+
+  &__main {
+    top: 180px;
+
+    &[data-device="mobile"] {
+      top: 0;
+      gap: var(--spacer-3);
+    }
+
+    justify-content: start;
+    align-items: center;
+    width: 100%;
+    max-width: 480px;
+    border-width: 1px;
+    gap: var(--spacer-5);
+    background-color: var(--white);
+    border: 1px solid var(--neutral-200);
+    padding: var(--spacer-7);
+    border-radius: var(--corner-radius-6);
+  }
+
+
+  &__logo {
+    &-container {
+      align-content: center;
+      justify-content: center;
+      align-items: center;
+      flex-wrap: wrap;
+    }
+
+    &-content {
+      width: 80px;
+      height: 64px;
+      align-content: center;
+      justify-content: start;
+      align-items: start;
+      flex-wrap: wrap;
+
+      svg {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+
+  &__title {
+    font-weight: bold;
+    font-size: 32px;
+    line-height: 40px;
+    text-align: center;
+  }
+
+  &__tips {
+    font-weight: 400;
+    font-style: normal;
+    font-size: 16px;
+    line-height: 26px;
+    letter-spacing: 1px;
+    text-align: center;
+  }
+
+  &__message {
+    font-weight: 400;
+    font-style: normal;
+    font-size: 14px;
+    line-height: 22px;
+    text-align: center;
+    letter-spacing: 1px;
+
+    span {
+      font-weight: bold;
+      cursor: pointer;
+    }
+  }
+
+}
+
+@mixin dtk-butler-button {
+
+  &__buttons {
+    gap: var(--spacer-6);
+    width: 100%;
+    justify-content: center;
+  }
+
+
+  &__button-main {
+    height: 48px;
+    opacity: 1;
+    gap: var(--spacer-4);
+    border-radius: var(--corner-radius-max);
+    padding-top: 8px;
+    padding-right: 16px;
+    padding-bottom: 8px;
+    padding-left: 16px;
+    cursor: pointer;
+
+    &[data-haptic="1"] {
+      opacity: .6;
+      pointer-events: none;
+    }
+
+    &.primary {
+      padding-right: 3px;
+      justify-content: center;
+      grid-template-columns: 1fr 40px;
+      background: var(--primary-500);
+      color: var(--white);
+      align-content: center;
+      flex-wrap: wrap;
+
+      .icon.svg-wrapper {
+        height: 38px;
+        width: 38px;
+        color: var(--primary-500);
+        background-color: white;
+        border-radius: 50%;
+        padding: 9px;
+      }
+    }
+
+    &.secondary {
+      justify-content: center;
+      background-color: var(--neutral-200);
+
+      .icon.svg-wrapper {
+        height: 32px;
+        width: 32px;
+        color: var(--neutral-900);
+        border-radius: 50%;
+        padding: 6px;
+      }
+    }
+
+    svg {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  &__button.btn {
+    width: auto;
+    height: 100%;
+    align-content: center;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    line-height: 20px;
+  }
+
+}

package/widgets/dialog/index.js

@@ -4,10 +4,9 @@
  * @class __welcome_signup
  * @extends __welcome_interact
  */
-const Common = require("..")
 require('./skin');
-
-export class dtk_butler_dialog extends Common {
+const { dtk_common } = require("..")
+export default class dtk_butler_dialog extends dtk_common {
 
   /**
    ** @param {object} opt

package/widgets/dialog/skeleton/index.js

@@ -2,18 +2,19 @@ const { header } = require("../../../skeletons")
 
 export default function (ui) {
   const fig = ui.fig.family
-  const { title, message, buttons } = ui.model.toJSON()
+  const { title, message, buttons, body } = ui.model.toJSON()
   const Buttons = Skeletons.Box.X({
     className: `${fig}__buttons`,
     kids: buttons
   })
-
+  if (message == null) message = '';
   let a = Skeletons.Box.Y({
     className: `${fig}__main`,
     debug: __filename,
     kids: [
       header(ui, title),
-      Skeletons.Element({ className: `${fig}__message`, content: message || LOCALE.ERROR_SERVER }),
+      Skeletons.Element({ className: `${fig}__message`, content: message }),
+      body,
       Buttons
     ]
   })

package/widgets/dialog/skin/index.scss

@@ -1,9 +1,9 @@
 @use '@drumee/ui-styles/src/mixins';
-@use '../../toolkit/skin' as *;
+@use '../../../skin' as *;
 
 .dtk-butler-dialog {
   @include dtk-butler-main;
-
+  @include dtk-butler-button;
 
   &__message {
     font-weight: 400;

package/widgets/index.js

@@ -2,7 +2,7 @@
 /**
  * Common class
  */
-class signup_common extends LetcBox {
+export class dtk_common extends LetcBox {
 
   /**
    * 
@@ -28,4 +28,3 @@ class signup_common extends LetcBox {
   }
 }
 
-module.exports = signup_common

package/widgets/otp/index.js

@@ -1,7 +1,7 @@
 
 require('./skin');
-const Common = require("..")
-export class dtk_otp extends Common {
+const { dtk_common } = require("..")
+export default class dtk_otp extends dtk_common {
 
   /**
    ** @param {object} opt
@@ -45,8 +45,21 @@ export class dtk_otp extends Common {
 
   /**
    * 
+   * @param {*} msg 
    */
-  checkForm(api) {
+  displayMessage(msg, error = 0) {
+    this.__tipsText.set({ content: msg });
+    this.__tipsText.el.dataset.error = error;
+    setTimeout(() => {
+      this.__tipsText.set({ content: '' });
+      this.__tipsText.el.dataset.error = error;
+    }, 3000)
+  }
+
+  /**
+   * 
+   */
+  checkForm() {
     this.ensurePart("digits").then((p) => {
       let res = [];
       for (let c of p.children.toArray()) {
@@ -55,9 +68,19 @@ export class dtk_otp extends Common {
           res.push(v)
         }
       }
+      let api = this.mget(_a.api)
+      let payload = this.mget('payload')
+      this.debug("AAA:59 checkForm", payload, res, api)
       if (res.length >= 6) {
         if (api) {
-          return this.postService(api, { otp: res.join('') }, { async: 1 })
+          return this.postService(api, { ...payload, code: res.join('') }, { async: 1 }).then((data) => {
+            this.debug("AAA:153 OTP verified", data)
+            let service = this.mget(_a.service) || 'otp-verified';
+            this.triggerHandlers({ data, service })
+          }).catch((e) => {
+            this.warn("AAA:157 OTP verify error", e)
+            this.triggerHandlers({ service: 'otp-failed', error: e })
+          })
         }
       }
     })
@@ -107,6 +130,18 @@ export class dtk_otp extends Common {
           this.checkForm()
         })
         break;
+      case "resend-code":
+        let { email } = this.mget('payload')
+        this.postService(SERVICE.otp.send, { email }).then((data) => {
+          this.mset({ payload: data })
+          this.displayMessage(LOCALE.NEW_CODE_RESENT)
+        }).catch((e) => {
+          this.displayMessage(LOCALE.UNKNOWN_ERROR, 1)
+          this.warn("AAA:104 Error sending OTP", e)
+        })
+        break;
+      default:
+        this.triggerHandlers({ ...args, service })
     }
   }
 

package/widgets/otp/skeleton/index.js

@@ -1,4 +1,4 @@
-const { header } = require("../../toolkit/skeleton")
+const { header } = require("../../../skeletons");
 
 function __skl_welcome_signup(ui) {
   const fig = ui.fig.family
@@ -39,7 +39,20 @@ function __skl_welcome_signup(ui) {
       Skeletons.Element({
         className: `${fig}__resend-text resend`,
         content: LOCALE.RESEND_CODE,
-        service: _a.resend
+        service: "resend-code"
+      }),
+    ]
+  })
+
+  const tips = Skeletons.Box.X({
+    className: `${fig}__tips`,
+    kidsOpt: {
+      tagName: _K.tag.span,
+    },
+    kids: [
+      Skeletons.Note({
+        sys_pn: "tips-text",
+        className: `${fig}__tips-text`,
       }),
     ]
   })
@@ -62,6 +75,7 @@ function __skl_welcome_signup(ui) {
       header(ui, title || LOCALE.VALIDATION_SENT_TO),
       message,
       code,
+      tips,
       resend
     ]
   })

package/widgets/otp/skin/index.scss

@@ -1,4 +1,4 @@
-@use '../../toolkit/skin' as *;
+@use '../../../skin' as *;
 
 .dtk-otp {
   @include dtk-butler-main;
@@ -44,6 +44,27 @@
     }
   }
 
+  &__tips {
+    width: 100%;
+    justify-content: center;
+    flex-wrap: wrap;
+
+    &-text {
+      font-weight: 400;
+      font-style: normal;
+      font-size: 16px;
+      line-height: 26px;
+      letter-spacing: 1px;
+      width: 100%;
+
+      &[data-error="1"] {
+        color: var(--red-500);
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
+  }
+
   &__resend {
     width: 100%;
     justify-content: start;

package/widgets/pwsetter/index.js

@@ -2,7 +2,7 @@
 
 require('./skin');
 
-export class dtk_pwmeter extends LetcBox {
+export default class dtk_pwsetter extends LetcBox {
 
   /**
    ** @param {object} opt
@@ -22,28 +22,38 @@ export class dtk_pwmeter extends LetcBox {
 
   /**
    * 
-   * @param {*} pw 
    */
-  check(pw) {
-    let rate = 100 * (pw.length / 20) + 5;
+  check() {
+    let { password, password2 } = this.getData()
+    let rate = 100 * (password.length / 20) + 5;
     if (rate > 100) rate = 100;
     this.__strengthGrade.el.style.width = `${rate}%`;
     let min = 6;
     this._isValid = 0;
-    if (pw.length < min) {
+    if (password.length < min) {
       this.__strengthState.set({ content: LOCALE.WEAK })
       this.__strengthGrade.el.dataset.strenght = "0";
-      this.__errorMessage.set({ content: LOCALE.PASSWORD_AT_LEAST.format(min) })
-    } else if (pw.length <= 10) {
+      this.__messageText.set({ content: LOCALE.PASSWORD_AT_LEAST.format(min) });
+      this.__messageText.el.dataset.status = "error";
+    } else if (password.length <= 10) {
       this.__strengthState.set({ content: LOCALE.STRONG })
       this.__strengthGrade.el.dataset.strenght = "1";
-      this.__errorMessage.set({ content: "" })
+      this.__messageText.set({ content: "" })
       this._isValid = 1;
+      this.__messageText.el.dataset.status = "normal";
     } else {
       this.__strengthGrade.el.dataset.strenght = "2";
       this.__strengthState.set({ content: LOCALE.VERY_STRONG })
-      this.__errorMessage.set({ content: "" });
+      this.__messageText.set({ content: "" });
       this._isValid = 1;
+      this.__messageText.el.dataset.status = "normal";
+    }
+    this.debug("AAA:PWSETTER", { password, password2 })
+    if (password2 && password == password2)  {
+      this.__messageIcon.el.dataset.state = "1";
+      this.__messageText.set({ content: LOCALE.PASSWORD_MATCH })
+    }else{
+      this.__messageIcon.el.dataset.state = "0";
     }
   }
 
@@ -51,16 +61,16 @@ export class dtk_pwmeter extends LetcBox {
    * 
    * @returns 
    */
-  isValid(){
+  isValid() {
     return this._isValid
   }
-  
+
   /**
    * 
    * @param {*} pw 
    */
   message(content) {
-    this.__errorMessage.set({ content })
+    this.__messageText.set({ content })
   }
 
   /**
@@ -72,6 +82,9 @@ export class dtk_pwmeter extends LetcBox {
     this.debug(`onUiEvent service = ${service}`, cmd, this);
 
     switch (service) {
+      case 'password-input':
+        this.check()
+        break;
       default:
         this.triggerHandlers({ service })
     }

package/widgets/pwsetter/skeleton/index.js

@@ -1,3 +1,4 @@
+const { password } = require("../../../skeletons");
 
 /**
 * 
@@ -7,9 +8,29 @@
 */
 function passmeter(ui, opt) {
   let fig = `${ui.fig.family}`
+  const form = Skeletons.Box.Y({
+    className: `${fig}__form`,
+    kids: [
+      password(ui, {
+        placeholder: LOCALE.PASSWORD,
+        name: _a.password,
+        sys_pn: _a.password,
+        interactive: 1,
+        service: 'password-input'
+      }),
+      password(ui, {
+        placeholder: LOCALE.PASSWORD_CONFIRM,
+        name: "password2",
+        sys_pn: "password2",
+        interactive: 1,
+        service: 'password-input'
+      }),
+    ]
+  })
   return Skeletons.Box.Y({
     className: `${fig}__main`,
     kids: [
+      form,
       Skeletons.Box.X({
         className: `${fig}__dashboard`,
         kids: [
@@ -33,11 +54,23 @@ function passmeter(ui, opt) {
           })
         ]
       }),
-      Skeletons.Note({
-        className: `${fig}__error`,
-        content: "",
-        sys_pn: "error-message"
-      }),
+      Skeletons.Box.X({
+        className: `${fig}__dashboard`,
+        kids: [
+          Skeletons.Button.Svg({
+            ico: "checked-circle",
+            className: `${fig}__message-icon`,
+            content: "",
+            sys_pn: "message-icon",
+            state: 0
+          }),
+          Skeletons.Note({
+            className: `${fig}__message-text`,
+            content: "",
+            sys_pn: "message-text"
+          }),
+        ]
+      })
     ]
   })
 };

package/widgets/pwsetter/skin/index.scss

@@ -23,7 +23,12 @@
   }
 
   &__dashboard {
-    gap: 10px;
+    padding-left: 16px;
+    padding-left: 16px;
+    height: 22px;
+    align-content: center;
+    flex-wrap: wrap;
+    gap: 8px;
   }
 
   &__strength-container {
@@ -51,8 +56,71 @@
     }
   }
 
-  &__error {
-    color: var(--red-500);
+  &__message-icon {
+    color: var(--green-400);
+    width: 16px;
+    height: 100%;
+
+    &[data-state="0"] {
+      display: none;
+    }
+  }
+
+  &__message-text {
+    align-content: center;
+    flex-wrap: wrap;
+
+    &[data-status="error"] {
+      color: var(--red-500);
+    }
+  }
+
+  &__buttons,
+  &__form {
+    gap: var(--spacer-4);
+    width: 100%;
+    margin-bottom: var(--spacer-4);
+  }
+
+  &__entry-main {
+    width: 100%;
+    height: 48px;
+    border-radius: 12px;
+    padding-right: 16px;
+    padding-left: 16px;
+    border-width: 1px;
+    justify-content: center;
+    align-content: center;
+    flex-wrap: wrap;
+  }
+
+  &__entry-input {
+    &[data-status="error"] {
+      input {
+        border: 1px var(--red-600) solid;
+      }
+    }
   }
 
+  &__entry-input {
+    input {
+      width: 100%;
+      gap: var(--spacer-4);
+      width: 100%;
+      border-radius: var(--spacer-4);
+      padding-top: 12px;
+      padding-right: 16px;
+      padding-bottom: 12px;
+      padding-left: 16px;
+      border: 1px var(--neutral-200) solid;
+    }
+
+    .entry-reminder__icon {
+      right: 5px;
+      position: absolute;
+    }
+
+    width: 100%;
+    height: 100%;
+  }
 }