sumba 1.0.7 → 1.0.9

package/bajo/hook/dobo.sumba-contact-form@before-record-create.js

@@ -0,0 +1,16 @@
+const doboBeforeRecordCreate = {
+  level: 1000,
+  handler: async function (body, options = {}) {
+    const { get, isEmpty } = this.app.bajo.lib._
+    const user = get(options, 'req.user')
+    if (user) {
+      if (isEmpty(body.firstName)) body.firstName = user.firstName
+      if (isEmpty(body.lastName)) body.lastName = user.firstName
+      if (isEmpty(body.email)) body.email = user.email
+    }
+    if (isEmpty(body.category)) body.category = 'MISC'
+    options.checksumId = true
+  }
+}
+
+export default doboBeforeRecordCreate

package/bajoI18N/resource/en-US.json

@@ -1,9 +1,11 @@
 {
-  "signoutWarning": "You're about to sign out. This means your session will be cleared and you'll be asked for your credential again in case you want to access any protected pages and resources.<br /><br />Are your sure?",
+  "signoutWarning": "You\\'re about to sign out. This means your session will be cleared and you\\'ll be asked for your credential again in case you want to access any protected pages and resources.<br /><br />Are your sure?",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",
     "verifyNewPassword": "Verify New Password",
-    "usernameEmail": "Username/Email"
+    "usernameEmail": "Username/Email",
+    "subject": "Subject",
+    "message": "Message"
   }
 }

package/bajoI18N/resource/id.json

@@ -47,6 +47,7 @@
   "User account successfully created": "Akun pengguna sukses dibuat",
   "Reset API Key": "Reset Kunci API",
   "Person In Charge": "Penanggung Jawab",
+  "Contact Form": "Form Kontak",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",
@@ -55,7 +56,9 @@
     "usernameEmail": "Nama Pengguna/Surel",
     "apiKey": "Kunci API",
     "hostname": "Nama Host",
-    "iconset": "Iconset"
+    "iconset": "Iconset",
+    "subject": "Judul",
+    "message": "Pesan"
   },
   "validation": {
     "password.minOfUppercase": "Mengandung setidaknya {{min}} huruf besar",

package/dobo/feature/status.js

@@ -6,7 +6,7 @@ async function status (opts = {}) {
       type: 'string',
       maxLength: 50,
       index: true,
-      values: ['UNVERIFIED', 'ACTIVE', 'INACTIVE']
+      values: opts.values ?? ['UNVERIFIED', 'ACTIVE', 'INACTIVE']
     }],
     hook: {
       beforeCreate: async function ({ body }) {

package/dobo/schema/contact-form.json

@@ -0,0 +1,21 @@
+{
+  "properties": [
+    "id::50:primary:true",
+    "firstName::50:true:true",
+    "lastName::50:true:true",
+    "email::50:true:true",
+    "category::50:true",
+    "subject::255::true",
+    "message:text"
+  ],
+  "feature": {
+    "sumba.status": {
+      "default": "NEW",
+      "values": ["NEW", "ACK"]
+    },
+    "sumba.userId": true,
+    "sumba.siteId": true,
+    "createdAt": true,
+    "updatedAt": true
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Bajo Framework's Biz Suite",
   "main": "index.js",
   "scripts": {

package/waibuMpa/partial/list-item/member-links.html

@@ -0,0 +1,9 @@
+<% if (_meta.user) { %>
+<c:list-item href="sumba:/my-stuff/profile" t:content="Your Profile" />
+<c:list-item href="sumba:/my-stuff/change-password" t:content="Change Password" />
+<c:list-item href="sumba:/signout" t:content="Signout" />
+<% } else { %>
+<c:list-item href="sumba:/signin" t:content="Signin" />
+<c:list-item href="sumba:/user/signup" t:content="New User Signup" />
+<c:list-item href="sumba:/user/forgot-password" t:content="Forgot Password" />
+<% } %>

package/waibuMpa/route/contact-form.js

@@ -0,0 +1,24 @@
+const contactForm = {
+  method: ['GET', 'POST'],
+  handler: async function (req, reply) {
+    const { defaultsDeep } = this.app.bajo
+    const { pick } = this.app.bajo.lib._
+    const { recordCreate } = this.app.waibuDb
+
+    const def = req.user ? pick(req.user, ['firstName', 'lastName', 'email']) : {}
+    const form = defaultsDeep(req.body, def)
+    let error
+    if (req.method === 'POST') {
+      try {
+        const { data } = await recordCreate({ model: 'SumbaContactForm', req, reply, options: { noFlash: true } })
+        req.flash('notify', 'Contact form successfully submitted')
+        return reply.view('sumba.template:/contact-form/success.html', { form: req.body, data })
+      } catch (err) {
+        error = err
+      }
+    }
+    return reply.view('sumba.template:/contact-form/form.html', { form, error })
+  }
+}
+
+export default contactForm

package/waibuMpa/template/contact-form/form.html

@@ -0,0 +1,17 @@
+---
+t:title: Contact Form
+---
+<c:form button reset-validation referer grid-gutter="2">
+  <c:form-input name="firstName" col="6-lg" label-floating <%= _meta.user ? 'readonly' : '' %> />
+  <c:form-input name="lastName" col="6-lg" label-floating <%= _meta.user ? 'readonly' : '' %> />
+  <c:form-input type="email" col="6-lg" name="email" label-floating <%= _meta.user ? 'readonly' : '' %> />
+  <c:form-select name="category" col="6-lg" label-floating>
+    <c:option value="QUESTION" t:content="Question" />
+    <c:option value="INQUIRY" t:content="Inquiry" />
+    <c:option value="BILLING" t:content="Billing" />
+    <c:option value="API" t:content="API Integration" />
+    <c:option value="MISC" t:content="Misc" />
+  </c:form-select>
+  <c:form-input name="subject" label-floating />
+  <c:form-textarea name="message" label-floating style="height:10em"/>
+</c:form>

package/waibuMpa/template/contact-form/success.html

@@ -0,0 +1,7 @@
+---
+t:title: Contact Form
+---
+<p><c:t>Congratulation!</c:t></p>
+<c:list type="unstyled" margin="start-3">
+  <c:list-item t:content="Goto Home" href="/" icon="house"/>
+</c:list>

package/waibuMpa/template/my-stuff/profile/edit.html

@@ -29,7 +29,7 @@ scripts:
         </c:fieldset>
     </c:grid-col>
     <c:grid-col col="4-md">
-      <c:heading type="6-display" t:content="Image" />
+      <c:heading type="5" t:content="Image" />
       <c:img holder="400x200" responsive rounded />
       <c:form-file name="image" no-label wrapper-margin="top-2"/>
       <c:btn-group margin="top-3" flex="full">
@@ -42,7 +42,7 @@ scripts:
       </c:btn>
       <% } %>
       <hr />
-      <c:heading type="6-display" t:content="More" margin="top-3" />
+      <c:heading type="5" t:content="More" margin="top-3" />
       <c:list type="group" hover>
         <c:list-item href="sumba:/my-stuff/change-password" t:content="Change Password" />
         <c:list-item t:content="Display API Key" target="api-key-modal"/>

package/waibuMpa/template/my-stuff/profile/view.html

@@ -28,9 +28,9 @@ scripts:
     </c:fieldset>
   </c:grid-col>
   <c:grid-col col="4-md">
-    <c:heading type="6-display" t:content="Image" />
+    <c:heading type="5" t:content="Image" />
     <c:img holder="400x200" responsive rounded />
-    <c:heading type="6-display" t:content="More" margin="top-3" />
+    <c:heading type="5" t:content="More" margin="top-3" />
     <c:list type="group" hover>
       <c:list-item href="sumba:/my-stuff/profile/edit" t:content="Update Profile" />
       <c:list-item t:content="Display API Key" target="api-key-modal"/>

package/waibuMpa/template/my-stuff/reset-api-key.html

@@ -6,9 +6,11 @@ layout: sumba.layout:/wide.html
   <c:form-plaintext name="apiKey" label-floating wrapper-margin="bottom-2" />
   <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
 </c:form>
+<% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
   <c:include resource="sumba.partial:/list-item/your-profile.html" />
   <c:include resource="sumba.partial:/list-item/change-password.html" />
   <c:include resource="sumba.partial:/list-item/signout.html" />
   <c:include resource="sumba.partial:/list-item/goto-home.html" />
 </c:list>
+<% } %>

package/waibuMpa/template/signin.html

@@ -5,8 +5,10 @@ t:title: Signin
   <c:form-input name="username" label-floating wrapper-margin="bottom-2" />
   <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
 </c:form>
+<% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
   <c:include resource="sumba.partial:/list-item/forgot-password.html" />
   <c:include resource="sumba.partial:/list-item/user-signup.html" />
   <c:include resource="sumba.partial:/list-item/goto-home.html" />
 </c:list>
+<% } %>

package/waibuMpa/template/signout.html

@@ -4,5 +4,7 @@ t:title: Signout
 <c:p t:content="signoutWarning" />
 <c:form method="POST" action="sumba:/signout" referer>
   <c:btn color="primary" t:content="Yes, sign me out now!" type="submit" />
+  <% if (!page.noLinks) { %>
   <c:btn color="link" icon="house" t:content="Goto Home" href="/" />
+  <% } %>
 </c:form>

package/waibuMpa/template/user/activation.html

@@ -4,8 +4,10 @@ t:title: User Activation
 <c:form button reset-validation referer>
   <c:form-input name="key" label-floating />
 </c:form>
+<% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
   <c:include resource="sumba.partial:/list-item/signin.html" />
   <c:include resource="sumba.partial:/list-item/forgot-password.html" />
   <c:include resource="sumba.partial:/list-item/goto-home.html" />
 </c:list>
+<% } %>

package/waibuMpa/template/user/forgot-password.html

@@ -4,8 +4,10 @@ t:title: Forgot Password
 <c:form button reset-validation>
   <c:form-input name="usernameEmail" label-floating wrapper-margin="bottom-2" t:hint="Link to reset password wil be sent to your email"/>
 </c:form>
+<% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
   <c:include resource="sumba.partial:/list-item/signin.html" />
   <c:include resource="sumba.partial:/list-item/user-signup.html" />
   <c:include resource="sumba.partial:/list-item/goto-home.html" />
 </c:list>
+<% } %>

package/waibuMpa/template/user/signup/form.html

@@ -10,8 +10,10 @@ t:title: New User Signup
   <c:form-input name="lastName" col="6-lg" label-floating />
   <c:form-check name="agree" col="12" value="true" t:label="I agree to the <a href='../info/terms-conditions'>Terms and Conditions</a>" />
 </c:form>
+<% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
   <c:include resource="sumba.partial:/list-item/forgot-password.html" />
   <c:include resource="sumba.partial:/list-item/signin.html" />
   <c:include resource="sumba.partial:/list-item/goto-home.html" />
 </c:list>
+<% } %>